From 83405b6dd2a6c78ba7da3b9f9826185a828a588f Mon Sep 17 00:00:00 2001 From: Default email Date: Wed, 15 Mar 2023 17:39:30 +0100 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: ac718d02867a84b42522a0ece52d841188208f2c --- third_party/nixpkgs/.github/CODEOWNERS | 1 + .../workflows/check-maintainers-sorted.yaml | 21 + .../nixpkgs/doc/builders/fetchers.chapter.md | 1 + .../doc/languages-frameworks/gnome.section.md | 4 - .../languages-frameworks/haskell.section.md | 24 +- .../doc/languages-frameworks/rust.section.md | 172 +- third_party/nixpkgs/lib/attrsets.nix | 60 + third_party/nixpkgs/lib/default.nix | 2 +- third_party/nixpkgs/lib/modules.nix | 34 +- third_party/nixpkgs/lib/path/default.nix | 77 + third_party/nixpkgs/lib/path/tests/unit.nix | 30 + third_party/nixpkgs/lib/systems/default.nix | 3 +- third_party/nixpkgs/lib/systems/doubles.nix | 2 +- third_party/nixpkgs/lib/systems/examples.nix | 5 +- third_party/nixpkgs/lib/systems/inspect.nix | 2 +- third_party/nixpkgs/lib/systems/parse.nix | 2 +- third_party/nixpkgs/lib/tests/misc.nix | 31 + third_party/nixpkgs/lib/tests/modules.sh | 12 + .../tests/modules/disable-module-bad-key.nix | 16 + .../tests/modules/disable-module-with-key.nix | 34 + .../disable-module-with-toString-key.nix | 34 + .../tests/modules/merge-module-with-key.nix | 49 + .../nixpkgs/maintainers/maintainer-list.nix | 2563 ++++---- .../scripts/check-maintainers-sorted.nix | 57 + .../scripts/haskell/hydra-report.hs | 4 +- third_party/nixpkgs/maintainers/team-list.nix | 1 + .../development/replace-modules.section.md | 11 +- .../manual/release-notes/rl-2305.section.md | 17 + .../nixos/modules/config/no-x-libs.nix | 2 +- .../installer/netboot/netboot-minimal.nix | 3 + .../installer/tools/nixos-generate-config.pl | 15 +- .../nixpkgs/nixos/modules/module-list.nix | 8 + .../nixpkgs/nixos/modules/profiles/base.nix | 16 +- .../nixpkgs/nixos/modules/programs/atop.nix | 2 + .../nixpkgs/nixos/modules/programs/java.nix | 24 +- .../nixos/modules/services/backup/btrbk.nix | 57 +- .../modules/services/cluster/hadoop/hbase.nix | 230 +- .../cluster/kubernetes/addons/dns.nix | 11 +- .../continuous-integration/hydra/default.nix | 2 +- .../woodpecker/agent.nix | 99 + .../woodpecker/server.nix | 98 + .../modules/services/development/gemstash.nix | 103 + .../nixos/modules/services/hardware/fwupd.nix | 16 + .../nixos/modules/services/misc/gitlab.nix | 218 +- .../modules/services/misc/jellyseerr.nix | 62 + .../nixos/modules/services/misc/readarr.nix | 88 + .../modules/services/misc/zoneminder.nix | 12 +- .../modules/services/monitoring/grafana.nix | 2 +- .../monitoring/prometheus/default.nix | 4 +- .../modules/services/networking/cgit.nix | 203 + .../networking/networkd-dispatcher.nix | 87 +- .../services/networking/ntp/chrony.nix | 2 +- .../services/system/cachix-watch-store.nix | 2 +- .../nixos/modules/services/web-apps/coder.nix | 217 + .../services/x11/desktop-managers/phosh.nix | 2 +- .../services/x11/desktop-managers/plasma5.nix | 1 + .../services/x11/window-managers/nimdow.nix | 23 + .../nixos/modules/services/x11/xserver.nix | 3 +- .../modules/system/activation/top-level.nix | 30 +- .../nixos/modules/system/boot/binfmt.nix | 4 +- .../system/boot/loader/grub/install-grub.pl | 7 +- .../systemd-boot/systemd-boot-builder.py | 17 +- .../nixos/modules/system/boot/systemd.nix | 2 +- .../modules/system/boot/systemd/initrd.nix | 29 +- .../nixos/modules/tasks/filesystems.nix | 48 +- .../nixos/modules/tasks/filesystems/vfat.nix | 2 +- .../virtualisation/ec2-metadata-fetcher.sh | 7 +- .../nixos/modules/virtualisation/qemu-vm.nix | 41 +- third_party/nixpkgs/nixos/tests/all-tests.nix | 8 + .../nixpkgs/nixos/tests/btrbk-doas.nix | 114 + third_party/nixpkgs/nixos/tests/cgit.nix | 73 + third_party/nixpkgs/nixos/tests/coder.nix | 24 + .../nixpkgs/nixos/tests/docker-tools.nix | 54 +- third_party/nixpkgs/nixos/tests/fsck.nix | 12 +- .../nixpkgs/nixos/tests/garage/default.nix | 2 +- third_party/nixpkgs/nixos/tests/gemstash.nix | 51 + third_party/nixpkgs/nixos/tests/gitlab.nix | 12 +- .../nixpkgs/nixos/tests/hadoop/hbase.nix | 25 + .../nixos/tests/initrd-secrets-changing.nix | 58 + third_party/nixpkgs/nixos/tests/installer.nix | 6 +- third_party/nixpkgs/nixos/tests/kea.nix | 120 +- third_party/nixpkgs/nixos/tests/knot.nix | 48 +- .../nixpkgs/nixos/tests/matrix/mjolnir.nix | 5 +- .../nixpkgs/nixos/tests/nixops/default.nix | 8 +- third_party/nixpkgs/nixos/tests/openldap.nix | 2 +- third_party/nixpkgs/nixos/tests/readarr.nix | 18 + .../nixpkgs/nixos/tests/timescaledb.nix | 93 + .../audio/bitwig-studio/bitwig-studio4.nix | 4 +- .../applications/audio/blanket/default.nix | 5 +- .../pkgs/applications/audio/carla/default.nix | 36 +- .../pkgs/applications/audio/cozy/default.nix | 5 - .../audio/easyeffects/default.nix | 5 +- .../audio/go-musicfox/default.nix | 6 +- .../applications/audio/gpodder/default.nix | 7 +- .../audio/listenbrainz-mpd/default.nix | 9 +- .../pkgs/applications/audio/mixxx/default.nix | 6 +- .../applications/audio/musikcube/default.nix | 6 +- .../pkgs/applications/audio/mympd/default.nix | 4 +- .../applications/audio/ncspot/default.nix | 6 +- .../applications/audio/opustags/default.nix | 4 +- .../audio/pulseaudio-dlna/default.nix | 2 +- .../audio/pulseeffects-legacy/default.nix | 1 - .../pkgs/applications/audio/qmmp/default.nix | 9 +- .../applications/audio/reaper/default.nix | 6 +- .../applications/audio/sonata/default.nix | 4 - .../audio/spotify-player/default.nix | 9 +- .../applications/audio/strawberry/default.nix | 4 +- .../audio/sublime-music/default.nix | 6 +- .../applications/audio/tageditor/default.nix | 4 +- .../pkgs/applications/audio/tauon/default.nix | 2 +- .../applications/audio/touchosc/default.nix | 8 +- .../applications/audio/touchosc/update.sh | 31 +- .../applications/audio/zrythm/default.nix | 106 +- .../blockchains/clightning/default.nix | 2 +- .../blockchains/erigon/default.nix | 6 +- .../blockchains/lighthouse/default.nix | 6 +- .../blockchains/polkadot/default.nix | 6 +- .../applications/editors/bless/default.nix | 1 - .../pkgs/applications/editors/bvi/default.nix | 4 +- .../editors/codeblocks/default.nix | 67 +- .../applications/editors/cudatext/default.nix | 4 +- .../applications/editors/cudatext/deps.json | 12 +- .../emacs/elisp-packages/elpa-generated.nix | 79 +- .../emacs/elisp-packages/manual-packages.nix | 10 + .../manual-packages/acm-terminal/default.nix | 43 + .../manual-packages/acm/default.nix | 32 + .../manual-packages/bqn-mode/default.nix | 22 + .../manual-packages/lsp-bridge/default.nix | 97 + .../emacs/elisp-packages/nongnu-generated.nix | 6 +- .../elisp-packages/recipes-archive-melpa.json | 1918 +++--- .../applications/editors/emacs/generic.nix | 7 +- .../applications/editors/l3afpad/default.nix | 4 +- .../editors/neovim/neovim-gtk.nix | 40 + .../editors/rednotebook/default.nix | 4 - .../editors/vim/plugins/generated.nix | 820 +-- .../vim/plugins/nvim-treesitter/generated.nix | 131 +- .../editors/vim/plugins/overrides.nix | 37 +- .../editors/vim/plugins/vim-plugin-names | 8 +- .../editors/vscode/extensions/default.nix | 21 +- .../vscode/extensions/language-packs.nix | 31 +- .../rust-analyzer/build-deps/package.json | 29 +- .../extensions/rust-analyzer/default.nix | 4 +- .../vscode/extensions/rust-analyzer/update.sh | 2 +- .../applications/editors/vscode/vscode.nix | 12 +- .../applications/editors/vscode/vscodium.nix | 12 +- .../applications/emulators/box64/default.nix | 14 +- .../emulators/c64-debugger/default.nix | 2 +- .../emulators/dolphin-emu/default.nix | 3 - .../emulators/proton-caller/default.nix | 6 +- .../emulators/retroarch/cores.nix | 19 +- .../emulators/retroarch/default.nix | 13 +- .../retroarch/fix-flycast-makefile.patch | 12 - .../emulators/retroarch/hashes.json | 186 +- .../retroarch/libretro-core-info.nix | 4 +- .../emulators/retroarch/mkLibretroCore.nix | 1 + .../emulators/ryujinx/appdir.patch | 23 - .../emulators/ryujinx/default.nix | 20 +- .../applications/emulators/ryujinx/deps.nix | 67 +- .../applications/emulators/vbam/default.nix | 1 - .../pkgs/applications/emulators/wine/base.nix | 7 +- .../applications/emulators/wine/sources.nix | 8 +- .../applications/emulators/wine/staging.nix | 11 +- .../applications/emulators/xemu/default.nix | 4 +- .../applications/file-managers/lf/ctpv.nix | 4 +- .../applications/finance/odoo/default.nix | 2 +- .../gis/zombietrackergps/default.nix | 1 + .../graphics/ImageMagick/default.nix | 4 +- .../graphics/cq-editor/default.nix | 2 +- .../applications/graphics/curtail/default.nix | 22 +- .../applications/graphics/dia/default.nix | 3 + .../graphics/displaycal/default.nix | 2 +- .../applications/graphics/eddy/default.nix | 2 +- .../applications/graphics/hydrus/default.nix | 16 +- .../graphics/kodelife/default.nix | 8 +- .../applications/graphics/mcomix/default.nix | 8 +- .../graphics/photoflow/CMakeLists.patch | 13 - .../graphics/photoflow/default.nix | 101 - .../graphics/photoflow/fix-build.patch | 76 - .../applications/graphics/photoqt/default.nix | 25 +- .../graphics/pick-colour-picker/default.nix | 4 - .../graphics/sane/backends/default.nix | 6 +- .../applications/graphics/tev/default.nix | 1 - .../applications/misc/1password/default.nix | 10 +- .../misc/ArchiSteamFarm/default.nix | 10 +- .../applications/misc/ArchiSteamFarm/deps.nix | 16 +- .../misc/ArchiSteamFarm/fix-framework.diff | 24 + .../misc/ArchiSteamFarm/web-ui/default.nix | 4 +- .../ArchiSteamFarm/web-ui/node-packages.nix | 223 +- .../applications/misc/ausweisapp2/default.nix | 4 +- .../applications/misc/blender/default.nix | 3 + .../applications/misc/calibre/default.nix | 2 +- .../applications/misc/citations/default.nix | 2 +- .../pkgs/applications/misc/cobang/default.nix | 4 +- .../pkgs/applications/misc/confy/default.nix | 57 + .../pkgs/applications/misc/cotp/default.nix | 4 +- .../misc/databricks-sql-cli/default.nix | 49 +- .../applications/misc/deckmaster/default.nix | 9 +- .../pkgs/applications/misc/dunst/default.nix | 4 +- .../misc/electron-cash/default.nix | 2 +- .../applications/misc/electrum/default.nix | 2 +- .../pkgs/applications/misc/electrum/grs.nix | 2 +- .../pkgs/applications/misc/electrum/ltc.nix | 2 +- .../applications/misc/etesync-dav/default.nix | 8 +- .../applications/misc/gallery-dl/default.nix | 4 +- .../misc/gnome-secrets/default.nix | 1 - .../pkgs/applications/misc/gpxsee/default.nix | 9 +- .../applications/misc/hamster/default.nix | 7 +- .../applications/misc/haxor-news/default.nix | 6 +- .../applications/misc/hue-plus/default.nix | 42 + .../pkgs/applications/misc/hugo/default.nix | 6 +- .../misc/jetbrains-toolbox/default.nix | 74 + .../pkgs/applications/misc/kupfer/default.nix | 10 +- .../pkgs/applications/misc/lutris/default.nix | 6 +- .../applications/misc/mediaelch/default.nix | 2 +- .../applications/misc/megacmd/default.nix | 4 +- .../applications/misc/megasync/default.nix | 4 +- .../applications/misc/minigalaxy/default.nix | 7 +- .../pkgs/applications/misc/mkgmap/default.nix | 4 +- .../misc/monitorcontrol/default.nix | 33 + .../applications/misc/octoprint/default.nix | 11 + .../applications/misc/onboard/default.nix | 3 - .../pkgs/applications/misc/openlp/lib.nix | 4 +- .../applications/misc/organicmaps/default.nix | 14 +- .../applications/misc/pe-bear/default.nix | 4 +- .../pkgs/applications/misc/phoc/default.nix | 5 +- .../applications/misc/printrun/default.nix | 2 - .../applications/misc/privacyidea/default.nix | 22 +- .../misc/process-viewer/default.nix | 6 +- .../applications/misc/pytrainer/default.nix | 14 +- .../applications/misc/shell-genie/default.nix | 10 +- .../pkgs/applications/misc/ttdl/default.nix | 6 +- .../pkgs/applications/misc/usql/default.nix | 6 +- .../pkgs/applications/misc/valent/default.nix | 67 + .../pkgs/applications/misc/wike/default.nix | 1 - .../pkgs/applications/misc/zine/default.nix | 6 +- .../networking/avalanchego/default.nix | 4 +- .../networking/browsers/brave/default.nix | 4 +- .../networking/browsers/chromium/default.nix | 6 +- .../browsers/chromium/upstream-info.json | 56 +- .../firefox-bin/devedition_sources.nix | 802 +-- .../browsers/firefox-bin/release_sources.nix | 806 +-- .../networking/browsers/firefox/common.nix | 41 +- .../env_var_for_system_dir-ff111.patch | 22 + .../networking/browsers/firefox/packages.nix | 8 +- .../networking/browsers/ladybird/default.nix | 3 - .../networking/browsers/lagrange/default.nix | 4 +- .../browsers/microsoft-edge/browser.nix | 16 +- .../networking/browsers/offpunk/default.nix | 38 +- .../networking/browsers/opera/default.nix | 2 +- .../browsers/qutebrowser/default.nix | 4 +- .../networking/browsers/vivaldi/default.nix | 18 +- .../browsers/vivaldi/update-vivaldi.sh | 16 + .../networking/browsers/vivaldi/update.sh | 15 +- .../applications/networking/calls/default.nix | 4 +- .../networking/circumflex/default.nix | 6 +- .../cluster/eks-node-viewer/default.nix | 23 + .../networking/cluster/fluxcd/default.nix | 8 +- .../networking/cluster/helm/default.nix | 6 +- .../networking/cluster/k3s/1_26/default.nix | 8 +- .../networking/cluster/karmor/default.nix | 6 +- .../networking/cluster/kluctl/default.nix | 6 +- .../cluster/kubebuilder/default.nix | 4 +- .../networking/cluster/kubedog/default.nix | 6 +- .../cluster/kubelogin-oidc/default.nix | 6 +- .../kubernetes-metrics-server/default.nix | 27 + .../networking/cluster/kyverno/default.nix | 6 +- .../networking/cluster/openlens/default.nix | 40 + .../networking/cluster/rancher/default.nix | 6 +- .../networking/cluster/rke/default.nix | 4 +- .../networking/cluster/roxctl/default.nix | 4 +- .../terraform-providers/providers.json | 116 +- .../networking/cluster/terraform/default.nix | 6 +- .../networking/cluster/terragrunt/default.nix | 4 +- .../networking/cluster/velero/default.nix | 6 +- .../networking/cluster/werf/default.nix | 8 +- .../networking/dnscontrol/default.nix | 6 +- .../feedreaders/gnome-feeds/default.nix | 3 - .../networking/flexget/default.nix | 12 +- .../networking/ftp/filezilla/default.nix | 4 +- .../applications/networking/geph/default.nix | 122 + .../networking/geph/package-lock.json | 3658 +++++++++++ .../applications/networking/giara/default.nix | 3 - .../applications/networking/gossa/default.nix | 2 +- .../instant-messengers/bluejeans/default.nix | 4 +- .../cinny-desktop/default.nix | 2 +- .../instant-messengers/discord/default.nix | 4 +- .../instant-messengers/discord/linux.nix | 2 + .../element/element-desktop.nix | 24 +- .../element/element-web.nix | 24 +- .../instant-messengers/element/pin.json | 7 - .../instant-messengers/element/pin.nix | 9 + .../instant-messengers/element/update.sh | 14 +- .../instant-messengers/jackline/default.nix | 6 +- .../instant-messengers/jami/default.nix | 4 +- .../matrix-commander/default.nix | 2 +- .../instant-messengers/mirage/default.nix | 2 +- .../instant-messengers/nchat/default.nix | 2 +- .../instant-messengers/nheko/default.nix | 3 - .../pantalaimon/default.nix | 8 +- .../signal-desktop/default.nix | 8 +- .../instant-messengers/zoom-us/default.nix | 12 +- .../networking/ipfs-cluster/default.nix | 6 +- .../scripts/weechat-matrix/default.nix | 6 +- .../networking/localsend/default.nix | 64 + .../mailreaders/bubblemail/default.nix | 5 +- .../networking/mkchromecast/default.nix | 2 +- .../networking/mullvad/mullvad.nix | 19 +- .../newsreaders/liferea/default.nix | 4 +- .../networking/nextcloud-client/default.nix | 4 +- .../networking/opsdroid/default.nix | 2 +- .../networking/p2p/deluge/default.nix | 2 +- .../networking/p2p/fragments/default.nix | 16 +- .../networking/p2p/fragments/gtk4-rs.patch | 28 + .../networking/p2p/tremc/default.nix | 2 +- .../networking/protonvpn-gui/default.nix | 2 - .../networking/remote/waypipe/default.nix | 4 +- .../networking/shellhub-agent/default.nix | 10 +- .../networking/sync/celeste/default.nix | 114 + .../sync/celeste/librclone-path.patch | 31 + .../networking/sync/celeste/target-dir.patch | 16 + .../networking/syncthing/default.nix | 6 +- .../pkgs/applications/office/gtg/default.nix | 1 - .../applications/office/jabref/default.nix | 45 +- .../applications/office/karlender/default.nix | 6 +- .../office/libreoffice/default.nix | 110 +- .../office/libreoffice/wrapper.nix | 136 +- .../office/libreoffice/wrapper.sh | 32 - .../office/pdfmixtool/default.nix | 11 +- .../office/super-productivity/default.nix | 4 +- .../pkgs/applications/office/zim/default.nix | 3 +- .../qubes/qubes-core-vchan-xen/default.nix | 4 +- .../applications/radio/cloudlog/default.nix | 2 +- .../applications/radio/gnss-sdr/default.nix | 2 +- .../pkgs/applications/radio/gnuradio/3.8.nix | 4 +- .../pkgs/applications/radio/gnuradio/3.9.nix | 4 +- .../applications/radio/gnuradio/default.nix | 4 +- .../pkgs/applications/radio/uhd/3.5.nix | 4 +- .../pkgs/applications/radio/uhd/default.nix | 4 +- .../science/biology/diamond/default.nix | 4 +- .../science/biology/eggnog-mapper/default.nix | 2 +- .../science/biology/muscle/default.nix | 4 +- .../science/biology/neuron/default.nix | 12 +- .../science/biology/veryfasttree/default.nix | 4 +- .../science/electronics/flatcam/default.nix | 2 +- .../science/engineering/strictdoc/default.nix | 4 +- .../science/logic/abc/default.nix | 6 +- .../science/logic/tamarin-prover/default.nix | 7 +- .../science/math/calc/default.nix | 4 +- .../applications/science/math/maxima/5.45.nix | 126 + .../science/math/maxima/default.nix | 6 - .../science/math/readstat/default.nix | 2 +- .../science/math/sage/default.nix | 2 +- .../science/misc/bada-bib/default.nix | 1 - .../science/misc/root/default.nix | 6 +- .../applications/search/recoll/default.nix | 4 +- .../terminal-emulators/guake/default.nix | 5 - .../terminal-emulators/kitty/themes.nix | 36 + .../terminal-emulators/xterm/default.nix | 4 +- .../version-management/bumpver/default.nix | 5 + .../version-management/commitizen/default.nix | 5 +- .../version-management/gfold/default.nix | 6 +- .../version-management/gh/default.nix | 6 +- .../git-machete/default.nix | 4 +- .../git-workspace/default.nix | 6 +- .../gitlab/Remove-geo-from-database.yml.patch | 34 +- .../version-management/gitlab/data.json | 16 +- .../version-management/gitlab/default.nix | 1 + .../version-management/gitlab/gitaly/Gemfile | 20 +- .../gitlab/gitaly/Gemfile.lock | 160 +- .../gitlab/gitaly/default.nix | 6 +- .../gitlab/gitaly/gemset.nix | 276 +- .../gitlab}/gitlab-pages/default.nix | 0 .../gitlab/gitlab-shell/default.nix | 10 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../version-management/gitlab/rubyEnv/Gemfile | 71 +- .../gitlab/rubyEnv/Gemfile.lock | 424 +- .../gitlab/rubyEnv/gemset.nix | 539 +- .../version-management/gitlab/update.py | 9 + .../version-management/gitlint/default.nix | 21 +- .../version-management/glab/default.nix | 4 +- .../version-management/lefthook/default.nix | 4 +- .../version-management/meld/default.nix | 4 - .../version-management/redmine/Gemfile.lock | 38 +- .../version-management/redmine/default.nix | 4 +- .../version-management/redmine/gemset.nix | 64 +- .../pkgs/applications/video/catt/default.nix | 7 +- .../applications/video/devede/default.nix | 9 - .../applications/video/gnomecast/default.nix | 2 +- .../video/jellyfin-mpv-shim/default.nix | 4 +- .../pkgs/applications/video/kazam/default.nix | 3 - .../add-KODI_WEBSERVER_EXTRA_WHITELIST.patch | 88 - .../addons/addon-update-script/default.nix | 2 +- .../video/kodi/addons/arrow/default.nix | 4 +- .../kodi/addons/arteplussept/default.nix | 2 +- .../video/kodi/addons/certifi/default.nix | 4 +- .../video/kodi/addons/chardet/default.nix | 4 +- .../video/kodi/addons/dateutil/default.nix | 4 +- .../video/kodi/addons/defusedxml/default.nix | 4 +- .../video/kodi/addons/future/default.nix | 2 +- .../video/kodi/addons/idna/default.nix | 4 +- .../addons/inputstream-adaptive/default.nix | 17 +- .../inputstream-ffmpegdirect/default.nix | 4 +- .../kodi/addons/inputstream-rtmp/default.nix | 4 +- .../kodi/addons/inputstreamhelper/default.nix | 4 +- .../video/kodi/addons/joystick/default.nix | 4 +- .../video/kodi/addons/keymap/default.nix | 4 +- .../video/kodi/addons/kodi-six/default.nix | 4 +- .../kodi/addons/libretro-genplus/default.nix | 4 +- .../kodi/addons/libretro-mgba/default.nix | 4 +- .../kodi/addons/libretro-snes9x/default.nix | 4 +- .../video/kodi/addons/libretro/default.nix | 4 +- .../video/kodi/addons/myconnpy/default.nix | 4 +- .../kodi/addons/pvr-hdhomerun/default.nix | 4 +- .../video/kodi/addons/pvr-hts/default.nix | 4 +- .../kodi/addons/pvr-iptvsimple/default.nix | 4 +- .../kodi/addons/requests-cache/default.nix | 4 +- .../video/kodi/addons/requests/default.nix | 4 +- .../video/kodi/addons/routing/default.nix | 4 +- .../video/kodi/addons/signals/default.nix | 4 +- .../video/kodi/addons/simplejson/default.nix | 2 +- .../video/kodi/addons/six/default.nix | 4 +- .../kodi/addons/steam-controller/default.nix | 6 +- .../kodi/addons/trakt-module/default.nix | 4 +- .../video/kodi/addons/trakt/default.nix | 4 +- .../kodi/addons/typing_extensions/default.nix | 4 +- .../video/kodi/addons/urllib3/default.nix | 4 +- .../kodi/addons/vfs-libarchive/default.nix | 4 +- .../video/kodi/addons/vfs-sftp/default.nix | 4 +- .../addons/visualization-waveform/default.nix | 4 +- .../video/kodi/addons/websocket/default.nix | 4 +- .../video/kodi/addons/youtube/default.nix | 4 +- .../applications/video/kodi/unwrapped.nix | 47 +- .../video/media-downloader/default.nix | 4 +- .../applications/video/mpv/scripts/uosc.nix | 48 + .../pkgs/applications/video/mpv/wrapper.nix | 3 + .../advanced-scene-switcher/default.nix | 54 + .../video/obs-studio/plugins/default.nix | 2 + .../pkgs/applications/video/peek/default.nix | 4 +- .../applications/video/pitivi/default.nix | 8 +- .../video/vokoscreen-ng/default.nix | 23 +- .../linux-support-installation-target.patch | 40 - .../virtualization/colima/default.nix | 4 +- .../virtualization/cri-o/default.nix | 4 +- .../virtualization/docker/compose_1.nix | 2 +- .../applications/virtualization/lima/bin.nix | 10 +- .../virtualization/lkl/default.nix | 4 + .../virtualization/nixpacks/default.nix | 6 +- .../virtualization/podman/default.nix | 3 +- .../virtualization/virt-manager/default.nix | 1 - ...tch => 0000-fix-install-python.4.15.patch} | 4 +- ...src.patch => 0000-fix-ipxe-src.4.15.patch} | 6 +- .../xen/0004-makefile-use-efi-ld.4.15.patch | 42 + .../xen/0004-makefile-use-efi-ld.patch | 36 - ...-makefile-fix-efi-mountdir-use.4.15.patch} | 12 +- .../virtualization/xen/{4.10.nix => 4.15.nix} | 97 +- .../virtualization/xen/generic.nix | 28 +- .../virtualization/xen/packages.nix | 13 +- .../virtualization/xen/xsa-patches.nix | 5 + .../window-managers/gamescope/default.nix | 58 +- .../window-managers/herbstluftwm/default.nix | 7 + .../window-managers/hyprwm/hypr/default.nix | 19 +- .../window-managers/i3/status-rust.nix | 6 +- .../window-managers/nimdow/default.nix | 36 + .../window-managers/phosh/default.nix | 9 +- .../window-managers/waybox/default.nix | 14 +- .../window-managers/weston/default.nix | 3 +- .../bintools-wrapper/default.nix | 16 +- .../bintools-wrapper/ld-wrapper.sh | 21 +- .../build-support/cc-wrapper/add-hardening.sh | 27 +- .../pkgs/build-support/cc-wrapper/default.nix | 6 +- .../pkgs/build-support/docker/default.nix | 12 +- .../pkgs/build-support/emacs/wrapper.nix | 11 + .../pkgs/build-support/fetchdarcs/builder.sh | 10 +- .../pkgs/build-support/fetchdarcs/default.nix | 11 +- .../pkgs/build-support/fetchpatch/default.nix | 15 +- .../pkgs/build-support/fetchpatch/tests.nix | 7 + .../nixpkgs/pkgs/build-support/ocaml/dune.nix | 5 +- .../rust/build-rust-crate/default.nix | 4 +- .../rust/build-rust-package/default.nix | 4 +- .../rust/hooks/cargo-setup-hook.sh | 10 +- .../pkgs/build-support/rust/hooks/default.nix | 3 - .../setup-hooks/patch-shebangs.sh | 14 +- .../setup-hooks/reproducible-builds.sh | 3 +- .../setup-hooks/wrap-gapps-hook/default.nix | 42 +- .../pkgs/build-support/trivial-builders.nix | 6 +- .../pkgs/build-support/writers/default.nix | 5 + .../pkgs/data/fonts/charis-sil/default.nix | 4 +- .../pkgs/data/fonts/monocraft/default.nix | 31 +- .../pkgs/data/fonts/mononoki/default.nix | 6 +- .../pkgs/data/fonts/openmoji/default.nix | 6 + .../pkgs/data/fonts/sarasa-gothic/default.nix | 4 +- .../nixpkgs/pkgs/data/fonts/siji/default.nix | 2 +- .../icons/numix-icon-theme-circle/default.nix | 4 +- .../pkgs/data/misc/clash-geoip/default.nix | 4 +- .../nixpkgs/pkgs/data/misc/hackage/pin.json | 8 +- .../data/misc/publicsuffix-list/default.nix | 6 +- .../v2ray-domain-list-community/default.nix | 4 +- .../pkgs/data/misc/v2ray-geoip/default.nix | 6 +- .../deepin/apps/deepin-compressor/default.nix | 6 +- .../deepin/apps/deepin-draw/default.nix | 15 +- .../deepin/apps/deepin-reader/default.nix | 10 +- .../deepin/apps/deepin-terminal/default.nix | 7 +- .../deepin/library/gio-qt/default.nix | 4 +- .../library/qt5platform-plugins/default.nix | 2 +- .../gnome/apps/accerciser/default.nix | 6 +- .../desktops/gnome/extensions/collisions.json | 4 + .../gnome/extensions/extensionRenames.nix | 3 + .../desktops/gnome/extensions/extensions.json | 57 +- .../gnome/misc/gnome-tweaks/default.nix | 1 - .../pantheon/apps/elementary-mail/default.nix | 20 +- .../pkgs/desktops/plasma-5/default.nix | 2 +- .../nixpkgs/pkgs/desktops/plasma-5/fetch.sh | 2 +- .../pkgs/desktops/plasma-5/kwin/default.nix | 7 +- .../nixpkgs/pkgs/desktops/plasma-5/srcs.nix | 480 +- .../xfce/applications/catfish/default.nix | 1 - .../beam-modules/erlang-ls/default.nix | 7 +- .../development/compilers/circt/default.nix | 4 +- .../compilers/cudatoolkit/common.nix | 6 +- .../compilers/cudatoolkit/flags.nix | 32 +- .../compilers/cudatoolkit/gpus.nix | 66 +- .../cudatoolkit/redist/overrides.nix | 6 +- .../development/compilers/elm/default.nix | 2 +- .../development/compilers/gcc/10/default.nix | 1 + .../development/compilers/gcc/11/default.nix | 5 + .../development/compilers/gcc/12/default.nix | 4 + .../development/compilers/gcc/4.8/default.nix | 2 +- .../development/compilers/gcc/4.9/default.nix | 1 + .../development/compilers/gcc/6/default.nix | 1 + .../development/compilers/gcc/7/default.nix | 1 + .../development/compilers/gcc/8/default.nix | 1 + .../development/compilers/gcc/9/default.nix | 1 + .../compilers/gcc/common/configure-flags.nix | 11 +- .../pkgs/development/compilers/ghc/8.10.7.nix | 11 +- .../pkgs/development/compilers/ghc/8.8.4.nix | 4 + .../pkgs/development/compilers/ghc/9.0.2.nix | 10 +- .../pkgs/development/compilers/ghc/9.2.4.nix | 15 + .../pkgs/development/compilers/ghc/9.2.5.nix | 15 + .../pkgs/development/compilers/ghc/9.2.6.nix | 15 + .../pkgs/development/compilers/ghc/9.2.7.nix | 8 + .../pkgs/development/compilers/ghc/9.4.2.nix | 9 + .../pkgs/development/compilers/ghc/9.4.3.nix | 9 + .../pkgs/development/compilers/ghc/9.4.4.nix | 8 + .../pkgs/development/compilers/ghc/9.6.1.nix | 4 + ...-3.4-paths-fix-cycle-aarch64-darwin.patch} | 0 ...l-3.6-paths-fix-cycle-aarch64-darwin.patch | 602 ++ .../compilers/ghc/common-hadrian.nix | 19 +- .../compilers/ghc/ghc-8.8.4-sphinx-6.0.patch | 13 + .../pkgs/development/compilers/ghc/head.nix | 6 +- .../compilers/gnatboot/default.nix | 2 +- .../pkgs/development/compilers/go/1.19.nix | 4 +- .../development/compilers/halide/default.nix | 4 +- .../compilers/jetbrains-jdk/default.nix | 6 +- .../pkgs/development/compilers/julia/1.9.nix | 4 +- .../compilers/llvm/10/clang/default.nix | 6 +- .../development/compilers/llvm/10/default.nix | 12 +- .../compilers/llvm/10/lld/default.nix | 3 + .../compilers/llvm/11/clang/default.nix | 6 +- .../development/compilers/llvm/11/default.nix | 12 +- .../compilers/llvm/11/lld/default.nix | 3 + .../compilers/llvm/12/clang/default.nix | 6 +- .../development/compilers/llvm/12/default.nix | 12 +- .../compilers/llvm/12/lld/default.nix | 3 + .../llvm/13/clang/add-nostdlibinc-flag.patch | 18 - .../compilers/llvm/13/clang/default.nix | 8 +- .../development/compilers/llvm/13/default.nix | 12 +- .../compilers/llvm/13/lld/default.nix | 3 + .../llvm/14/clang/add-nostdlibinc-flag.patch | 18 - .../compilers/llvm/14/clang/default.nix | 8 +- .../development/compilers/llvm/14/default.nix | 13 +- .../compilers/llvm/14/lld/default.nix | 2 + .../compilers/llvm/15/clang/default.nix | 8 +- .../compilers/llvm/15/compiler-rt/default.nix | 2 +- .../development/compilers/llvm/15/default.nix | 13 +- .../compilers/llvm/15/lld/default.nix | 2 + .../compilers/llvm/5/clang/default.nix | 6 +- .../development/compilers/llvm/5/default.nix | 11 +- .../compilers/llvm/5/lld/default.nix | 3 + .../compilers/llvm/6/clang/default.nix | 6 +- .../development/compilers/llvm/6/default.nix | 11 +- .../compilers/llvm/6/lld/default.nix | 3 + .../compilers/llvm/7/clang/default.nix | 6 +- .../development/compilers/llvm/7/default.nix | 12 +- .../compilers/llvm/7/lld/default.nix | 3 + .../compilers/llvm/8/clang/default.nix | 6 +- .../development/compilers/llvm/8/default.nix | 12 +- .../compilers/llvm/8/lld/default.nix | 3 + .../compilers/llvm/9/clang/default.nix | 6 +- .../development/compilers/llvm/9/default.nix | 12 +- .../compilers/llvm/9/lld/default.nix | 3 + .../clang/add-nostdlibinc-flag.patch | 0 .../compiler-rt/armv7l-15.patch} | 0 .../compilers/llvm/git/clang/default.nix | 16 +- .../llvm/git/compiler-rt/armv7l.patch | 32 - .../llvm/git/compiler-rt/default.nix | 10 +- .../compilers/llvm/git/default.nix | 19 +- .../compilers/llvm/git/libcxx/default.nix | 6 +- .../compilers/llvm/git/libcxxabi/default.nix | 4 +- .../compilers/llvm/git/libunwind/default.nix | 3 +- .../compilers/llvm/git/lld/default.nix | 6 +- .../compilers/llvm/git/lldb/default.nix | 7 +- .../compilers/llvm/git/llvm/default.nix | 14 +- .../compilers/llvm/git/openmp/default.nix | 3 +- .../development/compilers/marst/default.nix | 2 +- .../compilers/minimacy/default.nix | 17 +- .../development/compilers/ocaml/generic.nix | 14 +- .../pkgs/development/compilers/openjdk/11.nix | 5 +- .../pkgs/development/compilers/openjdk/17.nix | 5 +- .../pkgs/development/compilers/openjdk/19.nix | 5 +- .../development/compilers/p4c/default.nix | 4 +- .../development/compilers/ponyc/default.nix | 58 +- .../ponyc/make-safe-for-sandbox.patch | 31 +- .../compilers/ponyc/pony-corral.nix | 8 +- .../purescript/purescript/default.nix | 6 +- .../pkgs/development/compilers/rust/rustc.nix | 8 +- .../development/compilers/vala/default.nix | 4 +- .../development/compilers/yosys/default.nix | 4 +- .../development/coq-modules/ITree/default.nix | 2 + .../coq-modules/coq-elpi/default.nix | 3 + .../coq-modules/coq-ext-lib/default.nix | 2 +- .../coq-modules/coqeal/default.nix | 2 +- .../coq-modules/coquelicot/default.nix | 2 +- .../development/coq-modules/flocq/default.nix | 2 + .../coq-modules/graph-theory/default.nix | 8 +- .../coq-modules/hierarchy-builder/default.nix | 2 +- .../coq-modules/interval/default.nix | 2 + .../coq-modules/mathcomp-analysis/default.nix | 6 +- .../mathcomp-bigenough/default.nix | 2 +- .../coq-modules/mathcomp-finmap/default.nix | 2 +- .../mathcomp-real-closed/default.nix | 2 + .../coq-modules/mathcomp-zify/default.nix | 2 + .../coq-modules/mathcomp/default.nix | 2 + .../coq-modules/multinomials/default.nix | 4 +- .../development/coq-modules/paco/default.nix | 2 +- .../development/embedded/openocd/default.nix | 21 +- .../development/embedded/platformio/core.nix | 7 +- .../gnuradio-modules/osmosdr/default.nix | 2 +- .../haskell-modules/configuration-common.nix | 47 +- .../configuration-ghc-8.10.x.nix | 2 +- .../configuration-ghc-8.6.x.nix | 2 +- .../configuration-ghc-8.8.x.nix | 2 +- .../configuration-ghc-9.0.x.nix | 2 +- .../configuration-ghc-9.2.x.nix | 2 +- .../configuration-ghc-9.4.x.nix | 8 +- .../configuration-ghc-9.6.x.nix | 50 + .../configuration-ghc-9.8.x.nix | 2 +- .../configuration-hackage2nix/broken.yaml | 15 +- .../configuration-hackage2nix/main.yaml | 1 + .../configuration-hackage2nix/stackage.yaml | 119 +- .../transitive-broken.yaml | 16 +- .../haskell-modules/configuration-nix.nix | 21 +- .../haskell-modules/hackage-packages.nix | 2729 +++++--- .../development/interpreters/bats/default.nix | 22 +- .../interpreters/bats/libraries.nix | 16 +- .../development/interpreters/erlang/R25.nix | 4 +- .../development/interpreters/luau/default.nix | 4 +- .../interpreters/python/default.nix | 4 +- .../development/interpreters/ruby/default.nix | 6 +- .../interpreters/spidermonkey/common.nix | 3 - .../interpreters/wasmtime/default.nix | 6 +- .../interpreters/yabasic/default.nix | 19 +- .../development/libraries/SDL2/default.nix | 7 +- .../libraries/SDL2_mixer/default.nix | 3 + .../development/libraries/acl/default.nix | 3 + .../development/libraries/alembic/default.nix | 56 +- .../pkgs/development/libraries/allegro/5.nix | 18 +- .../libraries/amf-headers/default.nix | 26 + .../libraries/arrow-cpp/default.nix | 1 - .../development/libraries/asmjit/default.nix | 2 +- .../libraries/at-spi2-core/default.nix | 7 +- .../libraries/audio/zix/default.nix | 42 + .../libraries/aws-c-cal/default.nix | 4 +- .../development/libraries/babl/default.nix | 4 +- .../libraries/bc-decaf/default.nix | 6 +- .../development/libraries/bobcat/default.nix | 4 - .../development/libraries/boca/default.nix | 4 +- .../development/libraries/c-ares/default.nix | 15 +- .../development/libraries/cgreen/default.nix | 20 +- .../libraries/chromaprint/default.nix | 2 +- .../development/libraries/cmocka/default.nix | 19 +- .../libraries/cmocka/uintptr_t.patch | 16 + .../libraries/cracklib/default.nix | 6 +- .../development/libraries/dav1d/default.nix | 9 +- .../pkgs/development/libraries/embree/2.x.nix | 2 +- .../development/libraries/embree/default.nix | 1 + .../development/libraries/ffmpeg/generic.nix | 12 +- .../libraries/freetype/default.nix | 4 +- .../development/libraries/g2o/default.nix | 7 +- .../development/libraries/gdal/default.nix | 2 + .../libraries/gdk-pixbuf/default.nix | 20 +- .../libraries/geographiclib/default.nix | 4 +- .../gobject-introspection/default.nix | 2 +- ...python-find-version-string-above-310.patch | 4 +- .../development/libraries/grpc/default.nix | 18 +- .../gsettings-desktop-schemas/default.nix | 7 + .../development/libraries/gsm/default.nix | 4 +- .../libraries/gstreamer/default.nix | 2 + .../gstreamer/icamerasrc/default.nix | 55 + .../pkgs/development/libraries/gtk/3.x.nix | 15 +- .../libraries/harfbuzz/default.nix | 4 +- .../development/libraries/hipfft/default.nix | 2 +- .../libraries/hipsparse/default.nix | 2 +- .../development/libraries/httplib/default.nix | 4 +- .../libraries/hunspell/dictionaries.nix | 12 +- .../development/libraries/incrtcl/default.nix | 4 +- .../libraries/ipu6-camera-hal/default.nix | 72 + .../libraries/jbig2enc/default.nix | 2 +- .../libraries/json-glib/default.nix | 12 +- .../libraries/kde-frameworks/default.nix | 2 +- .../libraries/kde-frameworks/fetch.sh | 2 +- .../{solid.nix => solid/default.nix} | 1 + .../solid/fix-search-path.patch | 17 + .../libraries/kde-frameworks/srcs.nix | 664 +- .../libraries/keystone/default.nix | 4 + .../libraries/level-zero/default.nix | 14 +- .../development/libraries/libaom/default.nix | 4 +- .../development/libraries/libass/default.nix | 4 +- .../development/libraries/libax25/default.nix | 2 +- .../libraries/libdatovka/default.nix | 3 +- .../development/libraries/libdrm/default.nix | 4 +- .../libraries/libfabric/default.nix | 2 +- .../development/libraries/libffi/default.nix | 1 + .../libraries/libfido2/default.nix | 4 +- .../libraries/libgbinder/default.nix | 7 + .../development/libraries/libgit2/default.nix | 14 +- .../libraries/libglibutil/default.nix | 5 + .../development/libraries/libheif/default.nix | 4 +- .../development/libraries/libical/default.nix | 20 +- .../development/libraries/libidn2/default.nix | 2 +- .../development/libraries/libime/default.nix | 4 +- .../development/libraries/libjxl/default.nix | 17 +- .../development/libraries/liblc3/default.nix | 4 +- .../libraries/libliftoff/default.nix | 6 +- .../libraries/liblouis/default.nix | 17 +- .../libraries/libmanette/default.nix | 16 +- .../development/libraries/libmbim/default.nix | 3 +- .../libraries/libnotify/default.nix | 3 +- .../libraries/libomxil-bellagio/default.nix | 11 +- .../libraries/libpipeline/default.nix | 4 +- .../libraries/libplacebo/default.nix | 2 +- .../libraries/librclone/default.nix | 33 + .../development/libraries/librsvg/default.nix | 20 +- .../libraries/libsecret/default.nix | 16 +- .../development/libraries/libsoup/3.x.nix | 14 +- .../development/libraries/libsoup/default.nix | 5 + .../development/libraries/libtiff/default.nix | 21 + .../libraries/libtiger/default.nix | 14 +- .../libraries/libtiger/pkg-config.patch | 37 + .../libraries/libunistring/default.nix | 4 +- .../libraries/libvirt-glib/default.nix | 3 +- .../development/libraries/libvpx/default.nix | 4 +- .../libraries/libwacom/default.nix | 18 +- .../libraries/lightning/default.nix | 4 +- .../development/libraries/lmdb/default.nix | 4 +- .../development/libraries/mesa/default.nix | 6 +- .../libraries/migraphx/default.nix | 2 +- .../libraries/minizip-ng/default.nix | 19 +- .../pkgs/development/libraries/mlt/qt-5.nix | 4 +- .../libraries/mtxclient/default.nix | 3 - .../libraries/muparserx/default.nix | 4 +- .../pkgs/development/libraries/nss/latest.nix | 4 +- .../development/libraries/ogre/default.nix | 4 +- .../libraries/opencl-headers/default.nix | 4 +- .../libraries/openldap/default.nix | 11 +- .../development/libraries/openvr/default.nix | 55 + .../libraries/physics/hepmc3/default.nix | 9 +- .../libraries/pipewire/wireplumber.nix | 4 +- .../development/libraries/polkit/default.nix | 11 +- .../development/libraries/presage/default.nix | 3 +- .../libraries/prometheus-cpp/default.nix | 4 +- .../development/libraries/qpdf/default.nix | 4 +- .../libraries/qt-5/5.15/default.nix | 7 +- .../libraries/qt-5/modules/qtbase.nix | 11 +- .../development/libraries/qxmpp/default.nix | 4 +- .../libraries/rapidjson/default.nix | 3 +- .../development/libraries/re2/default.nix | 4 +- .../libraries/rocalution/default.nix | 2 +- .../development/libraries/rure/Cargo.lock | 12 +- .../development/libraries/rure/default.nix | 5 + .../science/chemistry/openmm/default.nix | 3 - .../libraries/science/math/ipopt/default.nix | 4 +- .../libraries/science/math/magma/generic.nix | 3 + .../development/libraries/serd/default.nix | 52 +- .../libraries/simdjson/default.nix | 4 +- .../development/libraries/smooth/default.nix | 4 +- .../development/libraries/sqlite/default.nix | 7 +- .../development/libraries/sqlite/tools.nix | 6 +- .../development/libraries/srtp/default.nix | 4 +- .../development/libraries/stduuid/default.nix | 4 +- .../development/libraries/ta-lib/default.nix | 2 +- .../libraries/tagparser/default.nix | 4 +- .../pkgs/development/libraries/tbb/2020_3.nix | 106 + .../development/libraries/tbb/default.nix | 94 +- .../development/libraries/tracker/default.nix | 8 +- .../development/libraries/volk/default.nix | 2 +- .../development/libraries/waffle/default.nix | 4 +- .../libraries/webrtc-audio-processing/0.3.nix | 6 +- .../webrtc-audio-processing/default.nix | 6 +- .../libraries/xcb-imdkit/default.nix | 4 +- .../development/libraries/zchunk/default.nix | 4 +- .../development/misc/brev-cli/default.nix | 4 +- .../development/misc/datafusion/default.nix | 2 +- .../development/nim-packages/cbor/default.nix | 4 +- .../development/nim-packages/coap/default.nix | 20 + .../development/nim-packages/eris/default.nix | 37 + .../nim-packages/freedesktop_org/default.nix | 32 + .../nim-packages/preserves/default.nix | 20 + .../nim-packages/safeset/default.nix | 22 + .../nim-packages/syndicate/default.nix | 20 + .../development/nim-packages/x11/default.nix | 22 + .../development/node-packages/node-env.nix | 7 +- .../node-packages/node-packages.nix | 5543 ++++++++--------- .../development/node-packages/overrides.nix | 22 +- .../ocaml-modules/alcotest/mirage.nix | 2 + .../development/ocaml-modules/awa/default.nix | 4 +- .../ocaml-modules/chacha/default.nix | 3 +- .../ocaml-modules/conduit/default.nix | 4 +- .../ocaml-modules/conduit/mirage.nix | 4 +- .../development/ocaml-modules/dns/cli.nix | 4 +- .../ocaml-modules/dns/client-lwt.nix | 30 + .../ocaml-modules/dns/client-mirage.nix | 32 + .../development/ocaml-modules/dns/client.nix | 14 - .../development/ocaml-modules/dns/default.nix | 4 +- .../development/ocaml-modules/dns/stub.nix | 4 +- .../ocaml-modules/duration/default.nix | 8 +- .../ocaml-modules/ffmpeg/ffmpeg-avdevice.nix | 13 +- .../development/ocaml-modules/git/unix.nix | 9 +- .../ocaml-modules/gmetadom/default.nix | 36 - .../ocaml-modules/gmetadom/gcc-4.3.patch | 18 - .../ocaml-modules/happy-eyeballs/default.nix | 5 +- .../ocaml-modules/happy-eyeballs/lwt.nix | 4 +- .../ocaml-modules/happy-eyeballs/mirage.nix | 4 +- .../http-mirage-client/default.nix | 63 + .../ocaml-modules/letsencrypt/default.nix | 6 +- .../ocaml-modules/letsencrypt/mirage.nix | 20 + .../ocaml-modules/metrics/default.nix | 1 + .../ocaml-modules/metrics/influx.nix | 2 + .../development/ocaml-modules/metrics/lwt.nix | 2 + .../ocaml-modules/metrics/rusage.nix | 1 + .../ocaml-modules/metrics/unix.nix | 2 + .../ocaml-modules/mirage-crypto/default.nix | 5 +- .../ocaml-modules/mirage-crypto/ec.nix | 2 + .../ocaml-modules/mirage-crypto/pk.nix | 2 + .../ocaml-modules/mirage-crypto/rng-async.nix | 2 + .../ocaml-modules/mirage-crypto/rng-lwt.nix | 17 + .../mirage-crypto/rng-mirage.nix | 1 + .../ocaml-modules/mirage-crypto/rng.nix | 3 +- .../ocaml-modules/mirage-fs/default.nix | 8 +- .../ocaml-modules/mirage-kv/default.nix | 14 +- .../ocaml-modules/mirage-time/default.nix | 10 +- .../ocaml-modules/mirage-time/unix.nix | 7 +- .../ocaml-modules/mirage-unix/default.nix | 4 +- .../ocaml-modules/mirage-vnetif/default.nix | 3 +- .../development/ocaml-modules/paf/cohttp.nix | 1 + .../development/ocaml-modules/paf/default.nix | 8 + .../pkgs/development/ocaml-modules/paf/le.nix | 5 +- .../ocaml-modules/routes/default.nix | 6 +- .../development/ocaml-modules/tls/default.nix | 4 +- .../development/ocaml-modules/tls/lwt.nix | 19 + .../ocaml-modules/x509/default.nix | 4 +- .../development/perl-modules/Po4a/default.nix | 8 +- .../strip-nondeterminism/default.nix | 14 +- .../php-packages/msgpack/default.nix | 16 + .../development/php-packages/ssh2/default.nix | 19 + .../python-modules/Cython/default.nix | 2 +- .../python-modules/absl-py/default.nix | 4 +- .../python-modules/acoustics/default.nix | 2 +- .../python-modules/actdiag/default.nix | 2 +- .../adafruit-nrfutil/default.nix | 4 +- .../adafruit-platformdetect/default.nix | 4 +- .../python-modules/adax/default.nix | 2 +- .../add-trailing-comma/default.nix | 2 +- .../python-modules/adjusttext/default.nix | 2 +- .../python-modules/advocate/default.nix | 2 +- .../python-modules/aemet-opendata/default.nix | 2 +- .../python-modules/aeppl/default.nix | 5 +- .../python-modules/aesara/default.nix | 4 +- .../python-modules/afdko/default.nix | 4 +- .../python-modules/affine/default.nix | 4 +- .../python-modules/agate-sql/default.nix | 4 +- .../python-modules/agate/default.nix | 2 +- .../python-modules/aggdraw/default.nix | 2 +- .../python-modules/ailment/default.nix | 4 +- .../aio-geojson-geonetnz-volcano/default.nix | 2 +- .../python-modules/aioairzone/default.nix | 4 +- .../python-modules/aioapns/default.nix | 2 +- .../python-modules/aioazuredevops/default.nix | 2 +- .../python-modules/aiobroadlink/default.nix | 2 +- .../python-modules/aioconsole/default.nix | 2 +- .../python-modules/aiocron/default.nix | 2 +- .../python-modules/aiofiles/default.nix | 2 +- .../python-modules/aioflo/default.nix | 2 +- .../python-modules/aioftp/default.nix | 2 +- .../python-modules/aioharmony/default.nix | 2 +- .../aiohttp-openmetrics/default.nix | 2 +- .../python-modules/aiohttp-socks/default.nix | 4 +- .../python-modules/aiohttp-wsgi/default.nix | 2 +- .../python-modules/aiohttp/default.nix | 9 +- .../python-modules/aiohwenergy/default.nix | 2 +- .../python-modules/aiolimiter/default.nix | 4 +- .../python-modules/aiomodernforms/default.nix | 2 +- .../aiomultiprocess/default.nix | 2 +- .../python-modules/aiomysensors/default.nix | 4 +- .../python-modules/aiopulse/default.nix | 5 +- .../python-modules/aiopvpc/default.nix | 4 +- .../python-modules/aiopyarr/default.nix | 5 + .../python-modules/aiopylgtv/default.nix | 2 +- .../python-modules/aioquic/default.nix | 2 +- .../python-modules/aiorecollect/default.nix | 2 +- .../python-modules/aioresponses/default.nix | 2 +- .../python-modules/aiorwlock/default.nix | 2 +- .../python-modules/aiosenz/default.nix | 2 +- .../python-modules/aioserial/default.nix | 2 +- .../python-modules/aioshutil/default.nix | 4 +- .../python-modules/aioskybell/default.nix | 5 + .../python-modules/aioslimproto/default.nix | 5 +- .../python-modules/aiosmtpd/default.nix | 4 +- .../python-modules/aiosomecomfort/default.nix | 4 +- .../python-modules/aiostream/default.nix | 2 +- .../python-modules/aiosyncthing/default.nix | 2 +- .../python-modules/aiotractive/default.nix | 2 +- .../python-modules/aiounittest/default.nix | 2 +- .../python-modules/aiowatttime/default.nix | 2 +- .../python-modules/aioxmpp/default.nix | 2 + .../python-modules/aioymaps/default.nix | 2 +- .../python-modules/airly/default.nix | 2 +- .../airthings-cloud/default.nix | 2 +- .../python-modules/alabaster/default.nix | 4 +- .../python-modules/alarmdecoder/default.nix | 2 +- .../python-modules/ale-py/default.nix | 6 +- .../python-modules/alembic/default.nix | 8 +- .../python-modules/allure-behave/default.nix | 2 +- .../python-modules/allure-pytest/default.nix | 2 +- .../allure-python-commons-test/default.nix | 2 +- .../allure-python-commons/default.nix | 2 +- .../python-modules/altair/default.nix | 2 +- .../python-modules/amaranth/default.nix | 4 +- .../python-modules/amazon_kclpy/default.nix | 6 +- .../python-modules/ambee/default.nix | 2 +- .../python-modules/amberelectric/default.nix | 2 +- .../python-modules/amcrest/default.nix | 2 +- .../python-modules/amply/default.nix | 2 +- .../python-modules/angr/default.nix | 4 +- .../python-modules/aniso8601/default.nix | 2 +- .../python-modules/ansi2html/default.nix | 2 +- .../python-modules/ansible-compat/default.nix | 2 +- .../python-modules/ansible-kernel/default.nix | 2 +- .../python-modules/ansible-lint/default.nix | 4 +- .../python-modules/ansible/default.nix | 2 +- .../python-modules/ansimarkup/default.nix | 2 +- .../python-modules/anyascii/default.nix | 2 +- .../python-modules/anyconfig/default.nix | 2 +- .../python-modules/apache-airflow/default.nix | 4 +- .../apache-airflow/providers.nix | 4 +- .../python-modules/apcaccess/default.nix | 2 +- .../python-modules/appnope/default.nix | 2 +- .../python-modules/apprise/default.nix | 6 +- .../python-modules/apptools/default.nix | 2 +- .../{APScheduler => apscheduler}/default.nix | 4 +- .../python-modules/apsw/default.nix | 4 +- .../python-modules/aqualogic/default.nix | 2 +- .../python-modules/archinfo/default.nix | 4 +- .../python-modules/aresponses/default.nix | 2 +- .../python-modules/argcomplete/default.nix | 42 +- .../python-modules/argh/default.nix | 10 +- .../argparse-addons/default.nix | 4 +- .../python-modules/ariadne/default.nix | 4 +- .../python-modules/arnparse/default.nix | 2 +- .../python-modules/arpeggio/default.nix | 2 +- .../python-modules/arris-tg2492lg/default.nix | 2 +- .../python-modules/arrow/default.nix | 2 +- .../python-modules/arviz/default.nix | 6 +- .../python-modules/asana/default.nix | 4 +- .../python-modules/asciimatics/default.nix | 2 +- .../python-modules/asdf/default.nix | 2 +- .../python-modules/ase/default.nix | 2 +- .../python-modules/asf-search/default.nix | 4 +- .../python-modules/asgi-csrf/default.nix | 2 +- .../python-modules/asgiref/default.nix | 2 +- .../python-modules/asn1crypto/default.nix | 2 +- .../python-modules/asn1tools/default.nix | 4 +- .../python-modules/assay/default.nix | 2 +- .../python-modules/astroid/default.nix | 12 +- .../astropy-healpix/default.nix | 2 +- .../python-modules/astropy/default.nix | 4 +- .../python-modules/astroquery/default.nix | 2 +- .../python-modules/asyncclick/default.nix | 2 +- .../python-modules/asyncmy/default.nix | 2 +- .../python-modules/asyncsleepiq/default.nix | 2 +- .../python-modules/asyncssh/default.nix | 33 +- .../atlassian-python-api/default.nix | 2 +- .../python-modules/atom/default.nix | 4 +- .../python-modules/atomicwrites/default.nix | 2 +- .../python-modules/atpublic/default.nix | 2 +- .../atsim_potentials/default.nix | 2 +- .../python-modules/audible/default.nix | 2 +- .../python-modules/audioread/default.nix | 2 +- .../python-modules/audiotools/default.nix | 2 +- .../python-modules/auroranoaa/default.nix | 2 +- .../python-modules/auth0-python/default.nix | 4 +- .../authcaptureproxy/default.nix | 2 +- .../python-modules/authheaders/default.nix | 2 +- .../python-modules/autobahn/default.nix | 4 +- .../python-modules/autocommand/default.nix | 2 +- .../python-modules/autofaiss/default.nix | 4 +- .../python-modules/autoflake/default.nix | 10 +- .../python-modules/autograd/default.nix | 2 +- .../python-modules/autoit-ripper/default.nix | 2 +- .../python-modules/automate-home/default.nix | 6 +- .../python-modules/autopage/default.nix | 2 +- .../python-modules/avro/default.nix | 2 +- .../python-modules/awesomeversion/default.nix | 2 +- .../python-modules/awkward-cpp/default.nix | 4 +- .../python-modules/awkward/default.nix | 4 +- .../aws-lambda-builders/default.nix | 4 +- .../aws-sam-translator/default.nix | 29 +- .../python-modules/aws-xray-sdk/default.nix | 2 +- .../awsiotpythonsdk/default.nix | 2 +- .../azure-appconfiguration/default.nix | 2 +- .../azure-applicationinsights/default.nix | 2 +- .../python-modules/azure-common/default.nix | 2 +- .../azure-containerregistry/default.nix | 2 +- .../python-modules/azure-core/default.nix | 2 +- .../azure-data-tables/default.nix | 2 +- .../python-modules/azure-eventhub/default.nix | 2 +- .../azure-mgmt-appconfiguration/default.nix | 2 +- .../default.nix | 2 +- .../azure-mgmt-authorization/default.nix | 2 +- .../azure-mgmt-botservice/default.nix | 2 +- .../python-modules/azure-mgmt-cdn/default.nix | 2 +- .../azure-mgmt-consumption/default.nix | 2 +- .../azure-mgmt-containerinstance/default.nix | 2 +- .../azure-mgmt-core/default.nix | 2 +- .../azure-mgmt-datalake-store/default.nix | 2 +- .../azure-mgmt-extendedlocation/default.nix | 2 +- .../azure-mgmt-imagebuilder/default.nix | 2 +- .../azure-mgmt-iothub/default.nix | 2 +- .../default.nix | 2 +- .../azure-mgmt-apimanagement/default.nix | 2 +- .../azure-mgmt-kusto/default.nix | 2 +- .../python-modules/azure-mgmt-msi/default.nix | 2 +- .../azure-mgmt-rdbms/default.nix | 2 +- .../azure-mgmt-redhatopenshift/default.nix | 2 +- .../azure-mgmt-redis/default.nix | 2 +- .../default.nix | 2 +- .../azure-mgmt-servicelinker/default.nix | 2 +- .../azure-mgmt-subscription/default.nix | 2 +- .../azure-mgmt-trafficmanager/default.nix | 2 +- .../python-modules/azure-mgmt-web/default.nix | 2 +- .../azure-multiapi-storage/default.nix | 2 +- .../azure-storage-file-share/default.nix | 4 +- .../azure-storage-queue/default.nix | 4 +- .../azure-synapse-artifacts/default.nix | 2 +- .../python-modules/babel/default.nix | 6 +- .../python-modules/backoff/default.nix | 2 +- .../backports-cached-property/default.nix | 2 +- .../backports-zoneinfo/default.nix | 2 +- .../python-modules/bacpypes/default.nix | 6 +- .../python-modules/bambi/default.nix | 4 +- .../python-modules/bandit/default.nix | 4 +- .../bayesian-optimization/default.nix | 2 +- .../python-modules/bayespy/default.nix | 2 +- .../python-modules/bbox/default.nix | 2 +- .../bc-detect-secrets/default.nix | 80 + .../python-modules/bc-jsonpath-ng/default.nix | 48 + .../beancount-black/default.nix | 4 +- .../python-modules/beancount/default.nix | 2 +- .../beancount_docverif/default.nix | 2 +- .../python-modules/beautifulsoup4/default.nix | 6 +- .../python-modules/bech32/default.nix | 2 +- .../python-modules/bellows/default.nix | 4 +- .../python-modules/bencode-py/default.nix | 2 +- .../python-modules/betterproto/default.nix | 2 +- .../python-modules/bidict/default.nix | 21 +- .../python-modules/bids-validator/default.nix | 2 +- .../python-modules/billiard/default.nix | 3 +- .../bimmer-connected/default.nix | 4 +- .../python-modules/bincopy/default.nix | 4 +- .../python-modules/binwalk/default.nix | 2 +- .../python-modules/biopython/default.nix | 2 +- .../python-modules/bitbox02/default.nix | 2 +- .../python-modules/bitcoinlib/default.nix | 2 +- .../python-modules/black/default.nix | 55 +- .../bleach-allowlist/default.nix | 2 +- .../python-modules/bleach/default.nix | 4 +- .../bleak-retry-connector/default.nix | 4 +- .../python-modules/blessed/default.nix | 4 +- .../python-modules/blinker/default.nix | 2 +- .../python-modules/blinkstick/default.nix | 2 +- .../python-modules/blis/default.nix | 4 +- .../python-modules/block-io/default.nix | 2 +- .../python-modules/blockdiag/default.nix | 2 +- .../python-modules/blocksat-cli/default.nix | 2 +- .../python-modules/blosc2/default.nix | 70 + .../python-modules/blspy/default.nix | 4 +- .../python-modules/bme680/default.nix | 2 +- .../python-modules/bokeh/default.nix | 2 +- .../bootstrapped-pip/default.nix | 1 + .../python-modules/boschshcpy/default.nix | 2 +- .../python-modules/boto3/default.nix | 4 +- .../python-modules/botocore/default.nix | 4 +- .../python-modules/bottle/default.nix | 6 +- .../python-modules/bottleneck/default.nix | 4 +- .../python-modules/bpycv/default.nix | 5 +- .../python-modules/bracex/default.nix | 2 +- .../python-modules/bravia-tv/default.nix | 2 +- .../python-modules/breezy/default.nix | 2 +- .../python-modules/brelpy/default.nix | 4 +- .../python-modules/brian2/default.nix | 2 +- .../python-modules/brother-ql/default.nix | 2 +- .../python-modules/brotli/default.nix | 2 +- .../python-modules/bsuite/default.nix | 2 +- .../python-modules/btchip-python/default.nix | 46 + .../python-modules/btchip/default.nix | 24 - .../python-modules/bthome-ble/default.nix | 4 +- .../python-modules/btrfs/default.nix | 2 +- .../python-modules/bucketstore/default.nix | 2 +- .../python-modules/build/default.nix | 19 +- .../python-modules/buildbot/pkg.nix | 2 +- .../python-modules/buildbot/plugins.nix | 12 +- .../python-modules/buildbot/worker.nix | 2 +- .../python-modules/bundlewrap/default.nix | 9 +- .../python-modules/bx-python/default.nix | 2 +- .../python-modules/bytecode/default.nix | 2 +- .../python-modules/cachelib/default.nix | 9 +- .../python-modules/cachetools/default.nix | 4 +- .../python-modules/cachey/default.nix | 2 +- .../python-modules/cairo-lang/default.nix | 2 +- .../python-modules/cairocffi/default.nix | 2 +- .../python-modules/cairosvg/default.nix | 2 +- .../python-modules/caldav/default.nix | 4 +- .../python-modules/can/default.nix | 9 + .../python-modules/canmatrix/default.nix | 4 +- .../python-modules/carbon/default.nix | 2 +- .../casa-formats-io/default.nix | 2 +- .../python-modules/casbin/default.nix | 4 +- .../python-modules/catalogue/default.nix | 2 +- .../python-modules/catboost/default.nix | 6 +- .../python-modules/cchardet/default.nix | 57 - .../python-modules/cdcs/default.nix | 2 +- .../python-modules/cement/default.nix | 2 +- .../python-modules/cepa/default.nix | 2 +- .../python-modules/certauth/default.nix | 2 +- .../certbot-dns-inwx/default.nix | 2 +- .../python-modules/certbot/default.nix | 4 +- .../python-modules/certomancer/default.nix | 5 + .../python-modules/certvalidator/default.nix | 2 +- .../python-modules/cexprtk/default.nix | 2 +- .../python-modules/cffi/default.nix | 4 +- .../python-modules/cfn-lint/default.nix | 4 +- .../python-modules/cfscrape/default.nix | 2 +- .../python-modules/chart-studio/default.nix | 4 +- .../python-modules/cherrypy/default.nix | 2 + .../python-modules/chex/default.nix | 4 +- .../python-modules/chia-rs/default.nix | 6 +- .../python-modules/chiapos/default.nix | 2 +- .../python-modules/chromaprint/default.nix | 2 +- .../python-modules/ci-info/default.nix | 2 +- .../python-modules/cinemagoer/default.nix | 2 +- .../python-modules/circuitbreaker/default.nix | 2 +- .../python-modules/ciso8601/default.nix | 2 +- .../python-modules/ckcc-protocol/default.nix | 2 +- .../python-modules/claripy/default.nix | 4 +- .../python-modules/cle/default.nix | 4 +- .../python-modules/clevercsv/default.nix | 9 +- .../python-modules/click-log/default.nix | 2 +- .../click-option-group/default.nix | 2 +- .../click-threading/default.nix | 2 +- .../python-modules/click/default.nix | 2 +- .../python-modules/clickgen/default.nix | 2 +- .../clickhouse-cityhash/default.nix | 2 +- .../python-modules/clickhouse-cli/default.nix | 2 +- .../python-modules/cliff/default.nix | 4 +- .../python-modules/clifford/default.nix | 2 +- .../python-modules/cligj/default.nix | 2 +- .../python-modules/clldutils/default.nix | 2 +- .../python-modules/cloudscraper/default.nix | 4 +- .../python-modules/cloup/default.nix | 2 +- .../python-modules/clustershell/default.nix | 2 +- .../python-modules/clvm-rs/default.nix | 4 +- .../python-modules/clvm-tools-rs/default.nix | 4 +- .../python-modules/clvm-tools/default.nix | 2 +- .../python-modules/clvm/default.nix | 2 +- .../python-modules/cmarkgfm/default.nix | 2 +- .../python-modules/cmd2/default.nix | 12 +- .../python-modules/coapthon3/default.nix | 2 +- .../python-modules/cock/default.nix | 2 +- .../python-modules/coconut/default.nix | 2 +- .../python-modules/cocotb/default.nix | 2 +- .../python-modules/codepy/default.nix | 2 +- .../python-modules/coincurve/default.nix | 2 +- .../coinmetrics-api-client/default.nix | 4 +- .../python-modules/colander/default.nix | 36 +- .../colanderalchemy/default.nix | 2 +- .../python-modules/colorcet/default.nix | 2 +- .../colored-traceback/default.nix | 2 +- .../python-modules/colored/default.nix | 2 +- .../python-modules/colorlog/default.nix | 2 +- .../python-modules/colormath/default.nix | 2 +- .../python-modules/commentjson/default.nix | 2 +- .../python-modules/commoncode/default.nix | 4 +- .../python-modules/compreffor/default.nix | 2 +- .../python-modules/configclass/default.nix | 2 +- .../python-modules/confight/default.nix | 2 +- .../python-modules/configparser/default.nix | 2 +- .../python-modules/configupdater/default.nix | 2 +- .../confluent-kafka/default.nix | 4 +- .../python-modules/confuse/default.nix | 2 +- .../python-modules/connect_box/default.nix | 2 +- .../python-modules/cons/default.nix | 2 +- .../construct-classes/default.nix | 2 +- .../python-modules/construct/default.nix | 2 +- .../container-inspector/default.nix | 7 + .../python-modules/contexttimer/default.nix | 2 +- .../python-modules/contourpy/default.nix | 4 +- .../python-modules/cookiecutter/default.nix | 2 +- .../python-modules/coqpit/default.nix | 2 +- .../python-modules/coverage/default.nix | 4 +- .../cppheaderparser/default.nix | 2 +- .../python-modules/cppy/default.nix | 2 +- .../python-modules/crashtest/default.nix | 2 +- .../python-modules/crc32c/default.nix | 2 +- .../criticality-score/default.nix | 6 +- .../cron-descriptor/default.nix | 2 +- .../crownstone-cloud/default.nix | 14 +- .../crownstone-core/default.nix | 2 +- .../python-modules/crownstone-sse/default.nix | 2 +- .../crownstone-uart/default.nix | 2 +- .../python-modules/cryptolyzer/default.nix | 4 +- .../python-modules/cryptoparser/default.nix | 4 +- .../python-modules/css-parser/default.nix | 2 +- .../python-modules/cssselect2/default.nix | 2 +- .../python-modules/curio/default.nix | 3 +- .../python-modules/cvss/default.nix | 2 +- .../python-modules/cvxopt/default.nix | 2 +- .../python-modules/cwcwidth/default.nix | 2 +- .../python-modules/cx_freeze/default.nix | 4 +- .../python-modules/cymem/default.nix | 2 +- .../python-modules/cypari2/default.nix | 2 +- .../python-modules/cypherpunkpay/default.nix | 6 +- .../python-modules/cytoolz/default.nix | 2 +- .../python-modules/daiquiri/default.nix | 39 + .../python-modules/dalle-mini/default.nix | 4 +- .../dash-core-components/default.nix | 2 +- .../python-modules/dash-table/default.nix | 2 +- .../python-modules/dash/default.nix | 20 +- .../python-modules/dask/default.nix | 9 +- .../python-modules/databases/default.nix | 2 + .../databricks-connect/default.nix | 4 +- .../databricks-sql-connector/default.nix | 10 +- .../python-modules/datafusion/default.nix | 4 +- .../python-modules/datasette/default.nix | 4 +- .../python-modules/datauri/default.nix | 2 +- .../python-modules/dateutil/default.nix | 2 +- .../python-modules/dateutils/default.nix | 2 +- .../python-modules/datrie/default.nix | 2 +- .../python-modules/dbus-fast/default.nix | 4 +- .../python-modules/dbus-next/default.nix | 2 +- .../dbus-python-client-gen/default.nix | 11 +- .../python-modules/ddt/default.nix | 2 +- .../python-modules/deap/default.nix | 2 +- .../python-modules/debtcollector/default.nix | 2 +- .../python-modules/debugpy/default.nix | 2 +- .../python-modules/decli/default.nix | 2 +- .../python-modules/decorator/default.nix | 22 +- .../python-modules/deemix/default.nix | 2 +- .../python-modules/deep-chainmap/default.nix | 2 +- .../deep-translator/default.nix | 7 +- .../python-modules/deepmerge/default.nix | 2 +- .../python-modules/deepwave/default.nix | 2 +- .../python-modules/deezer-py/default.nix | 2 +- .../python-modules/delorean/default.nix | 16 +- .../python-modules/demetriek/default.nix | 2 +- .../python-modules/deprecated/default.nix | 2 +- .../python-modules/deprecation/default.nix | 2 +- .../devolo-home-control-api/default.nix | 4 +- .../python-modules/devpi-common/default.nix | 2 +- .../python-modules/devtools/default.nix | 2 +- .../python-modules/diceware/default.nix | 2 +- .../python-modules/dict2xml/default.nix | 8 +- .../python-modules/dicttoxml/default.nix | 2 +- .../python-modules/diff-cover/default.nix | 4 +- .../python-modules/dingz/default.nix | 2 +- .../python-modules/distrax/default.nix | 4 +- .../python-modules/distributed/default.nix | 4 +- .../python-modules/dj-rest-auth/default.nix | 31 +- .../django-admin-sortable2/default.nix | 2 +- .../django-annoying/default.nix | 4 +- .../python-modules/django-anymail/default.nix | 2 +- .../django-auth-ldap/default.nix | 2 +- .../django-autocomplete-light/default.nix | 2 +- .../django-celery-email/default.nix | 2 +- .../django-celery-results/default.nix | 5 + .../django-compressor/default.nix | 4 +- .../django-configurations/default.nix | 2 +- .../django-cors-headers/default.nix | 2 +- .../django-crispy-forms/default.nix | 6 +- .../django-dynamic-preferences/default.nix | 2 +- .../django-extensions/default.nix | 11 +- .../python-modules/django-filter/default.nix | 2 +- .../django-formtools/default.nix | 2 +- .../django-haystack/default.nix | 2 +- .../django-hcaptcha/default.nix | 2 +- .../django-import-export/default.nix | 4 +- .../python-modules/django-ipware/default.nix | 15 +- .../django-js-reverse/default.nix | 4 +- .../django-mailman3/default.nix | 4 +- .../django-model-utils/default.nix | 2 +- .../django-oauth-toolkit/default.nix | 2 +- .../python-modules/django-otp/default.nix | 2 +- .../django-phonenumber-field/default.nix | 4 +- .../django-polymorphic/default.nix | 2 +- .../python-modules/django-q/default.nix | 2 +- .../python-modules/django-redis/default.nix | 2 +- .../django-rest-auth/default.nix | 2 +- .../django-rest-polymorphic/default.nix | 2 +- .../python-modules/django-scopes/default.nix | 2 +- .../python-modules/django-sites/default.nix | 2 +- .../django-stubs-ext/default.nix | 2 +- .../python-modules/django-stubs/default.nix | 4 +- .../django-timezone-field/default.nix | 2 +- .../django-versatileimagefield/default.nix | 4 +- .../django_contrib_comments/default.nix | 2 +- .../python-modules/django_environ/default.nix | 2 +- .../python-modules/djangoql/default.nix | 2 +- .../default.nix | 2 +- .../default.nix | 2 +- .../djangorestframework-guardian/default.nix | 2 +- .../djangorestframework-recursive/default.nix | 2 +- .../djangorestframework/default.nix | 2 +- .../python-modules/dkimpy/default.nix | 4 +- .../python-modules/dlms-cosem/default.nix | 2 +- .../python-modules/dnachisel/default.nix | 2 +- .../python-modules/docopt-ng/default.nix | 2 +- .../python-modules/docplex/default.nix | 2 +- .../python-modules/dogpile-cache/default.nix | 6 +- .../python-modules/dogtail/default.nix | 7 +- .../python-modules/doit-py/default.nix | 2 +- .../python-modules/doit/default.nix | 2 +- .../python-modules/dotty-dict/default.nix | 2 +- .../python-modules/dpath/default.nix | 2 +- .../python-modules/dpkt/default.nix | 2 +- .../python-modules/dragonfly/default.nix | 2 +- .../drf-spectacular-sidecar/default.nix | 3 +- .../drf-spectacular/default.nix | 5 +- .../drf-writable-nested/default.nix | 2 +- .../python-modules/drf-yasg/default.nix | 2 +- .../python-modules/drms/default.nix | 2 +- .../python-modules/dropbox/default.nix | 3 + .../python-modules/ducc0/default.nix | 2 +- .../python-modules/duecredit/default.nix | 2 +- .../python-modules/duet/default.nix | 2 +- .../python-modules/dungeon-eos/default.nix | 2 +- .../python-modules/dvc-data/default.nix | 4 +- .../python-modules/dvc-http/default.nix | 53 + .../python-modules/dvc-objects/default.nix | 4 +- .../python-modules/dvclive/default.nix | 4 +- .../python-modules/easydict/default.nix | 2 +- .../python-modules/easyenergy/default.nix | 4 +- .../python-modules/easygui/default.nix | 2 +- .../python-modules/easyocr/default.nix | 2 +- .../python-modules/easyprocess/default.nix | 7 +- .../python-modules/ebaysdk/default.nix | 2 +- .../python-modules/ecdsa/default.nix | 2 +- .../python-modules/ecos/default.nix | 2 +- .../python-modules/ecs-logging/default.nix | 2 +- .../ed25519-blake2b/default.nix | 2 +- .../python-modules/edalize/default.nix | 2 +- .../python-modules/editables/default.nix | 2 +- .../python-modules/editorconfig/default.nix | 4 +- .../python-modules/elastic-apm/default.nix | 4 +- .../python-modules/elgato/default.nix | 2 +- .../python-modules/elmax/default.nix | 2 +- .../email-validator/default.nix | 18 +- .../python-modules/emailthreads/default.nix | 2 +- .../python-modules/empty-files/default.nix | 2 +- .../python-modules/enaml/default.nix | 4 +- .../python-modules/enamlx/default.nix | 2 +- .../energyflip-client/default.nix | 2 +- .../python-modules/entrance/default.nix | 2 +- .../python-modules/entrypoint2/default.nix | 4 +- .../python-modules/entrypoints/default.nix | 2 +- .../python-modules/enturclient/default.nix | 2 +- .../python-modules/environs/default.nix | 2 +- .../python-modules/envisage/default.nix | 4 +- .../python-modules/envoy-reader/default.nix | 2 +- .../python-modules/ephem/default.nix | 2 +- .../epson-projector/default.nix | 2 +- .../python-modules/eradicate/default.nix | 2 +- .../python-modules/etcd/default.nix | 2 +- .../python-modules/etcd3/default.nix | 59 + .../python-modules/eth-abi/default.nix | 2 +- .../python-modules/eth-account/default.nix | 2 +- .../python-modules/eth-hash/default.nix | 2 +- .../python-modules/eth-keyfile/default.nix | 2 +- .../python-modules/eth-keys/default.nix | 2 +- .../python-modules/eth-rlp/default.nix | 2 +- .../python-modules/eth-utils/default.nix | 2 +- .../python-modules/etils/default.nix | 4 +- .../python-modules/etuples/default.nix | 2 +- .../python-modules/evaluate/default.nix | 5 + .../python-modules/eve/default.nix | 9 +- .../python-modules/evohome-async/default.nix | 2 +- .../python-modules/exdown/default.nix | 2 +- .../python-modules/exif/default.nix | 2 +- .../python-modules/exifread/default.nix | 2 +- .../python-modules/expiringdict/default.nix | 2 +- .../python-modules/exrex/default.nix | 28 +- .../python-modules/extractcode/7z.nix | 2 +- .../python-modules/extractcode/default.nix | 7 + .../python-modules/extruct/default.nix | 2 +- .../python-modules/eyed3/default.nix | 2 +- .../python-modules/ezdxf/default.nix | 2 +- .../python-modules/ezyrb/default.nix | 4 +- .../python-modules/f90nml/default.nix | 2 +- .../python-modules/faadelays/default.nix | 2 +- .../{Fabric => fabric}/default.nix | 4 +- .../python-modules/fabulous/default.nix | 2 +- .../python-modules/factory_boy/default.nix | 2 +- .../python-modules/faker/default.nix | 4 +- .../default.nix | 2 +- .../python-modules/fastapi-mail/default.nix | 4 +- .../python-modules/fastapi/default.nix | 10 +- .../python-modules/fastavro/default.nix | 2 +- .../python-modules/fastcore/default.nix | 2 +- .../python-modules/fastjsonschema/default.nix | 2 +- .../python-modules/fastnumbers/default.nix | 18 +- .../python-modules/fastprogress/default.nix | 2 +- .../fasttext-predict/default.nix | 2 +- .../python-modules/faust-cchardet/default.nix | 7 + .../python-modules/feedparser/default.nix | 2 +- .../python-modules/fido2/default.nix | 2 +- .../python-modules/fields/default.nix | 2 +- .../python-modules/filecheck/default.nix | 6 +- .../python-modules/fingerprints/default.nix | 4 +- .../python-modules/finitude/default.nix | 2 +- .../python-modules/fipy/default.nix | 2 +- .../flake8-future-import/default.nix | 2 +- .../python-modules/flake8-length/default.nix | 2 +- .../python-modules/flametree/default.nix | 2 +- .../python-modules/flammkuchen/default.nix | 2 +- .../python-modules/flask-admin/default.nix | 4 +- .../python-modules/flask-babel/default.nix | 9 + .../python-modules/flask-babelex/default.nix | 24 +- .../flask-basicauth/default.nix | 4 +- .../python-modules/flask-bcrypt/default.nix | 2 +- .../python-modules/flask-caching/default.nix | 9 +- .../python-modules/flask-compress/default.nix | 2 +- .../flask-expects-json/default.nix | 53 + .../python-modules/flask-httpauth/default.nix | 28 +- .../python-modules/flask-limiter/default.nix | 3 +- .../python-modules/flask-login/default.nix | 4 +- .../python-modules/flask-mailman/default.nix | 2 +- .../python-modules/flask-migrate/default.nix | 12 +- .../python-modules/flask-paranoid/default.nix | 2 +- .../python-modules/flask-restx/default.nix | 2 +- .../python-modules/flask-seasurf/default.nix | 2 +- .../flask-security-too/default.nix | 4 +- .../python-modules/flask-session/default.nix | 2 +- .../python-modules/flask-socketio/default.nix | 2 +- .../flask-swagger-ui/default.nix | 2 +- .../python-modules/flask-talisman/default.nix | 2 +- .../python-modules/flask-wtf/default.nix | 18 +- .../python-modules/flask/default.nix | 10 +- .../python-modules/flax/default.nix | 4 +- .../python-modules/fleep/default.nix | 2 +- .../python-modules/flipr-api/default.nix | 7 +- .../python-modules/flufl/bounce.nix | 2 +- .../development/python-modules/flufl/i18n.nix | 2 +- .../development/python-modules/flufl/lock.nix | 2 +- .../python-modules/fontmake/default.nix | 2 +- .../python-modules/fontmath/default.nix | 2 +- .../python-modules/fontparts/default.nix | 2 +- .../python-modules/fonttools/default.nix | 2 +- .../python-modules/foolscap/default.nix | 39 +- .../python-modules/forecast-solar/default.nix | 2 +- .../python-modules/formbox/default.nix | 2 +- .../{FormEncode => formencode}/default.nix | 5 +- .../python-modules/formulaic/default.nix | 2 +- .../python-modules/fpylll/default.nix | 2 +- .../python-modules/fqdn/default.nix | 2 +- .../python-modules/frigidaire/default.nix | 2 +- .../fritzconnection/default.nix | 10 +- .../python-modules/fritzprofiles/default.nix | 2 +- .../development/python-modules/fs/default.nix | 2 +- .../python-modules/ftfy/default.nix | 2 +- .../python-modules/funcparserlib/default.nix | 2 +- .../python-modules/funcy/default.nix | 2 +- .../python-modules/fuse-python/default.nix | 2 +- .../python-modules/fvs/default.nix | 2 +- .../python-modules/fx2/default.nix | 2 +- .../python-modules/galois/default.nix | 4 +- .../python-modules/garminconnect/default.nix | 4 +- .../python-modules/gast/default.nix | 2 +- .../python-modules/gb-io/default.nix | 4 +- .../python-modules/gbinder-python/default.nix | 5 + .../python-modules/gbulb/default.nix | 2 +- .../python-modules/gcovr/default.nix | 5 +- .../gcs-oauth2-boto-plugin/default.nix | 2 +- .../python-modules/gekitchen/default.nix | 2 +- .../python-modules/generic/default.nix | 2 +- .../python-modules/genpy/default.nix | 2 +- .../python-modules/genshi/default.nix | 2 +- .../python-modules/geocachingapi/default.nix | 2 +- .../python-modules/geographiclib/default.nix | 2 +- .../{GeoIP => geoip}/default.nix | 9 +- .../python-modules/geojson/default.nix | 32 +- .../python-modules/geopandas/default.nix | 4 +- .../python-modules/geopy/default.nix | 2 +- .../python-modules/georss-client/default.nix | 2 +- .../georss-generic-client/default.nix | 2 +- .../default.nix | 2 +- .../python-modules/ghapi/default.nix | 2 +- .../python-modules/ghrepo-stats/default.nix | 8 +- .../python-modules/gidgethub/default.nix | 2 +- .../python-modules/gios/default.nix | 13 +- .../git-filter-repo/default.nix | 2 +- .../python-modules/git-revise/default.nix | 2 +- .../python-modules/gitdb/default.nix | 2 +- .../github-to-sqlite/default.nix | 2 +- .../python-modules/github3_py/default.nix | 2 +- .../python-modules/gitpython/default.nix | 7 +- .../python-modules/glad/default.nix | 2 +- .../python-modules/glances-api/default.nix | 2 +- .../python-modules/glcontext/default.nix | 2 +- .../python-modules/glean-parser/default.nix | 5 +- .../python-modules/glfw/default.nix | 2 +- .../python-modules/glom/default.nix | 9 +- .../python-modules/glyphslib/default.nix | 2 +- .../python-modules/gmpy2/default.nix | 2 +- .../python-modules/gnureadline/default.nix | 2 +- .../python-modules/goalzero/default.nix | 2 +- .../python-modules/goobook/default.nix | 2 +- .../python-modules/goodwe/default.nix | 4 +- .../google-api-python-client/default.nix | 4 +- .../google-auth-oauthlib/default.nix | 4 +- .../python-modules/google-auth/default.nix | 6 +- .../default.nix | 4 +- .../google-cloud-bigtable/default.nix | 4 +- .../google-cloud-compute/default.nix | 4 +- .../google-cloud-dataproc/default.nix | 4 +- .../google-cloud-datastore/default.nix | 4 +- .../google-cloud-dlp/default.nix | 4 +- .../google-cloud-iam/default.nix | 4 +- .../google-cloud-kms/default.nix | 4 +- .../google-cloud-redis/default.nix | 4 +- .../google-cloud-resource-manager/default.nix | 4 +- .../google-cloud-tasks/default.nix | 4 +- .../google-cloud-testutils/default.nix | 2 +- .../google-cloud-trace/default.nix | 4 +- .../google-cloud-translate/default.nix | 4 +- .../default.nix | 4 +- .../python-modules/google-crc32c/default.nix | 2 +- .../google-i18n-address/default.nix | 2 +- .../google-nest-sdm/default.nix | 2 - .../google-resumable-media/default.nix | 4 +- .../googleapis-common-protos/default.nix | 4 +- .../python-modules/goveelights/default.nix | 2 +- .../python-modules/gphoto2/default.nix | 2 +- .../python-modules/gpsoauth/default.nix | 2 +- .../python-modules/gpt-2-simple/default.nix | 2 +- .../python-modules/gpustat/default.nix | 2 +- .../python-modules/gpxpy/default.nix | 2 +- .../python-modules/graphite-web/default.nix | 4 +- .../python-modules/graspologic/default.nix | 2 +- .../python-modules/green/default.nix | 2 +- .../python-modules/greenlet/default.nix | 4 +- .../python-modules/gremlinpython/default.nix | 2 +- .../python-modules/grip/default.nix | 2 +- .../grpc-google-iam-v1/default.nix | 4 +- .../python-modules/grpcio-status/default.nix | 4 +- .../python-modules/grpcio-tools/default.nix | 4 +- .../python-modules/grpclib/default.nix | 2 +- .../python-modules/gruut-ipa/default.nix | 2 +- .../python-modules/gruut/default.nix | 6 +- .../python-modules/gssapi/default.nix | 2 +- .../python-modules/gtts/default.nix | 2 +- .../python-modules/gunicorn/default.nix | 4 +- .../python-modules/guppy3/default.nix | 2 +- .../python-modules/gvm-tools/default.nix | 2 +- .../python-modules/gym-notices/default.nix | 2 +- .../python-modules/gym/default.nix | 2 +- .../python-modules/h11/default.nix | 2 +- .../development/python-modules/h2/default.nix | 2 +- .../development/python-modules/h3/default.nix | 2 +- .../python-modules/habanero/default.nix | 9 +- .../python-modules/hacking/default.nix | 2 +- .../python-modules/hahomematic/default.nix | 6 +- .../python-modules/halohome/default.nix | 2 +- .../python-modules/hass-nabucasa/default.nix | 2 +- .../hatch-nodejs-version/default.nix | 2 +- .../python-modules/hatch-vcs/default.nix | 2 +- .../python-modules/hatchling/default.nix | 6 +- .../python-modules/hdbscan/default.nix | 4 +- .../python-modules/hdf5plugin/default.nix | 4 +- .../python-modules/heatshrink2/default.nix | 2 +- .../python-modules/here-routing/default.nix | 6 +- .../python-modules/hexbytes/default.nix | 2 +- .../python-modules/hexdump/default.nix | 2 +- .../python-modules/hg-evolve/default.nix | 2 +- .../python-modules/hid/default.nix | 2 +- .../python-modules/hiredis/default.nix | 29 +- .../python-modules/hiro/default.nix | 4 +- .../python-modules/hiyapyco/default.nix | 2 +- .../python-modules/holidays/default.nix | 4 +- .../homepluscontrol/default.nix | 2 +- .../python-modules/hpack/default.nix | 2 +- .../python-modules/hpccm/default.nix | 2 +- .../python-modules/hsluv/default.nix | 2 +- .../python-modules/html-text/default.nix | 2 +- .../python-modules/html5lib/default.nix | 2 +- .../{HTSeq => htseq}/default.nix | 2 +- .../python-modules/httmock/default.nix | 2 +- .../python-modules/httplib2/default.nix | 2 +- .../python-modules/httptools/default.nix | 2 +- .../python-modules/httpx-socks/default.nix | 2 +- .../python-modules/httpx/default.nix | 10 +- .../python-modules/hupper/default.nix | 4 +- .../python-modules/hwi/default.nix | 2 +- .../python-modules/hydra-check/default.nix | 2 +- .../python-modules/hydra-core/default.nix | 4 +- .../python-modules/hydrus-api/default.nix | 26 +- .../python-modules/hyperion-py/default.nix | 2 +- .../python-modules/hypothesis/default.nix | 5 +- .../python-modules/hypothesmith/default.nix | 2 +- .../python-modules/hyppo/default.nix | 2 +- .../python-modules/iapws/default.nix | 2 +- .../python-modules/ibis-framework/default.nix | 8 +- .../python-modules/ibis/default.nix | 2 +- .../python-modules/ibm-watson/default.nix | 2 +- .../python-modules/icecream/default.nix | 2 +- .../python-modules/icmplib/default.nix | 2 +- .../python-modules/icnsutil/default.nix | 2 +- .../python-modules/icoextract/default.nix | 2 +- .../python-modules/ics/default.nix | 2 +- .../python-modules/idasen/default.nix | 6 +- .../python-modules/identify/default.nix | 4 +- .../python-modules/idna/default.nix | 2 +- .../python-modules/ifaddr/default.nix | 2 +- .../python-modules/ignite/default.nix | 2 +- .../python-modules/ihatemoney/default.nix | 6 +- .../python-modules/ilua/default.nix | 2 +- .../python-modules/image-go-nord/default.nix | 2 +- .../python-modules/imageio-ffmpeg/default.nix | 4 +- .../imageio-ffmpeg/ffmpeg-path.patch | 16 +- .../python-modules/imageio/default.nix | 4 +- .../python-modules/imagesize/default.nix | 2 +- .../imbalanced-learn/default.nix | 2 +- .../python-modules/importlab/default.nix | 2 +- .../importlib-metadata/default.nix | 4 +- .../importlib-resources/default.nix | 4 +- .../python-modules/in-n-out/default.nix | 2 +- .../python-modules/incremental/default.nix | 2 +- .../python-modules/inflect/default.nix | 2 +- .../influxdb-client/default.nix | 4 +- .../python-modules/iniconfig/default.nix | 30 +- .../python-modules/iniconfig/version.patch | 42 + .../python-modules/injector/default.nix | 2 +- .../python-modules/installer/default.nix | 2 +- .../default.nix | 4 +- .../python-modules/intelhex/default.nix | 2 +- .../intensity-normalization/default.nix | 2 +- .../internetarchive/default.nix | 2 +- .../invisible-watermark/default.nix | 2 +- .../python-modules/invoke/default.nix | 4 +- .../python-modules/ionhash/default.nix | 4 +- .../python-modules/ipfshttpclient/default.nix | 2 +- .../python-modules/ipwhl/default.nix | 2 +- .../python-modules/ipwhois/default.nix | 71 + .../python-modules/ipydatawidgets/default.nix | 2 +- .../python-modules/ipykernel/default.nix | 4 +- .../python-modules/ipympl/default.nix | 2 +- .../python-modules/ipython/default.nix | 15 +- .../python-modules/ipyvue/default.nix | 2 +- .../python-modules/ipyvuetify/default.nix | 2 +- .../python-modules/ipywidgets/default.nix | 5 + .../python-modules/irc/default.nix | 2 +- .../python-modules/ircrobots/default.nix | 2 +- .../python-modules/irctokens/default.nix | 2 +- .../python-modules/ismartgate/default.nix | 13 +- .../python-modules/iso3166/default.nix | 2 +- .../python-modules/isoduration/default.nix | 2 +- .../python-modules/isort/default.nix | 2 +- .../python-modules/isounidecode/default.nix | 2 +- .../iteration-utilities/default.nix | 2 +- .../python-modules/iterm2/default.nix | 2 +- .../python-modules/itsdangerous/default.nix | 2 +- .../python-modules/jaraco-abode/default.nix | 4 +- .../python-modules/jaraco-net/default.nix | 6 +- .../jaraco_collections/default.nix | 2 +- .../jaraco_functools/default.nix | 4 +- .../jaraco_itertools/default.nix | 2 +- .../python-modules/jaraco_logging/default.nix | 2 +- .../python-modules/jaraco_text/default.nix | 4 +- .../python-modules/jax/default.nix | 6 + .../{JayDeBeApi => jaydebeapi}/default.nix | 9 +- .../development/python-modules/jc/default.nix | 2 +- .../python-modules/jdatetime/default.nix | 2 +- .../jenkins-job-builder/default.nix | 4 +- .../python-modules/jenkinsapi/default.nix | 4 +- .../jinja2-ansible-filters/default.nix | 2 +- .../python-modules/jinja2-time/default.nix | 2 +- .../python-modules/jinja2/default.nix | 2 +- .../python-modules/jira/default.nix | 5 +- .../python-modules/jmespath/default.nix | 2 +- .../python-modules/jmp/default.nix | 2 +- .../python-modules/joblib/default.nix | 2 +- .../python-modules/josepy/default.nix | 2 +- .../python-modules/jplephem/default.nix | 2 +- .../python-modules/jproperties/default.nix | 2 +- .../python-modules/jpylyzer/default.nix | 4 +- .../{JPype1 => jpype1}/default.nix | 7 +- .../development/python-modules/jq/default.nix | 2 +- .../json-home-client/default.nix | 2 +- .../python-modules/json-rpc/default.nix | 2 +- .../json-stream-rs-tokenizer/Cargo.lock | 596 ++ .../json-stream-rs-tokenizer/default.nix | 63 + .../python-modules/json-stream/default.nix | 12 +- .../python-modules/jsonconversion/default.nix | 2 +- .../python-modules/jsondiff/default.nix | 2 +- .../python-modules/jsonmerge/default.nix | 2 +- .../python-modules/jsonpath-ng/default.nix | 2 +- .../python-modules/jsonpickle/default.nix | 2 +- .../python-modules/jsonpointer/default.nix | 2 +- .../jsonrpc-websocket/default.nix | 2 +- .../jsonrpclib-pelix/default.nix | 2 +- .../jsonschema-spec/default.nix | 4 +- .../python-modules/jsonschema/default.nix | 2 +- .../python-modules/jstyleson/default.nix | 2 +- .../python-modules/jupyter-book/default.nix | 6 +- .../python-modules/jupyter-client/default.nix | 4 +- .../python-modules/jupyter-core/default.nix | 10 +- .../python-modules/jupyter-events/default.nix | 4 +- .../python-modules/jupyter-lsp/default.nix | 2 +- .../jupyter-packaging/default.nix | 2 +- .../jupyter-server-fileid/default.nix | 54 + .../jupyter-server-mathjax/default.nix | 11 +- .../jupyter-server-terminals/default.nix | 4 +- .../jupyter-server-ydoc/default.nix | 60 + .../python-modules/jupyter-sphinx/default.nix | 2 +- .../python-modules/jupyter-ydoc/default.nix | 51 + .../jupyter_console/default.nix | 68 +- .../jupyterhub-systemdspawner/default.nix | 2 +- .../python-modules/jupyterhub/default.nix | 2 +- .../python-modules/jupyterlab-git/default.nix | 2 +- .../python-modules/jupyterlab-lsp/default.nix | 2 +- .../jupyterlab-widgets/default.nix | 2 +- .../python-modules/jupyterlab/default.nix | 30 +- .../jupyterlab_server/default.nix | 4 +- .../python-modules/k5test/default.nix | 2 +- .../python-modules/kaitaistruct/default.nix | 4 +- .../python-modules/kajiki/default.nix | 6 +- .../python-modules/kazoo/default.nix | 2 +- .../python-modules/keep/default.nix | 4 +- .../python-modules/keras/default.nix | 2 +- .../python-modules/keyboard/default.nix | 2 +- .../python-modules/keyrings-alt/default.nix | 2 +- .../keyrings-cryptfile/default.nix | 4 +- .../default.nix | 2 +- .../keyrings-passwordstore/default.nix | 2 +- .../python-modules/keystoneauth1/default.nix | 4 +- .../python-modules/kiss-headers/default.nix | 2 +- .../python-modules/kivy/default.nix | 2 +- .../python-modules/kiwisolver/default.nix | 4 +- .../python-modules/klaus/default.nix | 2 +- .../python-modules/kombu/default.nix | 9 +- .../korean-lunar-calendar/default.nix | 2 +- .../python-modules/kubernetes/default.nix | 2 +- .../python-modules/labelbox/default.nix | 4 +- .../python-modules/labmath/default.nix | 2 +- .../python-modules/language-tags/default.nix | 6 +- .../python-modules/lark/default.nix | 2 +- .../python-modules/launchpadlib/default.nix | 2 +- .../lazr-restfulclient/default.nix | 2 +- .../python-modules/lazy-loader/default.nix | 35 + .../lazy-object-proxy/default.nix | 4 +- .../python-modules/lc7001/default.nix | 2 +- .../python-modules/lcgit/default.nix | 42 + .../python-modules/lcov_cobertura/default.nix | 2 +- .../python-modules/ldaptor/default.nix | 2 +- .../python-modules/leb128/default.nix | 2 +- .../python-modules/ledgerwallet/default.nix | 2 +- .../python-modules/libagent/default.nix | 2 +- .../python-modules/libarcus/default.nix | 2 +- .../python-modules/libcloud/default.nix | 2 +- .../python-modules/libevdev/default.nix | 2 +- .../python-modules/libgpuarray/default.nix | 4 +- .../python-modules/liblarch/default.nix | 2 +- .../python-modules/libnacl/default.nix | 4 +- .../python-modules/librosa/default.nix | 107 +- .../python-modules/librouteros/default.nix | 2 +- .../python-modules/libsass/default.nix | 2 +- .../python-modules/libsavitar/default.nix | 2 +- .../python-modules/libversion/default.nix | 2 +- .../python-modules/libvirt/default.nix | 2 +- .../python-modules/lifelines/default.nix | 2 +- .../lightning-utilities/default.nix | 8 +- .../python-modules/limits/default.nix | 6 +- .../python-modules/lineedit/default.nix | 45 + .../python-modules/lingua/default.nix | 2 +- .../livestreamer-curses/default.nix | 2 +- .../python-modules/livestreamer/default.nix | 2 +- .../python-modules/lizard/default.nix | 2 +- .../python-modules/llvmlite/default.nix | 2 +- .../localstack-client/default.nix | 2 +- .../python-modules/localstack-ext/default.nix | 4 +- .../python-modules/localstack/default.nix | 4 +- .../locationsharinglib/default.nix | 4 +- .../{Logbook => logbook}/default.nix | 5 +- .../logical-unification/default.nix | 2 +- .../python-modules/logilab/constraint.nix | 2 +- .../python-modules/ludios_wpull/default.nix | 4 +- .../python-modules/luftdaten/default.nix | 2 +- .../python-modules/luhn/default.nix | 2 +- .../python-modules/lupa/default.nix | 2 +- .../python-modules/luxtronik/default.nix | 2 +- .../python-modules/lxml/default.nix | 2 +- .../python-modules/lz4/default.nix | 2 +- .../python-modules/m2crypto/default.nix | 2 +- .../python-modules/m2r/default.nix | 2 +- .../python-modules/m3u8/default.nix | 4 +- .../python-modules/maestral/default.nix | 4 +- .../python-modules/magicgui/default.nix | 2 +- .../python-modules/mahotas/default.nix | 2 +- .../python-modules/makefun/default.nix | 2 +- .../python-modules/{Mako => mako}/default.nix | 7 +- .../python-modules/manuel/default.nix | 14 +- .../python-modules/marisa-trie/default.nix | 2 +- .../markdown-include/default.nix | 4 +- .../python-modules/markdown-it-py/default.nix | 45 +- .../python-modules/markdown2/default.nix | 14 +- .../python-modules/markdownify/default.nix | 2 +- .../python-modules/markuppy/default.nix | 2 +- .../python-modules/markups/default.nix | 11 +- .../python-modules/markupsafe/default.nix | 4 +- .../marshmallow-polyfield/default.nix | 2 +- .../python-modules/mask-rcnn/default.nix | 2 +- .../python-modules/masky/default.nix | 4 +- .../python-modules/mathlibtools/default.nix | 4 +- .../matplotlib-inline/default.nix | 2 +- .../python-modules/matplotlib/default.nix | 234 +- .../python-modules/matrix-common/default.nix | 2 +- .../python-modules/matrix-nio/default.nix | 24 +- .../python-modules/mautrix/default.nix | 5 + .../python-modules/mayavi/default.nix | 2 +- .../python-modules/mbstrdecoder/default.nix | 6 +- .../python-modules/mccabe/default.nix | 2 +- .../python-modules/md2gemini/default.nix | 2 +- .../python-modules/mdformat/default.nix | 2 +- .../mdit-py-plugins/default.nix | 9 +- .../python-modules/mdurl/default.nix | 2 +- .../python-modules/mdutils/default.nix | 8 +- .../python-modules/measurement/default.nix | 41 +- .../python-modules/mechanize/default.nix | 2 +- .../python-modules/mediapy/default.nix | 4 +- .../memory-allocator/default.nix | 2 +- .../python-modules/mercantile/default.nix | 2 +- .../python-modules/mergedict/default.nix | 2 +- .../python-modules/meshio/default.nix | 2 +- .../python-modules/meson-python/default.nix | 4 +- .../python-modules/mesonpep517/default.nix | 2 +- .../python-modules/metar/default.nix | 2 +- .../python-modules/meteoalertapi/default.nix | 2 +- .../python-modules/mf2py/default.nix | 2 +- .../python-modules/microdata/default.nix | 2 +- .../python-modules/milc/default.nix | 2 +- .../python-modules/millheater/default.nix | 2 +- .../python-modules/minexr/default.nix | 2 +- .../python-modules/minidump/default.nix | 2 +- .../python-modules/minikanren/default.nix | 2 +- .../python-modules/mip/default.nix | 4 +- .../python-modules/mistletoe/default.nix | 9 +- .../python-modules/mitmproxy/default.nix | 2 +- .../python-modules/mitogen/default.nix | 2 +- .../python-modules/mixins/default.nix | 25 + .../mkdocs-autorefs/default.nix | 2 +- .../mkdocs-drawio-exporter/default.nix | 2 +- .../mkdocs-gitlab-plugin/default.nix | 2 +- .../mkdocs-material/default.nix | 8 +- .../mkdocs-mermaid2-plugin/default.nix | 2 +- .../python-modules/mkdocs-minify/default.nix | 4 +- .../mkdocs-redirects/default.nix | 2 +- .../mkdocs-swagger-ui-tag/default.nix | 4 +- .../python-modules/ml-collections/default.nix | 2 +- .../python-modules/mlflow/default.nix | 4 +- .../python-modules/mlxtend/default.nix | 2 +- .../python-modules/mnemonic/default.nix | 2 +- .../mock-ssh-server/default.nix | 40 + .../python-modules/mock/default.nix | 2 +- .../python-modules/mockito/default.nix | 2 +- .../python-modules/moderngl/default.nix | 4 +- .../moderngl_window/default.nix | 2 +- .../python-modules/monero/default.nix | 2 +- .../python-modules/mongoengine/default.nix | 4 +- .../python-modules/moonraker-api/default.nix | 2 +- .../python-modules/more-itertools/default.nix | 2 +- .../python-modules/moto/default.nix | 16 +- .../python-modules/mouseinfo/default.nix | 2 +- .../python-modules/mpd2/default.nix | 2 +- .../python-modules/mpi4py/default.nix | 2 +- .../python-modules/mplfinance/default.nix | 2 +- .../python-modules/mpv/default.nix | 5 +- .../ms-active-directory/default.nix | 2 +- .../msal-extensions/default.nix | 2 +- .../python-modules/msgpack-numpy/default.nix | 2 +- .../python-modules/msgspec/default.nix | 2 +- .../python-modules/mt-940/default.nix | 2 +- .../python-modules/mujson/default.nix | 2 +- .../python-modules/multiprocess/default.nix | 2 +- .../python-modules/multiset/default.nix | 26 +- .../python-modules/multitasking/default.nix | 2 +- .../python-modules/mutag/default.nix | 2 +- .../python-modules/mutagen/default.nix | 10 + .../mwparserfromhell/default.nix | 2 +- .../python-modules/myfitnesspal/default.nix | 2 +- .../python-modules/myhome/default.nix | 2 +- .../python-modules/myjwt/default.nix | 25 +- .../mypy-boto3-builder/default.nix | 4 +- .../python-modules/mypy-protobuf/default.nix | 2 +- .../python-modules/mypy/default.nix | 110 +- .../python-modules/mypy/extensions.nix | 2 +- .../mysql-connector/default.nix | 2 +- .../python-modules/mysqlclient/default.nix | 2 +- .../python-modules/myst-docutils/default.nix | 2 +- .../python-modules/myst-nb/default.nix | 2 +- .../python-modules/myst-parser/default.nix | 20 +- .../python-modules/nad-receiver/default.nix | 2 +- .../python-modules/namedlist/default.nix | 2 +- .../python-modules/nameparser/default.nix | 2 +- .../python-modules/napalm/default.nix | 6 +- .../python-modules/napari-npe2/default.nix | 4 +- .../python-modules/natsort/default.nix | 7 +- .../python-modules/nbclassic/default.nix | 4 +- .../python-modules/nbdime/default.nix | 3 + .../python-modules/nbformat/default.nix | 4 +- .../python-modules/nbval/default.nix | 11 +- .../python-modules/nclib/default.nix | 2 +- .../python-modules/ndindex/default.nix | 64 + .../python-modules/nessclient/default.nix | 2 +- .../python-modules/nest-asyncio/default.nix | 2 +- .../python-modules/netcdf4/default.nix | 2 +- .../python-modules/netdata/default.nix | 2 +- .../python-modules/netdisco/default.nix | 2 +- .../python-modules/netmiko/default.nix | 2 +- .../python-modules/networkx/default.nix | 4 +- .../python-modules/nexia/default.nix | 2 +- .../python-modules/nextcord/default.nix | 8 +- .../python-modules/niaaml/default.nix | 2 +- .../python-modules/nianet/default.nix | 62 + .../python-modules/nibabel/default.nix | 70 +- .../{Nikola => nikola}/default.nix | 24 +- .../python-modules/nilearn/default.nix | 4 +- .../python-modules/nipype/default.nix | 2 +- .../python-modules/nitime/default.nix | 2 +- .../python-modules/nitransforms/default.nix | 2 +- .../python-modules/nkdfu/default.nix | 2 +- .../python-modules/nocasedict/default.nix | 4 +- .../python-modules/nocaselist/default.nix | 2 +- .../python-modules/nocturne/default.nix | 6 +- .../python-modules/notebook-shim/default.nix | 2 +- .../python-modules/notebook/default.nix | 3 +- .../python-modules/notion-client/default.nix | 2 +- .../python-modules/nptyping/default.nix | 4 +- .../python-modules/nsz/default.nix | 2 +- .../python-modules/ntc-templates/default.nix | 2 +- .../python-modules/ntlm-auth/default.nix | 58 - .../python-modules/nuitka/default.nix | 5 +- .../python-modules/num2words/default.nix | 2 +- .../python-modules/numba/default.nix | 10 +- .../python-modules/numba/numpy-1.24.patch | 644 ++ .../python-modules/numcodecs/default.nix | 6 +- .../python-modules/numpy-stl/default.nix | 2 +- .../python-modules/numpy/default.nix | 4 +- .../python-modules/numpydoc/default.nix | 2 +- .../python-modules/numpyro/default.nix | 4 +- .../python-modules/nunavut/default.nix | 4 +- .../python-modules/nvidia-ml-py/default.nix | 4 +- .../python-modules/nwdiag/default.nix | 2 +- .../python-modules/oath/default.nix | 2 +- .../python-modules/objax/default.nix | 2 +- .../python-modules/ofxtools/default.nix | 2 +- .../python-modules/omnikinverter/default.nix | 6 +- .../online-judge-api-client/default.nix | 2 +- .../onlykey-solo-python/default.nix | 2 +- .../python-modules/onnx/default.nix | 2 +- .../onnxconverter-common/default.nix | 12 +- .../python-modules/oocsi/default.nix | 2 +- .../python-modules/open-garage/default.nix | 2 +- .../python-modules/openai/default.nix | 4 +- .../python-modules/openaiauth/default.nix | 32 + .../openapi-spec-validator/default.nix | 2 +- .../opencensus-context/default.nix | 2 +- .../python-modules/opencensus/default.nix | 4 +- .../python-modules/openevsewifi/default.nix | 4 +- .../python-modules/openpyxl/default.nix | 4 +- .../python-modules/openrazer/common.nix | 2 +- .../python-modules/openshift/default.nix | 2 +- .../openstackdocstheme/default.nix | 2 +- .../python-modules/openstep-plist/default.nix | 2 +- .../openwrt-luci-rpc/default.nix | 4 +- .../python-modules/optuna/default.nix | 4 +- .../python-modules/ordered-set/default.nix | 2 +- .../python-modules/orjson/default.nix | 20 +- .../python-modules/osc-lib/default.nix | 2 +- .../oslo-concurrency/default.nix | 4 +- .../python-modules/oslo-config/default.nix | 4 +- .../python-modules/oslo-context/default.nix | 2 +- .../python-modules/oslo-db/default.nix | 2 +- .../python-modules/oslo-i18n/default.nix | 13 +- .../oslo-serialization/default.nix | 2 +- .../python-modules/oslo-utils/default.nix | 2 +- .../python-modules/osmnx/default.nix | 4 +- .../python-modules/osmpythontools/default.nix | 2 +- .../python-modules/outcome/default.nix | 2 +- .../python-modules/ovh/default.nix | 2 +- .../python-modules/owslib/default.nix | 6 +- .../python-modules/p1monitor/default.nix | 4 +- .../python-modules/packaging/default.nix | 21 +- .../python-modules/packet-python/default.nix | 2 +- .../python-modules/pad4pi/default.nix | 2 +- .../python-modules/paho-mqtt/default.nix | 2 +- .../python-modules/pandas-stubs/default.nix | 4 +- .../python-modules/pandas/default.nix | 11 +- .../python-modules/pandoc-xnos/default.nix | 2 +- .../python-modules/papermill/default.nix | 4 +- .../python-modules/parfive/default.nix | 2 +- .../python-modules/parse-type/default.nix | 2 +- .../python-modules/parsedmarc/default.nix | 14 +- .../python-modules/parsimonious/default.nix | 8 + .../python-modules/parso/default.nix | 2 +- .../python-modules/parsy/default.nix | 2 +- .../python-modules/partd/default.nix | 2 +- .../python-modules/pathlib2/default.nix | 2 +- .../python-modules/pathos/default.nix | 2 +- .../python-modules/pathspec/default.nix | 19 +- .../python-modules/patrowl4py/default.nix | 2 +- .../python-modules/patsy/default.nix | 2 +- .../python-modules/pbr/default.nix | 4 +- .../python-modules/pcodedmp/default.nix | 2 +- .../python-modules/pdfminer-six/default.nix | 2 +- .../python-modules/pdfposter/default.nix | 2 +- .../python-modules/pdfx/default.nix | 2 +- .../python-modules/pdm-backend/default.nix | 50 + .../python-modules/pdm-pep517/default.nix | 6 +- .../python-modules/pdoc/default.nix | 7 +- .../python-modules/pdoc3/default.nix | 4 +- .../python-modules/peaqevcore/default.nix | 4 +- .../python-modules/pecan/default.nix | 16 +- .../python-modules/pep517/default.nix | 2 +- .../python-modules/perfplot/default.nix | 2 +- .../persisting-theory/default.nix | 2 +- .../python-modules/pex/default.nix | 4 +- .../python-modules/pgcli/default.nix | 2 +- .../python-modules/pgspecial/default.nix | 2 +- .../python-modules/phe/default.nix | 2 +- .../python-modules/phone-modem/default.nix | 2 +- .../phx-class-registry/default.nix | 6 +- .../python-modules/piccata/default.nix | 2 +- .../python-modules/piccolo-theme/default.nix | 2 +- .../python-modules/piep/default.nix | 2 +- .../python-modules/pika/default.nix | 2 +- .../python-modules/pillow-simd/default.nix | 2 +- .../python-modules/pint/default.nix | 2 +- .../pip-requirements-parser/default.nix | 14 +- .../python-modules/pip/default.nix | 5 +- .../python-modules/pipx/default.nix | 22 +- .../python-modules/pkce/default.nix | 2 +- .../python-modules/pkgconfig/default.nix | 2 +- .../python-modules/pkginfo/default.nix | 4 +- .../plantuml-markdown/default.nix | 4 +- .../python-modules/plantuml/default.nix | 2 +- .../python-modules/plaster/default.nix | 2 +- .../python-modules/platformdirs/default.nix | 4 +- .../python-modules/playwright/default.nix | 2 +- .../python-modules/plexapi/default.nix | 4 +- .../python-modules/plexwebsocket/default.nix | 2 +- .../python-modules/plotly/default.nix | 4 +- .../python-modules/plum-py/default.nix | 25 +- .../python-modules/plumbum/default.nix | 11 +- .../python-modules/plux/default.nix | 2 +- .../python-modules/plyer/default.nix | 4 +- .../python-modules/plyvel/default.nix | 2 +- .../python-modules/{Pmw => pmw}/default.nix | 7 +- .../python-modules/poetry-core/default.nix | 20 +- .../poetry-plugin-export/default.nix | 4 +- .../python-modules/poetry-semver/default.nix | 2 +- .../polarizationsolver/default.nix | 2 +- .../python-modules/polars/default.nix | 4 +- .../python-modules/polib/default.nix | 4 +- .../python-modules/polyline/default.nix | 4 +- .../python-modules/pontos/default.nix | 6 +- .../python-modules/pooch/default.nix | 2 +- .../python-modules/pot/default.nix | 2 +- .../python-modules/powerline/default.nix | 2 +- .../python-modules/pox/default.nix | 2 +- .../python-modules/ppft/default.nix | 2 +- .../python-modules/primer3/default.nix | 2 +- .../python-modules/prison/default.nix | 2 +- .../privacyidea-ldap-proxy/default.nix | 2 +- .../python-modules/proglog/default.nix | 2 +- .../prometheus-client/default.nix | 5 +- .../prometheus-flask-exporter/default.nix | 2 +- .../python-modules/prompt-toolkit/default.nix | 5 +- .../python-modules/protego/default.nix | 2 +- .../python-modules/proto-plus/default.nix | 2 +- .../python-modules/proton-client/default.nix | 2 +- .../protonvpn-nm-lib/default.nix | 2 +- .../python-modules/proxy_tools/default.nix | 2 +- .../python-modules/psycopg2/default.nix | 2 +- .../python-modules/ptyprocess/default.nix | 2 +- .../python-modules/pulsectl/default.nix | 2 +- .../pure-python-adb-homeassistant/default.nix | 2 +- .../python-modules/purl/default.nix | 2 +- .../python-modules/push-receiver/default.nix | 2 +- .../python-modules/pvo/default.nix | 2 +- .../python-modules/pweave/default.nix | 5 +- .../python-modules/pwntools/default.nix | 6 +- .../python-modules/py-cid/default.nix | 2 +- .../python-modules/py-ecc/default.nix | 2 +- .../py-eth-sig-utils/default.nix | 2 +- .../python-modules/py-libzfs/default.nix | 2 +- .../python-modules/py-multiaddr/default.nix | 2 +- .../python-modules/py-multicodec/default.nix | 2 +- .../python-modules/py-multihash/default.nix | 2 +- .../python-modules/py-sonic/default.nix | 4 +- .../py-sr25519-bindings/default.nix | 2 +- .../python-modules/py-tree-sitter/default.nix | 2 +- .../python-modules/py17track/default.nix | 2 +- .../python-modules/py4j/default.nix | 2 +- .../python-modules/pySmartDL/default.nix | 2 +- .../pyTelegramBotAPI/default.nix | 4 +- .../python-modules/py_scrypt/default.nix | 2 +- .../python-modules/pyads/default.nix | 2 +- .../python-modules/pyairnow/default.nix | 1 + .../python-modules/pyamg/default.nix | 2 +- .../python-modules/pyarr/default.nix | 2 +- .../python-modules/pyasn/default.nix | 4 +- .../python-modules/pyatag/default.nix | 4 +- .../python-modules/pyaudio/default.nix | 2 +- .../python-modules/pyautogui/default.nix | 2 +- .../python-modules/pyavm/default.nix | 2 +- .../python-modules/pyaxmlparser/default.nix | 2 +- .../python-modules/pybalboa/default.nix | 5 +- .../python-modules/pybase64/default.nix | 2 +- .../python-modules/pybids/default.nix | 2 +- .../python-modules/pybullet/default.nix | 2 +- .../python-modules/pycairo/default.nix | 2 +- .../python-modules/pycangjie/default.nix | 2 +- .../python-modules/pycarwings2/default.nix | 2 +- .../python-modules/pycec/default.nix | 2 +- .../python-modules/pycfdns/default.nix | 5 + .../python-modules/pychannels/default.nix | 2 +- .../python-modules/pyclimacell/default.nix | 2 +- .../python-modules/pycm/default.nix | 4 +- .../python-modules/pycmarkgfm/default.nix | 2 +- .../python-modules/pycocotools/default.nix | 2 +- .../python-modules/pycognito/default.nix | 2 +- .../python-modules/pycoin/default.nix | 2 +- .../python-modules/pycomfoconnect/default.nix | 2 +- .../python-modules/pycotap/default.nix | 2 +- .../python-modules/pycountry/default.nix | 2 +- .../python-modules/pycritty/default.nix | 2 +- .../python-modules/pycsdr/default.nix | 2 +- .../python-modules/pyctr/default.nix | 2 +- .../python-modules/pycuda/default.nix | 6 +- .../python-modules/pycurl/default.nix | 4 +- .../python-modules/pydal/default.nix | 2 +- .../python-modules/pydanfossair/default.nix | 2 +- .../python-modules/pydantic/default.nix | 9 +- .../pydata-sphinx-theme/default.nix | 4 +- .../python-modules/pydeck/default.nix | 2 +- .../python-modules/pydeconz/default.nix | 4 +- .../python-modules/pydevd/default.nix | 2 +- .../python-modules/pydexcom/default.nix | 2 +- .../python-modules/pydigiham/default.nix | 2 +- .../python-modules/pydispatcher/default.nix | 4 +- .../python-modules/pydocstyle/default.nix | 34 +- .../python-modules/pydsdl/default.nix | 2 +- .../python-modules/pydy/default.nix | 2 +- .../python-modules/pyeapi/default.nix | 6 +- .../python-modules/pyebus/default.nix | 2 +- .../python-modules/pyeclib/default.nix | 2 +- .../python-modules/pyefergy/default.nix | 6 + .../python-modules/pyeight/default.nix | 2 +- .../python-modules/pyemby/default.nix | 2 +- .../python-modules/pyenvisalink/default.nix | 2 +- .../python-modules/pyevilgenius/default.nix | 2 +- .../python-modules/pyexcel-io/default.nix | 2 +- .../python-modules/pyexcel/default.nix | 2 +- .../python-modules/pyfaidx/default.nix | 8 +- .../python-modules/pyfakefs/default.nix | 4 +- .../python-modules/pyfftw/default.nix | 2 +- .../python-modules/pyfido/default.nix | 2 +- .../pyfireservicerota/default.nix | 2 +- .../python-modules/pyflume/default.nix | 2 +- .../python-modules/pygal/default.nix | 2 +- .../python-modules/pygame-gui/default.nix | 4 +- .../python-modules/pygame/default.nix | 12 +- .../pygame/fix-dependency-finding.patch | 17 +- .../python-modules/pygame_sdl2/default.nix | 2 +- .../python-modules/pygdbmi/default.nix | 9 +- .../python-modules/pygetwindow/default.nix | 2 +- .../python-modules/pygit2/default.nix | 6 +- .../{pyGithub => pygithub}/default.nix | 6 +- .../python-modules/pyglet/default.nix | 4 +- .../python-modules/pygls/default.nix | 6 +- .../python-modules/pygmars/default.nix | 2 +- .../python-modules/pygments/default.nix | 4 +- .../python-modules/pygmo/default.nix | 6 +- .../python-modules/pygmt/default.nix | 2 +- .../python-modules/pygti/default.nix | 2 +- .../pygtkspellcheck/default.nix | 2 +- .../python-modules/pygtrie/default.nix | 2 +- .../pyhanko-certvalidator/default.nix | 10 +- .../python-modules/pyhanko/default.nix | 66 +- .../python-modules/pyhaversion/default.nix | 2 +- .../python-modules/pyhocon/default.nix | 2 +- .../python-modules/pyicloud/default.nix | 2 +- .../python-modules/pyinsteon/default.nix | 4 +- .../python-modules/pyintesishome/default.nix | 2 +- .../python-modules/pyjet/default.nix | 2 +- .../python-modules/pyjnius/default.nix | 2 +- .../python-modules/pyjsparser/default.nix | 2 +- .../python-modules/pyjwt/default.nix | 2 +- .../python-modules/pykaleidescape/default.nix | 4 +- .../python-modules/pykdtree/default.nix | 2 +- .../python-modules/pykerberos/default.nix | 2 +- .../python-modules/pykka/default.nix | 2 +- .../python-modules/pykmtronic/default.nix | 2 +- .../python-modules/pykodi/default.nix | 2 +- .../python-modules/pykoplenti/default.nix | 17 +- .../python-modules/pykulersky/default.nix | 2 +- .../python-modules/pykwalify/default.nix | 2 +- .../python-modules/pylint-venv/default.nix | 4 +- .../python-modules/pylint/default.nix | 38 +- .../python-modules/pylnk3/default.nix | 2 +- .../python-modules/pylsp-mypy/default.nix | 4 +- .../python-modules/pylsqpack/default.nix | 2 +- .../python-modules/pylti/default.nix | 5 +- .../python-modules/pylutron/default.nix | 2 +- .../python-modules/pylxd/default.nix | 2 +- .../python-modules/pylyrics/default.nix | 2 +- .../python-modules/pymanopt/default.nix | 4 +- .../python-modules/pymarshal/default.nix | 2 +- .../python-modules/pymavlink/default.nix | 2 +- .../python-modules/pymazda/default.nix | 4 +- .../python-modules/pymbolic/default.nix | 2 +- .../pymdown-extensions/default.nix | 4 +- .../python-modules/pymeeus/default.nix | 2 +- .../python-modules/pymetno/default.nix | 2 +- .../python-modules/pymitv/default.nix | 2 +- .../python-modules/pymoo/default.nix | 4 +- .../python-modules/pymsgbox/default.nix | 2 +- .../python-modules/pymsteams/default.nix | 2 +- .../python-modules/pymumble/default.nix | 18 +- .../python-modules/pymvglive/default.nix | 5 +- .../python-modules/pynamodb/default.nix | 4 +- .../python-modules/pynest2d/default.nix | 2 +- .../python-modules/pynvim/default.nix | 2 +- .../python-modules/pynvml/default.nix | 2 +- .../python-modules/pynws/default.nix | 2 +- .../python-modules/pynx584/default.nix | 2 +- .../python-modules/pyocd/default.nix | 2 +- .../python-modules/pyocr/default.nix | 2 +- .../python-modules/pyopencl/default.nix | 6 +- .../pyopengl-accelerate/default.nix | 2 +- .../python-modules/pyopengl/default.nix | 2 +- .../pyoutbreaksnearme/default.nix | 2 +- .../python-modules/pyowm/default.nix | 2 +- .../python-modules/pyp/default.nix | 6 +- .../python-modules/pyparsing/default.nix | 2 +- .../python-modules/pyparted/default.nix | 2 +- .../python-modules/pypcap/default.nix | 2 +- .../python-modules/pypdf/default.nix | 92 + .../python-modules/pypdf2/default.nix | 13 +- .../python-modules/pypdf3/default.nix | 2 +- .../python-modules/pypemicro/default.nix | 4 +- .../python-modules/pypinyin/default.nix | 2 +- .../python-modules/pypiserver/default.nix | 2 +- .../python-modules/pypng/default.nix | 2 +- .../python-modules/pypoolstation/default.nix | 2 +- .../python-modules/pyppeteer/default.nix | 2 +- .../python-modules/pyprecice/default.nix | 4 +- .../python-modules/pyproject-api/default.nix | 4 +- .../pyproject-metadata/default.nix | 4 +- .../python-modules/pyprosegur/default.nix | 2 +- .../python-modules/pypugjs/default.nix | 6 +- .../python-modules/pypytools/default.nix | 2 +- .../python-modules/pyqldb/default.nix | 2 +- .../python-modules/pyqt-builder/default.nix | 4 +- .../python-modules/pyqt/pyqt6-sip.nix | 2 +- .../development/python-modules/pyqt/sip.nix | 2 +- .../python-modules/pyqt6-charts.nix | 77 + .../python-modules/pyqt6-webengine.nix | 2 +- .../python-modules/pyqtgraph/default.nix | 3 + .../python-modules/pyquaternion/default.nix | 2 +- .../python-modules/pyquil/default.nix | 4 +- .../python-modules/pyrad/default.nix | 2 +- .../python-modules/pyradios/default.nix | 2 +- .../pyramid_chameleon/default.nix | 4 +- .../python-modules/pyramid_exclog/default.nix | 2 +- .../python-modules/pyramid_mako/default.nix | 4 +- .../python-modules/pyrdfa3/default.nix | 2 +- .../python-modules/pyreadstat/default.nix | 4 +- .../python-modules/pyrect/default.nix | 2 +- .../python-modules/pyregion/default.nix | 8 +- .../python-modules/pyrevolve/default.nix | 2 +- .../python-modules/pyrmvtransport/default.nix | 4 +- .../python-modules/pyrogram/default.nix | 4 +- .../python-modules/pyrsistent/default.nix | 2 +- .../python-modules/pyrss2gen/default.nix | 5 +- .../python-modules/pyruckus/default.nix | 2 +- .../python-modules/pysam/default.nix | 2 +- .../python-modules/pysaml2/default.nix | 19 +- .../pysaml2/hardcode-xmlsec1-path.patch | 14 +- .../python-modules/pysatochip/default.nix | 2 +- .../python-modules/pyscf/default.nix | 2 +- .../python-modules/pyschemes/default.nix | 2 +- .../python-modules/pyscreenshot/default.nix | 4 +- .../python-modules/pyscreeze/default.nix | 2 +- .../python-modules/pyscss/default.nix | 2 +- .../python-modules/pysdl2/default.nix | 2 +- .../pyserial-asyncio/default.nix | 2 +- .../python-modules/pysiaalarm/default.nix | 2 +- .../python-modules/pyside/apiextractor.nix | 2 +- .../python-modules/pyside/default.nix | 2 +- .../python-modules/pyside/generatorrunner.nix | 2 +- .../pysigma-backend-qradar/default.nix | 4 +- .../pysigma-backend-splunk/default.nix | 4 +- .../pysigma-pipeline-crowdstrike/default.nix | 4 +- .../pysigma-pipeline-sysmon/default.nix | 4 +- .../pysigma-pipeline-windows/default.nix | 4 +- .../python-modules/pysigma/default.nix | 20 +- .../python-modules/pysimplegui/default.nix | 2 +- .../python-modules/pyskyqhub/default.nix | 2 +- .../python-modules/pyslurm/default.nix | 4 +- .../python-modules/pysma/default.nix | 2 +- .../python-modules/pysmartapp/default.nix | 2 +- .../python-modules/pysmartthings/default.nix | 2 +- .../python-modules/pysml/default.nix | 2 +- .../python-modules/pysnow/default.nix | 2 +- .../python-modules/pysol-cards/default.nix | 4 +- .../python-modules/pysonos/default.nix | 2 +- .../python-modules/pyspcwebgw/default.nix | 2 +- .../python-modules/pyspnego/default.nix | 4 +- .../python-modules/pysqlcipher3/default.nix | 4 +- .../python-modules/pystemd/default.nix | 2 +- .../python-modules/pystemmer/default.nix | 11 +- .../python-modules/pystray/default.nix | 2 +- .../python-modules/pytapo/default.nix | 4 +- .../python-modules/pyte/default.nix | 2 +- .../python-modules/pytensor/default.nix | 4 +- .../python-modules/pytesseract/default.nix | 2 +- .../python-modules/pytest-astropy/default.nix | 2 +- .../python-modules/pytest-bdd/default.nix | 4 +- .../python-modules/pytest-cases/default.nix | 2 +- .../python-modules/pytest-celery/default.nix | 2 +- .../python-modules/pytest-cid/default.nix | 2 +- .../python-modules/pytest-click/default.nix | 2 +- .../python-modules/pytest-cov/default.nix | 2 +- .../python-modules/pytest-datadir/default.nix | 2 +- .../pytest-datafiles/default.nix | 6 +- .../pytest-dependency/default.nix | 2 +- .../python-modules/pytest-html/default.nix | 2 +- .../python-modules/pytest-httpx/default.nix | 5 +- .../pytest-localserver/default.nix | 5 +- .../python-modules/pytest-mpl/default.nix | 2 +- .../python-modules/pytest-mypy/default.nix | 2 +- .../python-modules/pytest-order/default.nix | 5 +- .../pytest-param-files/default.nix | 2 +- .../python-modules/pytest-plt/default.nix | 2 +- .../python-modules/pytest-pylint/default.nix | 2 +- .../pytest-pytestrail/default.nix | 48 + .../pytest-quickcheck/default.nix | 2 +- .../python-modules/pytest-raisin/default.nix | 2 +- .../pytest-random-order/default.nix | 2 +- .../pytest-regressions/default.nix | 4 +- .../pytest-rerunfailures/default.nix | 4 +- .../python-modules/pytest-runner/default.nix | 2 +- .../python-modules/pytest-sanic/default.nix | 2 +- .../pytest-snapshot/default.nix | 2 +- .../python-modules/pytest-socket/default.nix | 6 +- .../pytest-subtesthack/default.nix | 2 +- .../pytest-subtests/default.nix | 4 +- .../python-modules/pytest-sugar/default.nix | 2 +- .../python-modules/pytest-timeout/default.nix | 2 +- .../python-modules/pytest-xdist/default.nix | 7 +- .../pytest-xprocess/default.nix | 4 +- .../python-modules/pytest-xvfb/default.nix | 4 +- .../python-modules/pytest/default.nix | 6 +- .../python-modules/python-arango/default.nix | 4 +- .../python-modules/python-awair/default.nix | 2 +- .../python-modules/python-barcode/default.nix | 2 +- .../python-benedict/default.nix | 4 +- .../python-modules/python-binance/default.nix | 4 +- .../python-cinderclient/default.nix | 2 +- .../python-codon-tables/default.nix | 2 +- .../python-crfsuite/default.nix | 2 +- .../python-modules/python-daemon/default.nix | 4 +- .../python-datemath/default.nix | 2 +- .../python-dbusmock/default.nix | 4 +- .../python-didl-lite/default.nix | 2 +- .../python-modules/python-dotenv/default.nix | 4 +- .../python-modules/python-gammu/default.nix | 2 +- .../python-modules/python-gnupg/default.nix | 2 +- .../python-modules/python-gvm/default.nix | 2 +- .../python-heatclient/default.nix | 4 +- .../python-modules/python-hglib/default.nix | 2 +- .../python-modules/python-hosts/default.nix | 2 +- .../python-http-client/default.nix | 2 +- .../python-modules/python-ipmi/default.nix | 2 +- .../python-ironicclient/default.nix | 2 +- .../python-modules/python-jose/default.nix | 2 +- .../python-json-logger/default.nix | 15 +- .../python-modules/python-jwt/default.nix | 2 +- .../python-modules/python-kasa/default.nix | 2 +- .../python-keycloak/default.nix | 3 +- .../python-keystoneclient/default.nix | 4 +- .../python-linux-procfs/default.nix | 2 +- .../python-logstash/default.nix | 2 +- .../python-modules/python-louvain/default.nix | 4 +- .../python-lsp-black/default.nix | 2 +- .../python-modules/python-magic/default.nix | 2 +- .../python-modules/python-mapnik/default.nix | 2 +- .../python-mpv-jsonipc/default.nix | 2 +- .../python-modules/python-mystrom/default.nix | 2 +- .../python-modules/python-nmap/default.nix | 2 +- .../python-modules/python-nomad/default.nix | 2 +- .../python-opendata-transport/default.nix | 2 +- .../python-openstackclient/default.nix | 4 +- .../python-modules/python-osc/default.nix | 2 +- .../python-otbr-api/default.nix | 4 +- .../python-modules/python-pae/default.nix | 2 +- .../python-modules/python-pam/default.nix | 2 +- .../python-modules/python-pidfile/default.nix | 2 +- .../python-rapidjson/default.nix | 3 +- .../python-redis-lock/default.nix | 2 +- .../python-modules/python-sat/default.nix | 2 +- .../python-smarttub/default.nix | 2 +- .../python-modules/python-snappy/default.nix | 2 +- .../python-string-utils/default.nix | 2 +- .../python-modules/python-tado/default.nix | 2 +- .../python-telegram-bot/default.nix | 8 +- .../python-telegram/default.nix | 4 +- .../python-modules/python-trovo/default.nix | 2 +- .../python-modules/python-vagrant/default.nix | 2 +- .../python-vipaccess/default.nix | 2 +- .../python-modules/python-whois/default.nix | 2 +- .../python-modules/python-zbar/default.nix | 2 +- .../python3-application/default.nix | 2 +- .../python3-eventlib/default.nix | 2 +- .../python-modules/python3-gnutls/default.nix | 2 +- .../python-modules/pythonfinder/default.nix | 15 +- .../python-modules/pythonocc-core/default.nix | 2 +- .../python-modules/pythran/default.nix | 2 +- .../python-modules/pytile/default.nix | 2 +- .../python-modules/pytomlpp/default.nix | 2 +- .../python-modules/pytools/default.nix | 2 +- .../pytorch-lightning/default.nix | 4 +- .../pytorch-metric-learning/default.nix | 2 +- .../pytorch-pfn-extras/default.nix | 2 +- .../python-modules/pytraccar/default.nix | 2 +- .../python-modules/pytrends/default.nix | 4 +- .../python-modules/pytweening/default.nix | 2 +- .../python-modules/pyu2f/default.nix | 2 + .../python-modules/pyuavcan/default.nix | 2 +- .../python-modules/pyudev/default.nix | 2 +- .../python-modules/pyutil/default.nix | 2 +- .../python-modules/pyutilib/default.nix | 2 +- .../python-modules/pyuv/default.nix | 2 +- .../python-modules/pyvera/default.nix | 2 +- .../python-modules/pyvesync/default.nix | 2 +- .../python-modules/pyvex/default.nix | 4 +- .../python-modules/pyvicare/default.nix | 2 +- .../python-modules/pyvips/default.nix | 2 +- .../default.nix | 7 +- .../python-modules/pyvis/default.nix | 4 +- .../python-modules/pyviz-comms/default.nix | 2 +- .../python-modules/pyvo/default.nix | 2 +- .../python-modules/pywavelets/default.nix | 2 +- .../python-modules/pywbem/default.nix | 4 +- .../python-modules/pywebpush/default.nix | 2 +- .../python-modules/pywebview/default.nix | 4 +- .../python-modules/pywilight/default.nix | 2 +- .../python-modules/pywlroots/default.nix | 8 +- .../python-modules/pyworld/default.nix | 2 +- .../python-modules/pyx/default.nix | 2 +- .../python-modules/pyxattr/default.nix | 2 +- .../python-modules/pyxdg/default.nix | 2 +- .../pyxiaomigateway/default.nix | 2 +- .../python-modules/pyxnat/default.nix | 2 +- .../python-modules/pyyaml-include/default.nix | 2 +- .../python-modules/pyyaml/default.nix | 2 +- .../python-modules/pyzerproc/default.nix | 2 +- .../python-modules/qdarkstyle/default.nix | 2 +- .../python-modules/qdldl/default.nix | 2 +- .../python-modules/qimage2ndarray/default.nix | 2 +- .../python-modules/qiskit-aer/default.nix | 2 +- .../python-modules/qiskit-finance/default.nix | 2 +- .../qiskit-ibmq-provider/default.nix | 4 +- .../qiskit-machine-learning/default.nix | 2 +- .../python-modules/qiskit-nature/default.nix | 2 +- .../qiskit-optimization/default.nix | 4 +- .../python-modules/qiskit/default.nix | 4 +- .../python-modules/qmk-dotty-dict/default.nix | 2 +- .../python-modules/qrcode/default.nix | 38 +- .../python-modules/qtpy/default.nix | 2 +- .../python-modules/qualysclient/default.nix | 7 +- .../python-modules/quamash/default.nix | 2 +- .../python-modules/questionary/default.nix | 8 +- .../python-modules/r2pipe/default.nix | 4 +- .../python-modules/radian/default.nix | 71 + .../radicale_infcloud/default.nix | 2 +- .../rangehttpserver/default.nix | 17 +- .../python-modules/rapidfuzz/default.nix | 8 +- .../python-modules/ray/binary-hashes.nix | 10 +- .../python-modules/ray/default.nix | 18 +- .../python-modules/rchitect/default.nix | 52 + .../python-modules/rcssmin/default.nix | 2 +- .../python-modules/readchar/default.nix | 2 +- .../readme_renderer/default.nix | 5 +- .../readthedocs-sphinx-ext/default.nix | 2 +- .../recipe-scrapers/default.nix | 4 +- .../python-modules/recommonmark/default.nix | 4 +- .../python-modules/recordlinkage/default.nix | 2 +- .../python-modules/redis/default.nix | 11 +- .../python-modules/reflink/default.nix | 2 +- .../python-modules/reikna/default.nix | 6 +- .../python-modules/remote-pdb/default.nix | 2 +- .../python-modules/reolink-aio/default.nix | 4 +- .../python-modules/reolink/default.nix | 4 +- .../python-modules/reportengine/default.nix | 2 +- .../python-modules/reportlab/default.nix | 2 +- .../repoze_sphinx_autointerface/default.nix | 2 +- .../python-modules/repoze_who/default.nix | 2 +- .../python-modules/reqif/default.nix | 11 +- .../python-modules/requests-cache/default.nix | 7 +- .../python-modules/requests-mock/default.nix | 2 +- .../requests-oauthlib/default.nix | 2 +- .../python-modules/requests_ntlm/default.nix | 28 +- .../requirements-detector/default.nix | 4 +- .../requirements-parser/default.nix | 2 +- .../python-modules/resolvelib/default.nix | 11 + .../python-modules/respx/default.nix | 2 +- .../restructuredtext_lint/default.nix | 2 +- .../python-modules/restview/default.nix | 4 +- .../python-modules/rethinkdb/default.nix | 2 +- .../python-modules/rfc3986/default.nix | 2 +- .../python-modules/rflink/default.nix | 24 +- .../python-modules/rich-rst/default.nix | 2 +- .../python-modules/rich/default.nix | 10 +- .../ripe-atlas-cousteau/default.nix | 10 +- .../python-modules/riscof/default.nix | 6 +- .../python-modules/riscv-config/default.nix | 6 +- .../python-modules/rjsmin/default.nix | 2 +- .../rki-covid-parser/default.nix | 2 +- .../python-modules/rkm-codes/default.nix | 2 +- .../python-modules/rlax/default.nix | 4 +- .../python-modules/rlp/default.nix | 2 +- .../python-modules/rnginline/default.nix | 4 +- .../python-modules/rns/default.nix | 4 +- .../python-modules/robomachine/default.nix | 2 +- .../python-modules/robotframework/default.nix | 2 +- .../robotstatuschecker/default.nix | 2 +- .../python-modules/robotsuite/default.nix | 2 +- .../python-modules/rollbar/default.nix | 2 +- .../python-modules/roombapy/default.nix | 4 +- .../python-modules/rpcq/default.nix | 2 +- .../python-modules/rpi-gpio/default.nix | 2 +- .../python-modules/rplcd/default.nix | 2 +- .../python-modules/rpy2/default.nix | 4 +- .../python-modules/rsskey/default.nix | 2 +- .../python-modules/rst2ansi/default.nix | 2 +- .../python-modules/rstcheck/default.nix | 4 +- .../python-modules/rtoml/default.nix | 4 +- .../{Rtree => rtree}/default.nix | 2 +- .../python-modules/rtslib/default.nix | 4 +- .../python-modules/ruamel-yaml/default.nix | 2 +- .../python-modules/rzpipe/default.nix | 2 +- .../python-modules/safety/default.nix | 6 + .../python-modules/sagemaker/default.nix | 4 +- .../python-modules/samplerate/default.nix | 62 +- .../python-modules/saneyaml/default.nix | 4 +- .../python-modules/sarge/default.nix | 2 +- .../scancode-toolkit/default.nix | 4 +- .../python-modules/scapy/default.nix | 2 +- .../python-modules/schema-salad/default.nix | 4 +- .../python-modules/schiene/default.nix | 2 +- .../python-modules/schwifty/default.nix | 2 +- .../python-modules/scikit-bio/default.nix | 2 +- .../scikit-build-core/default.nix | 4 +- .../python-modules/scikit-build/default.nix | 4 +- .../python-modules/scikit-fmm/default.nix | 2 +- .../scikit-hep-testdata/default.nix | 6 +- .../python-modules/scikit-image/default.nix | 2 +- .../python-modules/scikit-learn/default.nix | 2 +- .../python-modules/scikit-misc/default.nix | 2 +- .../python-modules/scikit-rf/default.nix | 113 + .../scikit-survival/default.nix | 3 +- .../python-modules/scikits-odes/default.nix | 2 +- .../scikits-samplerate/default.nix | 44 + .../python-modules/scipy/default.nix | 13 +- .../scipy/disable-datasets-tests.patch | 9 + .../python-modules/scmrepo/default.nix | 4 +- .../python-modules/scp/default.nix | 4 +- .../python-modules/scrap-engine/default.nix | 2 +- .../python-modules/scrapy-splash/default.nix | 2 +- .../python-modules/screed/default.nix | 2 +- .../python-modules/screenlogicpy/default.nix | 4 +- .../python-modules/scs/default.nix | 2 +- .../python-modules/seaborn/default.nix | 16 +- .../python-modules/seedir/default.nix | 2 +- .../python-modules/segno/default.nix | 2 +- .../python-modules/segyio/default.nix | 4 +- .../semantic-version/default.nix | 2 +- .../python-modules/send2trash/default.nix | 11 + .../python-modules/sendgrid/default.nix | 2 +- .../sensor-state-data/default.nix | 4 +- .../python-modules/sentinel/default.nix | 2 +- .../python-modules/sentry-sdk/default.nix | 4 +- .../python-modules/seqdiag/default.nix | 2 +- .../python-modules/serpent/default.nix | 2 +- .../python-modules/servefile/default.nix | 2 +- .../service-identity/default.nix | 2 +- .../python-modules/setproctitle/default.nix | 2 +- .../python-modules/setupmeta/default.nix | 3 + .../default.nix | 2 +- .../setuptools-rust/default.nix | 2 +- .../python-modules/setuptools/default.nix | 11 +- .../setuptools/setuptools-distutils-C++.patch | 28 +- .../python-modules/sexpdata/default.nix | 4 +- .../python-modules/sfepy/default.nix | 2 +- .../python-modules/sgp4/default.nix | 2 +- .../development/python-modules/sh/default.nix | 45 +- .../shamir-mnemonic/default.nix | 2 +- .../python-modules/shap/default.nix | 2 +- .../python-modules/shapely/default.nix | 4 +- .../python-modules/shellingham/default.nix | 4 +- .../python-modules/shiv/default.nix | 2 +- .../python-modules/shlib/default.nix | 2 +- .../python-modules/shodan/default.nix | 6 +- .../python-modules/sievelib/default.nix | 2 +- .../python-modules/signalslot/default.nix | 2 +- .../python-modules/signify/default.nix | 2 +- .../python-modules/simanneal/default.nix | 2 +- .../simple-rest-client/default.nix | 2 +- .../python-modules/simple-rlp/default.nix | 2 +- .../simple-salesforce/default.nix | 4 +- .../python-modules/simplefix/default.nix | 2 +- .../python-modules/simplejson/default.nix | 4 +- .../python-modules/single-version/default.nix | 2 +- .../python-modules/siosocks/default.nix | 2 +- .../development/python-modules/sip/4.x.nix | 11 +- .../python-modules/skia-pathops/default.nix | 2 +- .../python-modules/skrl/default.nix | 6 +- .../python-modules/skyfield/default.nix | 2 +- .../skytemple-files/default.nix | 2 +- .../python-modules/skytemple-rust/default.nix | 4 +- .../skytemple-ssb-debugger/default.nix | 2 +- .../python-modules/slack-sdk/default.nix | 4 +- .../python-modules/slackclient/default.nix | 4 +- .../python-modules/smart-open/default.nix | 2 +- .../python-modules/smbus-cffi/default.nix | 2 +- .../python-modules/smbus2/default.nix | 2 +- .../python-modules/smhi-pkg/default.nix | 2 +- .../python-modules/snitun/default.nix | 11 +- .../snowballstemmer/default.nix | 4 +- .../social-auth-app-django/default.nix | 2 +- .../python-modules/socialscan/default.nix | 2 +- .../socketio-client/default.nix | 2 +- .../python-modules/softlayer/default.nix | 4 +- .../python-modules/solax/default.nix | 2 +- .../python-modules/solc-select/default.nix | 2 +- .../python-modules/solo-python/default.nix | 2 +- .../python-modules/somajo/default.nix | 2 +- .../python-modules/sorl_thumbnail/default.nix | 2 +- .../sortedcollections/default.nix | 2 +- .../sortedcontainers/default.nix | 2 +- .../python-modules/sounddevice/default.nix | 2 +- .../python-modules/soupsieve/default.nix | 4 +- .../python-modules/soxr/default.nix | 56 + .../spacy-alignments/default.nix | 4 +- .../python-modules/spacy-loggers/default.nix | 2 +- .../python-modules/spacy/default.nix | 5 +- .../python-modules/spacy/legacy.nix | 2 +- .../python-modules/sparqlwrapper/default.nix | 2 +- .../python-modules/spglib/default.nix | 2 +- .../sphinx-argparse/default.nix | 2 +- .../default.nix | 20 +- .../sphinx-autodoc-typehints/default.nix | 4 +- .../sphinx-basic-ng/default.nix | 2 +- .../sphinx-book-theme/default.nix | 2 +- .../sphinx-codeautolink/default.nix | 12 +- .../sphinx-copybutton/default.nix | 2 +- .../python-modules/sphinx-design/default.nix | 2 +- .../python-modules/sphinx-fortran/default.nix | 2 +- .../sphinx-hoverxref/default.nix | 8 +- .../sphinx-inline-tabs/default.nix | 2 +- .../python-modules/sphinx-jinja/default.nix | 2 +- .../python-modules/sphinx-jquery/default.nix | 36 - .../sphinx-jupyterbook-latex/default.nix | 2 +- .../sphinx-markdown-parser/default.nix | 4 +- .../sphinx-notfound-page/default.nix | 4 +- .../python-modules/sphinx-pytest/default.nix | 2 +- .../sphinx-rtd-theme/default.nix | 6 +- .../sphinx-togglebutton/default.nix | 2 +- .../sphinx-version-warning/default.nix | 4 +- .../python-modules/sphinx/default.nix | 15 + .../sphinxcontrib-apidoc/default.nix | 2 +- .../sphinxcontrib-bayesnet/default.nix | 2 +- .../default.nix | 4 +- .../sphinxcontrib-jquery/default.nix | 45 + .../sphinxcontrib-programoutput/default.nix | 2 +- .../sphinxcontrib-spelling/default.nix | 4 +- .../sphinxcontrib-tikz/default.nix | 2 +- .../sphinxcontrib_httpdomain/default.nix | 2 +- .../python-modules/sphinxemoji/default.nix | 34 +- .../python-modules/spiderpy/default.nix | 2 +- .../python-modules/spidev/default.nix | 2 +- .../python-modules/splinter/default.nix | 23 +- .../python-modules/spsdk/default.nix | 6 +- .../python-modules/spur/default.nix | 9 +- .../python-modules/spyder-kernels/default.nix | 4 +- .../python-modules/spyder/default.nix | 8 +- .../python-modules/spyse-python/default.nix | 2 +- .../sqlalchemy-jsonfield/default.nix | 2 +- .../sqlalchemy-migrate/default.nix | 8 +- .../sqlalchemy-mixins/default.nix | 2 +- .../sqlalchemy-utils/default.nix | 4 +- .../python-modules/sqlalchemy/default.nix | 31 +- .../python-modules/sqlitedict/default.nix | 2 +- .../python-modules/sqlmap/default.nix | 4 +- .../python-modules/sqlobject/default.nix | 4 +- .../python-modules/sqlparse/default.nix | 2 +- .../python-modules/sqltrie/default.nix | 4 +- .../python-modules/squarify/default.nix | 31 + .../python-modules/srvlookup/default.nix | 2 +- .../python-modules/ssdp/default.nix | 2 +- .../python-modules/ssh-mitm/default.nix | 4 +- .../python-modules/sshfs/default.nix | 53 + .../python-modules/sshtunnel/default.nix | 2 +- .../python-modules/stack-data/default.nix | 2 +- .../python-modules/stanza/default.nix | 5 +- .../python-modules/starlette/default.nix | 4 +- .../python-modules/staticjinja/default.nix | 2 +- .../python-modules/stem/default.nix | 2 +- .../python-modules/stestr/default.nix | 2 +- .../python-modules/stevedore/default.nix | 4 +- .../python-modules/stickytape/default.nix | 2 +- .../python-modules/stim/default.nix | 2 +- .../python-modules/stopit/default.nix | 2 +- .../python-modules/stravalib/default.nix | 2 +- .../strawberry-graphql/default.nix | 4 +- .../python-modules/streamdeck/default.nix | 2 +- .../streamlabswater/default.nix | 2 +- .../python-modules/strictyaml/default.nix | 2 +- .../python-modules/structlog/default.nix | 2 +- .../python-modules/subarulink/default.nix | 4 +- .../python-modules/subprocess-tee/default.nix | 2 +- .../python-modules/subunit2sql/default.nix | 2 +- .../python-modules/subzerod/default.nix | 2 +- .../python-modules/sumo/default.nix | 2 +- .../python-modules/sumtypes/default.nix | 2 +- .../python-modules/sunpy/default.nix | 4 +- .../python-modules/superqt/default.nix | 2 +- .../python-modules/supervisor/default.nix | 2 +- .../python-modules/sure/default.nix | 2 +- .../python-modules/surepy/default.nix | 6 +- .../python-modules/surt/default.nix | 2 +- .../python-modules/survey/default.nix | 2 +- .../python-modules/svgwrite/default.nix | 2 +- .../swagger-spec-validator/default.nix | 2 +- .../python-modules/swift/default.nix | 4 +- .../python-modules/symengine/default.nix | 2 +- .../python-modules/sympy/default.nix | 2 +- .../python-modules/systembridge/default.nix | 2 +- .../python-modules/systemd/default.nix | 2 +- .../python-modules/tabledata/default.nix | 7 +- .../python-modules/tables/default.nix | 36 +- .../python-modules/tago/default.nix | 2 +- .../python-modules/tahoma-api/default.nix | 2 +- .../python-modules/taskw/default.nix | 2 +- .../python-modules/tatsu/default.nix | 2 +- .../python-modules/taxi/default.nix | 2 +- .../teamcity-messages/default.nix | 2 +- .../python-modules/tempest/default.nix | 2 +- .../python-modules/tempora/default.nix | 4 +- .../python-modules/tenacity/default.nix | 4 +- .../tensorboard-data-server/default.nix | 2 +- .../tensorflow-datasets/default.nix | 4 +- .../tensorflow-metadata/default.nix | 2 +- .../python-modules/tensorflow/bin.nix | 2 +- .../python-modules/tensorflow/default.nix | 4 +- .../python-modules/termcolor/default.nix | 4 +- .../python-modules/terminado/default.nix | 2 +- .../python-modules/testbook/default.nix | 2 +- .../python-modules/testcontainers/default.nix | 2 +- .../python-modules/testfixtures/default.nix | 4 +- .../testing-postgresql/default.nix | 2 +- .../python-modules/testpath/default.nix | 2 +- .../python-modules/testrail-api/default.nix | 36 + .../python-modules/textdistance/default.nix | 2 +- .../python-modules/textfsm/default.nix | 2 +- .../python-modules/texttable/default.nix | 2 +- .../python-modules/textual/default.nix | 24 +- .../python-modules/textx/default.nix | 2 +- .../python-modules/tgcrypto/default.nix | 2 +- .../{Theano => theano}/default.nix | 2 +- .../python-modules/thespian/default.nix | 2 +- .../python-modules/threadpoolctl/default.nix | 2 +- .../python-modules/thrift/default.nix | 2 +- .../python-modules/tifffile/default.nix | 7 +- .../python-modules/tika/default.nix | 2 +- .../python-modules/tikzplotlib/default.nix | 2 +- .../python-modules/tiledb/default.nix | 4 +- .../python-modules/tiler/default.nix | 2 +- .../python-modules/time-machine/default.nix | 2 +- .../python-modules/timeago/default.nix | 4 +- .../python-modules/timetagger/default.nix | 29 +- .../python-modules/tinycss2/default.nix | 2 +- .../python-modules/tinydb/default.nix | 2 +- .../python-modules/tls-parser/default.nix | 4 +- .../python-modules/tlsh/default.nix | 2 +- .../todoist-api-python/default.nix | 2 +- .../python-modules/toggl-cli/default.nix | 2 +- .../python-modules/tokenize-rt/default.nix | 2 +- .../python-modules/tokenizers/default.nix | 2 +- .../python-modules/toml-adapt/default.nix | 2 +- .../python-modules/tomli-w/default.nix | 2 +- .../python-modules/tomli/default.nix | 2 +- .../python-modules/toolz/default.nix | 2 +- .../python-modules/toposort/default.nix | 2 +- .../python-modules/torch/default.nix | 10 +- .../python-modules/torchvision/default.nix | 68 +- .../python-modules/tornado/default.nix | 34 +- .../python-modules/torpy/default.nix | 2 +- .../python-modules/torrequest/default.nix | 2 +- .../python-modules/tox/default.nix | 4 +- .../tplink-omada-client/default.nix | 4 +- .../python-modules/tqdm/default.nix | 2 +- .../python-modules/trackpy/default.nix | 6 +- .../python-modules/trainer/default.nix | 4 +- .../python-modules/traitlets/default.nix | 4 +- .../python-modules/traits/default.nix | 2 +- .../python-modules/traittypes/default.nix | 6 + .../python-modules/transformers/default.nix | 4 +- .../python-modules/transitions/default.nix | 2 +- .../python-modules/translatepy/default.nix | 2 +- .../transmission-rpc/default.nix | 4 +- .../python-modules/trectools/default.nix | 2 +- .../python-modules/treq/default.nix | 2 +- .../python-modules/trezor/default.nix | 2 +- .../python-modules/trezor_agent/default.nix | 2 +- .../python-modules/trfl/default.nix | 2 +- .../python-modules/trimesh/default.nix | 4 +- .../python-modules/trio-websocket/default.nix | 2 +- .../python-modules/troposphere/default.nix | 6 +- .../trove-classifiers/default.nix | 4 +- .../python-modules/trustme/default.nix | 2 +- .../python-modules/trytond/default.nix | 4 +- .../python-modules/tubes/default.nix | 2 +- .../python-modules/turnt/default.nix | 2 +- .../tuya-iot-py-sdk/default.nix | 2 +- .../python-modules/tuyaha/default.nix | 2 +- .../python-modules/tvdb_api/default.nix | 2 +- .../python-modules/tweedledum/default.nix | 2 +- .../python-modules/tweepy/default.nix | 4 +- .../python-modules/twentemilieu/default.nix | 2 +- .../python-modules/twilio/default.nix | 4 +- .../python-modules/twine/default.nix | 2 +- .../python-modules/twinkly-client/default.nix | 2 +- .../python-modules/twitch-python/default.nix | 2 +- .../python-modules/txi2p-tahoe/default.nix | 50 + .../python-modules/txtorcon/default.nix | 4 +- .../python-modules/txzmq/default.nix | 2 +- .../python-modules/typecode/default.nix | 7 + .../types-decorator/default.nix | 2 +- .../python-modules/types-pillow/default.nix | 4 +- .../python-modules/types-protobuf/default.nix | 2 +- .../python-modules/types-psutil/default.nix | 4 +- .../python-modules/types-pytz/default.nix | 2 +- .../python-modules/types-pyyaml/default.nix | 2 +- .../python-modules/types-redis/default.nix | 4 +- .../python-modules/types-requests/default.nix | 2 +- .../types-setuptools/default.nix | 4 +- .../python-modules/types-toml/default.nix | 4 +- .../types-typed-ast/default.nix | 4 +- .../python-modules/types-ujson/default.nix | 28 + .../python-modules/typical/default.nix | 2 +- .../typing-extensions/default.nix | 4 +- .../python-modules/typing-inspect/default.nix | 2 +- .../u-msgpack-python/default.nix | 2 +- .../python-modules/uamqp/default.nix | 4 +- .../python-modules/udatetime/default.nix | 2 +- .../python-modules/uharfbuzz/default.nix | 2 +- .../python-modules/ujson/default.nix | 2 +- .../python-modules/ulid-transform/default.nix | 4 +- .../python-modules/uncertainties/default.nix | 2 +- .../python-modules/uncompyle6/default.nix | 2 +- .../python-modules/unearth/default.nix | 4 +- .../python-modules/unidiff/default.nix | 4 +- .../unittest-xml-reporting/default.nix | 2 +- .../python-modules/univers/default.nix | 4 +- .../python-modules/unrardll/default.nix | 4 +- .../python-modules/untangle/default.nix | 2 +- .../python-modules/uproot/default.nix | 4 +- .../uptime-kuma-api/default.nix | 4 +- .../python-modules/uranium/default.nix | 2 +- .../python-modules/uri-template/default.nix | 2 +- .../python-modules/uritemplate/default.nix | 2 +- .../python-modules/url-normalize/default.nix | 2 +- .../python-modules/urllib3/default.nix | 4 +- .../python-modules/urwid-readline/default.nix | 2 +- .../python-modules/urwidtrees/default.nix | 4 +- .../python-modules/usbtmc/default.nix | 2 +- .../python-modules/ush/default.nix | 2 +- .../python-modules/uvloop/default.nix | 15 +- .../python-modules/validators/default.nix | 2 +- .../python-modules/vdirsyncer/default.nix | 15 +- .../python-modules/vector/default.nix | 4 +- .../python-modules/vega/default.nix | 2 +- .../python-modules/vehicle/default.nix | 2 +- .../venstarcolortouch/default.nix | 2 +- .../vilfo-api-client/default.nix | 2 +- .../virtualenv-clone/default.nix | 2 +- .../python-modules/virtualenv/default.nix | 12 +- .../python-modules/viv-utils/default.nix | 2 +- .../voluptuous-serialize/default.nix | 20 +- .../python-modules/vowpalwabbit/default.nix | 2 +- .../python-modules/vqgan-jax/default.nix | 2 +- .../python-modules/vsure/default.nix | 4 +- .../python-modules/vulture/default.nix | 4 +- .../python-modules/wakeonlan/default.nix | 2 +- .../python-modules/wallbox/default.nix | 2 +- .../python-modules/wand/default.nix | 2 +- .../python-modules/warcio/default.nix | 4 +- .../python-modules/wasabi/default.nix | 2 +- .../python-modules/watchdog/default.nix | 56 +- .../python-modules/watchgod/default.nix | 2 +- .../python-modules/wavinsentio/default.nix | 2 +- .../wazeroutecalculator/default.nix | 2 +- .../wcag-contrast-ratio/default.nix | 2 +- .../python-modules/wcmatch/default.nix | 2 +- .../python-modules/wcwidth/default.nix | 4 +- .../python-modules/webargs/default.nix | 2 +- .../websocket-client/default.nix | 4 +- .../python-modules/websockify/default.nix | 41 +- .../webtest-aiohttp/default.nix | 2 +- .../python-modules/werkzeug/default.nix | 4 +- .../python-modules/wfuzz/default.nix | 5 + .../python-modules/whatthepatch/default.nix | 4 +- .../python-modules/whisper/default.nix | 2 +- .../python-modules/widlparser/default.nix | 2 +- .../python-modules/wifi/default.nix | 2 +- .../python-modules/willow/default.nix | 2 +- .../python-modules/withings-api/default.nix | 2 +- .../python-modules/wled/default.nix | 2 +- .../python-modules/wordfreq/default.nix | 2 +- .../python-modules/wrapio/default.nix | 2 +- .../python-modules/wsgiprox/default.nix | 2 +- .../python-modules/{WSME => wsme}/default.nix | 5 +- .../python-modules/wsproto/default.nix | 2 +- .../python-modules/xarray/default.nix | 4 +- .../python-modules/xcffib/default.nix | 23 +- .../python-modules/xdg/default.nix | 2 +- .../python-modules/xhtml2pdf/default.nix | 10 +- .../python-modules/xkbcommon/default.nix | 2 +- .../python-modules/xlsx2csv/default.nix | 2 +- .../{XlsxWriter => xlsxwriter}/default.nix | 0 .../python-modules/xml-marshaller/default.nix | 2 +- .../python-modules/xmldiff/default.nix | 2 +- .../python-modules/xmlsec/default.nix | 2 +- .../python-modules/xmltodict/default.nix | 2 +- .../python-modules/xxhash/default.nix | 2 +- .../python-modules/xyzservices/default.nix | 4 +- .../python-modules/y-py/default.nix | 44 + .../python-modules/yacs/default.nix | 2 +- .../yalesmartalarmclient/default.nix | 2 +- .../python-modules/yamale/default.nix | 2 +- .../python-modules/yamllint/default.nix | 9 +- .../python-modules/yangson/default.nix | 4 +- .../python-modules/yapsy/default.nix | 5 +- .../python-modules/yark/default.nix | 4 +- .../python-modules/yaspin/default.nix | 6 +- .../python-modules/yeelight/default.nix | 2 +- .../yoyo-migrations/default.nix | 2 +- .../python-modules/ypy-websocket/default.nix | 59 + .../development/python-modules/yq/default.nix | 4 +- .../python-modules/yq/jq-path.patch | 28 +- .../python-modules/yte/default.nix | 2 +- .../python-modules/zarr/default.nix | 31 +- .../python-modules/zbaemon/default.nix | 2 +- .../python-modules/zc_lockfile/default.nix | 4 +- .../python-modules/zconfig/default.nix | 2 +- .../python-modules/zeep/default.nix | 2 +- .../python-modules/zeroc-ice/default.nix | 2 +- .../python-modules/zfec/default.nix | 2 +- .../python-modules/zha-quirks/default.nix | 4 +- .../python-modules/zict/default.nix | 2 +- .../python-modules/zigpy-xbee/default.nix | 2 +- .../python-modules/zigpy-znp/default.nix | 2 +- .../python-modules/zigpy/default.nix | 7 + .../python-modules/zipp/default.nix | 4 +- .../python-modules/zodb/default.nix | 6 +- .../zope-cachedescriptors/default.nix | 2 +- .../python-modules/zope-hookable/default.nix | 2 +- .../python-modules/zope_component/default.nix | 4 +- .../zope_configuration/default.nix | 2 +- .../zope_contenttype/default.nix | 2 +- .../python-modules/zope_copy/default.nix | 2 +- .../zope_dottedname/default.nix | 2 +- .../python-modules/zope_event/default.nix | 2 +- .../zope_exceptions/default.nix | 2 +- .../zope_filerepresentation/default.nix | 2 +- .../zope_i18nmessageid/default.nix | 2 +- .../python-modules/zope_interface/default.nix | 2 +- .../zope_lifecycleevent/default.nix | 2 +- .../python-modules/zope_location/default.nix | 2 +- .../python-modules/zope_proxy/default.nix | 4 +- .../python-modules/zope_schema/default.nix | 4 +- .../python-modules/zope_size/default.nix | 2 +- .../python-modules/zope_testing/default.nix | 2 +- .../zope_testrunner/default.nix | 2 +- .../python-modules/zstandard/default.nix | 4 +- .../python-modules/zstd/default.nix | 4 +- .../zwave-js-server-python/default.nix | 1 + .../development/r-modules/wrapper-radian.nix | 37 + .../ruby-modules/with-packages/default.nix | 6 +- .../ruby-modules/with-packages/test.nix | 18 +- .../tools/altair-graphql-client/default.nix | 4 +- .../tools/analysis/brakeman/Gemfile.lock | 4 +- .../tools/analysis/brakeman/gemset.nix | 4 +- .../tools/analysis/checkov/default.nix | 71 +- .../tools/analysis/checkstyle/default.nix | 4 +- .../tools/analysis/cppcheck/default.nix | 4 +- .../tools/analysis/hotspot/default.nix | 4 + .../tools/analysis/radare2/default.nix | 7 +- .../pkgs/development/tools/argc/default.nix | 9 +- .../pkgs/development/tools/bacon/default.nix | 8 +- .../pkgs/development/tools/buf/default.nix | 6 +- .../tools/build-managers/cmake/default.nix | 4 +- .../tools/build-managers/fac/default.nix | 3 + .../gnumake/4.4/0001-No-impure-bin-sh.patch | 35 + .../gnumake/4.4/0002-remove-impure-dirs.patch | 40 + .../build-managers/gnumake/4.4/default.nix | 75 + .../tools/build-managers/gnumake/default.nix | 4 +- .../tools/build-managers/gradle/default.nix | 4 +- .../development/tools/buildkit/default.nix | 6 +- .../development/tools/cambalache/default.nix | 9 +- .../development/tools/cloud-nuke/default.nix | 6 +- .../pkgs/development/tools/coder/default.nix | 61 +- .../development/tools/codespell/default.nix | 6 +- .../github-runner/default.nix | 4 +- .../gitlab-runner/default.nix | 4 +- .../development/tools/cpm-cmake/default.nix | 2 +- .../tools/database/dbmate/default.nix | 6 +- .../tools/database/pgsync/Gemfile.lock | 10 +- .../tools/database/pgsync/gemset.nix | 12 +- .../tools/database/sqlfluff/default.nix | 4 +- .../pkgs/development/tools/datree/default.nix | 4 +- .../development/tools/dump_syms/default.nix | 6 +- .../pkgs/development/tools/fq/default.nix | 6 +- .../development/tools/gemstash/default.nix | 7 +- .../pkgs/development/tools/ginkgo/default.nix | 6 +- .../tools/github/cligh/default.nix | 4 +- .../development/tools/go-mockery/default.nix | 33 +- .../development/tools/go-protobuf/default.nix | 6 +- .../development/tools/go-task/default.nix | 9 +- .../pkgs/development/tools/hatch/default.nix | 2 + .../pkgs/development/tools/hclfmt/default.nix | 4 +- .../pkgs/development/tools/jaq/default.nix | 6 +- .../pkgs/development/tools/jql/default.nix | 14 +- .../development/tools/kafkactl/default.nix | 15 +- .../pkgs/development/tools/ko/default.nix | 5 +- .../development/tools/konstraint/default.nix | 6 +- .../lua-language-server/default.nix | 4 +- .../tools/language-servers/nil/default.nix | 6 +- .../vala-language-server/default.nix | 3 +- .../development/tools/marksman/default.nix | 4 +- .../pkgs/development/tools/mdk/default.nix | 2 +- .../development/tools/metal-cli/default.nix | 6 +- .../development/tools/micronaut/default.nix | 4 +- .../development/tools/misc/acr/default.nix | 4 +- .../tools/misc/blackfire/default.nix | 12 +- .../development/tools/misc/ccache/default.nix | 56 +- .../misc/ccache/force-objdump-on-darwin.patch | 8 +- .../tools/misc/circleci-cli/default.nix | 4 +- .../misc/cmake-language-server/default.nix | 10 +- .../disable-test-timeouts.patch | 8 +- .../development/tools/misc/d-feet/default.nix | 4 - .../tools/misc/devspace/default.nix | 4 +- .../tools/misc/elfutils/default.nix | 16 +- .../development/tools/misc/gdb/default.nix | 30 +- .../tools/misc/go-licenses/default.nix | 48 + .../go-licenses/fix-go-version-error.patch | 65 + .../misc/highlight-assertions/default.nix | 6 +- .../development/tools/misc/pahole/default.nix | 15 +- .../tools/misc/phpunit/default.nix | 4 +- .../development/tools/misc/seer/default.nix | 4 +- .../tools/misc/terracognita/default.nix | 6 +- .../development/tools/misc/texinfo/7.0.nix | 4 + .../development/tools/misc/texinfo/common.nix | 9 +- .../development/tools/misc/texlab/default.nix | 8 +- .../tools/misc/topiary/default.nix | 8 +- .../development/tools/mongosh/composition.nix | 17 - .../development/tools/mongosh/default.nix | 39 +- .../development/tools/mongosh/generate.sh | 13 - .../tools/mongosh/package-lock.json | 3824 ++++++++++++ .../development/tools/mongosh/packages.json | 3 - .../development/tools/mongosh/packages.nix | 2205 ------- .../development/tools/mongosh/source.json | 6 + .../pkgs/development/tools/mongosh/update.sh | 25 + .../pkgs/development/tools/moq/default.nix | 6 +- .../tools/ocaml/findlib/default.nix | 1 + .../development/tools/ocaml/merlin/4.x.nix | 6 +- .../development/tools/ocaml/opam/1.2.2.nix | 95 - .../development/tools/oh-my-posh/default.nix | 4 +- .../development/tools/opcr-policy/default.nix | 4 +- .../tools/osslsigncode/default.nix | 22 +- .../tools/paging-calculator/default.nix | 14 +- .../development/tools/parsing/antlr/4.nix | 20 +- .../pkgs/development/tools/pifpaf/default.nix | 41 + .../tools/profiling/systemtap/default.nix | 4 +- .../tools/protoc-gen-go-grpc/default.nix | 6 +- .../tools/protoc-gen-go/default.nix | 4 +- .../pkgs/development/tools/py-spy/default.nix | 37 +- .../development/tools/railway/default.nix | 28 +- .../tools/rust/cargo-all-features/default.nix | 6 +- .../tools/rust/cargo-binstall/default.nix | 13 +- .../tools/rust/cargo-binutils/default.nix | 2 +- .../tools/rust/cargo-deb/default.nix | 6 +- .../tools/rust/cargo-llvm-cov/default.nix | 2 +- .../tools/rust/cargo-nextest/default.nix | 6 +- .../rust/cargo-pgx/buildPgxExtension.nix | 160 + .../tools/rust/cargo-public-api/default.nix | 7 +- .../tools/rust/cargo-release/default.nix | 6 +- .../tools/rust/cargo-update/default.nix | 6 +- .../tools/rust/cargo-zigbuild/default.nix | 6 +- .../tools/rust/maturin/default.nix | 6 +- .../pkgs/development/tools/selene/default.nix | 6 +- .../development/tools/sentry-cli/default.nix | 6 +- .../development/tools/skaffold/default.nix | 6 +- .../pkgs/development/tools/sq/default.nix | 4 +- .../pkgs/development/tools/stylua/default.nix | 6 +- .../development/tools/tabnine/sources.json | 8 +- .../development/tools/the-way/default.nix | 6 +- .../pkgs/development/tools/toast/default.nix | 6 +- .../development/tools/twilio-cli/default.nix | 4 +- .../development/tools/viceroy/default.nix | 29 + .../pkgs/development/tools/xc/default.nix | 4 +- .../pkgs/development/web/flyctl/default.nix | 6 +- .../web/function-runner/default.nix | 6 +- .../development/web/lucky-cli/default.nix | 4 +- .../pkgs/development/web/lucky-cli/shard.lock | 4 +- .../pkgs/development/web/lucky-cli/shards.nix | 8 +- .../pkgs/development/web/nodejs/v19.nix | 4 +- .../nixpkgs/pkgs/games/anki/default.nix | 3 +- .../nixpkgs/pkgs/games/darkplaces/default.nix | 2 +- .../pkgs/games/endless-sky/default.nix | 8 +- .../nixpkgs/pkgs/games/factorio/versions.json | 40 +- .../nixpkgs/pkgs/games/fheroes2/default.nix | 4 +- .../nixpkgs/pkgs/games/naev/default.nix | 2 +- .../nixpkgs/pkgs/games/openmw/tes3mp.nix | 56 +- .../pkgs/games/prismlauncher/default.nix | 14 +- .../nixpkgs/pkgs/games/runelite/default.nix | 12 +- .../nixpkgs/pkgs/games/sm64ex/coop.nix | 6 +- .../nixpkgs/pkgs/games/sm64ex/sm64ex.nix | 6 +- .../nixpkgs/pkgs/games/unciv/default.nix | 4 +- .../nixpkgs/pkgs/games/unnethack/default.nix | 6 +- .../nixpkgs/pkgs/games/vassal/default.nix | 4 +- .../pkgs/games/xivlauncher/default.nix | 10 +- .../nixpkgs/pkgs/games/xmage/default.nix | 2 +- .../nixpkgs/pkgs/misc/cups/filters.nix | 3 + .../misc/drivers/sc-controller/default.nix | 7 +- .../nixpkgs/pkgs/misc/dxvk/default.nix | 2 +- third_party/nixpkgs/pkgs/misc/dxvk/dxvk.nix | 2 +- .../nixpkgs/pkgs/misc/dxvk/setup_dxvk.sh | 39 +- .../nixpkgs/pkgs/misc/fastly/default.nix | 18 +- .../pkgs/misc/kitty-themes/default.nix | 27 - .../nixpkgs/pkgs/misc/scrcpy/default.nix | 24 +- .../nixpkgs/pkgs/misc/solfege/default.nix | 2 - .../nixpkgs/pkgs/misc/wiki-tui/default.nix | 2 +- .../os-specific/darwin/binutils/default.nix | 1 + .../pkgs/os-specific/darwin/cctools/port.nix | 9 + .../pkgs/os-specific/darwin/goku/default.nix | 22 +- .../os-specific/darwin/smimesign/default.nix | 11 +- .../os-specific/linux/apparmor/default.nix | 6 +- .../os-specific/linux/cryptsetup/default.nix | 7 +- .../pkgs/os-specific/linux/ell/default.nix | 4 +- .../linux/firmware/fwupd/default.nix | 3 + .../firmware/ipu6-camera-bins/default.nix | 69 + .../linux/firmware/ivsc-firmware/default.nix | 41 + .../linux/firmware/linux-firmware/source.nix | 6 +- .../pkgs/os-specific/linux/hwdata/default.nix | 4 +- .../linux/intel-compute-runtime/default.nix | 14 +- .../os-specific/linux/iproute/default.nix | 4 + .../linux/ipu6-drivers/default.nix | 52 + .../os-specific/linux/ivsc-driver/default.nix | 43 + .../pkgs/os-specific/linux/iwd/default.nix | 4 +- .../linux/kernel-headers/default.nix | 4 +- .../linux/kernel/common-config.nix | 2 +- .../linux/kernel/hardened/patches.json | 50 +- .../linux/kernel/hardened/update.py | 2 +- .../os-specific/linux/kernel/linux-4.14.nix | 4 +- .../os-specific/linux/kernel/linux-4.19.nix | 4 +- .../os-specific/linux/kernel/linux-5.10.nix | 4 +- .../os-specific/linux/kernel/linux-5.15.nix | 4 +- .../os-specific/linux/kernel/linux-5.4.nix | 4 +- .../os-specific/linux/kernel/linux-6.1.nix | 4 +- .../os-specific/linux/kernel/linux-6.2.nix | 4 +- .../os-specific/linux/kernel/linux-libre.nix | 4 +- .../linux/kernel/linux-testing.nix | 4 +- .../linux/kernel/manual-config.nix | 2 - .../linux/kernel/xanmod-kernels.nix | 8 +- .../os-specific/linux/kernel/zen-kernels.nix | 10 +- .../os-specific/linux/keyutils/default.nix | 6 + .../pkgs/os-specific/linux/kmod/default.nix | 5 +- .../pkgs/os-specific/linux/libcap/default.nix | 4 +- .../os-specific/linux/libsepol/default.nix | 4 +- .../pkgs/os-specific/linux/lvm2/2_02.nix | 4 - .../pkgs/os-specific/linux/lvm2/2_03.nix | 4 +- .../pkgs/os-specific/linux/lvm2/common.nix | 39 +- .../linux/lvm2/fix-stdio-usage.patch | 31 +- .../os-specific/linux/lvm2/no-shared.diff | 25 - .../os-specific/linux/lvm2/no-shared.patch | 46 + .../pkgs/os-specific/linux/musl/default.nix | 12 +- .../os-specific/linux/nvidia-x11/default.nix | 16 + .../os-specific/linux/nvidia-x11/generic.nix | 3 +- .../pkgs/os-specific/linux/piper/default.nix | 4 +- .../os-specific/linux/rtl8821au/default.nix | 2 +- ...004-Look-for-fsck-in-the-right-place.patch | 21 +- .../os-specific/linux/vmm_clock/default.nix | 2 +- .../pkgs/os-specific/linux/zfs/default.nix | 14 +- .../nixpkgs/pkgs/servers/adguardhome/bins.nix | 28 +- .../pkgs/servers/adguardhome/default.nix | 4 +- .../nixpkgs/pkgs/servers/baserow/default.nix | 1 + .../pkgs/servers/calibre-web/default.nix | 21 +- .../nixpkgs/pkgs/servers/dendrite/default.nix | 6 +- .../pkgs/servers/dns/knot-dns/default.nix | 2 +- .../pkgs/servers/haste-server/default.nix | 4 +- .../pkgs/servers/haste-server/node-deps.nix | 42 +- .../nixpkgs/pkgs/servers/hbase/default.nix | 8 +- .../pkgs/servers/home-assistant/appdaemon.nix | 2 +- .../home-assistant/component-packages.nix | 8 +- .../pkgs/servers/home-assistant/default.nix | 15 +- .../pkgs/servers/home-assistant/frontend.nix | 4 +- .../home-assistant/parse-requirements.py | 27 +- .../pkgs/servers/home-assistant/stubs.nix | 12 +- .../pkgs/servers/home-assistant/tests.nix | 2 +- .../pkgs/servers/home-assistant/update.py | 263 + .../pkgs/servers/home-assistant/update.sh | 42 - .../nixpkgs/pkgs/servers/imgproxy/default.nix | 4 +- .../pkgs/servers/invidious/versions.json | 6 +- .../pkgs/servers/jellyseerr/default.nix | 93 + .../pkgs/servers/jellyseerr/package.json | 246 + .../nixpkgs/pkgs/servers/jellyseerr/pin.json | 5 + .../nixpkgs/pkgs/servers/jellyseerr/update.sh | 39 + .../nixpkgs/pkgs/servers/komga/default.nix | 4 +- .../nixpkgs/pkgs/servers/krill/default.nix | 6 +- .../pkgs/servers/libreddit/default.nix | 6 +- .../nixpkgs/pkgs/servers/maddy/default.nix | 4 +- .../pkgs/servers/matrix-synapse/default.nix | 6 +- .../matrix-appservice-irc/default.nix | 6 +- .../matrix-appservice-slack/default.nix | 2 +- .../matrix-appservice-slack/package.json | 4 +- .../matrix-appservice-slack/pin.json | 6 +- .../pkgs/servers/mautrix-facebook/default.nix | 3 +- .../servers/mautrix-googlechat/default.nix | 3 +- .../pkgs/servers/mautrix-signal/default.nix | 3 +- .../pkgs/servers/mautrix-telegram/default.nix | 4 +- .../pkgs/servers/misc/navidrome/default.nix | 6 +- .../misc/oven-media-engine/default.nix | 4 +- .../pkgs/servers/monitoring/karma/default.nix | 6 +- .../nagios/plugins/check_ssl_cert.nix | 4 +- .../servers/monitoring/prometheus/default.nix | 91 +- .../prometheus/influxdb-exporter.nix | 6 +- .../monitoring/prometheus/statsd-exporter.nix | 6 +- .../servers/monitoring/sensu-go/default.nix | 6 +- .../pkgs/servers/nosql/redis/default.nix | 10 +- .../nixpkgs/pkgs/servers/pinnwand/default.nix | 5 + third_party/nixpkgs/pkgs/servers/plex/raw.nix | 6 +- .../pkgs/servers/pocketbase/default.nix | 6 +- .../pkgs/servers/pufferpanel/default.nix | 71 +- .../pufferpanel/disable-group-checks.patch | 34 + .../pufferpanel/skip-network-tests.patch | 61 + .../nixpkgs/pkgs/servers/readarr/default.nix | 53 + .../nixpkgs/pkgs/servers/readarr/update.sh | 44 + .../nixpkgs/pkgs/servers/redpanda/default.nix | 6 +- .../servers/rtsp-simple-server/default.nix | 6 +- .../pkgs/servers/search/qdrant/default.nix | 6 +- .../pkgs/servers/snappymail/default.nix | 4 +- .../nixpkgs/pkgs/servers/spicedb/default.nix | 6 +- .../sql/postgresql/ext/plpgsql_check.nix | 4 +- .../sql/postgresql/ext/timescaledb.nix | 4 +- .../postgresql/ext/timescaledb_toolkit.nix | 42 + .../pkgs/servers/sql/postgresql/packages.nix | 2 + .../servers/static-web-server/default.nix | 6 +- .../nixpkgs/pkgs/servers/sunshine/default.nix | 46 +- .../nixpkgs/pkgs/servers/sunshine/ffmpeg.diff | 88 +- .../nixpkgs/pkgs/servers/sunshine/libcbs.nix | 48 + .../pkgs/servers/sunshine/package-lock.json | 46 +- .../pkgs/servers/syncstorage-rs/default.nix | 6 +- .../web-apps/changedetection-io/default.nix | 46 +- .../servers/web-apps/engelsystem/default.nix | 11 +- .../pkgs/servers/web-apps/nifi/default.nix | 14 +- .../pkgs/servers/web-apps/vikunja/api.nix | 6 +- .../servers/web-apps/vikunja/frontend.nix | 4 +- .../nixpkgs/pkgs/servers/x11/xorg/default.nix | 16 +- .../pkgs/servers/x11/xorg/overrides.nix | 1 + .../pkgs/servers/x11/xorg/tarballs.list | 4 +- .../pkgs/servers/zoneminder/default.nix | 4 +- .../pkgs/shells/bash/blesh/default.nix | 2 +- .../pkgs/shells/fish/plugins/async-prompt.nix | 20 + .../shells/fish/plugins/autopair-fish.nix | 20 - .../pkgs/shells/fish/plugins/autopair.nix | 6 +- .../pkgs/shells/fish/plugins/default.nix | 8 +- .../nixpkgs/pkgs/shells/nushell/default.nix | 6 +- .../shells/zsh/spaceship-prompt/default.nix | 4 +- third_party/nixpkgs/pkgs/stdenv/adapters.nix | 22 + .../stdenv/darwin/make-bootstrap-tools.nix | 206 +- .../darwin/patch-bootstrap-tools-next.sh | 38 + .../pkgs/stdenv/generic/make-derivation.nix | 30 +- .../stdenv/linux/bootstrap-files/aarch64.nix | 8 +- .../linux/bootstrap-files/mips64el-n32.nix | 25 + .../linux/bootstrap-tools-musl/default.nix | 1 + .../stdenv/linux/bootstrap-tools/default.nix | 1 + .../nixpkgs/pkgs/stdenv/linux/default.nix | 129 +- third_party/nixpkgs/pkgs/test/default.nix | 2 - .../pkgs/test/patch-shebangs/default.nix | 70 - .../nixpkgs/pkgs/test/stdenv/default.nix | 4 +- .../nixpkgs/pkgs/test/stdenv/hooks.nix | 4 +- .../pkgs/test/stdenv/patch-shebangs.nix | 98 + .../nixpkgs/pkgs/test/texlive/default.nix | 29 + .../nixpkgs/pkgs/tools/X11/alttab/default.nix | 6 +- .../nixpkgs/pkgs/tools/X11/arandr/default.nix | 4 - .../pkgs/tools/X11/caffeine-ng/default.nix | 5 +- .../pkgs/tools/X11/xdg-utils/default.nix | 9 +- .../pkgs/tools/admin/aws-vault/default.nix | 6 +- .../pkgs/tools/admin/awscli/default.nix | 4 +- .../pkgs/tools/admin/awscli2/default.nix | 18 +- .../pkgs/tools/admin/awslogs/default.nix | 3 +- .../pkgs/tools/admin/azure-cli/default.nix | 4 +- .../tools/admin/azure-cli/python-packages.nix | 76 +- .../pkgs/tools/admin/berglas/default.nix | 6 +- .../pkgs/tools/admin/coldsnap/default.nix | 6 +- .../pkgs/tools/admin/eksctl/default.nix | 6 +- .../admin/elasticsearch-curator/default.nix | 2 +- .../pkgs/tools/admin/meshcentral/default.nix | 6 +- .../pkgs/tools/admin/meshcentral/package.json | 8 +- .../pkgs/tools/admin/meshcentral/yarn.lock | 1860 +++--- .../pkgs/tools/admin/meshcentral/yarn.nix | 1344 ++-- .../pkgs/tools/admin/pgadmin/default.nix | 43 +- .../pkgs/tools/admin/pulumi-bin/data.nix | 258 +- .../pkgs/tools/admin/pulumi/default.nix | 6 +- .../pkgs/tools/admin/qovery-cli/default.nix | 6 +- .../pkgs/tools/admin/scaleway-cli/default.nix | 6 +- .../pkgs/tools/admin/trivy/default.nix | 6 +- .../pkgs/tools/archivers/dumpnar/default.nix | 26 + .../pkgs/tools/archivers/p7zip/default.nix | 35 +- .../pkgs/tools/archivers/p7zip/update.sh | 2 +- .../archivers/payload-dumper-go/default.nix | 30 + .../nixpkgs/pkgs/tools/audio/beets/common.nix | 2 - .../pkgs/tools/audio/mpdris2/default.nix | 1 - .../audio/openai-whisper-cpp/default.nix | 4 +- .../nixpkgs/pkgs/tools/audio/tts/default.nix | 20 + .../pkgs/tools/audio/yabridge/default.nix | 42 +- .../yabridge/hardcode-dependencies.patch | 6 +- .../libyabridge-from-nix-profiles.patch | 2 +- .../chainloader-from-nix-profiles.patch | 4 +- .../pkgs/tools/audio/yabridgectl/default.nix | 6 +- .../remove-dependency-verification.patch | 2 +- .../pkgs/tools/backup/btrbk/default.nix | 2 +- .../pkgs/tools/backup/grab-site/default.nix | 2 +- .../pkgs/tools/cd-dvd/ventoy-bin/default.nix | 4 +- .../pkgs/tools/compression/unzrip/default.nix | 35 + .../tools/filesystems/btrfs-progs/default.nix | 4 +- .../pkgs/tools/filesystems/ceph/default.nix | 22 +- .../tools/filesystems/e2fsprogs/default.nix | 17 +- .../pkgs/tools/filesystems/garage/default.nix | 31 +- .../pkgs/tools/filesystems/httm/default.nix | 6 +- .../minecraft/fabric-installer/default.nix | 4 +- .../pkgs/tools/games/scarab/default.nix | 4 +- .../directx-shader-compiler/default.nix | 4 +- .../pkgs/tools/graphics/glmark2/default.nix | 12 +- .../pkgs/tools/graphics/graphviz/default.nix | 4 +- .../pkgs/tools/graphics/mangohud/default.nix | 4 +- .../pkgs/tools/graphics/piglit/default.nix | 2 +- .../pkgs/tools/graphics/vkbasalt/default.nix | 12 +- .../tools/inputmethods/fcitx5/default.nix | 4 +- .../inputmethods/fcitx5/fcitx5-anthy.nix | 4 +- .../inputmethods/fcitx5/fcitx5-chewing.nix | 4 +- .../fcitx5/fcitx5-chinese-addons.nix | 4 +- .../inputmethods/fcitx5/fcitx5-configtool.nix | 4 +- .../tools/inputmethods/fcitx5/fcitx5-gtk.nix | 4 +- .../inputmethods/fcitx5/fcitx5-hangul.nix | 4 +- .../tools/inputmethods/fcitx5/fcitx5-qt.nix | 4 +- .../tools/inputmethods/fcitx5/fcitx5-rime.nix | 4 +- .../fcitx5/fcitx5-table-extra.nix | 4 +- .../fcitx5/fcitx5-table-other.nix | 4 +- .../inputmethods/fcitx5/fcitx5-unikey.nix | 4 +- .../inputmethods/input-remapper/default.nix | 5 - .../libinput-gestures/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/boxxy/default.nix | 6 +- .../pkgs/tools/misc/chezmoi/default.nix | 6 +- .../pkgs/tools/misc/codevis/default.nix | 6 +- .../tools/misc/coreboot-utils/default.nix | 20 +- .../tools/misc/csvs-to-sqlite/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/evhz/default.nix | 31 + .../pkgs/tools/misc/fclones/default.nix | 16 +- .../pkgs/tools/misc/gaphor/default.nix | 4 - .../nixpkgs/pkgs/tools/misc/geekbench/4.nix | 35 +- .../nixpkgs/pkgs/tools/misc/geekbench/5.nix | 52 + .../nixpkgs/pkgs/tools/misc/geekbench/6.nix | 52 + .../pkgs/tools/misc/geekbench/default.nix | 42 - .../pkgs/tools/misc/goreleaser/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/halp/default.nix | 80 + .../pkgs/tools/misc/halp/fix-target-dir.patch | 13 + .../pkgs/tools/misc/hyperfine/default.nix | 6 +- .../pkgs/tools/misc/infracost/default.nix | 6 +- .../pkgs/tools/misc/man-db/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/ntfy/default.nix | 18 +- .../nixpkgs/pkgs/tools/misc/nurl/default.nix | 6 +- .../pkgs/tools/misc/ocs-url/default.nix | 2 +- .../default.nix | 4 +- .../pkgs/tools/misc/open-pdf-sign/default.nix | 4 +- .../pkgs/tools/misc/parallel/default.nix | 4 +- .../pkgs/tools/misc/pre-commit/default.nix | 106 +- ...he-hardcoded-path-to-python-binaries.patch | 24 +- .../pkgs/tools/misc/psql2csv/default.nix | 43 + .../nixpkgs/pkgs/tools/misc/rauc/default.nix | 31 +- .../pkgs/tools/misc/ripdrag/default.nix | 6 +- .../pkgs/tools/misc/rpm-ostree/default.nix | 7 +- .../nixpkgs/pkgs/tools/misc/sfeed/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/skim/default.nix | 6 +- .../pkgs/tools/misc/topgrade/default.nix | 6 +- .../pkgs/tools/misc/trackma/default.nix | 7 +- .../nixpkgs/pkgs/tools/misc/turbo/default.nix | 12 +- .../nixpkgs/pkgs/tools/misc/vivid/default.nix | 6 +- .../pkgs/tools/misc/wakapi/default.nix | 6 +- .../pkgs/tools/misc/wakatime/default.nix | 6 +- .../pkgs/tools/misc/wasm-tools/Cargo.lock | 2162 +++++++ .../pkgs/tools/misc/wasm-tools/default.nix | 33 + .../nixpkgs/pkgs/tools/misc/xcp/default.nix | 6 +- .../pkgs/tools/misc/xvfb-run/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/ytmdl/default.nix | 1 + .../pkgs/tools/misc/zellij/default.nix | 6 +- .../tools/networking/airgeddon/default.nix | 9 +- .../pkgs/tools/networking/amass/default.nix | 6 +- .../pkgs/tools/networking/chaos/default.nix | 6 +- .../curl/7.88.0-http2-breakage.patch | 101 - .../pkgs/tools/networking/curl/default.nix | 6 +- .../pkgs/tools/networking/dnsperf/default.nix | 4 +- .../tools/networking/dnstwist/default.nix | 2 +- .../pkgs/tools/networking/frp/default.nix | 6 +- .../pkgs/tools/networking/gvproxy/default.nix | 7 +- .../pkgs/tools/networking/ipcalc/default.nix | 4 +- .../pkgs/tools/networking/mubeng/default.nix | 4 +- .../pkgs/tools/networking/netbird/default.nix | 6 +- .../pkgs/tools/networking/netboot/default.nix | 2 +- .../networkd-dispatcher/default.nix | 6 + .../support_nix_store_path.patch | 13 + .../tools/networking/opensnitch/daemon.nix | 7 + .../tools/networking/p2p/amule/default.nix | 13 +- .../pkgs/tools/networking/privoxy/default.nix | 4 +- .../networking/shadowsocks-rust/default.nix | 6 +- .../shadowsocks-v2ray-plugin/default.nix | 4 + .../tools/networking/smartdns/default.nix | 4 +- .../tools/networking/speedtest-go/default.nix | 32 + .../tools/networking/zerotierone/default.nix | 3 - .../tools/nix/nixos-render-docs/default.nix | 42 +- .../tools/package-management/apkg/default.nix | 11 + .../appimage-run/default.nix | 22 +- .../package-management/appimage-run/test.nix | 12 +- .../package-management/comma/default.nix | 6 +- .../nix-eval-jobs/default.nix | 4 +- .../tools/package-management/pkg/default.nix | 4 +- .../package-management/poetry/default.nix | 17 +- .../package-management/poetry/unwrapped.nix | 22 +- .../tools/security/biscuit-cli/Cargo.lock | 1080 ++++ .../tools/security/biscuit-cli/default.nix | 25 + .../tools/security/browserpass/default.nix | 6 +- .../pkgs/tools/security/cdk-go/default.nix | 4 +- .../pkgs/tools/security/crunch/default.nix | 7 +- .../tools/security/cryptomator/default.nix | 2 +- .../tools/security/cve-bin-tool/default.nix | 4 +- .../pkgs/tools/security/enumerepo/default.nix | 31 + .../pkgs/tools/security/expliot/default.nix | 2 +- .../pkgs/tools/security/exploitdb/default.nix | 4 +- .../tools/security/flare-floss/default.nix | 6 +- .../pkgs/tools/security/gitleaks/default.nix | 4 +- .../tools/security/gnome-keysign/default.nix | 3 - .../pkgs/tools/security/goverview/default.nix | 34 + .../pkgs/tools/security/grype/default.nix | 6 +- .../pkgs/tools/security/httpx/default.nix | 6 +- .../pkgs/tools/security/keyscope/default.nix | 6 +- .../security/kubernetes-polaris/default.nix | 52 + .../pkgs/tools/security/kubescape/default.nix | 4 +- .../pkgs/tools/security/kubesec/default.nix | 6 +- .../pkgs/tools/security/metasploit/Gemfile | 2 +- .../tools/security/metasploit/Gemfile.lock | 62 +- .../tools/security/metasploit/default.nix | 4 +- .../pkgs/tools/security/metasploit/gemset.nix | 90 +- .../security/mitmproxy2swagger/default.nix | 4 +- .../pkgs/tools/security/rbw/default.nix | 15 +- .../pkgs/tools/security/rsign2/default.nix | 24 + .../pkgs/tools/security/scorecard/default.nix | 2 +- .../pkgs/tools/security/secp256k1/default.nix | 4 +- .../pkgs/tools/security/semgrep/common.nix | 16 +- .../pkgs/tools/security/semgrep/default.nix | 21 +- .../pkgs/tools/security/semgrep/update.sh | 8 +- .../tools/security/slsa-verifier/default.nix | 43 + .../tools/security/ssh-to-age/default.nix | 6 +- .../pkgs/tools/security/step-cli/default.nix | 6 +- .../security/step-kms-plugin/default.nix | 53 + .../pkgs/tools/security/tlsx/default.nix | 6 +- .../tools/security/trufflehog/default.nix | 6 +- .../pkgs/tools/security/vals/default.nix | 6 +- .../pkgs/tools/security/wapiti/default.nix | 2 +- .../pkgs/tools/security/xcat/default.nix | 2 +- .../pkgs/tools/security/xsser/default.nix | 4 - .../tools/system/acpica-tools/default.nix | 5 +- .../system/automatic-timezoned/default.nix | 6 +- .../pkgs/tools/system/ipmitool/default.nix | 14 +- .../pkgs/tools/system/logcheck/default.nix | 4 +- .../pkgs/tools/system/stress-ng/default.nix | 4 +- .../pkgs/tools/system/zfxtop/default.nix | 6 +- .../nixpkgs/pkgs/tools/text/a2ps/default.nix | 42 +- .../pkgs/tools/text/csvkit/default.nix | 29 +- .../tools/text/csvquote/csvquote-path.patch | 14 + .../pkgs/tools/text/csvquote/default.nix | 47 + .../nixpkgs/pkgs/tools/text/d2/default.nix | 6 +- .../pkgs/tools/text/diffutils/default.nix | 16 +- .../tools/text/diffutils/fix-diff-D.patch | 15 + .../pkgs/tools/text/ebook-tools/default.nix | 5 - .../pkgs/tools/text/mdbook-katex/default.nix | 6 +- .../tools/text/mdbook-pagetoc/default.nix | 6 +- .../pkgs/tools/text/mdbook/default.nix | 6 +- .../nixpkgs/pkgs/tools/text/teip/default.nix | 36 +- .../nixpkgs/pkgs/tools/text/vale/default.nix | 4 +- .../tools/text/xml/html-xml-utils/default.nix | 4 +- .../CVE-2019-19917-and-CVE-2019-19918.patch | 95 - .../pkgs/tools/typesetting/lout/builder.sh | 43 - .../pkgs/tools/typesetting/lout/default.nix | 30 +- .../typesetting/tex/texlive/UPGRADING.md | 29 +- .../tools/typesetting/tex/texlive/bin.nix | 8 + .../tools/typesetting/tex/texlive/default.nix | 48 +- .../tex/texlive/{pkgs.nix => tlpdb.nix} | 0 .../nixpkgs/pkgs/tools/video/lux/default.nix | 6 +- .../pkgs/tools/video/rav1e/default.nix | 6 +- .../tools/virtualization/awsebcli/default.nix | 20 +- .../virtualization/cri-tools/default.nix | 4 +- .../pkgs/tools/wayland/cliphist/default.nix | 6 +- .../pkgs/tools/wayland/swww/default.nix | 25 + .../nixpkgs/pkgs/top-level/aliases.nix | 4 + .../nixpkgs/pkgs/top-level/all-packages.nix | 2490 ++++---- .../pkgs/top-level/dotnet-packages.nix | 4 +- .../pkgs/top-level/haskell-packages.nix | 37 +- .../nixpkgs/pkgs/top-level/kodi-packages.nix | 2 +- .../nixpkgs/pkgs/top-level/linux-kernels.nix | 4 + .../nixpkgs/pkgs/top-level/nim-packages.nix | 14 + .../nixpkgs/pkgs/top-level/ocaml-packages.nix | 16 +- .../nixpkgs/pkgs/top-level/perl-packages.nix | 2 + .../nixpkgs/pkgs/top-level/php-packages.nix | 4 + .../nixpkgs/pkgs/top-level/python-aliases.nix | 38 +- .../pkgs/top-level/python-packages.nix | 173 +- .../pkgs/top-level/release-haskell.nix | 38 +- .../nixpkgs/pkgs/top-level/release.nix | 53 +- third_party/nixpkgs/pkgs/top-level/stage.nix | 2 +- 3567 files changed, 46874 insertions(+), 24147 deletions(-) create mode 100644 third_party/nixpkgs/.github/workflows/check-maintainers-sorted.yaml create mode 100644 third_party/nixpkgs/lib/tests/modules/disable-module-bad-key.nix create mode 100644 third_party/nixpkgs/lib/tests/modules/disable-module-with-key.nix create mode 100644 third_party/nixpkgs/lib/tests/modules/disable-module-with-toString-key.nix create mode 100644 third_party/nixpkgs/lib/tests/modules/merge-module-with-key.nix create mode 100644 third_party/nixpkgs/maintainers/scripts/check-maintainers-sorted.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/continuous-integration/woodpecker/agent.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/continuous-integration/woodpecker/server.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/development/gemstash.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/misc/jellyseerr.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/misc/readarr.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/networking/cgit.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/web-apps/coder.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/x11/window-managers/nimdow.nix create mode 100644 third_party/nixpkgs/nixos/tests/btrbk-doas.nix create mode 100644 third_party/nixpkgs/nixos/tests/cgit.nix create mode 100644 third_party/nixpkgs/nixos/tests/coder.nix create mode 100644 third_party/nixpkgs/nixos/tests/gemstash.nix create mode 100644 third_party/nixpkgs/nixos/tests/initrd-secrets-changing.nix create mode 100644 third_party/nixpkgs/nixos/tests/readarr.nix create mode 100644 third_party/nixpkgs/nixos/tests/timescaledb.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/bqn-mode/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix create mode 100755 third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-gtk.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/emulators/ryujinx/appdir.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/graphics/photoflow/CMakeLists.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/graphics/photoflow/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/graphics/photoflow/fix-build.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/fix-framework.diff create mode 100644 third_party/nixpkgs/pkgs/applications/misc/confy/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/hue-plus/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/monitorcontrol/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/valent/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff111.patch create mode 100755 third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/update-vivaldi.sh create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/openlens/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/geph/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/geph/package-lock.json delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json create mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/localsend/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/p2p/fragments/gtk4-rs.patch create mode 100644 third_party/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/sync/celeste/librclone-path.patch create mode 100644 third_party/nixpkgs/pkgs/applications/networking/sync/celeste/target-dir.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.sh create mode 100644 third_party/nixpkgs/pkgs/applications/science/math/maxima/5.45.nix create mode 100644 third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/themes.nix rename third_party/nixpkgs/pkgs/{servers/http => applications/version-management/gitlab}/gitlab-pages/default.nix (100%) delete mode 100644 third_party/nixpkgs/pkgs/applications/video/kodi/add-KODI_WEBSERVER_EXTRA_WHITELIST.patch create mode 100644 third_party/nixpkgs/pkgs/applications/video/mpv/scripts/uosc.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/linux-support-installation-target.patch rename third_party/nixpkgs/pkgs/applications/virtualization/xen/{0000-fix-install-python.patch => 0000-fix-install-python.4.15.patch} (84%) rename third_party/nixpkgs/pkgs/applications/virtualization/xen/{0000-fix-ipxe-src.patch => 0000-fix-ipxe-src.4.15.patch} (88%) create mode 100644 third_party/nixpkgs/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.4.15.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.patch rename third_party/nixpkgs/pkgs/applications/virtualization/xen/{0005-makefile-fix-efi-mountdir-use.patch => 0005-makefile-fix-efi-mountdir-use.4.15.patch} (82%) rename third_party/nixpkgs/pkgs/applications/virtualization/xen/{4.10.nix => 4.15.nix} (66%) create mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/nimdow/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/ghc/9.6.1.nix rename third_party/nixpkgs/pkgs/development/compilers/ghc/{cabal-paths.patch => Cabal-3.2-3.4-paths-fix-cycle-aarch64-darwin.patch} (100%) create mode 100644 third_party/nixpkgs/pkgs/development/compilers/ghc/Cabal-3.6-paths-fix-cycle-aarch64-darwin.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/ghc/ghc-8.8.4-sphinx-6.0.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/13/clang/add-nostdlibinc-flag.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/clang/add-nostdlibinc-flag.patch rename third_party/nixpkgs/pkgs/development/compilers/llvm/{git => common}/clang/add-nostdlibinc-flag.patch (100%) rename third_party/nixpkgs/pkgs/development/compilers/llvm/{15/compiler-rt/armv7l.patch => common/compiler-rt/armv7l-15.patch} (100%) delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/armv7l.patch create mode 100644 third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/amf-headers/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/audio/zix/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/cmocka/uintptr_t.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix rename third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/{solid.nix => solid/default.nix} (89%) create mode 100644 third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/solid/fix-search-path.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/librclone/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libtiger/pkg-config.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/openvr/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/tbb/2020_3.nix create mode 100644 third_party/nixpkgs/pkgs/development/nim-packages/coap/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/nim-packages/eris/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/nim-packages/freedesktop_org/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/nim-packages/preserves/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/nim-packages/safeset/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/nim-packages/syndicate/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/nim-packages/x11/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client-lwt.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client-mirage.nix delete mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/gmetadom/gcc-4.3.patch create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/http-mirage-client/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/mirage.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-lwt.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/tls/lwt.nix create mode 100644 third_party/nixpkgs/pkgs/development/php-packages/msgpack/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/php-packages/ssh2/default.nix rename third_party/nixpkgs/pkgs/development/python-modules/{APScheduler => apscheduler}/default.nix (93%) create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/bc-detect-secrets/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/bc-jsonpath-ng/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/blosc2/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/btchip-python/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/btchip/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cchardet/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/daiquiri/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dvc-http/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/etcd3/default.nix rename third_party/nixpkgs/pkgs/development/python-modules/{Fabric => fabric}/default.nix (92%) create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/flask-expects-json/default.nix rename third_party/nixpkgs/pkgs/development/python-modules/{FormEncode => formencode}/default.nix (92%) rename third_party/nixpkgs/pkgs/development/python-modules/{GeoIP => geoip}/default.nix (86%) rename third_party/nixpkgs/pkgs/development/python-modules/{HTSeq => htseq}/default.nix (97%) create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/iniconfig/version.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ipwhois/default.nix rename third_party/nixpkgs/pkgs/development/python-modules/{JayDeBeApi => jaydebeapi}/default.nix (82%) rename third_party/nixpkgs/pkgs/development/python-modules/{JPype1 => jpype1}/default.nix (84%) create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/json-stream-rs-tokenizer/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-fileid/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-ydoc/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/jupyter-ydoc/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/lazy-loader/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/lcgit/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/lineedit/default.nix rename third_party/nixpkgs/pkgs/development/python-modules/{Logbook => logbook}/default.nix (90%) rename third_party/nixpkgs/pkgs/development/python-modules/{Mako => mako}/default.nix (90%) create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mixins/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mock-ssh-server/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ndindex/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/nianet/default.nix rename third_party/nixpkgs/pkgs/development/python-modules/{Nikola => nikola}/default.nix (79%) delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ntlm-auth/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/numba/numpy-1.24.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/openaiauth/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix rename third_party/nixpkgs/pkgs/development/python-modules/{Pmw => pmw}/default.nix (80%) rename third_party/nixpkgs/pkgs/development/python-modules/{pyGithub => pygithub}/default.nix (88%) create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pypdf/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyqt6-charts.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pytest-pytestrail/default.nix rename third_party/nixpkgs/pkgs/development/python-modules/{PyVirtualDisplay => pyvirtualdisplay}/default.nix (74%) create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/radian/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/rchitect/default.nix rename third_party/nixpkgs/pkgs/development/python-modules/{Rtree => rtree}/default.nix (92%) create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/scikits-samplerate/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/scipy/disable-datasets-tests.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/soxr/default.nix rename third_party/nixpkgs/pkgs/development/python-modules/{sphinxcontrib-autoapi => sphinx-autoapi}/default.nix (55%) delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/sphinx-jquery/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/squarify/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/sshfs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/testrail-api/default.nix rename third_party/nixpkgs/pkgs/development/python-modules/{Theano => theano}/default.nix (99%) create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/txi2p-tahoe/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/types-ujson/default.nix rename third_party/nixpkgs/pkgs/development/python-modules/{WSME => wsme}/default.nix (94%) rename third_party/nixpkgs/pkgs/development/python-modules/{XlsxWriter => xlsxwriter}/default.nix (100%) create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/y-py/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/r-modules/wrapper-radian.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.4/0001-No-impure-bin-sh.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.4/0002-remove-impure-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.4/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/go-licenses/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/go-licenses/fix-go-version-error.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/texinfo/7.0.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/mongosh/composition.nix delete mode 100755 third_party/nixpkgs/pkgs/development/tools/mongosh/generate.sh create mode 100644 third_party/nixpkgs/pkgs/development/tools/mongosh/package-lock.json delete mode 100644 third_party/nixpkgs/pkgs/development/tools/mongosh/packages.json delete mode 100644 third_party/nixpkgs/pkgs/development/tools/mongosh/packages.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/mongosh/source.json create mode 100755 third_party/nixpkgs/pkgs/development/tools/mongosh/update.sh delete mode 100644 third_party/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/pifpaf/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/buildPgxExtension.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/viceroy/default.nix delete mode 100644 third_party/nixpkgs/pkgs/misc/kitty-themes/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/ipu6-drivers/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/ivsc-driver/default.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/lvm2/2_02.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/lvm2/no-shared.diff create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/lvm2/no-shared.patch create mode 100755 third_party/nixpkgs/pkgs/servers/home-assistant/update.py delete mode 100755 third_party/nixpkgs/pkgs/servers/home-assistant/update.sh create mode 100644 third_party/nixpkgs/pkgs/servers/jellyseerr/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/jellyseerr/package.json create mode 100644 third_party/nixpkgs/pkgs/servers/jellyseerr/pin.json create mode 100755 third_party/nixpkgs/pkgs/servers/jellyseerr/update.sh create mode 100644 third_party/nixpkgs/pkgs/servers/pufferpanel/disable-group-checks.patch create mode 100644 third_party/nixpkgs/pkgs/servers/pufferpanel/skip-network-tests.patch create mode 100644 third_party/nixpkgs/pkgs/servers/readarr/default.nix create mode 100755 third_party/nixpkgs/pkgs/servers/readarr/update.sh create mode 100644 third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix create mode 100644 third_party/nixpkgs/pkgs/servers/sunshine/libcbs.nix create mode 100644 third_party/nixpkgs/pkgs/shells/fish/plugins/async-prompt.nix delete mode 100644 third_party/nixpkgs/pkgs/shells/fish/plugins/autopair-fish.nix create mode 100644 third_party/nixpkgs/pkgs/stdenv/darwin/patch-bootstrap-tools-next.sh create mode 100644 third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix delete mode 100644 third_party/nixpkgs/pkgs/test/patch-shebangs/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/stdenv/patch-shebangs.nix create mode 100644 third_party/nixpkgs/pkgs/tools/archivers/dumpnar/default.nix create mode 100755 third_party/nixpkgs/pkgs/tools/archivers/payload-dumper-go/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/compression/unzrip/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/evhz/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/geekbench/5.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/geekbench/6.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/geekbench/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/halp/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/halp/fix-target-dir.patch create mode 100644 third_party/nixpkgs/pkgs/tools/misc/psql2csv/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/wasm-tools/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/networking/curl/7.88.0-http2-breakage.patch create mode 100644 third_party/nixpkgs/pkgs/tools/networking/networkd-dispatcher/support_nix_store_path.patch create mode 100644 third_party/nixpkgs/pkgs/tools/networking/speedtest-go/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/biscuit-cli/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/tools/security/biscuit-cli/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/enumerepo/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/goverview/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/rsign2/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/slsa-verifier/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/step-kms-plugin/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/csvquote/csvquote-path.patch create mode 100644 third_party/nixpkgs/pkgs/tools/text/csvquote/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/diffutils/fix-diff-D.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/typesetting/lout/CVE-2019-19917-and-CVE-2019-19918.patch delete mode 100755 third_party/nixpkgs/pkgs/tools/typesetting/lout/builder.sh rename third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/{pkgs.nix => tlpdb.nix} (100%) create mode 100644 third_party/nixpkgs/pkgs/tools/wayland/swww/default.nix diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index 86787c03a5..b202fcd13e 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -237,6 +237,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/applications/editors/vim/plugins @figsoda @jonringer # VsCode Extensions +/pkgs/applications/editors/vscode @superherointj /pkgs/applications/editors/vscode/extensions @jonringer # Prometheus exporter modules and tests diff --git a/third_party/nixpkgs/.github/workflows/check-maintainers-sorted.yaml b/third_party/nixpkgs/.github/workflows/check-maintainers-sorted.yaml new file mode 100644 index 0000000000..73987f9b91 --- /dev/null +++ b/third_party/nixpkgs/.github/workflows/check-maintainers-sorted.yaml @@ -0,0 +1,21 @@ +name: "Check that maintainer list is sorted" + +on: + pull_request: + paths: + - 'maintainers/maintainer-list.nix' +permissions: + contents: read + +jobs: + nixos: + runs-on: ubuntu-latest + if: github.repository_owner == 'NixOS' + steps: + - uses: actions/checkout@v3 + - uses: cachix/install-nix-action@v19 + with: + # explicitly enable sandbox + extra_nix_config: sandbox = true + - name: Check that maintainer-list.nix is sorted + run: nix-instantiate --eval maintainers/scripts/check-maintainers-sorted.nix diff --git a/third_party/nixpkgs/doc/builders/fetchers.chapter.md b/third_party/nixpkgs/doc/builders/fetchers.chapter.md index 551df86a58..ecff018948 100644 --- a/third_party/nixpkgs/doc/builders/fetchers.chapter.md +++ b/third_party/nixpkgs/doc/builders/fetchers.chapter.md @@ -71,6 +71,7 @@ The main difference between `fetchurl` and `fetchzip` is in how they store the c - `relative`: Similar to using `git-diff`'s `--relative` flag, only keep changes inside the specified directory, making paths relative to it. - `stripLen`: Remove the first `stripLen` components of pathnames in the patch. +- `decode`: Pipe the downloaded data through this command before processing it as a patch. - `extraPrefix`: Prefix pathnames by this string. - `excludes`: Exclude files matching these patterns (applies after the above arguments). - `includes`: Include only files matching these patterns (applies after the above arguments). diff --git a/third_party/nixpkgs/doc/languages-frameworks/gnome.section.md b/third_party/nixpkgs/doc/languages-frameworks/gnome.section.md index 0d4865b7af..3c8539ac42 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/gnome.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/gnome.section.md @@ -116,10 +116,6 @@ For convenience, it also adds `dconf.lib` for a GIO module implementing a GSetti - []{#ssec-gnome-hooks-gobject-introspection} `gobject-introspection` setup hook populates `GI_TYPELIB_PATH` variable with `lib/girepository-1.0` directories of dependencies, which is then added to wrapper by `wrapGAppsHook`. It also adds `share` directories of dependencies to `XDG_DATA_DIRS`, which is intended to promote GIR files but it also [pollutes the closures](https://github.com/NixOS/nixpkgs/issues/32790) of packages using `wrapGAppsHook`. - ::: {.warning} - The setup hook [currently](https://github.com/NixOS/nixpkgs/issues/56943) does not work in expressions with `strictDeps` enabled, like Python packages. In those cases, you will need to disable it with `strictDeps = false;`. - ::: - - []{#ssec-gnome-hooks-gst-grl-plugins} Setup hooks of `gst_all_1.gstreamer` and `grilo` will populate the `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH` variables, respectively, which will then be added to the wrapper by `wrapGAppsHook`. You can also pass additional arguments to `makeWrapper` using `gappsWrapperArgs` in `preFixup` hook: diff --git a/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md b/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md index c6d85a240a..ec123e7c7b 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md @@ -71,8 +71,10 @@ $ nix-env -f '' -qaP -A haskell.compiler haskell.compiler.ghc810 ghc-8.10.7 haskell.compiler.ghc88 ghc-8.8.4 haskell.compiler.ghc90 ghc-9.0.2 -haskell.compiler.ghc92 ghc-9.2.4 +haskell.compiler.ghc924 ghc-9.2.4 haskell.compiler.ghc925 ghc-9.2.5 +haskell.compiler.ghc926 ghc-9.2.6 +haskell.compiler.ghc92 ghc-9.2.7 haskell.compiler.ghc942 ghc-9.4.2 haskell.compiler.ghc943 ghc-9.4.3 haskell.compiler.ghc94 ghc-9.4.4 @@ -86,13 +88,15 @@ haskell.compiler.ghc924Binary ghc-binary-9.2.4 haskell.compiler.ghc924BinaryMinimal ghc-binary-9.2.4 haskell.compiler.integer-simple.ghc810 ghc-integer-simple-8.10.7 haskell.compiler.integer-simple.ghc8107 ghc-integer-simple-8.10.7 -haskell.compiler.integer-simple.ghc884 ghc-integer-simple-8.8.4 haskell.compiler.integer-simple.ghc88 ghc-integer-simple-8.8.4 +haskell.compiler.integer-simple.ghc884 ghc-integer-simple-8.8.4 haskell.compiler.native-bignum.ghc90 ghc-native-bignum-9.0.2 haskell.compiler.native-bignum.ghc902 ghc-native-bignum-9.0.2 -haskell.compiler.native-bignum.ghc92 ghc-native-bignum-9.2.4 haskell.compiler.native-bignum.ghc924 ghc-native-bignum-9.2.4 haskell.compiler.native-bignum.ghc925 ghc-native-bignum-9.2.5 +haskell.compiler.native-bignum.ghc926 ghc-native-bignum-9.2.6 +haskell.compiler.native-bignum.ghc92 ghc-native-bignum-9.2.7 +haskell.compiler.native-bignum.ghc927 ghc-native-bignum-9.2.7 haskell.compiler.native-bignum.ghc942 ghc-native-bignum-9.4.2 haskell.compiler.native-bignum.ghc943 ghc-native-bignum-9.4.3 haskell.compiler.native-bignum.ghc94 ghc-native-bignum-9.4.4 @@ -105,15 +109,15 @@ Each of those compiler versions has a corresponding attribute set built using it. However, the non-standard package sets are not tested regularly and, as a result, contain fewer working packages. The corresponding package set for GHC 9.4.4 is `haskell.packages.ghc944`. In fact `haskellPackages` is just an alias -for `haskell.packages.ghc924`: +for `haskell.packages.ghc927`: ```console -$ nix-env -f '' -qaP -A haskell.packages.ghc924 -haskell.packages.ghc924.a50 a50-0.5 -haskell.packages.ghc924.AAI AAI-0.2.0.1 -haskell.packages.ghc924.aasam aasam-0.2.0.0 -haskell.packages.ghc924.abacate abacate-0.0.0.0 -haskell.packages.ghc924.abc-puzzle abc-puzzle-0.2.1 +$ nix-env -f '' -qaP -A haskell.packages.ghc927 +haskell.packages.ghc927.a50 a50-0.5 +haskell.packages.ghc927.AAI AAI-0.2.0.1 +haskell.packages.ghc927.aasam aasam-0.2.0.0 +haskell.packages.ghc927.abacate abacate-0.0.0.0 +haskell.packages.ghc927.abc-puzzle abc-puzzle-0.2.1 … ``` diff --git a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md index ec703105e1..b3f4405ee9 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md @@ -13,7 +13,7 @@ into your `configuration.nix` or bring them into scope with `nix-shell -p rustc For other versions such as daily builds (beta and nightly), use either `rustup` from nixpkgs (which will manage the rust installation in your home directory), -or use a community maintained [Rust overlay](#using-community-rust-overlays). +or use [community maintained Rust toolchains](#using-community-maintained-rust-toolchains). ## `buildRustPackage`: Compiling Rust applications with Cargo {#compiling-rust-applications-with-cargo} @@ -686,31 +686,61 @@ $ cargo build $ cargo test ``` -### Controlling Rust Version Inside `nix-shell` {#controlling-rust-version-inside-nix-shell} +## Using community maintained Rust toolchains {#using-community-maintained-rust-toolchains} -To control your rust version (i.e. use nightly) from within `shell.nix` (or -other nix expressions) you can use the following `shell.nix` +::: {.note} +Note: The following projects cannot be used within nixpkgs since [IFD](#ssec-import-from-derivation) is disallowed. +To package things that require Rust nightly, `RUSTC_BOOTSTRAP = true;` can sometimes be used as a hack. +::: + +There are two community maintained approaches to Rust toolchain management: +- [oxalica's Rust overlay](https://github.com/oxalica/rust-overlay) +- [fenix](https://github.com/nix-community/fenix) + +Despite their names, both projects provides a similar set of packages and overlays under different APIs. + +Oxalica's overlay allows you to select a particular Rust version without you providing a hash or a flake input, +but comes with a larger git repository than fenix. + +Fenix also provides rust-analyzer nightly in addition to the Rust toolchains. + +Both oxalica's overlay and fenix better integrate with nix and cache optimizations. +Because of this and ergonomics, either of those community projects +should be preferred to the Mozilla's Rust overlay ([nixpkgs-mozilla](https://github.com/mozilla/nixpkgs-mozilla)). + +The following documentation demonstrates examples using fenix and oxalica's Rust overlay +with `nix-shell` and building derivations. More advanced usages like flake usage +are documented in their own repositories. + +### Using Rust nightly with `nix-shell` {#using-rust-nightly-with-nix-shell} + +Here is a simple `shell.nix` that provides Rust nightly (default profile) using fenix: ```nix -# Latest Nightly -with import {}; -let src = fetchFromGitHub { - owner = "mozilla"; - repo = "nixpkgs-mozilla"; - # commit from: 2019-05-15 - rev = "9f35c4b09fd44a77227e79ff0c1b4b6a69dff533"; - hash = "sha256-18h0nvh55b5an4gmlgfbvwbyqj91bklf1zymis6lbdh75571qaz0="; - }; +with import { }; +let + fenix = callPackage + (fetchFromGitHub { + owner = "nix-community"; + repo = "fenix"; + # commit from: 2023-03-03 + rev = "e2ea04982b892263c4d939f1cc3bf60a9c4deaa1"; + hash = "sha256-AsOim1A8KKtMWIxG+lXh5Q4P2bhOZjoUhFWJ1EuZNNk="; + }) + { }; in -with import "${src.out}/rust-overlay.nix" pkgs pkgs; -stdenv.mkDerivation { +mkShell { name = "rust-env"; - buildInputs = [ - # Note: to use stable, just replace `nightly` with `stable` - latest.rustChannels.nightly.rust + nativeBuildInputs = [ + # Note: to use stable, just replace `default` with `stable` + fenix.default.toolchain - # Add some extra dependencies from `pkgs` - pkg-config openssl + # Example Build-time Additional Dependencies + pkg-config + ]; + buildInputs = [ + # Example Run-time Additional Dependencies + openssl ]; # Set Environment Variables @@ -718,116 +748,66 @@ stdenv.mkDerivation { } ``` -Now run: +Save this to `shell.nix`, then run: ```ShellSession $ rustc --version -rustc 1.26.0-nightly (188e693b3 2018-03-26) +rustc 1.69.0-nightly (13471d3b2 2023-03-02) ``` To see that you are using nightly. -## Using community Rust overlays {#using-community-rust-overlays} +Oxalica's Rust overlay has more complete examples of `shell.nix` (and cross compilation) under its +[`examples` directory](https://github.com/oxalica/rust-overlay/tree/e53e8853aa7b0688bc270e9e6a681d22e01cf299/examples). -There are two community maintained approaches to Rust toolchain management: -- [oxalica's Rust overlay](https://github.com/oxalica/rust-overlay) -- [fenix](https://github.com/nix-community/fenix) +### Using Rust nightly in a derivation with `buildRustPackage` {#using-rust-nightly-in-a-derivation-with-buildrustpackage} -Oxalica's overlay allows you to select a particular Rust version and components. -See [their documentation](https://github.com/oxalica/rust-overlay#rust-overlay) for more -detailed usage. +You can also use Rust nightly to build rust packages using `makeRustPlatform`. +The below snippet demonstrates invoking `buildRustPackage` with a Rust toolchain from oxalica's overlay: -Fenix is an alternative to `rustup` and can also be used as an overlay. - -Both oxalica's overlay and fenix better integrate with nix and cache optimizations. -Because of this and ergonomics, either of those community projects -should be preferred to the Mozilla's Rust overlay (`nixpkgs-mozilla`). - -### How to select a specific `rustc` and toolchain version {#how-to-select-a-specific-rustc-and-toolchain-version} - -You can consume the oxalica overlay and use it to grab a specific Rust toolchain version. -Here is an example `shell.nix` showing how to grab the current stable toolchain: ```nix -{ pkgs ? import { - overlays = [ - (import (fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz")) - ]; - } -}: -pkgs.mkShell { - nativeBuildInputs = with pkgs; [ - pkg-config - rust-bin.stable.latest.minimal - ]; -} -``` - -You can try this out by: -1. Saving that to `shell.nix` -2. Executing `nix-shell --pure --command 'rustc --version'` - -As of writing, this prints out `rustc 1.56.0 (09c42c458 2021-10-18)`. - -### How to use an overlay toolchain in a derivation {#how-to-use-an-overlay-toolchain-in-a-derivation} - -You can also use an overlay's Rust toolchain with `buildRustPackage`. -The below snippet demonstrates invoking `buildRustPackage` with an oxalica overlay selected Rust toolchain: -```nix -with import { +with import +{ overlays = [ (import (fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz")) ]; }; +let + rustPlatform = makeRustPlatform { + cargo = rust-bin.stable.latest.minimal; + rustc = rust-bin.stable.latest.minimal; + }; +in rustPlatform.buildRustPackage rec { pname = "ripgrep"; version = "12.1.1"; - nativeBuildInputs = [ - rust-bin.stable.latest.minimal - ]; src = fetchFromGitHub { owner = "BurntSushi"; repo = "ripgrep"; rev = version; - hash = "sha256-1hqps7l5qrjh9f914r5i6kmcz6f1yb951nv4lby0cjnp5l253kps="; + hash = "sha256-+s5RBC3XSgb8omTbUNLywZnP6jSxZBKSS1BmXOjRF8M="; }; - cargoSha256 = "03wf9r2csi6jpa7v5sw5lpxkrk4wfzwmzx7k3991q3bdjzcwnnwp"; + cargoHash = "sha256-l1vL2ZdtDRxSGvP0X/l3nMw8+6WF67KPutJEzUROjg8="; + + doCheck = false; meta = with lib; { description = "A fast line-oriented regex search tool, similar to ag and ack"; homepage = "https://github.com/BurntSushi/ripgrep"; - license = licenses.unlicense; - maintainers = [ maintainers.tailhook ]; + license = with licenses; [ mit unlicense ]; + maintainers = with maintainers; [ tailhook ]; }; } ``` Follow the below steps to try that snippet. -1. create a new directory 1. save the above snippet as `default.nix` in that directory -1. cd into that directory and run `nix-build` +2. cd into that directory and run `nix-build` -### Rust overlay installation {#rust-overlay-installation} - -You can use this overlay by either changing your local nixpkgs configuration, -or by adding the overlay declaratively in a nix expression, e.g. in `configuration.nix`. -For more information see [the manual on installing overlays](#sec-overlays-install). - -### Declarative Rust overlay installation {#declarative-rust-overlay-installation} - -This snippet shows how to use oxalica's Rust overlay. -Add the following to your `configuration.nix`, `home-configuration.nix`, `shell.nix`, or similar: - -```nix -{ pkgs ? import { - overlays = [ - (import (builtins.fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz")) - # Further overlays go here - ]; - }; -}; -``` - -Note that this will fetch the latest overlay version when rebuilding your system. +Fenix also has examples with `buildRustPackage`, +[crane](https://github.com/ipetkov/crane), +[naersk](https://github.com/nix-community/naersk), +and cross compilation in its [Examples](https://github.com/nix-community/fenix#examples) section. diff --git a/third_party/nixpkgs/lib/attrsets.nix b/third_party/nixpkgs/lib/attrsets.nix index 30952651ad..d9a6eab060 100644 --- a/third_party/nixpkgs/lib/attrsets.nix +++ b/third_party/nixpkgs/lib/attrsets.nix @@ -333,6 +333,66 @@ rec { ) (attrNames set) ); + /* + Like builtins.foldl' but for attribute sets. + Iterates over every name-value pair in the given attribute set. + The result of the callback function is often called `acc` for accumulator. It is passed between callbacks from left to right and the final `acc` is the return value of `foldlAttrs`. + + Attention: + There is a completely different function + `lib.foldAttrs` + which has nothing to do with this function, despite the similar name. + + Example: + foldlAttrs + (acc: name: value: { + sum = acc.sum + value; + names = acc.names ++ [name]; + }) + { sum = 0; names = []; } + { + foo = 1; + bar = 10; + } + -> + { + sum = 11; + names = ["bar" "foo"]; + } + + foldlAttrs + (throw "function not needed") + 123 + {}; + -> + 123 + + foldlAttrs + (_: _: v: v) + (throw "initial accumulator not needed") + { z = 3; a = 2; }; + -> + 3 + + The accumulator doesn't have to be an attrset. + It can be as simple as a number or string. + + foldlAttrs + (acc: _: v: acc * 10 + v) + 1 + { z = 1; a = 2; }; + -> + 121 + + Type: + foldlAttrs :: ( a -> String -> b -> a ) -> a -> { ... :: b } -> a + */ + foldlAttrs = f: init: set: + foldl' + (acc: name: f acc name set.${name}) + init + (attrNames set); + /* Apply fold functions to values grouped by key. Example: diff --git a/third_party/nixpkgs/lib/default.nix b/third_party/nixpkgs/lib/default.nix index 85303e0a5a..0424db36b2 100644 --- a/third_party/nixpkgs/lib/default.nix +++ b/third_party/nixpkgs/lib/default.nix @@ -78,7 +78,7 @@ let composeManyExtensions makeExtensible makeExtensibleWithCustomName; inherit (self.attrsets) attrByPath hasAttrByPath setAttrByPath getAttrFromPath attrVals attrValues getAttrs catAttrs filterAttrs - filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs + filterAttrsRecursive foldlAttrs foldAttrs collect nameValuePair mapAttrs mapAttrs' mapAttrsToList concatMapAttrs mapAttrsRecursive mapAttrsRecursiveCond genAttrs isDerivation toDerivation optionalAttrs zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil diff --git a/third_party/nixpkgs/lib/modules.nix b/third_party/nixpkgs/lib/modules.nix index 5e6bee6aab..051dbe2ef8 100644 --- a/third_party/nixpkgs/lib/modules.nix +++ b/third_party/nixpkgs/lib/modules.nix @@ -21,6 +21,7 @@ let isBool isFunction isList + isPath isString length mapAttrs @@ -45,6 +46,9 @@ let showOption unknownModule ; + inherit (lib.strings) + isConvertibleWithToString + ; showDeclPrefix = loc: decl: prefix: " - option(s) with prefix `${showOption (loc ++ [prefix])}' in module `${decl._file}'"; @@ -403,7 +407,7 @@ rec { key = module.key; module = module; modules = collectedImports.modules; - disabled = module.disabledModules ++ collectedImports.disabled; + disabled = (if module.disabledModules != [] then [{ file = module._file; disabled = module.disabledModules; }] else []) ++ collectedImports.disabled; }) initialModules); # filterModules :: String -> { disabled, modules } -> [ Module ] @@ -412,10 +416,30 @@ rec { # modules recursively. It returns the final list of unique-by-key modules filterModules = modulesPath: { disabled, modules }: let - moduleKey = m: if isString m && (builtins.substring 0 1 m != "/") - then toString modulesPath + "/" + m - else toString m; - disabledKeys = map moduleKey disabled; + moduleKey = file: m: + if isString m + then + if builtins.substring 0 1 m == "/" + then m + else toString modulesPath + "/" + m + + else if isConvertibleWithToString m + then + if m?key && m.key != toString m + then + throw "Module `${file}` contains a disabledModules item that is an attribute set that can be converted to a string (${toString m}) but also has a `.key` attribute (${m.key}) with a different value. This makes it ambiguous which module should be disabled." + else + toString m + + else if m?key + then + m.key + + else if isAttrs m + then throw "Module `${file}` contains a disabledModules item that is an attribute set, presumably a module, that does not have a `key` attribute. This means that the module system doesn't have any means to identify the module that should be disabled. Make sure that you've put the correct value in disabledModules: a string path relative to modulesPath, a path value, or an attribute set with a `key` attribute." + else throw "Each disabledModules item must be a path, string, or a attribute set with a key attribute, or a value supported by toString. However, one of the disabledModules items in `${toString file}` is none of that, but is of type ${builtins.typeOf m}."; + + disabledKeys = concatMap ({ file, disabled }: map (moduleKey file) disabled) disabled; keyFilter = filter (attrs: ! elem attrs.key disabledKeys); in map (attrs: attrs.module) (builtins.genericClosure { startSet = keyFilter modules; diff --git a/third_party/nixpkgs/lib/path/default.nix b/third_party/nixpkgs/lib/path/default.nix index 075e2fc0d1..a4a08668ae 100644 --- a/third_party/nixpkgs/lib/path/default.nix +++ b/third_party/nixpkgs/lib/path/default.nix @@ -15,6 +15,9 @@ let last genList elemAt + all + concatMap + foldl' ; inherit (lib.strings) @@ -190,6 +193,80 @@ in /* No rec! Add dependencies on this file at the top. */ { subpathInvalidReason value == null; + /* Join subpath strings together using `/`, returning a normalised subpath string. + + Like `concatStringsSep "/"` but safer, specifically: + + - All elements must be valid subpath strings, see `lib.path.subpath.isValid` + + - The result gets normalised, see `lib.path.subpath.normalise` + + - The edge case of an empty list gets properly handled by returning the neutral subpath `"./."` + + Laws: + + - Associativity: + + subpath.join [ x (subpath.join [ y z ]) ] == subpath.join [ (subpath.join [ x y ]) z ] + + - Identity - `"./."` is the neutral element for normalised paths: + + subpath.join [ ] == "./." + subpath.join [ (subpath.normalise p) "./." ] == subpath.normalise p + subpath.join [ "./." (subpath.normalise p) ] == subpath.normalise p + + - Normalisation - the result is normalised according to `lib.path.subpath.normalise`: + + subpath.join ps == subpath.normalise (subpath.join ps) + + - For non-empty lists, the implementation is equivalent to normalising the result of `concatStringsSep "/"`. + Note that the above laws can be derived from this one. + + ps != [] -> subpath.join ps == subpath.normalise (concatStringsSep "/" ps) + + Type: + subpath.join :: [ String ] -> String + + Example: + subpath.join [ "foo" "bar/baz" ] + => "./foo/bar/baz" + + # normalise the result + subpath.join [ "./foo" "." "bar//./baz/" ] + => "./foo/bar/baz" + + # passing an empty list results in the current directory + subpath.join [ ] + => "./." + + # elements must be valid subpath strings + subpath.join [ /foo ] + => + subpath.join [ "" ] + => + subpath.join [ "/foo" ] + => + subpath.join [ "../foo" ] + => + */ + subpath.join = + # The list of subpaths to join together + subpaths: + # Fast in case all paths are valid + if all isValid subpaths + then joinRelPath (concatMap splitRelPath subpaths) + else + # Otherwise we take our time to gather more info for a better error message + # Strictly go through each path, throwing on the first invalid one + # Tracks the list index in the fold accumulator + foldl' (i: path: + if isValid path + then i + 1 + else throw '' + lib.path.subpath.join: Element at index ${toString i} is not a valid subpath string: + ${subpathInvalidReason path}'' + ) 0 subpaths; + /* Normalise a subpath. Throw an error if the subpath isn't valid, see `lib.path.subpath.isValid` diff --git a/third_party/nixpkgs/lib/path/tests/unit.nix b/third_party/nixpkgs/lib/path/tests/unit.nix index a1a45173a9..61c4ab4d6f 100644 --- a/third_party/nixpkgs/lib/path/tests/unit.nix +++ b/third_party/nixpkgs/lib/path/tests/unit.nix @@ -107,6 +107,36 @@ let expected = true; }; + # Test examples from the lib.path.subpath.join documentation + testSubpathJoinExample1 = { + expr = subpath.join [ "foo" "bar/baz" ]; + expected = "./foo/bar/baz"; + }; + testSubpathJoinExample2 = { + expr = subpath.join [ "./foo" "." "bar//./baz/" ]; + expected = "./foo/bar/baz"; + }; + testSubpathJoinExample3 = { + expr = subpath.join [ ]; + expected = "./."; + }; + testSubpathJoinExample4 = { + expr = (builtins.tryEval (subpath.join [ /foo ])).success; + expected = false; + }; + testSubpathJoinExample5 = { + expr = (builtins.tryEval (subpath.join [ "" ])).success; + expected = false; + }; + testSubpathJoinExample6 = { + expr = (builtins.tryEval (subpath.join [ "/foo" ])).success; + expected = false; + }; + testSubpathJoinExample7 = { + expr = (builtins.tryEval (subpath.join [ "../foo" ])).success; + expected = false; + }; + # Test examples from the lib.path.subpath.normalise documentation testSubpathNormaliseExample1 = { expr = subpath.normalise "foo//bar"; diff --git a/third_party/nixpkgs/lib/systems/default.nix b/third_party/nixpkgs/lib/systems/default.nix index 4a5e66caec..7e6fa5ecfb 100644 --- a/third_party/nixpkgs/lib/systems/default.nix +++ b/third_party/nixpkgs/lib/systems/default.nix @@ -140,6 +140,7 @@ rec { qemuArch = if final.isAarch32 then "arm" + else if final.isS390 && !final.isS390x then null else if final.isx86_64 then "x86_64" else if final.isx86 then "i386" else final.uname.processor; @@ -193,7 +194,7 @@ rec { then "${pkgs.runtimeShell} -c '\"$@\"' --" else if final.isWindows then "${wine}/bin/wine${lib.optionalString (final.parsed.cpu.bits == 64) "64"}" - else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux + else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux && final.qemuArch != null then "${qemu-user}/bin/qemu-${final.qemuArch}" else if final.isWasi then "${pkgs.wasmtime}/bin/wasmtime" diff --git a/third_party/nixpkgs/lib/systems/doubles.nix b/third_party/nixpkgs/lib/systems/doubles.nix index 383dd30bfd..6b19309d11 100644 --- a/third_party/nixpkgs/lib/systems/doubles.nix +++ b/third_party/nixpkgs/lib/systems/doubles.nix @@ -22,7 +22,7 @@ let "x86_64-solaris" # JS - "js-ghcjs" + "javascript-ghcjs" # Linux "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" diff --git a/third_party/nixpkgs/lib/systems/examples.nix b/third_party/nixpkgs/lib/systems/examples.nix index de5adad3ca..9ea2e3b56e 100644 --- a/third_party/nixpkgs/lib/systems/examples.nix +++ b/third_party/nixpkgs/lib/systems/examples.nix @@ -329,6 +329,9 @@ rec { # Ghcjs ghcjs = { - config = "js-unknown-ghcjs"; + # This triple is special to GHC/Cabal/GHCJS and not recognized by autotools + # See: https://gitlab.haskell.org/ghc/ghc/-/commit/6636b670233522f01d002c9b97827d00289dbf5c + # https://github.com/ghcjs/ghcjs/issues/53 + config = "javascript-unknown-ghcjs"; }; } diff --git a/third_party/nixpkgs/lib/systems/inspect.nix b/third_party/nixpkgs/lib/systems/inspect.nix index 30615c9fde..b32c863010 100644 --- a/third_party/nixpkgs/lib/systems/inspect.nix +++ b/third_party/nixpkgs/lib/systems/inspect.nix @@ -49,7 +49,7 @@ rec { isM68k = { cpu = { family = "m68k"; }; }; isS390 = { cpu = { family = "s390"; }; }; isS390x = { cpu = { family = "s390"; bits = 64; }; }; - isJavaScript = { cpu = cpuTypes.js; }; + isJavaScript = { cpu = cpuTypes.javascript; }; is32bit = { cpu = { bits = 32; }; }; is64bit = { cpu = { bits = 64; }; }; diff --git a/third_party/nixpkgs/lib/systems/parse.nix b/third_party/nixpkgs/lib/systems/parse.nix index 5987cf1b5d..bd3366e140 100644 --- a/third_party/nixpkgs/lib/systems/parse.nix +++ b/third_party/nixpkgs/lib/systems/parse.nix @@ -131,7 +131,7 @@ rec { or1k = { bits = 32; significantByte = bigEndian; family = "or1k"; }; - js = { bits = 32; significantByte = littleEndian; family = "js"; }; + javascript = { bits = 32; significantByte = littleEndian; family = "javascript"; }; }; # GNU build systems assume that older NetBSD architectures are using a.out. diff --git a/third_party/nixpkgs/lib/tests/misc.nix b/third_party/nixpkgs/lib/tests/misc.nix index 07d04f5356..baa382f3e5 100644 --- a/third_party/nixpkgs/lib/tests/misc.nix +++ b/third_party/nixpkgs/lib/tests/misc.nix @@ -533,6 +533,37 @@ runTests { }; }; + # code from example + testFoldlAttrs = { + expr = { + example = foldlAttrs + (acc: name: value: { + sum = acc.sum + value; + names = acc.names ++ [ name ]; + }) + { sum = 0; names = [ ]; } + { + foo = 1; + bar = 10; + }; + # should just return the initial value + emptySet = foldlAttrs (throw "function not needed") 123 { }; + # should just evaluate to the last value + accNotNeeded = foldlAttrs (_acc: _name: v: v) (throw "accumulator not needed") { z = 3; a = 2; }; + # the accumulator doesnt have to be an attrset it can be as trivial as being just a number or string + trivialAcc = foldlAttrs (acc: _name: v: acc * 10 + v) 1 { z = 1; a = 2; }; + }; + expected = { + example = { + sum = 11; + names = [ "bar" "foo" ]; + }; + emptySet = 123; + accNotNeeded = 3; + trivialAcc = 121; + }; + }; + # code from the example testRecursiveUpdateUntil = { expr = recursiveUpdateUntil (path: l: r: path == ["foo"]) { diff --git a/third_party/nixpkgs/lib/tests/modules.sh b/third_party/nixpkgs/lib/tests/modules.sh index cde4da6439..8081b186a2 100755 --- a/third_party/nixpkgs/lib/tests/modules.sh +++ b/third_party/nixpkgs/lib/tests/modules.sh @@ -141,6 +141,14 @@ checkConfigError "The option .*enable.* does not exist. Definition values:\n\s*- checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-define-enable.nix ./disable-declare-enable.nix checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-enable-modules.nix +checkConfigOutput '^true$' 'config.positive.enable' ./disable-module-with-key.nix +checkConfigOutput '^false$' 'config.negative.enable' ./disable-module-with-key.nix +checkConfigError 'Module ..*disable-module-bad-key.nix. contains a disabledModules item that is an attribute set, presumably a module, that does not have a .key. attribute. .*' 'config.enable' ./disable-module-bad-key.nix + +# Not sure if we want to keep supporting module keys that aren't strings, paths or v?key, but we shouldn't remove support accidentally. +checkConfigOutput '^true$' 'config.positive.enable' ./disable-module-with-toString-key.nix +checkConfigOutput '^false$' 'config.negative.enable' ./disable-module-with-toString-key.nix + # Check _module.args. set -- config.enable ./declare-enable.nix ./define-enable-with-custom-arg.nix checkConfigError 'while evaluating the module argument .*custom.* in .*define-enable-with-custom-arg.nix.*:' "$@" @@ -358,6 +366,10 @@ checkConfigOutput '^"The option `a\.b. defined in `.*/doRename-warnings\.nix. ha config.result \ ./doRename-warnings.nix +# Anonymous modules get deduplicated by key +checkConfigOutput '^"pear"$' config.once.raw ./merge-module-with-key.nix +checkConfigOutput '^"pear\\npear"$' config.twice.raw ./merge-module-with-key.nix + cat < throw "maintainers entry ${n} is malformed"; + { name = n; line = pos.line; key = toLower (simplify n); }) + (attrNames maintainers)); + before = { name, line, key }: + foldl' + (acc: n: if n.key < key && (acc == null || n.key > acc.key) then n else acc) + null + namesSorted; + errors = foldl' add 0 + (map + (i: let a = elemAt namesSorted i; + b = elemAt namesSorted (i + 1); + lim = let t = before a; in if t == null then "the initial {" else t.name; + in if a.line >= b.line + then trace + ("maintainer ${a.name} (line ${toString a.line}) should be listed " + + "after ${lim}, not after ${b.name} (line ${toString b.line})") + 1 + else 0) + (genList (i: i) (length namesSorted - 1))); +in +assert errors == 0; "all good!" + +# generate edit commands to sort the list. +# may everything following the last current entry (closing } ff) in the wrong place +# with lib; +# concatStringsSep +# "\n" +# (let first = foldl' (acc: n: if n.line < acc then n.line else acc) 999999999 namesSorted; +# commands = map +# (i: let e = elemAt namesSorted i; +# begin = foldl' +# (acc: n: if n.line < e.line && n.line > acc then n.line else acc) +# 1 +# namesSorted; +# end = +# foldl' (acc: n: if n.line > e.line && n.line < acc then n.line else acc) +# 999999999 +# namesSorted; +# in "${toString e.line},${toString (end - 1)} p") +# (genList (i: i) (length namesSorted)); +# in map +# (c: "sed -ne '${c}' maintainers/maintainer-list.nix") +# ([ "1,${toString (first - 1)} p" ] ++ commands)) diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs b/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs index 27b3d3c43a..2cbeedeaf7 100755 --- a/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs +++ b/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs @@ -328,6 +328,7 @@ platformIcon (Platform x) = case x of "x86_64-linux" -> ":penguin:" "aarch64-linux" -> ":iphone:" "x86_64-darwin" -> ":apple:" + "aarch64-darwin" -> ":green_apple:" _ -> x data BuildResult = BuildResult {state :: BuildState, id :: Int} deriving (Show, Eq, Ord) @@ -488,7 +489,8 @@ printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = if' (isNothing maintainedJob) "No `maintained` job found." <> if' (Unfinished > maybe Success worstState mergeableJob) "`mergeable` jobset failed." <> if' (outstandingJobs (Platform "x86_64-linux") > 100) "Too many outstanding jobs on x86_64-linux." <> - if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux." + if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux." <> + if' (outstandingJobs (Platform "aarch64-darwin") > 100) "Too many outstanding jobs on aarch64-darwin." if' p e = if p then [e] else mempty outstandingJobs platform | Table m <- numSummary = Map.findWithDefault 0 (platform, Unfinished) m maintainedJob = Map.lookup "maintained" summary diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix index 4b3c017691..2201fc7f76 100644 --- a/third_party/nixpkgs/maintainers/team-list.nix +++ b/third_party/nixpkgs/maintainers/team-list.nix @@ -142,6 +142,7 @@ with lib.maintainers; { # gares has no entry in the maintainers list siraben vbgl + alizter ]; scope = "Maintain the Coq theorem prover and related packages."; shortName = "Coq"; diff --git a/third_party/nixpkgs/nixos/doc/manual/development/replace-modules.section.md b/third_party/nixpkgs/nixos/doc/manual/development/replace-modules.section.md index 0c0d6a7ac2..ac9f5adbaf 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/replace-modules.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/replace-modules.section.md @@ -8,8 +8,15 @@ the system on a stable release. `disabledModules` is a top level attribute like `imports`, `options` and `config`. It contains a list of modules that will be disabled. This can -either be the full path to the module or a string with the filename -relative to the modules path (eg. \ for nixos). +either be: + - the full path to the module, + - or a string with the filename relative to the modules path (eg. \ for nixos), + - or an attribute set containing a specific `key` attribute. + +The latter allows some modules to be disabled, despite them being distributed +via attributes instead of file paths. The `key` should be globally unique, so +it is recommended to include a file path in it, or rely on a framework to do it +for you. This example will replace the existing postgresql module with the version defined in the nixos-unstable channel while keeping the rest of diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md index 3e63ddced6..c0cf047e8c 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md @@ -33,6 +33,9 @@ In addition to numerous new and upgraded packages, this release has the followin - [Cloudlog](https://www.magicbug.co.uk/cloudlog/), a web-based Amateur Radio logging application. Available as [services.cloudlog](#opt-services.cloudlog.enable). - [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion). +- [readarr](https://github.com/Readarr/Readarr), Book Manager and Automation (Sonarr for Ebooks). Available as [services.readarr](options.html#opt-services.readarr.enable). + +- [gemstash](https://github.com/rubygems/gemstash), a RubyGems.org cache and private gem server. Available as [services.gemstash](#opt-services.gemstash.enable). - [gmediarender](https://github.com/hzeller/gmrender-resurrect), a simple, headless UPnP/DLNA renderer. Available as [services.gmediarender](options.html#opt-services.gmediarender.enable). @@ -58,12 +61,20 @@ In addition to numerous new and upgraded packages, this release has the followin - [ulogd](https://www.netfilter.org/projects/ulogd/index.html), a userspace logging daemon for netfilter/iptables related logging. Available as [services.ulogd](options.html#opt-services.ulogd.enable). +- [jellyseerr](https://github.com/Fallenbagel/jellyseerr), a web-based requests manager for Jellyfin, forked from Overseerr. Available as [services.jellyseerr](#opt-services.jellyseerr.enable). + - [photoprism](https://photoprism.app/), a AI-Powered Photos App for the Decentralized Web. Available as [services.photoprism](options.html#opt-services.photoprism.enable). - [autosuspend](https://github.com/languitar/autosuspend), a python daemon that suspends a system if certain conditions are met, or not met. - [sharing](https://github.com/parvardegr/sharing), a command-line tool to share directories and files from the CLI to iOS and Android devices without the need of an extra client app. Available as [programs.sharing](#opt-programs.sharing.enable). +- [nimdow](https://github.com/avahe-kellenberger/nimdow), a window manager written in Nim, inspired by dwm. + +- [woodpecker-agent](https://woodpecker-ci.org/), a simple CI engine with great extensibility. Available as [services.woodpecker-agent](#opt-services.woodpecker-agent.enable). + +- [woodpecker-server](https://woodpecker-ci.org/), a simple CI engine with great extensibility. Available as [services.woodpecker-server](#opt-services.woodpecker-server.enable). + ## Backward Incompatibilities {#sec-release-23.05-incompatibilities} @@ -82,6 +93,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `git-bug` has been updated to at least version 0.8.0, which includes backwards incompatible changes. The `git-bug-migration` package can be used to upgrade existing repositories. +- `nushell` has been updated to at least version 0.77.0, which includes potential breaking changes in aliases. The old aliases are now available as `old-alias` but it is recommended you migrate to the new format. See [Reworked aliases](https://www.nushell.sh/blog/2023-03-14-nushell_0_77.html#reworked-aliases-breaking-changes-kubouch). + - `keepassx` and `keepassx2` have been removed, due to upstream [stopping development](https://www.keepassx.org/index.html%3Fp=636.html). Consider [KeePassXC](https://keepassxc.org) as a maintained alternative. - The `services.kubo.settings` option is now no longer stateful. If you changed any of the options in `services.kubo.settings` in the past and then removed them from your NixOS configuration again, those changes are still in your Kubo configuration file but will now be reset to the default. If you're unsure, you may want to make a backup of your configuration file (probably /var/lib/ipfs/config) and compare after the update. @@ -115,6 +128,8 @@ In addition to numerous new and upgraded packages, this release has the followin - Calling `makeSetupHook` without passing a `name` argument is deprecated. +- `lib.systems.examples.ghcjs` and consequently `pkgsCross.ghcjs` now use the target triplet `javascript-unknown-ghcjs` instead of `js-unknown-ghcjs`. This has been done to match an [upstream decision](https://gitlab.haskell.org/ghc/ghc/-/commit/6636b670233522f01d002c9b97827d00289dbf5c) to follow Cabal's platform naming more closely. Nixpkgs will also reject `js` as an architecture name. + - The `cosmoc` package has been removed. The upstream scripts in `cosmocc` should be used instead. - Qt 5.12 and 5.14 have been removed, as the corresponding branches have been EOL upstream for a long time. This affected under 10 packages in nixpkgs, largely unmaintained upstream as well, however, out-of-tree package expressions may need to be updated manually. @@ -191,6 +206,8 @@ In addition to numerous new and upgraded packages, this release has the followin - To reduce closure size in `nixos/modules/profiles/minimal.nix` profile disabled installation documentations and manuals. Also disabled `logrotate` and `udisks2` services. +- To reduce closure size in `nixos/modules/installer/netboot/netboot-minimal.nix` profile disabled load linux firmwares, pre-installing the complete stdenv and `networking.wireless` service. + - The minimal ISO image now uses the `nixos/modules/profiles/minimal.nix` profile. - The `ghcWithPackages` and `ghcWithHoogle` wrappers will now also symlink GHC's diff --git a/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix b/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix index 763c2038f6..3ebe2fa9f1 100644 --- a/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix +++ b/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix @@ -61,7 +61,7 @@ with lib; pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; }; qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; }; qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; }); - qt5 = super.qt5.overrideScope' (const (super': { + qt5 = super.qt5.overrideScope (const (super': { qtbase = super'.qtbase.override { withGtk3 = false; }; })); stoken = super.stoken.override { withGTK3 = false; }; diff --git a/third_party/nixpkgs/nixos/modules/installer/netboot/netboot-minimal.nix b/third_party/nixpkgs/nixos/modules/installer/netboot/netboot-minimal.nix index 91065d52fa..5ca255acf3 100644 --- a/third_party/nixpkgs/nixos/modules/installer/netboot/netboot-minimal.nix +++ b/third_party/nixpkgs/nixos/modules/installer/netboot/netboot-minimal.nix @@ -9,4 +9,7 @@ ]; documentation.man.enable = lib.mkOverride 500 true; + hardware.enableRedistributableFirmware = lib.mkOverride 70 false; + system.extraDependencies = lib.mkOverride 70 []; + networking.wireless.enable = lib.mkOverride 500 false; } 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 212b2b3cd2..db530533e4 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 @@ -127,9 +127,6 @@ if (-e "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors") { push @kernelModules, "kvm-intel" if hasCPUFeature "vmx"; push @kernelModules, "kvm-amd" if hasCPUFeature "svm"; -push @attrs, "hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;" if cpuManufacturer "AuthenticAMD"; -push @attrs, "hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;" if cpuManufacturer "GenuineIntel"; - # Look at the PCI devices and add necessary modules. Note that most # modules are auto-detected so we don't need to list them here. @@ -324,11 +321,15 @@ if ($virt eq "systemd-nspawn") { } -# Provide firmware for devices that are not detected by this script, -# unless we're in a VM/container. -push @imports, "(modulesPath + \"/installer/scan/not-detected.nix\")" - if $virt eq "none"; +# Check if we're on bare metal, not in a VM/container. +if ($virt eq "none") { + # Provide firmware for devices that are not detected by this script. + push @imports, "(modulesPath + \"/installer/scan/not-detected.nix\")"; + # Update the microcode. + push @attrs, "hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;" if cpuManufacturer "AuthenticAMD"; + push @attrs, "hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;" if cpuManufacturer "GenuineIntel"; +} # For a device name like /dev/sda1, find a more stable path like # /dev/disk/by-uuid/X or /dev/disk/by-label/Y. diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 2b046d19d7..314d67419b 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -377,6 +377,8 @@ ./services/continuous-integration/jenkins/default.nix ./services/continuous-integration/jenkins/job-builder.nix ./services/continuous-integration/jenkins/slave.nix + ./services/continuous-integration/woodpecker/agent.nix + ./services/continuous-integration/woodpecker/server.nix ./services/databases/aerospike.nix ./services/databases/cassandra.nix ./services/databases/clickhouse.nix @@ -440,6 +442,7 @@ ./services/development/blackfire.nix ./services/development/bloop.nix ./services/development/distccd.nix + ./services/development/gemstash.nix ./services/development/hoogle.nix ./services/development/jupyter/default.nix ./services/development/jupyterhub/default.nix @@ -624,6 +627,7 @@ ./services/misc/irkerd.nix ./services/misc/jackett.nix ./services/misc/jellyfin.nix + ./services/misc/jellyseerr.nix ./services/misc/klipper.nix ./services/misc/languagetool.nix ./services/misc/leaps.nix @@ -663,6 +667,7 @@ ./services/misc/prowlarr.nix ./services/misc/pykms.nix ./services/misc/radarr.nix + ./services/misc/readarr.nix ./services/misc/redmine.nix ./services/misc/ripple-data-api.nix ./services/misc/rippled.nix @@ -801,6 +806,7 @@ ./services/networking/bitlbee.nix ./services/networking/blockbook-frontend.nix ./services/networking/blocky.nix + ./services/networking/cgit.nix ./services/networking/charybdis.nix ./services/networking/chisel-server.nix ./services/networking/cjdns.nix @@ -1129,6 +1135,7 @@ ./services/web-apps/baget.nix ./services/web-apps/bookstack.nix ./services/web-apps/calibre-web.nix + ./services/web-apps/coder.nix ./services/web-apps/changedetection-io.nix ./services/web-apps/cloudlog.nix ./services/web-apps/code-server.nix @@ -1268,6 +1275,7 @@ ./services/x11/window-managers/bspwm.nix ./services/x11/window-managers/katriawm.nix ./services/x11/window-managers/metacity.nix + ./services/x11/window-managers/nimdow.nix ./services/x11/window-managers/none.nix ./services/x11/window-managers/twm.nix ./services/x11/window-managers/windowlab.nix diff --git a/third_party/nixpkgs/nixos/modules/profiles/base.nix b/third_party/nixpkgs/nixos/modules/profiles/base.nix index 518a1f8d0b..9f32f85a61 100644 --- a/third_party/nixpkgs/nixos/modules/profiles/base.nix +++ b/third_party/nixpkgs/nixos/modules/profiles/base.nix @@ -1,5 +1,5 @@ # This module defines the software packages included in the "minimal" -# installation CD. It might be useful elsewhere. +# installation CD. It might be useful elsewhere. { config, lib, pkgs, ... }: @@ -17,7 +17,6 @@ pkgs.ddrescue pkgs.ccrypt pkgs.cryptsetup # needed for dm-crypt volumes - pkgs.mkpasswd # for generating password files # Some text editors. (pkgs.vim.customize { @@ -32,7 +31,6 @@ pkgs.fuse pkgs.fuse3 pkgs.sshfs-fuse - pkgs.rsync pkgs.socat pkgs.screen pkgs.tcpdump @@ -45,22 +43,14 @@ pkgs.usbutils pkgs.nvme-cli - # Tools to create / manipulate filesystems. - pkgs.ntfsprogs # for resizing NTFS partitions - pkgs.dosfstools - pkgs.mtools - pkgs.xfsprogs.bin - pkgs.jfsutils - pkgs.f2fs-tools - # Some compression/archiver tools. pkgs.unzip pkgs.zip ]; - # Include support for various filesystems. + # Include support for various filesystems and tools to create / manipulate them. boot.supportedFilesystems = - [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ] ++ + [ "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs" ] ++ lib.optional (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) "zfs"; # Configure host id for ZFS to work diff --git a/third_party/nixpkgs/nixos/modules/programs/atop.nix b/third_party/nixpkgs/nixos/modules/programs/atop.nix index 49d40ce751..9d5843bd67 100644 --- a/third_party/nixpkgs/nixos/modules/programs/atop.nix +++ b/third_party/nixpkgs/nixos/modules/programs/atop.nix @@ -151,6 +151,8 @@ in if ! ${pkgs.diffutils}/bin/cmp -s "$logfile" "$logfile".new then ${pkgs.coreutils}/bin/mv -v -f "$logfile".new "$logfile" + else + ${pkgs.coreutils}/bin/rm -f "$logfile".new fi done ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/java.nix b/third_party/nixpkgs/nixos/modules/programs/java.nix index 4f03c1f3ff..c5f83858d0 100644 --- a/third_party/nixpkgs/nixos/modules/programs/java.nix +++ b/third_party/nixpkgs/nixos/modules/programs/java.nix @@ -8,7 +8,6 @@ with lib; let cfg = config.programs.java; in - { options = { @@ -40,12 +39,35 @@ in type = types.package; }; + binfmt = mkEnableOption (lib.mdDoc "binfmt to execute java jar's and classes"); + }; }; config = mkIf cfg.enable { + boot.binfmt.registrations = mkIf cfg.binfmt { + java-class = { + recognitionType = "extension"; + magicOrExtension = "class"; + interpreter = pkgs.writeShellScript "java-class-wrapper" '' + test -e ${cfg.package}/nix-support/setup-hook && source ${cfg.package}/nix-support/setup-hook + classpath=$(dirname "$1") + class=$(basename "''${1%%.class}") + $JAVA_HOME/bin/java -classpath "$classpath" "$class" "''${@:2}" + ''; + }; + java-jar = { + recognitionType = "extension"; + magicOrExtension = "jar"; + interpreter = pkgs.writeShellScript "java-jar-wrapper" '' + test -e ${cfg.package}/nix-support/setup-hook && source ${cfg.package}/nix-support/setup-hook + $JAVA_HOME/bin/java -jar "$@" + ''; + }; + }; + environment.systemPackages = [ cfg.package ]; environment.shellInit = '' diff --git a/third_party/nixpkgs/nixos/modules/services/backup/btrbk.nix b/third_party/nixpkgs/nixos/modules/services/backup/btrbk.nix index b6eb68cc43..b838c17455 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/btrbk.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/btrbk.nix @@ -47,7 +47,12 @@ let then [ "${name} ${value}" ] else concatLists (mapAttrsToList (genSection name) value); - addDefaults = settings: { backend = "btrfs-progs-sudo"; } // settings; + sudo_doas = + if config.security.sudo.enable then "sudo" + else if config.security.doas.enable then "doas" + else throw "The btrbk nixos module needs either sudo or doas enabled in the configuration"; + + addDefaults = settings: { backend = "btrfs-progs-${sudo_doas}"; } // settings; mkConfigFile = name: settings: pkgs.writeTextFile { name = "btrbk-${name}.conf"; @@ -152,20 +157,41 @@ in }; config = mkIf (sshEnabled || serviceEnabled) { environment.systemPackages = [ pkgs.btrbk ] ++ cfg.extraPackages; - security.sudo.extraRules = [ - { - users = [ "btrbk" ]; - commands = [ - { command = "${pkgs.btrfs-progs}/bin/btrfs"; options = [ "NOPASSWD" ]; } - { command = "${pkgs.coreutils}/bin/mkdir"; options = [ "NOPASSWD" ]; } - { command = "${pkgs.coreutils}/bin/readlink"; options = [ "NOPASSWD" ]; } - # for ssh, they are not the same than the one hard coded in ${pkgs.btrbk} - { command = "/run/current-system/bin/btrfs"; options = [ "NOPASSWD" ]; } - { command = "/run/current-system/sw/bin/mkdir"; options = [ "NOPASSWD" ]; } - { command = "/run/current-system/sw/bin/readlink"; options = [ "NOPASSWD" ]; } + security.sudo = mkIf (sudo_doas == "sudo") { + extraRules = [ + { + users = [ "btrbk" ]; + commands = [ + { command = "${pkgs.btrfs-progs}/bin/btrfs"; options = [ "NOPASSWD" ]; } + { command = "${pkgs.coreutils}/bin/mkdir"; options = [ "NOPASSWD" ]; } + { command = "${pkgs.coreutils}/bin/readlink"; options = [ "NOPASSWD" ]; } + # for ssh, they are not the same than the one hard coded in ${pkgs.btrbk} + { command = "/run/current-system/bin/btrfs"; options = [ "NOPASSWD" ]; } + { command = "/run/current-system/sw/bin/mkdir"; options = [ "NOPASSWD" ]; } + { command = "/run/current-system/sw/bin/readlink"; options = [ "NOPASSWD" ]; } + ]; + } + ]; + }; + security.doas = mkIf (sudo_doas == "doas") { + extraRules = let + doasCmdNoPass = cmd: { users = [ "btrbk" ]; cmd = cmd; noPass = true; }; + in + [ + (doasCmdNoPass "${pkgs.btrfs-progs}/bin/btrfs") + (doasCmdNoPass "${pkgs.coreutils}/bin/mkdir") + (doasCmdNoPass "${pkgs.coreutils}/bin/readlink") + # for ssh, they are not the same than the one hard coded in ${pkgs.btrbk} + (doasCmdNoPass "/run/current-system/bin/btrfs") + (doasCmdNoPass "/run/current-system/sw/bin/mkdir") + (doasCmdNoPass "/run/current-system/sw/bin/readlink") + + # doas matches command, not binary + (doasCmdNoPass "btrfs") + (doasCmdNoPass "mkdir") + (doasCmdNoPass "readlink") ]; - } - ]; + }; users.users.btrbk = { isSystemUser = true; # ssh needs a home directory @@ -183,8 +209,9 @@ in "best-effort" = 2; "realtime" = 1; }.${cfg.ioSchedulingClass}; + sudo_doas_flag = "--${sudo_doas}"; in - ''command="${pkgs.util-linux}/bin/ionice -t -c ${toString ioniceClass} ${optionalString (cfg.niceness >= 1) "${pkgs.coreutils}/bin/nice -n ${toString cfg.niceness}"} ${pkgs.btrbk}/share/btrbk/scripts/ssh_filter_btrbk.sh --sudo ${options}" ${v.key}'' + ''command="${pkgs.util-linux}/bin/ionice -t -c ${toString ioniceClass} ${optionalString (cfg.niceness >= 1) "${pkgs.coreutils}/bin/nice -n ${toString cfg.niceness}"} ${pkgs.btrbk}/share/btrbk/scripts/ssh_filter_btrbk.sh ${sudo_doas_flag} ${options}" ${v.key}'' ) cfg.sshAccess; }; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/hbase.nix b/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/hbase.nix index 97951ebfe3..a39da2a84e 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/hbase.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/hbase.nix @@ -5,11 +5,95 @@ let cfg = config.services.hadoop; hadoopConf = "${import ./conf.nix { inherit cfg pkgs lib; }}/"; mkIfNotNull = x: mkIf (x != null) x; + # generic hbase role options + hbaseRoleOption = name: extraOpts: { + enable = mkEnableOption (mdDoc "HBase ${name}"); + + openFirewall = mkOption { + type = types.bool; + default = false; + description = mdDoc "Open firewall ports for HBase ${name}."; + }; + + restartIfChanged = mkOption { + type = types.bool; + default = false; + description = mdDoc "Restart ${name} con config change."; + }; + + extraFlags = mkOption { + type = with types; listOf str; + default = []; + example = literalExpression ''[ "--backup" ]''; + description = mdDoc "Extra flags for the ${name} service."; + }; + + environment = mkOption { + type = with types; attrsOf str; + default = {}; + example = literalExpression '' + { + HBASE_MASTER_OPTS = "-Dcom.sun.management.jmxremote.ssl=true"; + } + ''; + description = mdDoc "Environment variables passed to ${name}."; + }; + } // extraOpts; + # generic hbase role configs + hbaseRoleConfig = name: ports: (mkIf cfg.hbase."${name}".enable { + services.hadoop.gatewayRole = { + enable = true; + enableHbaseCli = mkDefault true; + }; + + systemd.services."hbase-${toLower name}" = { + description = "HBase ${name}"; + wantedBy = [ "multi-user.target" ]; + path = with cfg; [ hbase.package ] ++ optional + (with cfg.hbase.master; enable && initHDFS) package; + preStart = mkIf (with cfg.hbase.master; enable && initHDFS) + (concatStringsSep "\n" ( + map (x: "HADOOP_USER_NAME=hdfs hdfs --config /etc/hadoop-conf ${x}")[ + "dfsadmin -safemode wait" + "dfs -mkdir -p ${cfg.hbase.rootdir}" + "dfs -chown hbase ${cfg.hbase.rootdir}" + ] + )); + + inherit (cfg.hbase."${name}") environment; + script = concatStringsSep " " ( + [ + "hbase --config /etc/hadoop-conf/" + "${toLower name} start" + ] + ++ cfg.hbase."${name}".extraFlags + ++ map (x: "--${toLower x} ${toString cfg.hbase.${name}.${x}}") + (filter (x: hasAttr x cfg.hbase.${name}) ["port" "infoPort"]) + ); + + serviceConfig = { + User = "hbase"; + SyslogIdentifier = "hbase-${toLower name}"; + Restart = "always"; + }; + }; + + services.hadoop.hbaseSiteInternal."hbase.rootdir" = cfg.hbase.rootdir; + + networking = { + firewall.allowedTCPPorts = mkIf cfg.hbase."${name}".openFirewall ports; + hosts = mkIf (with cfg.hbase.regionServer; enable && overrideHosts) { + "127.0.0.2" = mkForce [ ]; + "::1" = mkForce [ ]; + }; + }; + + }); in { options.services.hadoop = { - gatewayRole.enableHbaseCli = mkEnableOption (lib.mdDoc "HBase CLI tools"); + gatewayRole.enableHbaseCli = mkEnableOption (mdDoc "HBase CLI tools"); hbaseSiteDefault = mkOption { default = { @@ -21,7 +105,7 @@ in "hbase.cluster.distributed" = "true"; }; type = types.attrsOf types.anything; - description = lib.mdDoc '' + description = mdDoc '' Default options for hbase-site.xml ''; }; @@ -29,8 +113,12 @@ in default = {}; type = with types; attrsOf anything; example = literalExpression '' + { + "hbase.hregion.max.filesize" = 20*1024*1024*1024; + "hbase.table.normalization.enabled" = "true"; + } ''; - description = lib.mdDoc '' + description = mdDoc '' Additional options and overrides for hbase-site.xml ''; @@ -39,7 +127,7 @@ in default = {}; type = with types; attrsOf anything; internal = true; - description = lib.mdDoc '' + description = mdDoc '' Internal option to add configs to hbase-site.xml based on module options ''; }; @@ -50,11 +138,11 @@ in type = types.package; default = pkgs.hbase; defaultText = literalExpression "pkgs.hbase"; - description = lib.mdDoc "HBase package"; + description = mdDoc "HBase package"; }; rootdir = mkOption { - description = lib.mdDoc '' + description = mdDoc '' This option will set "hbase.rootdir" in hbase-site.xml and determine the directory shared by region servers and into which HBase persists. The URL should be 'fully-qualified' to include the filesystem scheme. @@ -68,7 +156,7 @@ in default = "/hbase"; }; zookeeperQuorum = mkOption { - description = lib.mdDoc '' + description = mdDoc '' This option will set "hbase.zookeeper.quorum" in hbase-site.xml. Comma separated list of servers in the ZooKeeper ensemble. ''; @@ -76,107 +164,36 @@ in example = "zk1.internal,zk2.internal,zk3.internal"; default = null; }; - master = { - enable = mkEnableOption (lib.mdDoc "HBase Master"); - initHDFS = mkEnableOption (lib.mdDoc "initialization of the hbase directory on HDFS"); - - openFirewall = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Open firewall ports for HBase master. - ''; + } // (let + ports = port: infoPort: { + port = mkOption { + type = types.int; + default = port; + description = mdDoc "RPC port"; + }; + infoPort = mkOption { + type = types.int; + default = infoPort; + description = mdDoc "web UI port"; }; }; - regionServer = { - enable = mkEnableOption (lib.mdDoc "HBase RegionServer"); - - overrideHosts = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Remove /etc/hosts entries for "127.0.0.2" and "::1" defined in nixos/modules/config/networking.nix - Regionservers must be able to resolve their hostnames to their IP addresses, through PTR records - or /etc/hosts entries. - - ''; - }; - - openFirewall = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Open firewall ports for HBase master. - ''; - }; + in mapAttrs hbaseRoleOption { + master.initHDFS = mkEnableOption (mdDoc "initialization of the hbase directory on HDFS"); + regionServer.overrideHosts = mkOption { + type = types.bool; + default = true; + description = mdDoc '' + Remove /etc/hosts entries for "127.0.0.2" and "::1" defined in nixos/modules/config/networking.nix + Regionservers must be able to resolve their hostnames to their IP addresses, through PTR records + or /etc/hosts entries. + ''; }; - }; + thrift = ports 9090 9095; + rest = ports 8080 8085; + }); }; - config = mkMerge [ - (mkIf cfg.hbase.master.enable { - services.hadoop.gatewayRole = { - enable = true; - enableHbaseCli = mkDefault true; - }; - - systemd.services.hbase-master = { - description = "HBase master"; - wantedBy = [ "multi-user.target" ]; - - preStart = mkIf cfg.hbase.master.initHDFS '' - HADOOP_USER_NAME=hdfs ${cfg.package}/bin/hdfs --config ${hadoopConf} dfsadmin -safemode wait - HADOOP_USER_NAME=hdfs ${cfg.package}/bin/hdfs --config ${hadoopConf} dfs -mkdir -p ${cfg.hbase.rootdir} - HADOOP_USER_NAME=hdfs ${cfg.package}/bin/hdfs --config ${hadoopConf} dfs -chown hbase ${cfg.hbase.rootdir} - ''; - - serviceConfig = { - User = "hbase"; - SyslogIdentifier = "hbase-master"; - ExecStart = "${cfg.hbase.package}/bin/hbase --config ${hadoopConf} " + - "master start"; - Restart = "always"; - }; - }; - - services.hadoop.hbaseSiteInternal."hbase.rootdir" = cfg.hbase.rootdir; - - networking.firewall.allowedTCPPorts = mkIf cfg.hbase.master.openFirewall [ - 16000 16010 - ]; - - }) - - (mkIf cfg.hbase.regionServer.enable { - services.hadoop.gatewayRole = { - enable = true; - enableHbaseCli = mkDefault true; - }; - - systemd.services.hbase-regionserver = { - description = "HBase RegionServer"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = "hbase"; - SyslogIdentifier = "hbase-regionserver"; - ExecStart = "${cfg.hbase.package}/bin/hbase --config /etc/hadoop-conf/ " + - "regionserver start"; - Restart = "always"; - }; - }; - - services.hadoop.hbaseSiteInternal."hbase.rootdir" = cfg.hbase.rootdir; - - networking = { - firewall.allowedTCPPorts = mkIf cfg.hbase.regionServer.openFirewall [ - 16020 16030 - ]; - hosts = mkIf cfg.hbase.regionServer.overrideHosts { - "127.0.0.2" = mkForce [ ]; - "::1" = mkForce [ ]; - }; - }; - }) + config = mkMerge ([ (mkIf cfg.gatewayRole.enable { @@ -192,5 +209,10 @@ in isSystemUser = true; }; }) - ]; + ] ++ (mapAttrsToList hbaseRoleConfig { + master = [ 16000 16010 ]; + regionServer = [ 16020 16030 ]; + thrift = with cfg.hbase.thrift; [ port infoPort ]; + rest = with cfg.hbase.rest; [ port infoPort ]; + })); } diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix index 3d41b5f008..1c00329e6c 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix @@ -3,7 +3,7 @@ with lib; let - version = "1.7.1"; + version = "1.10.1"; cfg = config.services.kubernetes.addons.dns; ports = { dns = 10053; @@ -59,9 +59,9 @@ in { type = types.attrs; default = { imageName = "coredns/coredns"; - imageDigest = "sha256:4a6e0769130686518325b21b0c1d0688b54e7c79244d48e1b15634e98e40c6ef"; + imageDigest = "sha256:a0ead06651cf580044aeb0a0feba63591858fb2e43ade8c9dea45a6a89ae7e5e"; finalImageTag = version; - sha256 = "02r440xcdsgi137k5lmmvp0z5w5fmk8g9mysq5pnysq1wl8sj6mw"; + sha256 = "0wg696920smmal7552a2zdhfncndn5kfammfa8bk8l7dz9bhk0y1"; }; }; @@ -136,6 +136,11 @@ in { resources = [ "nodes" ]; verbs = [ "get" ]; } + { + apiGroups = [ "discovery.k8s.io" ]; + resources = [ "endpointslices" ]; + verbs = [ "list" "watch" ]; + } ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix index 564bcd37de..83078706fc 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix @@ -398,7 +398,7 @@ in systemd.services.hydra-evaluator = { wantedBy = [ "multi-user.target" ]; requires = [ "hydra-init.service" ]; - after = [ "hydra-init.service" "network.target" ]; + after = [ "hydra-init.service" "network.target" "network-online.target" ]; path = with pkgs; [ hydra-package nettools jq ]; restartTriggers = [ hydraConf ]; environment = env // { diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/woodpecker/agent.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/woodpecker/agent.nix new file mode 100644 index 0000000000..1aedec81c9 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/woodpecker/agent.nix @@ -0,0 +1,99 @@ +{ config +, lib +, pkgs +, ... +}: + +let + cfg = config.services.woodpecker-agent; +in +{ + meta.maintainers = [ lib.maintainers.janik ]; + + options = { + services.woodpecker-agent = { + enable = lib.mkEnableOption (lib.mdDoc "the Woodpecker-Agent, Agents execute tasks generated by a Server, every install will need one server and at least one agent"); + package = lib.mkPackageOptionMD pkgs "woodpecker-agent" { }; + + environment = lib.mkOption { + default = { }; + type = lib.types.attrsOf lib.types.str; + example = lib.literalExpression '' + { + WOODPECKER_SERVER = "localhost:9000"; + WOODPECKER_BACKEND = "docker"; + DOCKER_HOST = "unix:///run/podman/podman.sock"; + } + ''; + description = lib.mdDoc "woodpecker-agent config envrionment variables, for other options read the [documentation](https://woodpecker-ci.org/docs/administration/agent-config)"; + }; + + extraGroups = lib.mkOption { + default = null; + type = lib.types.nullOr (lib.types.listOf lib.types.str); + example = [ "podman" ]; + description = lib.mdDoc '' + Additional groups for the systemd service. + ''; + }; + + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/root/woodpecker-agent.env"; + description = lib.mdDoc '' + File to load environment variables + from. This is helpful for specifying secrets. + Example content of environmentFile: + ``` + WOODPECKER_AGENT_SECRET=your-shared-secret-goes-here + ``` + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services = { + woodpecker-agent = { + description = "Woodpecker-Agent Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + serviceConfig = { + DynamicUser = true; + SupplementaryGroups = lib.optionals (cfg.extraGroups != null) cfg.extraGroups; + EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile; + ExecStart = "${cfg.package}/bin/woodpecker-agent"; + Restart = "on-failure"; + RestartSec = 15; + CapabilityBoundingSet = ""; + # Security + NoNewPrivileges = true; + # Sandboxing + ProtectSystem = "strict"; + PrivateTmp = true; + PrivateDevices = true; + PrivateUsers = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ "AF_UNIX AF_INET AF_INET6" ]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + PrivateMounts = true; + # System Call Filtering + SystemCallArchitectures = "native"; + SystemCallFilter = "~@clock @privileged @cpu-emulation @debug @keyring @module @mount @obsolete @raw-io @reboot @setuid @swap"; + }; + inherit (cfg) environment; + }; + }; + }; +} + diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/woodpecker/server.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/woodpecker/server.nix new file mode 100644 index 0000000000..6b4e473246 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/woodpecker/server.nix @@ -0,0 +1,98 @@ +{ config +, lib +, pkgs +, ... +}: + +let + cfg = config.services.woodpecker-server; +in +{ + meta.maintainers = [ lib.maintainers.janik ]; + + + options = { + services.woodpecker-server = { + enable = lib.mkEnableOption (lib.mdDoc "the Woodpecker-Server, a CI/CD application for automatic builds, deployments and tests"); + package = lib.mkPackageOptionMD pkgs "woodpecker-server" { }; + environment = lib.mkOption { + default = { }; + type = lib.types.attrsOf lib.types.str; + example = lib.literalExpression + '' + { + WOODPECKER_HOST = "https://woodpecker.example.com"; + WOODPECKER_OPEN = "true"; + WOODPECKER_GITEA = "true"; + WOODPECKER_GITEA_CLIENT = "ffffffff-ffff-ffff-ffff-ffffffffffff"; + WOODPECKER_GITEA_URL = "https://git.example.com"; + } + ''; + description = lib.mdDoc "woodpecker-server config envrionment variables, for other options read the [documentation](https://woodpecker-ci.org/docs/administration/server-config)"; + }; + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/root/woodpecker-server.env"; + description = lib.mdDoc '' + File to load environment variables + from. This is helpful for specifying secrets. + Example content of environmentFile: + ``` + WOODPECKER_AGENT_SECRET=your-shared-secret-goes-here + WOODPECKER_GITEA_SECRET=gto_************************************** + ``` + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services = { + woodpecker-server = { + description = "Woodpecker-Server Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + serviceConfig = { + DynamicUser = true; + WorkingDirectory = "%S/woodpecker-server"; + StateDirectory = "woodpecker-server"; + StateDirectoryMode = "0700"; + UMask = "0007"; + ConfigurationDirectory = "woodpecker-server"; + EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile; + ExecStart = "${cfg.package}/bin/woodpecker-server"; + Restart = "on-failure"; + RestartSec = 15; + CapabilityBoundingSet = ""; + # Security + NoNewPrivileges = true; + # Sandboxing + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateUsers = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ "AF_UNIX AF_INET AF_INET6" ]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + PrivateMounts = true; + # System Call Filtering + SystemCallArchitectures = "native"; + SystemCallFilter = "~@clock @privileged @cpu-emulation @debug @keyring @module @mount @obsolete @raw-io @reboot @setuid @swap"; + }; + inherit (cfg) environment; + }; + }; + }; +} + diff --git a/third_party/nixpkgs/nixos/modules/services/development/gemstash.nix b/third_party/nixpkgs/nixos/modules/services/development/gemstash.nix new file mode 100644 index 0000000000..eb7ccb98bd --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/development/gemstash.nix @@ -0,0 +1,103 @@ +{ lib, pkgs, config, ... }: +with lib; + +let + settingsFormat = pkgs.formats.yaml { }; + + # gemstash uses a yaml config where the keys are ruby symbols, + # which means they start with ':'. This would be annoying to use + # on the nix side, so we rewrite plain names instead. + prefixColon = s: listToAttrs (map + (attrName: { + name = ":${attrName}"; + value = + if isAttrs s.${attrName} + then prefixColon s."${attrName}" + else s."${attrName}"; + }) + (attrNames s)); + + # parse the port number out of the tcp://ip:port bind setting string + parseBindPort = bind: strings.toInt (last (strings.splitString ":" bind)); + + cfg = config.services.gemstash; +in +{ + options.services.gemstash = { + enable = mkEnableOption (lib.mdDoc "gemstash service"); + + openFirewall = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to open the firewall for the port in {option}`services.gemstash.bind`. + ''; + }; + + settings = mkOption { + default = {}; + description = lib.mdDoc '' + Configuration for Gemstash. The details can be found at in + [gemstash documentation](https://github.com/rubygems/gemstash/blob/master/man/gemstash-configuration.5.md). + Each key set here is automatically prefixed with ":" to match the gemstash expectations. + ''; + type = types.submodule { + freeformType = settingsFormat.type; + options = { + base_path = mkOption { + type = types.path; + default = "/var/lib/gemstash"; + description = lib.mdDoc "Path to store the gem files and the sqlite database. If left unchanged, the directory will be created."; + }; + bind = mkOption { + type = types.str; + default = "tcp://0.0.0.0:9292"; + description = lib.mdDoc "Host and port combination for the server to listen on."; + }; + db_adapter = mkOption { + type = types.nullOr (types.enum [ "sqlite3" "postgres" "mysql" "mysql2" ]); + default = null; + description = lib.mdDoc "Which database type to use. For choices other than sqlite3, the dbUrl has to be specified as well."; + }; + db_url = mkOption { + type = types.nullOr types.str; + default = null; + description = lib.mdDoc "The database to connect to when using postgres, mysql, or mysql2."; + }; + }; + }; + }; + }; + + config = + mkIf cfg.enable { + users = { + users.gemstash = { + group = "gemstash"; + isSystemUser = true; + }; + groups.gemstash = { }; + }; + + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ (parseBindPort cfg.settings.bind) ]; + + systemd.services.gemstash = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = mkMerge [ + { + ExecStart = "${pkgs.gemstash}/bin/gemstash start --no-daemonize --config-file ${settingsFormat.generate "gemstash.yaml" (prefixColon cfg.settings)}"; + NoNewPrivileges = true; + User = "gemstash"; + Group = "gemstash"; + PrivateTmp = true; + RestrictSUIDSGID = true; + LockPersonality = true; + } + (mkIf (cfg.settings.base_path == "/var/lib/gemstash") { + StateDirectory = "gemstash"; + }) + ]; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/fwupd.nix b/third_party/nixpkgs/nixos/modules/services/hardware/fwupd.nix index 4e7d730d12..b8c2ac9484 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/fwupd.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/fwupd.nix @@ -18,6 +18,12 @@ let fwupd = cfg.daemonSettings; }; }; + + "fwupd/uefi_capsule.conf" = { + source = format.generate "uefi_capsule.conf" { + uefi_capsule = cfg.uefiCapsuleSettings; + }; + }; }; originalEtc = @@ -138,6 +144,16 @@ in { Configurations for the fwupd daemon. ''; }; + + uefiCapsuleSettings = mkOption { + type = types.submodule { + freeformType = format.type.nestedTypes.elemType; + }; + default = {}; + description = lib.mdDoc '' + UEFI capsule configurations for the fwupd daemon. + ''; + }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix index 179359c97a..c7299c1cca 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix @@ -89,11 +89,6 @@ let }; }; - pagesArgs = [ - "-pages-domain" gitlabConfig.production.pages.host - "-pages-root" "${gitlabConfig.production.shared.path}/pages" - ] ++ cfg.pagesExtraArgs; - gitlabConfig = { # These are the default settings from config/gitlab.example.yml production = flip recursiveUpdate cfg.extraConfig { @@ -161,6 +156,12 @@ let }; extra = {}; uploads.storage_path = cfg.statePath; + pages = { + enabled = cfg.pages.enable; + port = 8090; + host = cfg.pages.settings.pages-domain; + secret_file = cfg.pages.settings.api-secret-key; + }; }; }; @@ -246,6 +247,7 @@ in { (mkRenamedOptionModule [ "services" "gitlab" "backupPath" ] [ "services" "gitlab" "backup" "path" ]) (mkRemovedOptionModule [ "services" "gitlab" "satelliteDir" ] "") (mkRemovedOptionModule [ "services" "gitlab" "logrotate" "extraConfig" ] "Modify services.logrotate.settings.gitlab directly instead") + (mkRemovedOptionModule [ "services" "gitlab" "pagesExtraArgs" ] "Use services.gitlab.pages.settings instead") ]; options = { @@ -667,10 +669,127 @@ in { }; }; - pagesExtraArgs = mkOption { - type = types.listOf types.str; - default = [ "-listen-proxy" "127.0.0.1:8090" ]; - description = lib.mdDoc "Arguments to pass to the gitlab-pages daemon"; + pages.enable = mkEnableOption (lib.mdDoc "the GitLab Pages service"); + + pages.settings = mkOption { + example = literalExpression '' + { + pages-domain = "example.com"; + auth-client-id = "generated-id-xxxxxxx"; + auth-client-secret = { _secret = "/var/keys/auth-client-secret"; }; + auth-redirect-uri = "https://projects.example.com/auth"; + auth-secret = { _secret = "/var/keys/auth-secret"; }; + auth-server = "https://gitlab.example.com"; + } + ''; + + description = lib.mdDoc '' + Configuration options to set in the GitLab Pages config + file. + + Options containing secret data should be set to an attribute + set containing the attribute `_secret` - a string pointing + to a file containing the value the option should be set + to. See the example to get a better picture of this: in the + resulting configuration file, the `auth-client-secret` and + `auth-secret` keys will be set to the contents of the + {file}`/var/keys/auth-client-secret` and + {file}`/var/keys/auth-secret` files respectively. + ''; + + type = types.submodule { + freeformType = with types; attrsOf (nullOr (oneOf [ str int bool attrs ])); + + options = { + listen-http = mkOption { + type = with types; listOf str; + apply = x: if x == [] then null else lib.concatStringsSep "," x; + default = []; + description = lib.mdDoc '' + The address(es) to listen on for HTTP requests. + ''; + }; + + listen-https = mkOption { + type = with types; listOf str; + apply = x: if x == [] then null else lib.concatStringsSep "," x; + default = []; + description = lib.mdDoc '' + The address(es) to listen on for HTTPS requests. + ''; + }; + + listen-proxy = mkOption { + type = with types; listOf str; + apply = x: if x == [] then null else lib.concatStringsSep "," x; + default = [ "127.0.0.1:8090" ]; + description = lib.mdDoc '' + The address(es) to listen on for proxy requests. + ''; + }; + + artifacts-server = mkOption { + type = with types; nullOr str; + default = "http${optionalString cfg.https "s"}://${cfg.host}/api/v4"; + defaultText = "http(s):///api/v4"; + example = "https://gitlab.example.com/api/v4"; + description = lib.mdDoc '' + API URL to proxy artifact requests to. + ''; + }; + + gitlab-server = mkOption { + type = with types; nullOr str; + default = "http${optionalString cfg.https "s"}://${cfg.host}"; + defaultText = "http(s)://"; + example = "https://gitlab.example.com"; + description = lib.mdDoc '' + Public GitLab server URL. + ''; + }; + + internal-gitlab-server = mkOption { + type = with types; nullOr str; + default = null; + defaultText = "http(s)://"; + example = "https://gitlab.example.internal"; + description = lib.mdDoc '' + Internal GitLab server used for API requests, useful + if you want to send that traffic over an internal load + balancer. By default, the value of + `services.gitlab.pages.settings.gitlab-server` is + used. + ''; + }; + + api-secret-key = mkOption { + type = with types; nullOr str; + default = "${cfg.statePath}/gitlab_pages_secret"; + internal = true; + description = lib.mdDoc '' + File with secret key used to authenticate with the + GitLab API. + ''; + }; + + pages-domain = mkOption { + type = with types; nullOr str; + example = "example.com"; + description = lib.mdDoc '' + The domain to serve static pages on. + ''; + }; + + pages-root = mkOption { + type = types.str; + default = "${gitlabConfig.production.shared.path}/pages"; + defaultText = literalExpression ''config.${opt.extraConfig}.production.shared.path + "/pages"''; + description = lib.mdDoc '' + The directory where pages are stored. + ''; + }; + }; + }; }; secrets.secretFile = mkOption { @@ -1210,6 +1329,9 @@ in { umask u=rwx,g=,o= openssl rand -hex 32 > ${cfg.statePath}/gitlab_shell_secret + ${optionalString cfg.pages.enable '' + openssl rand -base64 32 > ${cfg.pages.settings.api-secret-key} + ''} rm -f '${cfg.statePath}/config/database.yml' @@ -1359,28 +1481,66 @@ in { }; }; - systemd.services.gitlab-pages = mkIf (gitlabConfig.production.pages.enabled or false) { - description = "GitLab static pages daemon"; - after = [ "network.target" "gitlab-config.service" ]; - bindsTo = [ "gitlab-config.service" ]; - wantedBy = [ "gitlab.target" ]; - partOf = [ "gitlab.target" ]; - - path = [ pkgs.unzip ]; - - serviceConfig = { - Type = "simple"; - TimeoutSec = "infinity"; - Restart = "on-failure"; - - User = cfg.user; - Group = cfg.group; - - ExecStart = "${cfg.packages.pages}/bin/gitlab-pages ${escapeShellArgs pagesArgs}"; - WorkingDirectory = gitlabEnv.HOME; - }; + services.gitlab.pages.settings = { + api-secret-key = "${cfg.statePath}/gitlab_pages_secret"; }; + systemd.services.gitlab-pages = + let + filteredConfig = filterAttrs (_: v: v != null) cfg.pages.settings; + isSecret = v: isAttrs v && v ? _secret && isString v._secret; + mkPagesKeyValue = lib.generators.toKeyValue { + mkKeyValue = lib.flip lib.generators.mkKeyValueDefault "=" rec { + mkValueString = v: + if isInt v then toString v + else if isString v then v + else if true == v then "true" + else if false == v then "false" + else if isSecret v then builtins.hashString "sha256" v._secret + else throw "unsupported type ${builtins.typeOf v}: ${(lib.generators.toPretty {}) v}"; + }; + }; + secretPaths = lib.catAttrs "_secret" (lib.collect isSecret filteredConfig); + mkSecretReplacement = file: '' + replace-secret ${lib.escapeShellArgs [ (builtins.hashString "sha256" file) file "/run/gitlab-pages/gitlab-pages.conf" ]} + ''; + secretReplacements = lib.concatMapStrings mkSecretReplacement secretPaths; + configFile = pkgs.writeText "gitlab-pages.conf" (mkPagesKeyValue filteredConfig); + in + mkIf cfg.pages.enable { + description = "GitLab static pages daemon"; + after = [ "network.target" "gitlab-config.service" "gitlab.service" ]; + bindsTo = [ "gitlab-config.service" "gitlab.service" ]; + wantedBy = [ "gitlab.target" ]; + partOf = [ "gitlab.target" ]; + + path = with pkgs; [ + unzip + replace-secret + ]; + + serviceConfig = { + Type = "simple"; + TimeoutSec = "infinity"; + Restart = "on-failure"; + + User = cfg.user; + Group = cfg.group; + + ExecStartPre = pkgs.writeShellScript "gitlab-pages-pre-start" '' + set -o errexit -o pipefail -o nounset + shopt -s dotglob nullglob inherit_errexit + + install -m u=rw ${configFile} /run/gitlab-pages/gitlab-pages.conf + ${secretReplacements} + ''; + ExecStart = "${cfg.packages.pages}/bin/gitlab-pages -config=/run/gitlab-pages/gitlab-pages.conf"; + WorkingDirectory = gitlabEnv.HOME; + RuntimeDirectory = "gitlab-pages"; + RuntimeDirectoryMode = "0700"; + }; + }; + systemd.services.gitlab-workhorse = { after = [ "network.target" ]; wantedBy = [ "gitlab.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/jellyseerr.nix b/third_party/nixpkgs/nixos/modules/services/misc/jellyseerr.nix new file mode 100644 index 0000000000..31e0c5beb6 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/misc/jellyseerr.nix @@ -0,0 +1,62 @@ +{ config, pkgs, lib, ... }: + +with lib; +let + cfg = config.services.jellyseerr; +in +{ + meta.maintainers = [ maintainers.camillemndn ]; + + options.services.jellyseerr = { + enable = mkEnableOption (mdDoc ''Jellyseerr, a requests manager for Jellyfin''); + + openFirewall = mkOption { + type = types.bool; + default = false; + description = mdDoc ''Open port in the firewall for the Jellyseerr web interface.''; + }; + + port = mkOption { + type = types.port; + default = 5055; + description = mdDoc ''The port which the Jellyseerr web UI should listen to.''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.jellyseerr = { + description = "Jellyseerr, a requests manager for Jellyfin"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + environment.PORT = toString cfg.port; + serviceConfig = { + Type = "exec"; + StateDirectory = "jellyseerr"; + WorkingDirectory = "${pkgs.jellyseerr}/libexec/jellyseerr/deps/jellyseerr"; + DynamicUser = true; + ExecStart = "${pkgs.jellyseerr}/bin/jellyseerr"; + BindPaths = [ "/var/lib/jellyseerr/:${pkgs.jellyseerr}/libexec/jellyseerr/deps/jellyseerr/config/" ]; + Restart = "on-failure"; + ProtectHome = true; + ProtectSystem = "strict"; + PrivateTmp = true; + PrivateDevices = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + NoNewPrivileges = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RemoveIPC = true; + PrivateMounts = true; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/readarr.nix b/third_party/nixpkgs/nixos/modules/services/misc/readarr.nix new file mode 100644 index 0000000000..dd4fef6e59 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/misc/readarr.nix @@ -0,0 +1,88 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.readarr; +in +{ + options = { + services.readarr = { + enable = mkEnableOption (lib.mdDoc "Readarr"); + + dataDir = mkOption { + type = types.str; + default = "/var/lib/readarr/"; + description = lib.mdDoc "The directory where Readarr stores its data files."; + }; + + package = mkOption { + type = types.package; + default = pkgs.readarr; + defaultText = literalExpression "pkgs.readarr"; + description = lib.mdDoc "The Readarr package to use"; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Open ports in the firewall for Readarr + ''; + }; + + user = mkOption { + type = types.str; + default = "readarr"; + description = lib.mdDoc '' + User account under which Readarr runs. + ''; + }; + + group = mkOption { + type = types.str; + default = "readarr"; + description = lib.mdDoc '' + Group under which Readarr runs. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' 0700 ${cfg.user} ${cfg.group} - -" + ]; + + systemd.services.readarr = { + description = "Readarr"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + ExecStart = "${cfg.package}/bin/Readarr -nobrowser -data='${cfg.dataDir}'"; + Restart = "on-failure"; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ 8787 ]; + }; + + users.users = mkIf (cfg.user == "readarr") { + readarr = { + description = "Readarr service"; + home = cfg.dataDir; + group = cfg.group; + isSystemUser = true; + }; + }; + + users.groups = mkIf (cfg.group == "readarr") { + readarr = { }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix b/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix index 109415a20e..1172297985 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix @@ -283,7 +283,8 @@ in { phpfpm = lib.mkIf useNginx { pools.zoneminder = { inherit user group; - phpPackage = pkgs.php.withExtensions ({ enabled, all }: enabled ++ [ all.apcu ]); + phpPackage = pkgs.php.withExtensions ( + { enabled, all }: enabled ++ [ all.apcu all.sysvsem ]); phpOptions = '' date.timezone = "${config.time.timeZone}" ''; @@ -326,6 +327,15 @@ in { fi ${zoneminder}/bin/zmupdate.pl -nointeractive + ${zoneminder}/bin/zmupdate.pl --nointeractive -f + + # Update ZM's Nix store path in the configuration table. Do nothing if the config doesn't + # contain ZM's Nix store path. + ${config.services.mysql.package}/bin/mysql -u zoneminder zm << EOF + UPDATE Config + SET Value = REGEXP_REPLACE(Value, "^/nix/store/[^-/]+-zoneminder-[^/]+", "${pkgs.zoneminder}") + WHERE Name = "ZM_FONT_FILE_LOCATION"; + EOF ''; serviceConfig = { User = user; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix index ba3f89e24d..5a8c65b9dc 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix @@ -1300,7 +1300,7 @@ in { SystemCallFilter = [ "@system-service" "~@privileged" - ] ++ lib.optional (cfg.settings.server.protocol == "socket") [ "@chown" ]; + ] ++ lib.optionals (cfg.settings.server.protocol == "socket") [ "@chown" ]; UMask = "0027"; }; preStart = '' diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix index f516b75ab1..fb3bab7963 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix @@ -31,7 +31,7 @@ let if checkConfigEnabled then pkgs.runCommandLocal "${name}-${replaceStrings [" "] [""] what}-checked" - { buildInputs = [ cfg.package ]; } '' + { buildInputs = [ cfg.package.cli ]; } '' ln -s ${file} $out promtool ${what} $out '' else file; @@ -1408,7 +1408,7 @@ let ''; action = - mkDefOpt (types.enum [ "replace" "keep" "drop" "hashmod" "labelmap" "labeldrop" "labelkeep" ]) "replace" '' + mkDefOpt (types.enum [ "replace" "lowercase" "uppercase" "keep" "drop" "hashmod" "labelmap" "labeldrop" "labelkeep" ]) "replace" '' Action to perform based on regex matching. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/cgit.nix b/third_party/nixpkgs/nixos/modules/services/networking/cgit.nix new file mode 100644 index 0000000000..672b0b030e --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/cgit.nix @@ -0,0 +1,203 @@ +{ config, lib, pkgs, ...}: + +with lib; + +let + cfgs = config.services.cgit; + + settingType = with types; oneOf [ bool int str ]; + + genAttrs' = names: f: listToAttrs (map f names); + + regexEscape = + let + # taken from https://github.com/python/cpython/blob/05cb728d68a278d11466f9a6c8258d914135c96c/Lib/re.py#L251-L266 + special = [ + "(" ")" "[" "]" "{" "}" "?" "*" "+" "-" "|" "^" "$" "\\" "." "&" "~" + "#" " " "\t" "\n" "\r" "\v" "\f" + ]; + in + replaceStrings special (map (c: "\\${c}") special); + + stripLocation = cfg: removeSuffix "/" cfg.nginx.location; + + regexLocation = cfg: regexEscape (stripLocation cfg); + + mkFastcgiPass = cfg: '' + ${if cfg.nginx.location == "/" then '' + fastcgi_param PATH_INFO $uri; + '' else '' + fastcgi_split_path_info ^(${regexLocation cfg})(/.+)$; + fastcgi_param PATH_INFO $fastcgi_path_info; + '' + }fastcgi_pass unix:${config.services.fcgiwrap.socketAddress}; + ''; + + cgitrcLine = name: value: "${name}=${ + if value == true then + "1" + else if value == false then + "0" + else + toString value + }"; + + mkCgitrc = cfg: pkgs.writeText "cgitrc" '' + # global settings + ${concatStringsSep "\n" ( + mapAttrsToList + cgitrcLine + ({ virtual-root = cfg.nginx.location; } // cfg.settings) + ) + } + ${optionalString (cfg.scanPath != null) (cgitrcLine "scan-path" cfg.scanPath)} + + # repository settings + ${concatStrings ( + mapAttrsToList + (url: settings: '' + ${cgitrcLine "repo.url" url} + ${concatStringsSep "\n" ( + mapAttrsToList (name: cgitrcLine "repo.${name}") settings + ) + } + '') + cfg.repos + ) + } + + # extra config + ${cfg.extraConfig} + ''; + + mkCgitReposDir = cfg: + if cfg.scanPath != null then + cfg.scanPath + else + pkgs.runCommand "cgit-repos" { + preferLocalBuild = true; + allowSubstitutes = false; + } '' + mkdir -p "$out" + ${ + concatStrings ( + mapAttrsToList + (name: value: '' + ln -s ${escapeShellArg value.path} "$out"/${escapeShellArg name} + '') + cfg.repos + ) + } + ''; + +in +{ + options = { + services.cgit = mkOption { + description = mdDoc "Configure cgit instances."; + default = {}; + type = types.attrsOf (types.submodule ({ config, ... }: { + options = { + enable = mkEnableOption (mdDoc "cgit"); + + package = mkPackageOptionMD pkgs "cgit" {}; + + nginx.virtualHost = mkOption { + description = mdDoc "VirtualHost to serve cgit on, defaults to the attribute name."; + type = types.str; + default = config._module.args.name; + example = "git.example.com"; + }; + + nginx.location = mkOption { + description = mdDoc "Location to serve cgit under."; + type = types.str; + default = "/"; + example = "/git/"; + }; + + repos = mkOption { + description = mdDoc "cgit repository settings, see cgitrc(5)"; + type = with types; attrsOf (attrsOf settingType); + default = {}; + example = { + blah = { + path = "/var/lib/git/example"; + desc = "An example repository"; + }; + }; + }; + + scanPath = mkOption { + description = mdDoc "A path which will be scanned for repositories."; + type = types.nullOr types.path; + default = null; + example = "/var/lib/git"; + }; + + settings = mkOption { + description = mdDoc "cgit configuration, see cgitrc(5)"; + type = types.attrsOf settingType; + default = {}; + example = literalExpression '' + { + enable-follow-links = true; + source-filter = "''${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py"; + } + ''; + }; + + extraConfig = mkOption { + description = mdDoc "These lines go to the end of cgitrc verbatim."; + type = types.lines; + default = ""; + }; + }; + })); + }; + }; + + config = mkIf (any (cfg: cfg.enable) (attrValues cfgs)) { + assertions = mapAttrsToList (vhost: cfg: { + assertion = !cfg.enable || (cfg.scanPath == null) != (cfg.repos == {}); + message = "Exactly one of services.cgit.${vhost}.scanPath or services.cgit.${vhost}.repos must be set."; + }) cfgs; + + services.fcgiwrap.enable = true; + + services.nginx.enable = true; + + services.nginx.virtualHosts = mkMerge (mapAttrsToList (_: cfg: { + ${cfg.nginx.virtualHost} = { + locations = ( + genAttrs' + [ "cgit.css" "cgit.png" "favicon.ico" "robots.txt" ] + (name: nameValuePair "= ${stripLocation cfg}/${name}" { + extraConfig = '' + alias ${cfg.package}/cgit/${name}; + ''; + }) + ) // { + "~ ${regexLocation cfg}/.+/(info/refs|git-upload-pack)" = { + fastcgiParams = rec { + SCRIPT_FILENAME = "${pkgs.git}/libexec/git-core/git-http-backend"; + GIT_HTTP_EXPORT_ALL = "1"; + GIT_PROJECT_ROOT = mkCgitReposDir cfg; + HOME = GIT_PROJECT_ROOT; + }; + extraConfig = mkFastcgiPass cfg; + }; + "${stripLocation cfg}/" = { + fastcgiParams = { + SCRIPT_FILENAME = "${cfg.package}/cgit/cgit.cgi"; + QUERY_STRING = "$args"; + HTTP_HOST = "$server_name"; + CGIT_CONFIG = mkCgitrc cfg; + }; + extraConfig = mkFastcgiPass cfg; + }; + }; + }; + }) cfgs); + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/networkd-dispatcher.nix b/third_party/nixpkgs/nixos/modules/services/networking/networkd-dispatcher.nix index d13ca23368..c5319ca7b8 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/networkd-dispatcher.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/networkd-dispatcher.nix @@ -3,8 +3,11 @@ with lib; let + cfg = config.services.networkd-dispatcher; + in { + options = { services.networkd-dispatcher = { @@ -14,14 +17,49 @@ in { for usage. ''); - scriptDir = mkOption { - type = types.path; - default = "/var/lib/networkd-dispatcher"; - description = mdDoc '' - This directory is used for keeping various scripts read and run by - networkd-dispatcher. See [https://gitlab.com/craftyguy/networkd-dispatcher](upstream instructions) - for directory structure and script usage. + rules = mkOption { + default = {}; + example = lib.literalExpression '' + { "restart-tor" = { + onState = ["routable" "off"]; + script = ''' + #!''${pkgs.runtimeShell} + if [[ $IFACE == "wlan0" && $AdministrativeState == "configured" ]]; then + echo "Restarting Tor ..." + systemctl restart tor + fi + exit 0 + '''; + }; + }; ''; + description = lib.mdDoc '' + Declarative configuration of networkd-dispatcher rules. See + [https://gitlab.com/craftyguy/networkd-dispatcher](upstream instructions) + for an introduction and example scripts. + ''; + type = types.attrsOf (types.submodule { + options = { + onState = mkOption { + type = types.listOf (types.enum [ + "routable" "dormant" "no-carrier" "off" "carrier" "degraded" + "configuring" "configured" + ]); + default = null; + description = lib.mdDoc '' + List of names of the systemd-networkd operational states which + should trigger the script. See + for a description of the specific state type. + ''; + }; + script = mkOption { + type = types.lines; + description = lib.mdDoc '' + Shell commands executed on specified operational states. + ''; + }; + }; + }); }; }; @@ -30,34 +68,31 @@ in { config = mkIf cfg.enable { systemd = { - packages = [ pkgs.networkd-dispatcher ]; services.networkd-dispatcher = { wantedBy = [ "multi-user.target" ]; # Override existing ExecStart definition - serviceConfig.ExecStart = [ + serviceConfig.ExecStart = let + scriptDir = pkgs.symlinkJoin { + name = "networkd-dispatcher-script-dir"; + paths = lib.mapAttrsToList (name: cfg: + (map(state: + pkgs.writeTextFile { + inherit name; + text = cfg.script; + destination = "/${state}.d/${name}"; + executable = true; + } + ) cfg.onState) + ) cfg.rules; + }; + in [ "" - "${pkgs.networkd-dispatcher}/bin/networkd-dispatcher -v --script-dir ${cfg.scriptDir} $networkd_dispatcher_args" + "${pkgs.networkd-dispatcher}/bin/networkd-dispatcher -v --script-dir ${scriptDir} $networkd_dispatcher_args" ]; }; - - # Directory structure required according to upstream instructions - # https://gitlab.com/craftyguy/networkd-dispatcher - tmpfiles.rules = [ - "d '${cfg.scriptDir}' 0750 root root - -" - "d '${cfg.scriptDir}/routable.d' 0750 root root - -" - "d '${cfg.scriptDir}/dormant.d' 0750 root root - -" - "d '${cfg.scriptDir}/no-carrier.d' 0750 root root - -" - "d '${cfg.scriptDir}/off.d' 0750 root root - -" - "d '${cfg.scriptDir}/carrier.d' 0750 root root - -" - "d '${cfg.scriptDir}/degraded.d' 0750 root root - -" - "d '${cfg.scriptDir}/configuring.d' 0750 root root - -" - "d '${cfg.scriptDir}/configured.d' 0750 root root - -" - ]; - }; - }; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix b/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix index 6c8d7b985d..2d421abc8b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix @@ -203,7 +203,7 @@ in PrivateMounts = true; # System Call Filtering SystemCallArchitectures = "native"; - SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @resources" "@clock" "@setuid" "capset" "chown" ] ++ lib.optional pkgs.stdenv.hostPlatform.isAarch64 "fchownat"; + SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @resources" "@clock" "@setuid" "capset" "@chown" ]; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/system/cachix-watch-store.nix b/third_party/nixpkgs/nixos/modules/services/system/cachix-watch-store.nix index ec73c0bcdc..85e9509bcc 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/cachix-watch-store.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/cachix-watch-store.nix @@ -25,7 +25,7 @@ in compressionLevel = mkOption { type = types.nullOr types.int; - description = lib.mdDoc "The compression level for XZ compression (between 0 and 9)"; + description = lib.mdDoc "The compression level for ZSTD compression (between 0 and 16)"; default = null; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/coder.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/coder.nix new file mode 100644 index 0000000000..469a29bc3a --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/coder.nix @@ -0,0 +1,217 @@ +{ config, lib, options, pkgs, ... }: + +with lib; + +let + cfg = config.services.coder; + name = "coder"; +in { + options = { + services.coder = { + enable = mkEnableOption (lib.mdDoc "Coder service"); + + user = mkOption { + type = types.str; + default = "coder"; + description = lib.mdDoc '' + User under which the coder service runs. + + ::: {.note} + If left as the default value this user will automatically be created + on system activation, otherwise it needs to be configured manually. + ::: + ''; + }; + + group = mkOption { + type = types.str; + default = "coder"; + description = lib.mdDoc '' + Group under which the coder service runs. + + ::: {.note} + If left as the default value this group will automatically be created + on system activation, otherwise it needs to be configured manually. + ::: + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.coder; + description = lib.mdDoc '' + Package to use for the service. + ''; + defaultText = literalExpression "pkgs.coder"; + }; + + homeDir = mkOption { + type = types.str; + description = lib.mdDoc '' + Home directory for coder user. + ''; + default = "/var/lib/coder"; + }; + + listenAddress = mkOption { + type = types.str; + description = lib.mdDoc '' + Listen address. + ''; + default = "127.0.0.1:3000"; + }; + + accessUrl = mkOption { + type = types.nullOr types.str; + description = lib.mdDoc '' + Access URL should be a external IP address or domain with DNS records pointing to Coder. + ''; + default = null; + example = "https://coder.example.com"; + }; + + wildcardAccessUrl = mkOption { + type = types.nullOr types.str; + description = lib.mdDoc '' + If you are providing TLS certificates directly to the Coder server, you must use a single certificate for the root and wildcard domains. + ''; + default = null; + example = "*.coder.example.com"; + }; + + database = { + createLocally = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Create the database and database user locally. + ''; + }; + + host = mkOption { + type = types.str; + default = "/run/postgresql"; + description = lib.mdDoc '' + Hostname hosting the database. + ''; + }; + + database = mkOption { + type = types.str; + default = "coder"; + description = lib.mdDoc '' + Name of database. + ''; + }; + + username = mkOption { + type = types.str; + default = "coder"; + description = lib.mdDoc '' + Username for accessing the database. + ''; + }; + + password = mkOption { + type = types.nullOr types.str; + default = null; + description = lib.mdDoc '' + Password for accessing the database. + ''; + }; + + sslmode = mkOption { + type = types.nullOr types.str; + default = "disable"; + description = lib.mdDoc '' + Password for accessing the database. + ''; + }; + }; + + tlsCert = mkOption { + type = types.nullOr types.path; + description = lib.mdDoc '' + The path to the TLS certificate. + ''; + default = null; + }; + + tlsKey = mkOption { + type = types.nullOr types.path; + description = lib.mdDoc '' + The path to the TLS key. + ''; + default = null; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { assertion = cfg.database.createLocally -> cfg.database.username == name; + message = "services.coder.database.username must be set to ${user} if services.coder.database.createLocally is set true"; + } + ]; + + systemd.services.coder = { + description = "Coder - Self-hosted developer workspaces on your infra"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + environment = { + CODER_ACCESS_URL = cfg.accessUrl; + CODER_WILDCARD_ACCESS_URL = cfg.wildcardAccessUrl; + CODER_PG_CONNECTION_URL = "user=${cfg.database.username} ${optionalString (cfg.database.password != null) "password=${cfg.database.password}"} database=${cfg.database.database} host=${cfg.database.host} ${optionalString (cfg.database.sslmode != null) "sslmode=${cfg.database.sslmode}"}"; + CODER_ADDRESS = cfg.listenAddress; + CODER_TLS_ENABLE = optionalString (cfg.tlsCert != null) "1"; + CODER_TLS_CERT_FILE = cfg.tlsCert; + CODER_TLS_KEY_FILE = cfg.tlsKey; + }; + + serviceConfig = { + ProtectSystem = "full"; + PrivateTmp = "yes"; + PrivateDevices = "yes"; + SecureBits = "keep-caps"; + AmbientCapabilities = "CAP_IPC_LOCK CAP_NET_BIND_SERVICE"; + CacheDirectory = "coder"; + CapabilityBoundingSet = "CAP_SYSLOG CAP_IPC_LOCK CAP_NET_BIND_SERVICE"; + KillSignal = "SIGINT"; + KillMode = "mixed"; + NoNewPrivileges = "yes"; + Restart = "on-failure"; + ExecStart = "${cfg.package}/bin/coder server"; + User = cfg.user; + Group = cfg.group; + }; + }; + + services.postgresql = lib.mkIf cfg.database.createLocally { + enable = true; + ensureDatabases = [ + cfg.database.database + ]; + ensureUsers = [{ + name = cfg.database.username; + ensurePermissions = { + "DATABASE \"${cfg.database.database}\"" = "ALL PRIVILEGES"; + }; + } + ]; + }; + + users.groups = optionalAttrs (cfg.group == name) { + "${cfg.group}" = {}; + }; + users.users = optionalAttrs (cfg.user == name) { + ${name} = { + description = "Coder service user"; + group = cfg.group; + home = cfg.homeDir; + createHome = true; + isSystemUser = true; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/phosh.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/phosh.nix index e889c0e34e..3cfa6e044b 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/phosh.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/phosh.nix @@ -173,7 +173,7 @@ in systemd.services.phosh = { wantedBy = [ "graphical.target" ]; serviceConfig = { - ExecStart = "${cfg.package}/bin/phosh"; + ExecStart = "${cfg.package}/bin/phosh-session"; User = cfg.user; Group = cfg.group; PAMName = "login"; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix index 73322696ae..f0c4b2172f 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -448,6 +448,7 @@ in kio-extras ]; optionalPackages = [ + ark elisa gwenview okular diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/nimdow.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/nimdow.nix new file mode 100644 index 0000000000..de31928760 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/nimdow.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.nimdow; +in +{ + options = { + services.xserver.windowManager.nimdow.enable = mkEnableOption (lib.mdDoc "nimdow"); + }; + + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { + name = "nimdow"; + start = '' + ${pkgs.nimdow}/bin/nimdow & + waitPID=$! + ''; + }; + environment.systemPackages = [ pkgs.nimdow ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix index adb079c87a..0f5dce4064 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix @@ -592,7 +592,8 @@ in || dmConf.sddm.enable || dmConf.xpra.enable || dmConf.sx.enable - || dmConf.startx.enable); + || dmConf.startx.enable + || config.services.greetd.enable); in mkIf (default) (mkDefault true); # so that the service won't be enabled when only startx is used diff --git a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix index 240e209591..896f8c0a69 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix +++ b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix @@ -130,6 +130,13 @@ let pkgs.replaceDependency { inherit oldDependency newDependency drv; } ) baseSystemAssertWarn config.system.replaceRuntimeDependencies; + systemWithBuildDeps = system.overrideAttrs (o: { + systemBuildClosure = pkgs.closureInfo { rootPaths = [ system.drvPath ]; }; + buildCommand = o.buildCommand + '' + ln -sn $systemBuildClosure $out/build-closure + ''; + }); + in { @@ -306,6 +313,27 @@ in ''; }; + system.includeBuildDependencies = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to include the build closure of the whole system in + its runtime closure. This can be useful for making changes + fully offline, as it includes all sources, patches, and + intermediate outputs required to build all the derivations + that the system depends on. + + Note that this includes _all_ the derivations, down from the + included applications to their sources, the compilers used to + build them, and even the bootstrap compiler used to compile + the compilers. This increases the size of the system and the + time needed to download its dependencies drastically: a + minimal configuration with no extra services enabled grows + from ~670MiB in size to 13.5GiB, and takes proportionally + longer to download. + ''; + }; + }; @@ -336,7 +364,7 @@ in ]; }; }; - system.build.toplevel = system; + system.build.toplevel = if config.system.includeBuildDependencies then systemWithBuildDeps else system; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix b/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix index 98db67e7c0..cceb02c1a7 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix @@ -134,11 +134,11 @@ let mask = ''\xff\xff\xff\xff''; }; x86_64-windows = { - magicOrExtension = ".exe"; + magicOrExtension = "exe"; recognitionType = "extension"; }; i686-windows = { - magicOrExtension = ".exe"; + magicOrExtension = "exe"; recognitionType = "extension"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl index 205f1513fd..aea426c7fd 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -450,8 +450,9 @@ sub addEntry { # Include second initrd with secrets if (-e -x "$path/append-initrd-secrets") { - my $initrdName = basename($initrd); - my $initrdSecretsPath = "$bootPath/kernels/$initrdName-secrets"; + # Name the initrd secrets after the system from which they're derived. + my $systemName = basename(Cwd::abs_path("$path")); + my $initrdSecretsPath = "$bootPath/kernels/$systemName-secrets"; mkpath(dirname($initrdSecretsPath), 0, 0755); my $oldUmask = umask; @@ -470,7 +471,7 @@ sub addEntry { if (-e $initrdSecretsPathTemp && ! -z _) { rename $initrdSecretsPathTemp, $initrdSecretsPath or die "failed to move initrd secrets into place: $!\n"; $copied{$initrdSecretsPath} = 1; - $initrd .= " " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/kernels/$initrdName-secrets"; + $initrd .= " " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/kernels/$systemName-secrets"; } else { unlink $initrdSecretsPathTemp; rmdir dirname($initrdSecretsPathTemp); diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 3e3683211f..c924519972 100755 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -85,18 +85,18 @@ def copy_from_profile(profile: Optional[str], generation: int, specialisation: O return efi_file_path -def describe_generation(generation_dir: str) -> str: +def describe_generation(profile: Optional[str], generation: int, specialisation: Optional[str]) -> str: try: - with open("%s/nixos-version" % generation_dir) as f: + with open(profile_path(profile, generation, specialisation, "nixos-version")) as f: nixos_version = f.read() except IOError: nixos_version = "Unknown" - kernel_dir = os.path.dirname(os.path.realpath("%s/kernel" % generation_dir)) + kernel_dir = os.path.dirname(profile_path(profile, generation, specialisation, "kernel")) module_dir = glob.glob("%s/lib/modules/*" % kernel_dir)[0] kernel_version = os.path.basename(module_dir) - build_time = int(os.path.getctime(generation_dir)) + build_time = int(os.path.getctime(system_dir(profile, generation, specialisation))) build_date = datetime.datetime.fromtimestamp(build_time).strftime('%F') description = "@distroName@ {}, Linux Kernel {}, Built on {}".format( @@ -131,11 +131,10 @@ def write_entry(profile: Optional[str], generation: int, specialisation: Optiona "or renamed a file in `boot.initrd.secrets`", file=sys.stderr) entry_file = "@efiSysMountPoint@/loader/entries/%s" % ( generation_conf_filename(profile, generation, specialisation)) - generation_dir = os.readlink(system_dir(profile, generation, specialisation)) tmp_path = "%s.tmp" % (entry_file) - kernel_params = "init=%s/init " % generation_dir + kernel_params = "init=%s " % profile_path(profile, generation, specialisation, "init") - with open("%s/kernel-params" % (generation_dir)) as params_file: + with open(profile_path(profile, generation, specialisation, "kernel-params")) as params_file: kernel_params = kernel_params + params_file.read() with open(tmp_path, 'w') as f: f.write(BOOT_ENTRY.format(title=title, @@ -143,7 +142,7 @@ def write_entry(profile: Optional[str], generation: int, specialisation: Optiona kernel=kernel, initrd=initrd, kernel_params=kernel_params, - description=describe_generation(generation_dir))) + description=describe_generation(profile, generation, specialisation))) if machine_id is not None: f.write("machine-id %s\n" % machine_id) os.rename(tmp_path, entry_file) @@ -296,7 +295,7 @@ def main() -> None: remove_old_entries(gens) for gen in gens: try: - is_default = os.readlink(system_dir(*gen)) == args.default_config + is_default = os.path.dirname(profile_path(*gen, "init")) == args.default_config write_entry(*gen, machine_id, current=is_default) for specialisation in get_specialisations(*gen): write_entry(*specialisation, machine_id, current=is_default) diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix index 679a663362..8b20f9a7e8 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -614,7 +614,7 @@ in # Avoid potentially degraded system state due to # "Userspace Out-Of-Memory (OOM) Killer was skipped because of a failed condition check (ConditionControlGroupController=v2)." - systemd.services.systemd-oomd.enable = mkIf (!cfg.enableUnifiedCgroupHierarchy) false; + systemd.oomd.enable = mkIf (!cfg.enableUnifiedCgroupHierarchy) false; services.logrotate.settings = { "/var/log/btmp" = mapAttrs (_: mkDefault) { diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix index cf76704577..f937581b76 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix @@ -158,6 +158,16 @@ in { ''; }; + managerEnvironment = mkOption { + type = with types; attrsOf (nullOr (oneOf [ str path package ])); + default = {}; + example = { SYSTEMD_LOG_LEVEL = "debug"; }; + description = lib.mdDoc '' + Environment variables of PID 1. These variables are + *not* passed to started units. + ''; + }; + contents = mkOption { description = lib.mdDoc "Set of files that have to be linked into the initrd"; example = literalExpression '' @@ -355,8 +365,11 @@ in { less = "${pkgs.less}/bin/less"; mount = "${cfg.package.util-linux}/bin/mount"; umount = "${cfg.package.util-linux}/bin/umount"; + fsck = "${cfg.package.util-linux}/bin/fsck"; }; + managerEnvironment.PATH = "/bin:/sbin"; + contents = { "/init".source = "${cfg.package}/lib/systemd/systemd"; "/etc/systemd/system".source = stage1Units; @@ -365,6 +378,7 @@ in { [Manager] DefaultEnvironment=PATH=/bin:/sbin ${optionalString (isBool cfg.emergencyAccess && cfg.emergencyAccess) "SYSTEMD_SULOGIN_FORCE=1"} ${cfg.extraConfig} + ManagerEnvironment=${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") cfg.managerEnvironment)} ''; "/lib/modules".source = "${modulesClosure}/lib/modules"; @@ -444,21 +458,6 @@ in { (v: let n = escapeSystemdPath v.where; in nameValuePair "${n}.automount" (automountToUnit n v)) cfg.automounts); - # The unit in /run/systemd/generator shadows the unit in - # /etc/systemd/system, but will still apply drop-ins from - # /etc/systemd/system/foo.service.d/ - # - # We need IgnoreOnIsolate, otherwise the Requires dependency of - # a mount unit on its makefs unit causes it to be unmounted when - # we isolate for switch-root. Use a dummy package so that - # generateUnits will generate drop-ins instead of unit files. - packages = [(pkgs.runCommand "dummy" {} '' - mkdir -p $out/etc/systemd/system - touch $out/etc/systemd/system/systemd-{makefs,growfs}@.service - '')]; - services."systemd-makefs@" = lib.mkIf needMakefs { unitConfig.IgnoreOnIsolate = true; }; - services."systemd-growfs@" = lib.mkIf needGrowfs { unitConfig.IgnoreOnIsolate = true; }; - # make sure all the /dev nodes are set up services.systemd-tmpfiles-setup-dev.wantedBy = ["sysinit.target"]; diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix index 7f2c8a41b2..822f159347 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix @@ -140,7 +140,10 @@ let else if config.fsType == "reiserfs" then "-q" else null; in { - options = mkIf config.autoResize [ "x-nixos.autoresize" ]; + options = mkMerge [ + (mkIf config.autoResize [ "x-nixos.autoresize" ]) + (mkIf (utils.fsNeededForBoot config) [ "x-initrd.mount" ]) + ]; formatOptions = mkIf (defaultFormatOptions != null) (mkDefault defaultFormatOptions); }; @@ -155,27 +158,54 @@ let makeFstabEntries = let - fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "nfs4" "vboxsf" "glusterfs" "apfs" "9p" "cifs" "prl_fs" "vmhgfs" ]; + fsToSkipCheck = [ + "none" + "auto" + "overlay" + "iso9660" + "bindfs" + "udf" + "btrfs" + "zfs" + "tmpfs" + "bcachefs" + "nfs" + "nfs4" + "nilfs2" + "vboxsf" + "squashfs" + "glusterfs" + "apfs" + "9p" + "cifs" + "prl_fs" + "vmhgfs" + ] ++ lib.optionals (!config.boot.initrd.checkJournalingFS) [ + "ext3" + "ext4" + "reiserfs" + "xfs" + "jfs" + "f2fs" + ]; isBindMount = fs: builtins.elem "bind" fs.options; skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck || isBindMount fs; # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string; - in fstabFileSystems: { rootPrefix ? "", excludeChecks ? false, extraOpts ? (fs: []) }: concatMapStrings (fs: + in fstabFileSystems: { rootPrefix ? "", extraOpts ? (fs: []) }: concatMapStrings (fs: (optionalString (isBindMount fs) (escape rootPrefix)) + (if fs.device != null then escape fs.device else if fs.label != null then "/dev/disk/by-label/${escape fs.label}" else throw "No device specified for mount point ‘${fs.mountPoint}’.") - + " " + escape (rootPrefix + fs.mountPoint) + + " " + escape fs.mountPoint + " " + fs.fsType + " " + escape (builtins.concatStringsSep "," (fs.options ++ (extraOpts fs))) - + " " + (optionalString (!excludeChecks) - ("0 " + (if skipCheck fs then "0" else if fs.mountPoint == "/" then "1" else "2"))) + + " 0 " + (if skipCheck fs then "0" else if fs.mountPoint == "/" then "1" else "2") + "\n" ) fstabFileSystems; initrdFstab = pkgs.writeText "initrd-fstab" (makeFstabEntries (filter utils.fsNeededForBoot fileSystems) { rootPrefix = "/sysroot"; - excludeChecks = true; extraOpts = fs: (optional fs.autoResize "x-systemd.growfs") ++ (optional fs.autoFormat "x-systemd.makefs"); @@ -328,7 +358,9 @@ in )} ''; - boot.initrd.systemd.contents."/etc/fstab".source = initrdFstab; + boot.initrd.systemd.storePaths = [initrdFstab]; + boot.initrd.systemd.managerEnvironment.SYSTEMD_SYSROOT_FSTAB = initrdFstab; + boot.initrd.systemd.services.initrd-parse-etc.environment.SYSTEMD_SYSROOT_FSTAB = initrdFstab; # Provide a target that pulls in all filesystems. systemd.targets.fs = diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/vfat.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/vfat.nix index 5baab1c802..5421b617b4 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/vfat.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/vfat.nix @@ -11,7 +11,7 @@ in { config = mkIf (any (fs: fs == "vfat") config.boot.supportedFilesystems) { - system.fsPackages = [ pkgs.dosfstools ]; + system.fsPackages = [ pkgs.dosfstools pkgs.mtools ]; boot.initrd.kernelModules = mkIf inInitrd [ "vfat" "nls_cp437" "nls_iso8859-1" ]; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/ec2-metadata-fetcher.sh b/third_party/nixpkgs/nixos/modules/virtualisation/ec2-metadata-fetcher.sh index 9e204d45db..716aff7c22 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/ec2-metadata-fetcher.sh +++ b/third_party/nixpkgs/nixos/modules/virtualisation/ec2-metadata-fetcher.sh @@ -55,10 +55,9 @@ done echo "getting EC2 instance metadata..." get_imds() { - # Intentionally no --fail here, so that we proceed even if e.g. a - # 404 was returned (but we still fail if we can't reach the IMDS - # server). - curl --silent --show-error --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" "$@" + # --fail to avoid populating missing files with 404 HTML response body + # || true to allow the script to continue even when encountering a 404 + curl --silent --show-error --fail --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" "$@" || true } get_imds -o "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix index c98916f60f..a55a21a46a 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix @@ -152,9 +152,11 @@ let ${lib.optionalString cfg.useBootLoader '' - # Create a writable copy/snapshot of the boot disk. - # A writable boot disk can be booted from automatically. - ${qemu}/bin/qemu-img create -f qcow2 -F qcow2 -b ${bootDisk}/disk.img "$TMPDIR/disk.img" + if ${if !cfg.persistBootDevice then "true" else "! test -e $TMPDIR/disk.img"}; then + # Create a writable copy/snapshot of the boot disk. + # A writable boot disk can be booted from automatically. + ${qemu}/bin/qemu-img create -f qcow2 -F qcow2 -b ${bootDisk}/disk.img "$TMPDIR/disk.img" + fi NIX_EFI_VARS=$(readlink -f "''${NIX_EFI_VARS:-${cfg.efiVars}}") @@ -370,6 +372,17 @@ in ''; }; + virtualisation.persistBootDevice = + mkOption { + type = types.bool; + default = false; + description = + lib.mdDoc '' + If useBootLoader is specified, whether to recreate the boot device + on each instantiaton or allow it to persist. + ''; + }; + virtualisation.emptyDiskImages = mkOption { type = types.listOf types.ints.positive; @@ -853,6 +866,8 @@ in # * The disks are attached in `virtualisation.qemu.drives`. # Their order makes them appear as devices `a`, `b`, etc. # * `fileSystems."/boot"` is adjusted to be on device `b`. + # * The disk.img is recreated each time the VM is booted unless + # virtualisation.persistBootDevice is set. # If `useBootLoader`, GRUB goes to the second disk, see # note [Disk layout with `useBootLoader`]. @@ -895,7 +910,7 @@ in ${optionalString cfg.writableStore '' echo "mounting overlay filesystem on /nix/store..." - mkdir -p 0755 $targetRoot/nix/.rw-store/store $targetRoot/nix/.rw-store/work $targetRoot/nix/store + mkdir -p -m 0755 $targetRoot/nix/.rw-store/store $targetRoot/nix/.rw-store/work $targetRoot/nix/store mount -t overlay overlay $targetRoot/nix/store \ -o lowerdir=$targetRoot/nix/.ro-store,upperdir=$targetRoot/nix/.rw-store/store,workdir=$targetRoot/nix/.rw-store/work || fail ''} @@ -1086,18 +1101,20 @@ in what = "overlay"; type = "overlay"; options = "lowerdir=/sysroot/nix/.ro-store,upperdir=/sysroot/nix/.rw-store/store,workdir=/sysroot/nix/.rw-store/work"; - wantedBy = ["local-fs.target"]; - before = ["local-fs.target"]; - requires = ["sysroot-nix-.ro\\x2dstore.mount" "sysroot-nix-.rw\\x2dstore.mount" "rw-store.service"]; - after = ["sysroot-nix-.ro\\x2dstore.mount" "sysroot-nix-.rw\\x2dstore.mount" "rw-store.service"]; - unitConfig.IgnoreOnIsolate = true; + wantedBy = ["initrd-fs.target"]; + before = ["initrd-fs.target"]; + requires = ["rw-store.service"]; + after = ["rw-store.service"]; + unitConfig.RequiresMountsFor = "/sysroot/nix/.ro-store"; }]; services.rw-store = { - after = ["sysroot-nix-.rw\\x2dstore.mount"]; - unitConfig.DefaultDependencies = false; + unitConfig = { + DefaultDependencies = false; + RequiresMountsFor = "/sysroot/nix/.rw-store"; + }; serviceConfig = { Type = "oneshot"; - ExecStart = "/bin/mkdir -p 0755 /sysroot/nix/.rw-store/store /sysroot/nix/.rw-store/work /sysroot/nix/store"; + ExecStart = "/bin/mkdir -p -m 0755 /sysroot/nix/.rw-store/store /sysroot/nix/.rw-store/work /sysroot/nix/store"; }; }; }; diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 07adf3dbeb..ee1f6bb805 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -108,6 +108,7 @@ in { breitbandmessung = handleTest ./breitbandmessung.nix {}; brscan5 = handleTest ./brscan5.nix {}; btrbk = handleTest ./btrbk.nix {}; + btrbk-doas = handleTest ./btrbk-doas.nix {}; btrbk-no-timer = handleTest ./btrbk-no-timer.nix {}; btrbk-section-order = handleTest ./btrbk-section-order.nix {}; buildbot = handleTest ./buildbot.nix {}; @@ -125,6 +126,7 @@ in { ceph-single-node-bluestore = handleTestOn ["x86_64-linux"] ./ceph-single-node-bluestore.nix {}; certmgr = handleTest ./certmgr.nix {}; cfssl = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cfssl.nix {}; + cgit = handleTest ./cgit.nix {}; charliecloud = handleTest ./charliecloud.nix {}; chromium = (handleTestOn ["aarch64-linux" "x86_64-linux"] ./chromium.nix {}).stable or {}; chrony-ptp = handleTestOn ["aarch64-linux" "x86_64-linux"] ./chrony-ptp.nix {}; @@ -137,6 +139,7 @@ in { cntr = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cntr.nix {}; cockpit = handleTest ./cockpit.nix {}; cockroachdb = handleTestOn ["x86_64-linux"] ./cockroachdb.nix {}; + coder = handleTest ./coder.nix {}; collectd = handleTest ./collectd.nix {}; connman = handleTest ./connman.nix {}; consul = handleTest ./consul.nix {}; @@ -235,9 +238,11 @@ in { freshrss-pgsql = handleTest ./freshrss-pgsql.nix {}; frr = handleTest ./frr.nix {}; fsck = handleTest ./fsck.nix {}; + fsck-systemd-stage-1 = handleTest ./fsck.nix { systemdStage1 = true; }; ft2-clone = handleTest ./ft2-clone.nix {}; mimir = handleTest ./mimir.nix {}; garage = handleTest ./garage {}; + gemstash = handleTest ./gemstash.nix {}; gerrit = handleTest ./gerrit.nix {}; geth = handleTest ./geth.nix {}; ghostunnel = handleTest ./ghostunnel.nix {}; @@ -308,6 +313,7 @@ in { initrd-network-ssh = handleTest ./initrd-network-ssh {}; initrdNetwork = handleTest ./initrd-network.nix {}; initrd-secrets = handleTest ./initrd-secrets.nix {}; + initrd-secrets-changing = handleTest ./initrd-secrets-changing.nix {}; input-remapper = handleTest ./input-remapper.nix {}; inspircd = handleTest ./inspircd.nix {}; installer = handleTest ./installer.nix {}; @@ -580,6 +586,7 @@ in { radarr = handleTest ./radarr.nix {}; radicale = handleTest ./radicale.nix {}; rasdaemon = handleTest ./rasdaemon.nix {}; + readarr = handleTest ./readarr.nix {}; redis = handleTest ./redis.nix {}; redmine = handleTest ./redmine.nix {}; restartByActivationScript = handleTest ./restart-by-activation-script.nix {}; @@ -687,6 +694,7 @@ in { terminal-emulators = handleTest ./terminal-emulators.nix {}; tiddlywiki = handleTest ./tiddlywiki.nix {}; tigervnc = handleTest ./tigervnc.nix {}; + timescaledb = handleTest ./timescaledb.nix {}; timezone = handleTest ./timezone.nix {}; tinc = handleTest ./tinc {}; tinydns = handleTest ./tinydns.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/btrbk-doas.nix b/third_party/nixpkgs/nixos/tests/btrbk-doas.nix new file mode 100644 index 0000000000..1e3f8d56ad --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/btrbk-doas.nix @@ -0,0 +1,114 @@ +import ./make-test-python.nix ({ pkgs, ... }: + + let + privateKey = '' + -----BEGIN OPENSSH PRIVATE KEY----- + b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW + QyNTUxOQAAACBx8UB04Q6Q/fwDFjakHq904PYFzG9pU2TJ9KXpaPMcrwAAAJB+cF5HfnBe + RwAAAAtzc2gtZWQyNTUxOQAAACBx8UB04Q6Q/fwDFjakHq904PYFzG9pU2TJ9KXpaPMcrw + AAAEBN75NsJZSpt63faCuaD75Unko0JjlSDxMhYHAPJk2/xXHxQHThDpD9/AMWNqQer3Tg + 9gXMb2lTZMn0pelo8xyvAAAADXJzY2h1ZXR6QGt1cnQ= + -----END OPENSSH PRIVATE KEY----- + ''; + publicKey = '' + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHHxQHThDpD9/AMWNqQer3Tg9gXMb2lTZMn0pelo8xyv + ''; + in + { + name = "btrbk-doas"; + meta = with pkgs.lib; { + maintainers = with maintainers; [ symphorien tu-maurice ]; + }; + + nodes = { + archive = { ... }: { + security.sudo.enable = false; + security.doas.enable = true; + environment.systemPackages = with pkgs; [ btrfs-progs ]; + # note: this makes the privateKey world readable. + # don't do it with real ssh keys. + environment.etc."btrbk_key".text = privateKey; + services.btrbk = { + extraPackages = [ pkgs.lz4 ]; + instances = { + remote = { + onCalendar = "minutely"; + settings = { + ssh_identity = "/etc/btrbk_key"; + ssh_user = "btrbk"; + stream_compress = "lz4"; + volume = { + "ssh://main/mnt" = { + target = "/mnt"; + snapshot_dir = "btrbk/remote"; + subvolume = "to_backup"; + }; + }; + }; + }; + }; + }; + }; + + main = { ... }: { + security.sudo.enable = false; + security.doas.enable = true; + environment.systemPackages = with pkgs; [ btrfs-progs ]; + services.openssh = { + enable = true; + passwordAuthentication = false; + kbdInteractiveAuthentication = false; + }; + services.btrbk = { + extraPackages = [ pkgs.lz4 ]; + sshAccess = [ + { + key = publicKey; + roles = [ "source" "send" "info" "delete" ]; + } + ]; + instances = { + local = { + onCalendar = "minutely"; + settings = { + volume = { + "/mnt" = { + snapshot_dir = "btrbk/local"; + subvolume = "to_backup"; + }; + }; + }; + }; + }; + }; + }; + }; + + testScript = '' + start_all() + + # create btrfs partition at /mnt + for machine in (archive, main): + machine.succeed("dd if=/dev/zero of=/data_fs bs=120M count=1") + machine.succeed("mkfs.btrfs /data_fs") + machine.succeed("mkdir /mnt") + machine.succeed("mount /data_fs /mnt") + + # what to backup and where + main.succeed("btrfs subvolume create /mnt/to_backup") + main.succeed("mkdir -p /mnt/btrbk/{local,remote}") + + # check that local snapshots work + with subtest("local"): + main.succeed("echo foo > /mnt/to_backup/bar") + main.wait_until_succeeds("cat /mnt/btrbk/local/*/bar | grep foo") + main.succeed("echo bar > /mnt/to_backup/bar") + main.succeed("cat /mnt/btrbk/local/*/bar | grep foo") + + # check that btrfs send/receive works and ssh access works + with subtest("remote"): + archive.wait_until_succeeds("cat /mnt/*/bar | grep bar") + main.succeed("echo baz > /mnt/to_backup/bar") + archive.succeed("cat /mnt/*/bar | grep bar") + ''; + }) diff --git a/third_party/nixpkgs/nixos/tests/cgit.nix b/third_party/nixpkgs/nixos/tests/cgit.nix new file mode 100644 index 0000000000..6aed06adef --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/cgit.nix @@ -0,0 +1,73 @@ +import ./make-test-python.nix ({ pkgs, ... }: +let + robotsTxt = pkgs.writeText "cgit-robots.txt" '' + User-agent: * + Disallow: / + ''; +in { + name = "cgit"; + meta = with pkgs.lib.maintainers; { + maintainers = [ schnusch ]; + }; + + nodes = { + server = { ... }: { + services.cgit."localhost" = { + enable = true; + package = pkgs.cgit.overrideAttrs ({ postInstall, ... }: { + postInstall = '' + ${postInstall} + cp ${robotsTxt} "$out/cgit/robots.txt" + ''; + }); + nginx.location = "/(c)git/"; + repos = { + some-repo = { + path = "/srv/git/some-repo"; + desc = "some-repo description"; + }; + }; + }; + + environment.systemPackages = [ pkgs.git ]; + }; + }; + + testScript = { nodes, ... }: '' + start_all() + + server.wait_for_unit("nginx.service") + server.wait_for_unit("network.target") + server.wait_for_open_port(80) + + server.succeed("curl -fsS http://localhost/%28c%29git/cgit.css") + + server.succeed("curl -fsS http://localhost/%28c%29git/robots.txt | diff -u - ${robotsTxt}") + + server.succeed( + "curl -fsS http://localhost/%28c%29git/ | grep -F 'some-repo description'" + ) + + server.fail("curl -fsS http://localhost/robots.txt") + + server.succeed("${pkgs.writeShellScript "setup-cgit-test-repo" '' + set -e + git init --bare -b master /srv/git/some-repo + git init -b master reference + cd reference + git remote add origin /srv/git/some-repo + date > date.txt + git add date.txt + git -c user.name=test -c user.email=test@localhost commit -m 'add date' + git push -u origin master + ''}") + + server.succeed( + "curl -fsS 'http://localhost/%28c%29git/some-repo/plain/date.txt?id=master' | diff -u reference/date.txt -" + ) + + server.succeed( + "git clone http://localhost/%28c%29git/some-repo && diff -u reference/date.txt some-repo/date.txt" + ) + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/coder.nix b/third_party/nixpkgs/nixos/tests/coder.nix new file mode 100644 index 0000000000..1281382728 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/coder.nix @@ -0,0 +1,24 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "coder"; + meta = with pkgs.lib.maintainers; { + maintainers = [ shyim ghuntley ]; + }; + + nodes.machine = + { pkgs, ... }: + { + services.coder = { + enable = true; + accessUrl = "http://localhost:3000"; + }; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("postgresql.service") + machine.wait_for_unit("coder.service") + machine.wait_for_open_port(3000) + + machine.succeed("curl --fail http://localhost:3000") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/docker-tools.nix b/third_party/nixpkgs/nixos/tests/docker-tools.nix index 98704ecb2f..44b583ebce 100644 --- a/third_party/nixpkgs/nixos/tests/docker-tools.nix +++ b/third_party/nixpkgs/nixos/tests/docker-tools.nix @@ -1,6 +1,52 @@ # this test creates a simple GNU image with docker tools and sees if it executes -import ./make-test-python.nix ({ pkgs, ... }: { +import ./make-test-python.nix ({ pkgs, ... }: +let + # nixpkgs#214434: dockerTools.buildImage fails to unpack base images + # containing duplicate layers when those duplicate tarballs + # appear under the manifest's 'Layers'. Docker can generate images + # like this even though dockerTools does not. + repeatedLayerTestImage = + let + # Rootfs diffs for layers 1 and 2 are identical (and empty) + layer1 = pkgs.dockerTools.buildImage { name = "empty"; }; + layer2 = layer1.overrideAttrs (_: { fromImage = layer1; }); + repeatedRootfsDiffs = pkgs.runCommandNoCC "image-with-links.tar" { + nativeBuildInputs = [pkgs.jq]; + } '' + mkdir contents + tar -xf "${layer2}" -C contents + cd contents + first_rootfs=$(jq -r '.[0].Layers[0]' manifest.json) + second_rootfs=$(jq -r '.[0].Layers[1]' manifest.json) + target_rootfs=$(sha256sum "$first_rootfs" | cut -d' ' -f 1).tar + + # Replace duplicated rootfs diffs with symlinks to one tarball + chmod -R ug+w . + mv "$first_rootfs" "$target_rootfs" + rm "$second_rootfs" + ln -s "../$target_rootfs" "$first_rootfs" + ln -s "../$target_rootfs" "$second_rootfs" + + # Update manifest's layers to use the symlinks' target + cat manifest.json | \ + jq ".[0].Layers[0] = \"$target_rootfs\"" | + jq ".[0].Layers[1] = \"$target_rootfs\"" > manifest.json.new + mv manifest.json.new manifest.json + + tar --sort=name --hard-dereference -cf $out . + ''; + in pkgs.dockerTools.buildImage { + fromImage = repeatedRootfsDiffs; + name = "repeated-layer-test"; + tag = "latest"; + copyToRoot = pkgs.bash; + # A runAsRoot script is required to force previous layers to be unpacked + runAsRoot = '' + echo 'runAsRoot has run.' + ''; + }; +in { name = "docker-tools"; meta = with pkgs.lib.maintainers; { maintainers = [ lnl7 roberth ]; @@ -221,6 +267,12 @@ import ./make-test-python.nix ({ pkgs, ... }: { "docker run --rm ${examples.layersUnpackOrder.imageName} cat /layer-order" ) + with subtest("Ensure repeated base layers handled by buildImage"): + docker.succeed( + "docker load --input='${repeatedLayerTestImage}'", + "docker run --rm ${repeatedLayerTestImage.imageName} /bin/bash -c 'exit 0'" + ) + with subtest("Ensure environment variables are correctly inherited"): docker.succeed( "docker load --input='${examples.environmentVariables}'" diff --git a/third_party/nixpkgs/nixos/tests/fsck.nix b/third_party/nixpkgs/nixos/tests/fsck.nix index 5b8b09f433..ccb664be08 100644 --- a/third_party/nixpkgs/nixos/tests/fsck.nix +++ b/third_party/nixpkgs/nixos/tests/fsck.nix @@ -1,3 +1,9 @@ +{ system ? builtins.currentSystem +, config ? {} +, pkgs ? import ../.. { inherit system config; } +, systemdStage1 ? false +}: + import ./make-test-python.nix { name = "fsck"; @@ -11,13 +17,17 @@ import ./make-test-python.nix { autoFormat = true; }; }; + + boot.initrd.systemd.enable = systemdStage1; }; testScript = '' machine.wait_for_unit("default.target") with subtest("root fs is fsckd"): - machine.succeed("journalctl -b | grep 'fsck.ext4.*/dev/vda'") + machine.succeed("journalctl -b | grep '${if systemdStage1 + then "fsck.*vda.*clean" + else "fsck.ext4.*/dev/vda"}'") with subtest("mnt fs is fsckd"): machine.succeed("journalctl -b | grep 'fsck.*/dev/vdb.*clean'") diff --git a/third_party/nixpkgs/nixos/tests/garage/default.nix b/third_party/nixpkgs/nixos/tests/garage/default.nix index 4c38ea1bc8..0a1ccde056 100644 --- a/third_party/nixpkgs/nixos/tests/garage/default.nix +++ b/third_party/nixpkgs/nixos/tests/garage/default.nix @@ -49,5 +49,5 @@ in }) {} [ - "0_8_0" + "0_8" ] diff --git a/third_party/nixpkgs/nixos/tests/gemstash.nix b/third_party/nixpkgs/nixos/tests/gemstash.nix new file mode 100644 index 0000000000..bc152e42e9 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/gemstash.nix @@ -0,0 +1,51 @@ +{ system ? builtins.currentSystem, config ? { } +, pkgs ? import ../.. { inherit system config; } }: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +let common_meta = { maintainers = [ maintainers.viraptor ]; }; +in +{ + gemstash_works = makeTest { + name = "gemstash-works"; + meta = common_meta; + + nodes.machine = { config, pkgs, ... }: { + services.gemstash = { + enable = true; + }; + }; + + # gemstash responds to http requests + testScript = '' + machine.wait_for_unit("gemstash.service") + machine.wait_for_file("/var/lib/gemstash") + machine.wait_for_open_port(9292) + machine.succeed("curl http://localhost:9292") + ''; + }; + + gemstash_custom_port = makeTest { + name = "gemstash-custom-port"; + meta = common_meta; + + nodes.machine = { config, pkgs, ... }: { + services.gemstash = { + enable = true; + openFirewall = true; + settings = { + bind = "tcp://0.0.0.0:12345"; + }; + }; + }; + + # gemstash responds to http requests + testScript = '' + machine.wait_for_unit("gemstash.service") + machine.wait_for_file("/var/lib/gemstash") + machine.wait_for_open_port(12345) + machine.succeed("curl http://localhost:12345") + ''; + }; +} diff --git a/third_party/nixpkgs/nixos/tests/gitlab.nix b/third_party/nixpkgs/nixos/tests/gitlab.nix index 59dbc99052..c2a11bada0 100644 --- a/third_party/nixpkgs/nixos/tests/gitlab.nix +++ b/third_party/nixpkgs/nixos/tests/gitlab.nix @@ -69,6 +69,10 @@ in { databasePasswordFile = pkgs.writeText "dbPassword" "xo0daiF4"; initialRootPasswordFile = pkgs.writeText "rootPassword" initialRootPassword; smtp.enable = true; + pages = { + enable = true; + settings.pages-domain = "localhost"; + }; extraConfig = { incoming_email = { enabled = true; @@ -79,11 +83,6 @@ in { host = "localhost"; port = 143; }; - # https://github.com/NixOS/nixpkgs/issues/132295 - # pages = { - # enabled = true; - # host = "localhost"; - # }; }; secrets = { secretFile = pkgs.writeText "secret" "Aig5zaic"; @@ -171,10 +170,9 @@ in { waitForServices = '' gitlab.wait_for_unit("gitaly.service") gitlab.wait_for_unit("gitlab-workhorse.service") - # https://github.com/NixOS/nixpkgs/issues/132295 - # gitlab.wait_for_unit("gitlab-pages.service") gitlab.wait_for_unit("gitlab-mailroom.service") gitlab.wait_for_unit("gitlab.service") + gitlab.wait_for_unit("gitlab-pages.service") gitlab.wait_for_unit("gitlab-sidekiq.service") gitlab.wait_for_file("${nodes.gitlab.config.services.gitlab.statePath}/tmp/sockets/gitlab.socket") gitlab.wait_until_succeeds("curl -sSf http://gitlab/users/sign_in") diff --git a/third_party/nixpkgs/nixos/tests/hadoop/hbase.nix b/third_party/nixpkgs/nixos/tests/hadoop/hbase.nix index d9d2dac0f6..0416345682 100644 --- a/third_party/nixpkgs/nixos/tests/hadoop/hbase.nix +++ b/third_party/nixpkgs/nixos/tests/hadoop/hbase.nix @@ -53,6 +53,24 @@ with pkgs.lib; }; }; }; + thrift = { ... }:{ + services.hadoop = { + inherit coreSite; + hbase = { + inherit zookeeperQuorum; + thrift = defOpts; + }; + }; + }; + rest = { ... }:{ + services.hadoop = { + inherit coreSite; + hbase = { + inherit zookeeperQuorum; + rest = defOpts; + }; + }; + }; }; testScript = '' @@ -80,5 +98,12 @@ with pkgs.lib; assert "1 active master, 0 backup masters, 1 servers" in master.succeed("echo status | HADOOP_USER_NAME=hbase hbase shell -n") regionserver.wait_until_succeeds("echo \"create 't1','f1'\" | HADOOP_USER_NAME=hbase hbase shell -n") assert "NAME => 'f1'" in regionserver.succeed("echo \"describe 't1'\" | HADOOP_USER_NAME=hbase hbase shell -n") + + rest.wait_for_open_port(8080) + assert "${hbase.version}" in regionserver.succeed("curl http://rest:8080/version/cluster") + + thrift.wait_for_open_port(9090) ''; + + meta.maintainers = with maintainers; [ illustris ]; }) diff --git a/third_party/nixpkgs/nixos/tests/initrd-secrets-changing.nix b/third_party/nixpkgs/nixos/tests/initrd-secrets-changing.nix new file mode 100644 index 0000000000..775c69d014 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/initrd-secrets-changing.nix @@ -0,0 +1,58 @@ +{ system ? builtins.currentSystem +, config ? {} +, pkgs ? import ../.. { inherit system config; } +, lib ? pkgs.lib +, testing ? import ../lib/testing-python.nix { inherit system pkgs; } +}: + +let + secret1InStore = pkgs.writeText "topsecret" "iamasecret1"; + secret2InStore = pkgs.writeText "topsecret" "iamasecret2"; +in + +testing.makeTest { + name = "initrd-secrets-changing"; + + nodes.machine = { ... }: { + virtualisation.useBootLoader = true; + virtualisation.persistBootDevice = true; + + boot.loader.grub.device = "/dev/vda"; + + boot.initrd.secrets = { + "/test" = secret1InStore; + "/run/keys/test" = secret1InStore; + }; + boot.initrd.postMountCommands = "cp /test /mnt-root/secret-from-initramfs"; + + specialisation.secrets2System.configuration = { + boot.initrd.secrets = lib.mkForce { + "/test" = secret2InStore; + "/run/keys/test" = secret2InStore; + }; + }; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("multi-user.target") + print(machine.succeed("cat /run/keys/test")) + machine.succeed( + "cmp ${secret1InStore} /secret-from-initramfs", + "cmp ${secret1InStore} /run/keys/test", + ) + # Select the second boot entry corresponding to the specialisation secrets2System. + machine.succeed("grub-reboot 1") + machine.shutdown() + + with subtest("Check that the specialisation's secrets are distinct despite identical kernels"): + machine.wait_for_unit("multi-user.target") + print(machine.succeed("cat /run/keys/test")) + machine.succeed( + "cmp ${secret2InStore} /secret-from-initramfs", + "cmp ${secret2InStore} /run/keys/test", + ) + machine.shutdown() + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/installer.nix b/third_party/nixpkgs/nixos/tests/installer.nix index 3adfa979ed..d441765fe1 100644 --- a/third_party/nixpkgs/nixos/tests/installer.nix +++ b/third_party/nixpkgs/nixos/tests/installer.nix @@ -77,9 +77,9 @@ let let iface = if grubVersion == 1 then "ide" else "virtio"; isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi); bios = if pkgs.stdenv.isAarch64 then "QEMU_EFI.fd" else "OVMF.fd"; - in if !isEfi && !pkgs.stdenv.hostPlatform.isx86 then - throw "Non-EFI boot methods are only supported on i686 / x86_64" - else '' + in if !isEfi && !pkgs.stdenv.hostPlatform.isx86 then '' + machine.succeed("true") + '' else '' def assemble_qemu_flags(): flags = "-cpu max" ${if (system == "x86_64-linux" || system == "i686-linux") diff --git a/third_party/nixpkgs/nixos/tests/kea.nix b/third_party/nixpkgs/nixos/tests/kea.nix index b1d5894cc7..b4095893b4 100644 --- a/third_party/nixpkgs/nixos/tests/kea.nix +++ b/third_party/nixpkgs/nixos/tests/kea.nix @@ -1,3 +1,10 @@ +# This test verifies DHCPv4 interaction between a client and a router. +# For successful DHCP allocations a dynamic update request is sent +# towards a nameserver to allocate a name in the lan.nixos.test zone. +# We then verify whether client and router can ping each other, and +# that the nameserver can resolve the clients fqdn to the correct IP +# address. + import ./make-test-python.nix ({ pkgs, lib, ...}: { meta.maintainers = with lib.maintainers; [ hexa ]; @@ -8,17 +15,17 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: { virtualisation.vlans = [ 1 ]; networking = { - useNetworkd = true; useDHCP = false; firewall.allowedUDPPorts = [ 67 ]; }; systemd.network = { + enable = true; networks = { "01-eth1" = { name = "eth1"; networkConfig = { - Address = "10.0.0.1/30"; + Address = "10.0.0.1/29"; }; }; }; @@ -45,13 +52,115 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: { }; subnet4 = [ { - subnet = "10.0.0.0/30"; + subnet = "10.0.0.0/29"; pools = [ { - pool = "10.0.0.2 - 10.0.0.2"; + pool = "10.0.0.3 - 10.0.0.3"; } ]; } ]; + + # Enable communication between dhcp4 and a local dhcp-ddns + # instance. + # https://kea.readthedocs.io/en/kea-2.2.0/arm/dhcp4-srv.html#ddns-for-dhcpv4 + dhcp-ddns = { + enable-updates = true; + }; + + ddns-send-updates = true; + ddns-qualifying-suffix = "lan.nixos.test."; }; }; + + services.kea.dhcp-ddns = { + enable = true; + settings = { + forward-ddns = { + # Configure updates of a forward zone named `lan.nixos.test` + # hosted at the nameserver at 10.0.0.2 + # https://kea.readthedocs.io/en/kea-2.2.0/arm/ddns.html#adding-forward-dns-servers + ddns-domains = [ { + name = "lan.nixos.test."; + # Use a TSIG key in production! + key-name = ""; + dns-servers = [ { + ip-address = "10.0.0.2"; + port = 53; + } ]; + } ]; + }; + }; + }; + }; + + nameserver = { config, pkgs, ... }: { + virtualisation.vlans = [ 1 ]; + + networking = { + useDHCP = false; + firewall.allowedUDPPorts = [ 53 ]; + }; + + systemd.network = { + enable = true; + networks = { + "01-eth1" = { + name = "eth1"; + networkConfig = { + Address = "10.0.0.2/29"; + }; + }; + }; + }; + + services.resolved.enable = false; + + # Set up an authoritative nameserver, serving the `lan.nixos.test` + # zone and configure an ACL that allows dynamic updates from + # the router's ip address. + # This ACL is likely insufficient for production usage. Please + # use TSIG keys. + services.knot = let + zone = pkgs.writeTextDir "lan.nixos.test.zone" '' + @ SOA ns.nixos.test nox.nixos.test 0 86400 7200 3600000 172800 + @ NS nameserver + nameserver A 10.0.0.3 + router A 10.0.0.1 + ''; + zonesDir = pkgs.buildEnv { + name = "knot-zones"; + paths = [ zone ]; + }; + in { + enable = true; + extraArgs = [ + "-v" + ]; + extraConfig = '' + server: + listen: 0.0.0.0@53 + + log: + - target: syslog + any: debug + + acl: + - id: dhcp_ddns + address: 10.0.0.1 + action: update + + template: + - id: default + storage: ${zonesDir} + zonefile-sync: -1 + zonefile-load: difference-no-serial + journal-content: all + + zone: + - domain: lan.nixos.test + file: lan.nixos.test.zone + acl: [dhcp_ddns] + ''; + }; + }; client = { config, pkgs, ... }: { @@ -70,6 +179,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: { router.wait_for_unit("kea-dhcp4-server.service") client.wait_for_unit("systemd-networkd-wait-online.service") client.wait_until_succeeds("ping -c 5 10.0.0.1") - router.wait_until_succeeds("ping -c 5 10.0.0.2") + router.wait_until_succeeds("ping -c 5 10.0.0.3") + nameserver.wait_until_succeeds("kdig +short client.lan.nixos.test @10.0.0.2 | grep -q 10.0.0.3") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/knot.nix b/third_party/nixpkgs/nixos/tests/knot.nix index 203fd03fac..2ecbf69194 100644 --- a/third_party/nixpkgs/nixos/tests/knot.nix +++ b/third_party/nixpkgs/nixos/tests/knot.nix @@ -31,7 +31,7 @@ let # DO NOT USE pkgs.writeText IN PRODUCTION. This put secrets in the nix store! tsigFile = pkgs.writeText "tsig.conf" '' key: - - id: slave_key + - id: xfr_key algorithm: hmac-sha256 secret: zOYgOgnzx3TGe5J5I/0kxd7gTcxXhLYMEq3Ek3fY37s= ''; @@ -43,7 +43,7 @@ in { nodes = { - master = { lib, ... }: { + primary = { lib, ... }: { imports = [ common ]; # trigger sched_setaffinity syscall @@ -64,22 +64,17 @@ in { server: listen: 0.0.0.0@53 listen: ::@53 - - acl: - - id: slave_acl - address: 192.168.0.2 - key: slave_key - action: transfer + automatic-acl: true remote: - - id: slave + - id: secondary address: 192.168.0.2@53 + key: xfr_key template: - id: default storage: ${knotZonesEnv} - notify: [slave] - acl: [slave_acl] + notify: [secondary] dnssec-signing: on # Input-only zone files # https://www.knot-dns.cz/docs/2.8/html/operation.html#example-3 @@ -105,7 +100,7 @@ in { ''; }; - slave = { lib, ... }: { + secondary = { lib, ... }: { imports = [ common ]; networking.interfaces.eth1 = { ipv4.addresses = lib.mkForce [ @@ -122,21 +117,16 @@ in { server: listen: 0.0.0.0@53 listen: ::@53 - - acl: - - id: notify_from_master - address: 192.168.0.1 - action: notify + automatic-acl: true remote: - - id: master + - id: primary address: 192.168.0.1@53 - key: slave_key + key: xfr_key template: - id: default - master: master - acl: [notify_from_master] + master: primary # zonefileless setup # https://www.knot-dns.cz/docs/2.8/html/operation.html#example-2 zonefile-sync: -1 @@ -174,19 +164,19 @@ in { }; testScript = { nodes, ... }: let - master4 = (lib.head nodes.master.config.networking.interfaces.eth1.ipv4.addresses).address; - master6 = (lib.head nodes.master.config.networking.interfaces.eth1.ipv6.addresses).address; + primary4 = (lib.head nodes.primary.config.networking.interfaces.eth1.ipv4.addresses).address; + primary6 = (lib.head nodes.primary.config.networking.interfaces.eth1.ipv6.addresses).address; - slave4 = (lib.head nodes.slave.config.networking.interfaces.eth1.ipv4.addresses).address; - slave6 = (lib.head nodes.slave.config.networking.interfaces.eth1.ipv6.addresses).address; + secondary4 = (lib.head nodes.secondary.config.networking.interfaces.eth1.ipv4.addresses).address; + secondary6 = (lib.head nodes.secondary.config.networking.interfaces.eth1.ipv6.addresses).address; in '' import re start_all() client.wait_for_unit("network.target") - master.wait_for_unit("knot.service") - slave.wait_for_unit("knot.service") + primary.wait_for_unit("knot.service") + secondary.wait_for_unit("knot.service") def test(host, query_type, query, pattern): @@ -195,7 +185,7 @@ in { assert re.search(pattern, out), f'Did not match "{pattern}"' - for host in ("${master4}", "${master6}", "${slave4}", "${slave6}"): + for host in ("${primary4}", "${primary6}", "${secondary4}", "${secondary6}"): with subtest(f"Interrogate {host}"): test(host, "SOA", "example.com", r"start of authority.*noc\.example\.com\.") test(host, "A", "example.com", r"has no [^ ]+ record") @@ -211,6 +201,6 @@ in { test(host, "RRSIG", "www.example.com", r"RR set signature is") test(host, "DNSKEY", "example.com", r"DNSSEC key is") - master.log(master.succeed("systemd-analyze security knot.service | grep -v '✓'")) + primary.log(primary.succeed("systemd-analyze security knot.service | grep -v '✓'")) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/matrix/mjolnir.nix b/third_party/nixpkgs/nixos/tests/matrix/mjolnir.nix index b1ac55d951..c88113cb26 100644 --- a/third_party/nixpkgs/nixos/tests/matrix/mjolnir.nix +++ b/third_party/nixpkgs/nixos/tests/matrix/mjolnir.nix @@ -107,7 +107,10 @@ import ../make-test-python.nix ( client = { pkgs, ... }: { environment.systemPackages = [ (pkgs.writers.writePython3Bin "create_management_room_and_invite_mjolnir" - { libraries = [ pkgs.python3Packages.matrix-nio ]; } '' + { libraries = with pkgs.python3Packages; [ + matrix-nio + ] ++ matrix-nio.optional-dependencies.e2e; + } '' import asyncio from nio import ( diff --git a/third_party/nixpkgs/nixos/tests/nixops/default.nix b/third_party/nixpkgs/nixos/tests/nixops/default.nix index b77ac24763..bd00e61436 100644 --- a/third_party/nixpkgs/nixos/tests/nixops/default.nix +++ b/third_party/nixpkgs/nixos/tests/nixops/default.nix @@ -30,12 +30,10 @@ let virtualisation.additionalPaths = [ pkgs.hello pkgs.figlet - - # This includes build dependencies all the way down. Not efficient, - # but we do need build deps to an *arbitrary* depth, which is hard to - # determine. - (allDrvOutputs nodes.server.config.system.build.toplevel) ]; + + # TODO: make this efficient, https://github.com/NixOS/nixpkgs/issues/180529 + system.includeBuildDependencies = true; }; server = { lib, ... }: { imports = [ ./legacy/base-configuration.nix ]; diff --git a/third_party/nixpkgs/nixos/tests/openldap.nix b/third_party/nixpkgs/nixos/tests/openldap.nix index 075bb5d1f6..47d6a91843 100644 --- a/third_party/nixpkgs/nixos/tests/openldap.nix +++ b/third_party/nixpkgs/nixos/tests/openldap.nix @@ -118,7 +118,7 @@ in { }; }; testScript = { nodes, ... }: let - specializations = "${nodes.machine.config.system.build.toplevel}/specialisation"; + specializations = "${nodes.machine.system.build.toplevel}/specialisation"; changeRootPw = '' dn: olcDatabase={1}mdb,cn=config changetype: modify diff --git a/third_party/nixpkgs/nixos/tests/readarr.nix b/third_party/nixpkgs/nixos/tests/readarr.nix new file mode 100644 index 0000000000..bb7dd85298 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/readarr.nix @@ -0,0 +1,18 @@ +import ./make-test-python.nix ({ lib, ... }: + +with lib; + +{ + name = "readarr"; + meta.maintainers = with maintainers; [ jocelynthode ]; + + nodes.machine = + { pkgs, ... }: + { services.readarr.enable = true; }; + + testScript = '' + machine.wait_for_unit("readarr.service") + machine.wait_for_open_port(8787) + machine.succeed("curl --fail http://localhost:8787/") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/timescaledb.nix b/third_party/nixpkgs/nixos/tests/timescaledb.nix new file mode 100644 index 0000000000..00a7f9af09 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/timescaledb.nix @@ -0,0 +1,93 @@ +# mostly copied from ./postgresql.nix as it seemed unapproriate to +# test additional extensions for postgresql there. + +{ system ? builtins.currentSystem +, config ? { } +, pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +let + postgresql-versions = import ../../pkgs/servers/sql/postgresql pkgs; + test-sql = pkgs.writeText "postgresql-test" '' + CREATE EXTENSION timescaledb; + CREATE EXTENSION timescaledb_toolkit; + + CREATE TABLE sth ( + time TIMESTAMPTZ NOT NULL, + value DOUBLE PRECISION + ); + + SELECT create_hypertable('sth', 'time'); + + INSERT INTO sth (time, value) VALUES + ('2003-04-12 04:05:06 America/New_York', 1.0), + ('2003-04-12 04:05:07 America/New_York', 2.0), + ('2003-04-12 04:05:08 America/New_York', 3.0), + ('2003-04-12 04:05:09 America/New_York', 4.0), + ('2003-04-12 04:05:10 America/New_York', 5.0) + ; + + WITH t AS ( + SELECT + time_bucket('1 day'::interval, time) AS dt, + stats_agg(value) AS stats + FROM sth + GROUP BY time_bucket('1 day'::interval, time) + ) + SELECT + average(stats) + FROM t; + ''; + make-postgresql-test = postgresql-name: postgresql-package: makeTest { + name = postgresql-name; + meta = with pkgs.lib.maintainers; { + maintainers = [ typetetris ]; + }; + + nodes.machine = { ... }: + { + services.postgresql = { + enable = true; + package = postgresql-package; + extraPlugins = with postgresql-package.pkgs; [ + timescaledb + timescaledb_toolkit + ]; + settings = { shared_preload_libraries = "timescaledb, timescaledb_toolkit"; }; + }; + }; + + testScript = '' + def check_count(statement, lines): + return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format( + statement, lines + ) + + + machine.start() + machine.wait_for_unit("postgresql") + + with subtest("Postgresql with extensions timescaledb and timescaledb_toolkit is available just after unit start"): + machine.succeed( + "sudo -u postgres psql -f ${test-sql}" + ) + + machine.fail(check_count("SELECT * FROM sth;", 3)) + machine.succeed(check_count("SELECT * FROM sth;", 5)) + machine.fail(check_count("SELECT * FROM sth;", 4)) + + machine.shutdown() + ''; + + }; + applicablePostgresqlVersions = filterAttrs (_: value: versionAtLeast value.version "12") postgresql-versions; +in +mapAttrs' + (name: package: { + inherit name; + value = make-postgresql-test name package; + }) + applicablePostgresqlVersions diff --git a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 940e6c3c0c..e6b0bea5d4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "4.4.6"; + version = "4.4.8"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-VcK74JrVH81sgNeh1FDvCO1jtgkVeLpx5IqlXuzH27A="; + sha256 = "sha256-qdqRvCmp6Q7lcTdOIEHeQKAAOLtJxs867gapopyeHuc="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/blanket/default.nix b/third_party/nixpkgs/pkgs/applications/audio/blanket/default.nix index 4662002c95..5a3d9949f8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/blanket/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/blanket/default.nix @@ -31,13 +31,13 @@ python3Packages.buildPythonApplication rec { pkg-config wrapGAppsHook4 desktop-file-utils + gobject-introspection ]; buildInputs = [ glib gtk4 libadwaita - gobject-introspection gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -48,9 +48,6 @@ python3Packages.buildPythonApplication rec { pygobject3 ]; - # Broken with gobject-introspection setup hook - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; format = "other"; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix b/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix index 70ef1ebdf6..74a84e2a8d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix @@ -1,25 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, alsa-lib, file, fluidsynth, jack2, - liblo, libpulseaudio, libsndfile, pkg-config, python3Packages, - which, withFrontend ? true, - withQt ? true, qtbase ? null, wrapQtAppsHook ? null, - withGtk2 ? true, gtk2 ? null, - withGtk3 ? true, gtk3 ? null }: +{ lib +, stdenv +, fetchFromGitHub +, alsa-lib +, file +, fluidsynth +, jack2 +, liblo +, libpulseaudio +, libsndfile +, pkg-config +, python3Packages +, which +, gtk2 ? null +, gtk3 ? null +, qtbase ? null +, withFrontend ? true +, withGtk2 ? true +, withGtk3 ? true +, withQt ? true +, wrapQtAppsHook ? null +}: -assert withFrontend -> python3Packages ? pyqt5; assert withQt -> qtbase != null; assert withQt -> wrapQtAppsHook != null; -assert withGtk2 -> gtk2 != null; -assert withGtk3 -> gtk3 != null; stdenv.mkDerivation rec { pname = "carla"; - version = "2.5.1"; + version = "2.5.3"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SN+9Q5v0bv+kQcYLBJmSCd9WIGSeQuOZze8LVwF20EA="; + hash = "sha256-J0C3GLdlLMkm3LHl6l3OI2rA73A6z5MMcNJ1I1T0pbI="; }; nativeBuildInputs = [ @@ -60,7 +73,6 @@ stdenv.mkDerivation rec { patchPythonScript "$f" done patchPythonScript "$out/share/carla/carla_settings.py" - patchPythonScript "$out/share/carla/carla_database.py" for program in $out/bin/*; do wrapQtApp "$program" \ diff --git a/third_party/nixpkgs/pkgs/applications/audio/cozy/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cozy/default.nix index 6398141c86..8f7461683b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cozy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cozy/default.nix @@ -24,11 +24,6 @@ python3Packages.buildPythonApplication rec { pname = "cozy"; version = "1.2.1"; - # Temporary fix - # See https://github.com/NixOS/nixpkgs/issues/57029 - # and https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - src = fetchFromGitHub { owner = "geigi"; repo = pname; diff --git a/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix b/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix index 1d363e4b2c..62c5962b53 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix @@ -37,13 +37,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "7.0.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - sha256 = "sha256-SjhJj5kClPd8DT1vzbSdqJ9AJw0XiX9Q8/R8SDnxGPQ="; + sha256 = "sha256-PI29TJSYa/dARlSHe4mO4ejV+muhGFhwVvhA10jziTA="; }; nativeBuildInputs = [ @@ -107,6 +107,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; - badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix b/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix index 66f2a1a02d..da0eef815c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix @@ -10,13 +10,13 @@ # gcc only supports objc on darwin buildGoModule.override { stdenv = clangStdenv; } rec { pname = "go-musicfox"; - version = "3.7.2"; + version = "3.7.3"; src = fetchFromGitHub { owner = "anhoder"; repo = pname; rev = "v${version}"; - hash = "sha256-Wc9HFvBSLQA7jT+LJj+tyHzRbszhR2XD1/3C+SdrAGA="; + hash = "sha256-aM7IJGRRY2V2Rovj042ctg5254EUw1bTuoRCp9Za1FY="; }; deleteVendor = true; @@ -45,6 +45,6 @@ buildGoModule.override { stdenv = clangStdenv; } rec { homepage = "https://github.com/anhoder/go-musicfox"; license = licenses.mit; mainProgram = "musicfox"; - maintainers = with maintainers; [ zendo ]; + maintainers = with maintainers; [ zendo Ruixi-rebirth ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix index a6164189c1..d79aa713f0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix @@ -27,17 +27,12 @@ python3Packages.buildPythonApplication rec { intltool wrapGAppsHook glibcLocales + gobject-introspection ]; - # as of 2021-07, the gobject-introspection setup hook does not - # work with `strictDeps` enabled, thus for proper `wrapGAppsHook` - # it needs to be disabled explicitly. https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - buildInputs = [ python3 gtk3 - gobject-introspection gnome.adwaita-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix index 04216bdf09..b831509854 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix @@ -5,25 +5,26 @@ , stdenv , openssl , libiconv +, sqlite , Security }: rustPlatform.buildRustPackage rec { pname = "listenbrainz-mpd"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "elomatreb"; repo = "listenbrainz-mpd"; rev = "v${version}"; - hash = "sha256-DO7YUqaJZyVWjiAZ9WIVNTTvOU0qdsI2ct7aT/6O5dQ="; + hash = "sha256-AalZTlizaw93KlVffFDjGNoKkCHUFQTiElZgJo64shs="; }; - cargoHash = "sha256-MiAalxe0drRHrST3maVvi8GM2y3d0z4Zl7R7Zx8VjEM="; + cargoHash = "sha256-n24P56ZrF8qEpM45uIFr7bJhlzuAexNr6siEsF219uA="; nativeBuildInputs = [ pkg-config ]; - buildInputs = if stdenv.isDarwin then [ libiconv Security ] else [ openssl ]; + buildInputs = [ sqlite ] ++ (if stdenv.isDarwin then [ libiconv Security ] else [ openssl ]); meta = with lib; { homepage = "https://codeberg.org/elomatreb/listenbrainz-mpd"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix index 76c5de75ef..e72e809e91 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix @@ -52,13 +52,13 @@ mkDerivation rec { pname = "mixxx"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; rev = version; - sha256 = "sha256-NRtrEobdJMFgDXrEeb2t1zeVN8pQP7+pda2DSU/yNX8="; + sha256 = "sha256-1hOMU/Mdk1vT0GQipn/WX2fm9ddN0mPIq7kf2i2w3xQ="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -116,7 +116,7 @@ mkDerivation rec { # mixxx installs udev rules to DATADIR instead of SYSCONFDIR # let's disable this and install udev rules manually via postInstall - # see https://github.com/mixxxdj/mixxx/blob/2.3.3/CMakeLists.txt#L1381-L1392 + # see https://github.com/mixxxdj/mixxx/blob/2.3.4/CMakeLists.txt#L1381-L1392 cmakeFlags = [ "-DINSTALL_USER_UDEV_RULES=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix b/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix index c9e1bed1db..5697e5986c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix @@ -70,9 +70,9 @@ stdenv.mkDerivation rec { Cocoa SystemConfiguration ] ++ lib.optionals coreaudioSupport [ CoreAudio - ] ++ lib.optional sndioSupport [ + ] ++ lib.optionals sndioSupport [ sndio - ] ++ lib.optional pipewireSupport [ + ] ++ lib.optionals pipewireSupport [ pipewire ]; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { "-DDISABLE_STRIP=true" ]; - postFixup = lib.optionals stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.isDarwin '' install_name_tool -add_rpath $out/share/${pname} $out/share/${pname}/${pname} install_name_tool -add_rpath $out/share/${pname} $out/share/${pname}/${pname}d ''; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix index a1a958c3d5..d987c770c9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "mympd"; - version = "10.2.4"; + version = "10.2.5"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${version}"; - sha256 = "sha256-12hCIAwrLQkwiU9t9nNPBdIiHfMidfErSWOA0FPfhBQ="; + sha256 = "sha256-ZxGMvbm9GKhhfCNZdeIYUh2FF4c3vXtvRdu24u3Zrtg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix index c15f6b9c14..85613815b3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "sha256-kqGYBaXmGeGuGJ5fcc4OQzHISU8fVuQNGwiD8nyPa/0="; + hash = "sha256-YWA8chp33SkMdo+XT/7qikIkgwt8pozC9wMFpY8Dv8Q="; }; - cargoSha256 = "sha256-gVXH2pFtyMfYkCqda9NrqOgczvmxiWHe0zArJfnnrgE="; + cargoHash = "sha256-DB3r6pPtustEQG8QXM6qT1hkd7msC//46bhVP/HMxnY="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix b/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix index 20fd355fa0..895691fde9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "opustags"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "fmang"; repo = "opustags"; rev = version; - sha256 = "sha256-vGMRzw46X3DNRIvlI9XEKoDwiJsVL0v9Nfn8pbszRbw="; + sha256 = "sha256-qxtTJ4Hl2ccL+rhONeoOfV6ZyJaWaVDPMsXYJkXCWkY="; }; buildInputs = [ libogg ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix index 384718f1db..5358750b13 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -43,7 +43,7 @@ python3Packages.buildPythonApplication { notify2 pyroute2 pygobject3 - PyChromecast + pychromecast lxml setuptools zeroconf diff --git a/third_party/nixpkgs/pkgs/applications/audio/pulseeffects-legacy/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects-legacy/default.nix index 53d2a998fb..7d255b7a71 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pulseeffects-legacy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects-legacy/default.nix @@ -110,6 +110,5 @@ in stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; - badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/qmmp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qmmp/default.nix index 00931a2101..5712eacd2a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/qmmp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/qmmp/default.nix @@ -5,16 +5,14 @@ # input plugins , libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile , libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi, libbs2b, game-music-emu +, libarchive, opusfile, soxr, wavpack # output plugins -, alsa-lib, libpulseaudio, pipewire +, alsa-lib, libpulseaudio, pipewire, libjack2 # effect plugins , libsamplerate }: # Additional plugins that can be added: -# wavpack (https://www.wavpack.com/) -# Ogg Opus support -# JACK audio support # ProjectM visualization plugin # To make MIDI work we must tell Qmmp what instrument configuration to use (and @@ -45,8 +43,9 @@ stdenv.mkDerivation rec { # input plugins libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile libcdio cdparanoia libcddb faad2 ffmpeg wildmidi libbs2b game-music-emu + libarchive opusfile soxr wavpack # output plugins - alsa-lib libpulseaudio pipewire + alsa-lib libpulseaudio pipewire libjack2 # effect plugins libsamplerate ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix index 72a0ac5209..60f7cf657f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "6.75"; + version = "6.77"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; hash = { - x86_64-linux = "sha256-wtXClHL+SeuLxMROaZKZOwYnLo6MXC7lAiwCj80X0Ck="; - aarch64-linux = "sha256-xCkAbKzXH7E1Ud6iGsnzgZT/2Sy6qpRItYUHFF6ggpQ="; + x86_64-linux = "sha256-1HQtmhcLV/yhrANy1wLM1ju3t9o/lnU1OaYxqe20UFc="; + aarch64-linux = "sha256-17lBwadEDINoXd0yF/hCVFRGoWq6AuFUf4o+uPR6q60="; }.${stdenv.hostPlatform.system}; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix index 9eae394488..78c17d09e0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix @@ -39,10 +39,6 @@ in buildPythonApplication rec { setuptools ]; - # Otherwise the setup hook for gobject-introspection is not run: - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - postPatch = '' # Remove "Local MPD" tab which is not suitable for NixOS. sed -i '/localmpd/d' sonata/consts.py diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix index 2330d9c279..df4cf7af49 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "aome510"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-nWXXaRHTzCXmu4eKw88pKuWXgdG9n7azPeBbXYz+Fio="; + rev = "refs/tags/v${version}"; + hash = "sha256-KHbeCnsdHP7Zsj9KeVLuumcVOW6m7Tz1GgBBQ25Rbyo="; }; - cargoHash = "sha256-y/qHiwZes4nVtjbFN/jL2LFugGpRKnYij7+XXZbqguQ="; + cargoHash = "sha256-51xKCiGdvJ8k9ArWBCazJGgRljqHxZiyTdes4i7JZH8="; nativeBuildInputs = [ pkg-config @@ -46,6 +46,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A command driven spotify player"; homepage = "https://github.com/aome510/spotify-player"; + changelog = "https://github.com/aome510/spotify-player/releases/tag/v${version}"; mainProgram = "spotify_player"; license = licenses.mit; maintainers = with maintainers; [ dit7ya ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix index eeed1e1837..8f3eef1cdb 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation rec { pname = "strawberry"; - version = "1.0.14"; + version = "1.0.15"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - hash = "sha256-ThfycS5yNpp6+mE33qPqEWlhSB3OIF7d/t2XvI+rF2E="; + hash = "sha256-P7M7UIRFr0pABNhb63pV3TqIdTP8Xox4f0BT2ii9rRE="; }; # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead diff --git a/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix index d469c9689a..39de4728f3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix @@ -70,15 +70,11 @@ python3Packages.buildPythonApplication rec { requests semver ] - ++ lib.optional chromecastSupport PyChromecast + ++ lib.optional chromecastSupport pychromecast ++ lib.optional keyringSupport keyring ++ lib.optional serverSupport bottle ; - # hook for gobject-introspection doesn't like strictDeps - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - nativeCheckInputs = with python3Packages; [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix index 47c6a32ad1..b79e9c217e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "tageditor"; - version = "3.7.7"; + version = "3.7.8"; src = fetchFromGitHub { owner = "martchus"; repo = pname; rev = "v${version}"; - hash = "sha256-CjbV/Uwpe+x7LBDUDY+NRonUt549MrjGnlJ2olIrKQ4="; + hash = "sha256-/34KS6nxpIsKEklSRpO+AmGAdpJhapoGe24DCCodU38="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix index db7851d9e1..984938a7b4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { plexapi pulsectl pycairo - PyChromecast + pychromecast pylast pygobject3 pylyrics diff --git a/third_party/nixpkgs/pkgs/applications/audio/touchosc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/touchosc/default.nix index dff52d1257..2e755dab50 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/touchosc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/touchosc/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "touchosc"; - version = "1.1.6.150"; + version = "1.1.9.163"; suffix = { aarch64-linux = "linux-arm64"; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; hash = { - aarch64-linux = "sha256-sYkAFyXnmzgSzo68OF0oiv8tUvY+g1WCcY783OZO+RM="; - armv7l-linux = "sha256-GWpYW1262plxIzPVzBEh4Z3fQIhSmy0N9xAgwnjXrQE="; - x86_64-linux = "sha256-LUWlLEsTUqVoWAkjXC/zOziPqO85H8iIlwJU7eqLRcY="; + aarch64-linux = "sha256-LhF0pgMRbEXeLt5g56VBNuCssaTjsczx/+C76ckmGZo="; + armv7l-linux = "sha256-T4AzXIbhO6fNN8xDFwz6M2lSH6hLgNjVyDsSt8m+Mr4="; + x86_64-linux = "sha256-LJ36kHx8PPzfLpJMx1ANSmifS84saCQ8pF0quhgzdt0="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/touchosc/update.sh b/third_party/nixpkgs/pkgs/applications/audio/touchosc/update.sh index f656a1df72..dc3e2f0888 100755 --- a/third_party/nixpkgs/pkgs/applications/audio/touchosc/update.sh +++ b/third_party/nixpkgs/pkgs/applications/audio/touchosc/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix curl libxml2 jq common-updater-scripts +#!nix-shell -i bash -p nix curl libxml2 jq set -euo pipefail @@ -8,6 +8,20 @@ nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixp attr="${UPDATE_NIX_ATTR_PATH:-touchosc}" version="$(curl -sSL https://hexler.net/touchosc/appcast/linux | xmllint --xpath '/rss/channel/item/enclosure/@*[local-name()="version"]' - | cut -d= -f2- | tr -d '"' | head -n1)" +narhash() { + nix --extra-experimental-features nix-command store prefetch-file --json "$url" | jq -r .hash +} + +nixeval() { + if [ "$#" -ge 2 ]; then + systemargs=(--argstr system "$2") + else + systemargs=() + fi + + nix --extra-experimental-features nix-command eval --json --impure "${systemargs[@]}" -f "$nixpkgs" "$1" | jq -r . +} + findpath() { path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)" outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")" @@ -19,15 +33,22 @@ findpath() { echo "$path" } +oldversion="${UPDATE_NIX_OLD_VERSION:-$(nixeval "$attr".version)}" + pkgpath="$(findpath "$attr")" -sed -i -e "/version\s*=/ s|\"$UPDATE_NIX_OLD_VERSION\"|\"$version\"|" "$pkgpath" +if [ "$version" = "$oldversion" ]; then + echo 'update.sh: New version same as old version, nothing to do.' + exit 0 +fi + +sed -i -e "/version\s*=/ s|\"$oldversion\"|\"$version\"|" "$pkgpath" for system in aarch64-linux armv7l-linux x86_64-linux; do - url="$(nix --extra-experimental-features nix-command eval --json --impure --argstr system "$system" -f "$nixpkgs" "$attr".src.url | jq -r .)" + url="$(nixeval "$attr".src.url "$system")" - curhash="$(nix --extra-experimental-features nix-command eval --json --impure --argstr system "$system" -f "$nixpkgs" "$attr".src.outputHash | jq -r .)" - newhash="$(nix --extra-experimental-features nix-command store prefetch-file --json "$url" | jq -r .hash)" + curhash="$(nixeval "$attr".src.outputHash "$system")" + newhash="$(narhash "$url")" sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath" done diff --git a/third_party/nixpkgs/pkgs/applications/audio/zrythm/default.nix b/third_party/nixpkgs/pkgs/applications/audio/zrythm/default.nix index 7b92626d5b..fbb040709a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/zrythm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/zrythm/default.nix @@ -1,34 +1,43 @@ { stdenv , lib , fetchFromGitHub +, fetchFromSourcehut , SDL2 , alsa-lib -, libaudec +, appstream +, appstream-glib , bash-completion +, boost , breeze-icons , carla , chromaprint , cmake , curl +, dbus , dconf -, libepoxy +, faust2lv2 , fftw , fftwFloat , flex , glib +, graphviz , gtk4 , gtksourceview5 , guile -, graphviz , help2man -, json-glib , jq +, json-glib +, libadwaita +, libaudec , libbacktrace , libcyaml +, libepoxy , libgtop , libjack2 +, libpanel , libpulseaudio , libsamplerate +, libsass , libsndfile , libsoundio , libxml2 @@ -46,31 +55,48 @@ , rtaudio , rtmidi , rubberband +, sassc , serd , sord +, sox , sratom , texi2html +, vamp-plugin-sdk , wrapGAppsHook , xdg-utils , xxHash -, vamp-plugin-sdk +, zix , zstd -, libadwaita -, sassc }: -stdenv.mkDerivation rec { - pname = "zrythm"; - version = "1.0.0-alpha.28.1.3"; +let + # As of zrythm-1.0.0-beta.4.5.62, Zrythm needs clap + # https://github.com/falktx/carla/tree/main/source/includes/clap, which is + # only available on Carla unstable as of 2023-02-24. + carla-unstable = carla.overrideAttrs (oldAttrs: rec { + pname = "carla"; + version = "unstable-2023-02-24"; - src = fetchFromGitHub { - owner = pname; + src = fetchFromGitHub { + owner = "falkTX"; + repo = pname; + rev = "33a142f447925f55d00532933a1f28e9745c13eb"; + hash = "sha256-hQj0HlcOYfwsxG05pq/qcuKcOwDMV1ED+YdxBToBzvk="; + }; + }); +in stdenv.mkDerivation rec { + pname = "zrythm"; + version = "1.0.0-beta.4.5.62"; + + src = fetchFromSourcehut { + owner = "~alextee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ERE7I6E3+RmmpnZEtcJL/1v9a37IwFauVsbJvI9gsRQ="; + hash = "sha256-K93Y4Adh9TqoetSn7nrbbruIri1MKYoSGzoRBGHwbPA="; }; nativeBuildInputs = [ + cmake help2man jq libaudec @@ -81,36 +107,44 @@ stdenv.mkDerivation rec { pkg-config python3 python3.pkgs.sphinx + sassc texi2html wrapGAppsHook - cmake ]; buildInputs = [ SDL2 alsa-lib + appstream + appstream-glib bash-completion - carla + boost + breeze-icons + carla-unstable chromaprint curl + dbus dconf - libepoxy + faust2lv2 fftw fftwFloat flex - breeze-icons glib + graphviz gtk4 gtksourceview5 - graphviz guile json-glib + libadwaita libbacktrace libcyaml + libepoxy libgtop libjack2 + libpanel libpulseaudio libsamplerate + libsass libsndfile libsoundio libyaml @@ -124,34 +158,46 @@ stdenv.mkDerivation rec { rubberband serd sord + sox sratom vamp-plugin-sdk xdg-utils xxHash + zix zstd - libadwaita - sassc ]; + # Zrythm uses meson to build, but requires cmake for dependency detection. + dontUseCmakeConfigure = true; + mesonFlags = [ - "-Drtmidi=enabled" - "-Drtaudio=enabled" - "-Dsdl=enabled" - "-Dcarla=enabled" - "-Dmanpage=true" - # "-Duser_manual=true" # needs sphinx-intl - "-Dlsp_dsp=disabled" "-Db_lto=false" + "-Dcarla=enabled" + "-Dcarla_binaries_dir=${carla-unstable}/lib/carla" "-Ddebug=true" + "-Dfftw3_threads_separate=false" + "-Dfftw3_threads_separate_type=library" + "-Dfftw3f_separate=false" + "-Dlsp_dsp=disabled" + "-Dmanpage=true" + "-Drtaudio=enabled" + "-Drtmidi=enabled" + "-Dsdl=enabled" + # "-Duser_manual=true" # needs sphinx-intl ]; NIX_LDFLAGS = '' -lfftw3_threads -lfftw3f_threads ''; + GUILE_AUTO_COMPILE = 0; + dontStrip = true; postPatch = '' + substituteInPlace meson.build \ + --replace "'/usr/lib', '/usr/local/lib', '/opt/homebrew/lib'" "'${fftw}/lib'" + chmod +x scripts/meson-post-install.sh patchShebangs ext/sh-manpage-completions/run.sh scripts/generic_guile_wrap.sh \ scripts/meson-post-install.sh tools/check_have_unlimited_memlock.sh @@ -160,13 +206,13 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( --prefix GSETTINGS_SCHEMA_DIR : "$out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas/" - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" - ) + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${breeze-icons}/share" + ) ''; meta = with lib; { homepage = "https://www.zrythm.org"; - description = "Highly automated and intuitive digital audio workstation"; + description = "Automated and intuitive digital audio workstation"; maintainers = with maintainers; [ tshaynik magnetophon ]; platforms = platforms.linux; license = licenses.agpl3Plus; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix index 700a65f3a5..3ecf6e9eb4 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix @@ -18,7 +18,7 @@ , zlib }: let - py3 = python3.withPackages (p: [ p.Mako ]); + py3 = python3.withPackages (p: [ p.mako ]); in stdenv.mkDerivation rec { pname = "clightning"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix index e4823f1a66..fd864e65eb 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix @@ -2,7 +2,7 @@ let pname = "erigon"; - version = "2.39.0"; + version = "2.40.1"; in buildGoModule { inherit pname version; @@ -11,11 +11,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HlAnuc6n/de6EzHTit3xGCFLrc2+S+H/o0gCxH8d0aU="; + sha256 = "sha256-iuJ/iajZiqKBP4hgrwt8KKkWEdYa+idpai/aWpCOjQw="; fetchSubmodules = true; }; - vendorSha256 = "sha256-kKwaA6NjRdg97tTEzEI+TWMSx7izzFWcefR5B086cUY="; + vendorSha256 = "sha256-0xHu7uvk7kRxyLXGvrT9U8vgfZPrs7Rmg2lFH49YOSI="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/default.nix index 78c503e7ee..2e78049b66 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { pname = "lighthouse"; - version = "3.5.0"; + version = "3.5.1"; # lighthouse/common/deposit_contract/build.rs depositContractSpecVersion = "0.12.1"; @@ -30,10 +30,10 @@ rustPlatform.buildRustPackage rec { owner = "sigp"; repo = "lighthouse"; rev = "v${version}"; - hash = "sha256-09EQr/ghgdcnek0dih0+TXyIh5qwGWmg+nhI8d9n3Jc="; + hash = "sha256-oF32s1nfzEZbaNUi5sQSrotcyOSinULj/qrRQWdMXHg="; }; - cargoHash = "sha256-NWG3yIgxfD1GkiQ6TyZF4lNPy9s/i/9TaTujlOtx2NI="; + cargoHash = "sha256-T404OxWBDy8ghQDdhqt0jac+Tff8ph6D3gGnKrToXHY="; buildFeatures = [ "modern" "gnosis" ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix index 096ff9bd9b..23e75c0e89 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix @@ -12,13 +12,13 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.39"; + version = "0.9.39-1"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - hash = "sha256-ewjab9BtItJWtadEZO1PH5+2fOAafNof+2uVm8e78V4="; + hash = "sha256-Hr3VFqfoBW7VGc7FXLxeCtZDLRMM+jITgR8LGA5uEP8="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-KqdUh+ES9UB01yrmNVXdiyYZPh9pjJOEjcuwlJr6Jxc="; + cargoHash = "sha256-gLU/3wHiSpOA7oQwmy7v5s3PiAtElJv4EwLqdOyKhds="; buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/bless/default.nix b/third_party/nixpkgs/pkgs/applications/editors/bless/default.nix index f79d727923..dc7e0ff2f8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/bless/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/bless/default.nix @@ -66,6 +66,5 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.mkg20001 ]; license = licenses.gpl2; platforms = platforms.linux; - badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/bvi/default.nix b/third_party/nixpkgs/pkgs/applications/editors/bvi/default.nix index e4e41ec732..d032435a6f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/bvi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/bvi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bvi"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { url = "mirror://sourceforge/bvi/${pname}-${version}.src.tar.gz"; - sha256 = "0a0yl0dcyff31k3dr4dpgqmlwygp8iaslnr5gmb6814ylxf2ad9h"; + sha256 = "sha256-S7oWwrSWljqbk5M2wKvMjUiGZEkggK5DqG2hjPTOlPI="; }; buildInputs = [ ncurses ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/codeblocks/default.nix b/third_party/nixpkgs/pkgs/applications/editors/codeblocks/default.nix index 441b224ef0..60edd1871b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/codeblocks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/codeblocks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK31, gtk3 +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK32, gtk3 , contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ]; - buildInputs = [ wxGTK31 gtk3 ] + buildInputs = [ wxGTK32 gtk3 ] ++ lib.optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; patches = [ @@ -47,11 +47,74 @@ stdenv.mkDerivation rec { url = "https://github.com/arnholm/codeblocks_sfmirror/commit/2345b020b862ec855038dd32a51ebb072647f28d.patch"; sha256 = "sha256-RRjwZA37RllnG8cJdBEnASpEd8z0+ru96fjntO42OvU="; }) + (fetchpatch { + name = "fix-taskbar-icons.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/40eb88e3f2b933f19f9933e06c8d0899c54f5e25.patch"; + hash = "sha256-Gj5gtxX5QNYAeF+QrPS/bBHLLEmflSxUHSLUK3GSs0I="; + }) + (fetchpatch { + name = "fix-warnings.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/56ac0396fad7a5b4bbb40bb8c4b5fe1755078aef.patch"; + excludes = [ "src/src/environmentsettingsdlg.h" ]; + hash = "sha256-tl4rF9iAf1TzCIbKhVFqcxvr1IiPdwqLYZg0SY5BJ7I="; + }) (fetchpatch { name = "fix-getstring.patch"; url = "https://github.com/arnholm/codeblocks_sfmirror/commit/dbdf5c5ea9e3161233f0588a7616b7e4fedc7870.patch"; sha256 = "sha256-DrEMFluN8vs0LERa7ULGshl7HdejpsuvXAMjIr/K1fQ="; }) + # Fix build with wxGTK 3.1.6 + (fetchpatch { + name = "remove-code-for-old-wx-1.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/8035dfdff321754819f79e3165401aa59bd8c7f7.patch"; + hash = "sha256-Z8Ap03W/XH5VwKFVudJr7rugb0BgI2dKJgQS4yIWbEM="; + }) + (fetchpatch { + name = "remove-code-for-old-wx-2.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/9a9c6a9d5e3e0f6eff5594ecd61a2222f073be9c.patch"; + hash = "sha256-SwYixvbRuXQ+jA1ijmClWkzqzzr0viVuFOAsihGc5dM="; + }) + (fetchpatch { + name = "remove-code-for-old-wx-3.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/c28746f4887f10e6f9f10eeafae0fb22ecdbf9c7.patch"; + hash = "sha256-1lcIiCnY2nBuUsffXC2rdglOE3ccIbogcgTx4M2Ee2I="; + }) + (fetchpatch { + name = "fix-notebookstyles.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/29315df024251850832583f73e67e515dae10830.patch"; + hash = "sha256-Uc1V0eEbNljnN+1Dqb/35MLSSoLjyuRZMTofgcXRyb8="; + }) + (fetchpatch { + name = "fix-regex.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/46720043319758cb0e798eb23520063583c40eaa.patch"; + hash = "sha256-Aix58T0JJcX/7VZukU/9i/nXh9GJywXC3yXEyUZK0js="; + }) + (fetchpatch { + name = "fix-build-with-clang.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/92cb2239662952e3b59b31e03edd653bb8066e64.patch"; + hash = "sha256-XI7JW9Nuueb7muKpaC2icM/CxhrCJtO48cLHK+BVWXI="; + }) + (fetchpatch { + name = "fix-normalize.patch"; + url = "https://github.com/archlinux/svntogit-community/raw/458eacb60bc0e71e3d333943cebbc41e75ed0956/trunk/sc_wxtypes-normalize.patch"; + hash = "sha256-7wEwDLwuNUWHUwHjFyq74sHiuEha1VexRLEX42rPZSs="; + }) + # Fix HiDPI + (fetchpatch { + name = "update-about-dialog.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/a4aacc92640b587ad049cd6aa68c637e536e9ab5.patch"; + hash = "sha256-2S4sVn+Dq5y9xcxCkzQ+WeR+qWxAOLbQUZEnk060RI0="; + }) + (fetchpatch { + name = "add-display-info.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/f2f127cf5cd97c7da6a957a3f7764cb25cc9017e.patch"; + hash = "sha256-C0dVfC0NIHMXfWNlOwjzoGz5tmG2dlnU/EE92Jjebbs="; + }) + (fetchpatch { + name = "fix-hidpi.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/b2e4f1279804e1d11b71bc75eeb37072c3589296.patch"; + hash = "sha256-/Xp6ww9C3V6I67tTA4MrGpSGo3J0MXzFjzQU7RxY84U="; + }) ]; preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; postConfigure = lib.optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix index 08e6d7ea44..5ff9dd593e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.186.2"; + version = "1.187.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-qpxYzman93e+u0BHxdhBUyfnZOR4hjQpTuNikGDNQCA="; + hash = "sha256-Ri/VTJF59GCJdhbMWRAYaQifj7FjVYSACywpq8gHKXg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json index 86854afd48..85cefe1444 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json +++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json @@ -11,18 +11,18 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2023.02.05", - "hash": "sha256-ZOnIhUnFd+7mBEz6YIhUOQkhBbCNeTFD0tfUILuC1x4=" + "rev": "2023.03.10", + "hash": "sha256-RHNWJN+P3w67UupeikHn6GrWZCOSoGCrP7BYG7myx+A=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.03.02", - "hash": "sha256-rZzcWED8c68wtejUho71kbPtLyDyOlXpS/eg8Ti0r2A=" + "rev": "2023.03.10", + "hash": "sha256-NdLg/cQNy5SaC/zPb3bLplUe6FiO7ePi1++WDIvQziI=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2022.10.18", - "hash": "sha256-yaS1XF0v5rkfKj9aksSc4XimKh5wpL7yLt4ElcIKAIE=" + "rev": "2023.03.10", + "hash": "sha256-KfzTO0GMFkWRFxbRSdKAh4sr7cx7A2snj/UO1nsvacI=" }, "EControl": { "owner": "Alexey-T", 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 6ee95f860a..41329ec143 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 @@ -366,21 +366,6 @@ license = lib.licenses.free; }; }) {}; - beframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "beframe"; - ename = "beframe"; - version = "0.1.11"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/beframe-0.1.11.tar"; - sha256 = "1r5wlg2xaih197fi3jk0qmnhpy7mc6xrwraxfnygsjwr63dxhnq2"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/beframe.html"; - license = lib.licenses.free; - }; - }) {}; bind-key = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "bind-key"; @@ -1674,16 +1659,16 @@ license = lib.licenses.free; }; }) {}; - erc = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: + erc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "erc"; ename = "erc"; - version = "5.5"; + version = "5.4.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/erc-5.5.tar"; - sha256 = "02649ijnpyalk0k1yq1dcinj92awhbnkia2x9sdb9xjk80xw1gqp"; + url = "https://elpa.gnu.org/packages/erc-5.4.1.tar"; + sha256 = "0hghqwqrx11f8qa1zhyhjqp99w01l686azsmd24z9w0l93fz598a"; }; - packageRequires = [ compat emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/erc.html"; license = lib.licenses.free; @@ -2627,10 +2612,10 @@ elpaBuild { pname = "kind-icon"; ename = "kind-icon"; - version = "0.2.0"; + version = "0.1.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/kind-icon-0.2.0.tar"; - sha256 = "1vgwbd99vx793iy04albkxl24c7vq598s7bg0raqwmgx84abww6r"; + url = "https://elpa.gnu.org/packages/kind-icon-0.1.9.tar"; + sha256 = "0phssrcpmcidzlwy1577f3f02qwjs6hpavb416302y0n8kkhwvli"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -3062,10 +3047,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.1.1"; + version = "3.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-4.1.1.tar"; - sha256 = "06lp7mpazby7iiwzw4naym983plg9r63ba9vmaszh3609d2gm0s9"; + url = "https://elpa.gnu.org/packages/modus-themes-3.0.0.tar"; + sha256 = "1c3rls175nmc4n01hfzwqxv2nhyv8n6i8d4pv93k28z6c30n8lhs"; }; packageRequires = [ emacs ]; meta = { @@ -3746,10 +3731,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.42"; + version = "0.4.39"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.42.tar"; - sha256 = "040wrmz9wl0x86vdgzyfdwxdciscd94v9nfgfz0ir2ghwhw6j9x3"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.39.tar"; + sha256 = "0wixalji4c4hjqb41n1yvxfy3qfl2ipfsjawbgk9wdwb7jkhjr1i"; }; packageRequires = [ emacs ]; meta = { @@ -3836,10 +3821,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.4.0"; + version = "1.3.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-1.4.0.tar"; - sha256 = "0pqy7scdi3qxj518xm0bbr3979byfxqxxh64wny37xzhd4apsw5j"; + url = "https://elpa.gnu.org/packages/posframe-1.3.3.tar"; + sha256 = "07hgbhvhwj6zfhlg6znavwrj3gp7cv4c758chrhkvk33a3slhw6b"; }; packageRequires = [ emacs ]; meta = { @@ -4437,10 +4422,10 @@ elpaBuild { pname = "shell-command-plus"; ename = "shell-command+"; - version = "2.4.2"; + version = "2.4.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.4.2.tar"; - sha256 = "1ldvil6hjs8c7wpdwx0jwaar867dil5qh6vy2k27i1alffr9nnqm"; + url = "https://elpa.gnu.org/packages/shell-command+-2.4.1.tar"; + sha256 = "1pbv5g58647gq83vn5pg8c6kjhvjn3lj0wggz3iz3695yvl8aw4i"; }; packageRequires = [ emacs ]; meta = { @@ -4911,10 +4896,10 @@ elpaBuild { pname = "taxy-magit-section"; ename = "taxy-magit-section"; - version = "0.12.2"; + version = "0.12.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/taxy-magit-section-0.12.2.tar"; - sha256 = "1pf83zz5ibhqqlqgcxig0dsl1rnkk5r6v16s5ngvbc37q40vkwn1"; + url = "https://elpa.gnu.org/packages/taxy-magit-section-0.12.1.tar"; + sha256 = "0bs00y8pl51dji23zx5w64h6la0y109q0jv2q1nggizk6q5bsxmg"; }; packageRequires = [ emacs magit-section taxy ]; meta = { @@ -5050,10 +5035,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.6.0.2"; + version = "2.6.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.6.0.2.tar"; - sha256 = "0pfrsgci1rqrykkfyxm9wsn7f0l3rzc2vj1fas27w925l0k0lrci"; + url = "https://elpa.gnu.org/packages/tramp-2.6.0.1.tar"; + sha256 = "1mxkl8v40wdcyvsyjayw9yj7ghn5zrnzgaapwh1prxs42scw85x8"; }; packageRequires = [ emacs ]; meta = { @@ -5155,10 +5140,10 @@ elpaBuild { pname = "triples"; ename = "triples"; - version = "0.2.6"; + version = "0.2.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/triples-0.2.6.tar"; - sha256 = "09vr8r78vpycpxglacbgy2fy01khmvhh42panilwz2n9nhjy6xzm"; + url = "https://elpa.gnu.org/packages/triples-0.2.3.tar"; + sha256 = "1p6vijaab3a7h9lqlxxhyipwd9rkr15r3rm0iyxxanlcggi04a39"; }; packageRequires = [ emacs seq ]; meta = { @@ -5426,10 +5411,10 @@ elpaBuild { pname = "vertico-posframe"; ename = "vertico-posframe"; - version = "0.7.2"; + version = "0.7.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.2.tar"; - sha256 = "1sbgg0syyk24phwzji40lyw5dmwxssgvwv2fs8mbmkhv0q44f9ny"; + url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.1.tar"; + sha256 = "18a65hnacavy375ry5qmfj454b10h2yg9p6wbx1wdx30fwpi247a"; }; packageRequires = [ emacs posframe vertico ]; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index a7e8721f75..b58465e20e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -5,10 +5,16 @@ let inherit (self) callPackage; in { + acm = callPackage ./manual-packages/acm { }; + + acm-terminal = callPackage ./manual-packages/acm-terminal { }; + agda-input = callPackage ./manual-packages/agda-input { }; agda2-mode = callPackage ./manual-packages/agda2-mode { }; + bqn-mode = callPackage ./manual-packages/bqn-mode { }; + cask = callPackage ./manual-packages/cask { }; control-lock = callPackage ./manual-packages/control-lock { }; @@ -47,6 +53,10 @@ in llvm-mode = callPackage ./manual-packages/llvm-mode { }; + lsp-bridge = callPackage ./manual-packages/lsp-bridge { + inherit (pkgs) python3 git go gopls pyright; + }; + matrix-client = callPackage ./manual-packages/matrix-client { _map = self.map; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix new file mode 100644 index 0000000000..8aadb0867c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix @@ -0,0 +1,43 @@ +{ lib +, melpaBuild +, fetchFromGitHub +, acm +, popon +, writeText +, unstableGitUpdater +}: + +let + rev = "321e05fc0398a6159925b858f46608ea07ef269e"; +in +melpaBuild { + pname = "acm-terminal"; + version = "20230215.414"; # 4:14 UTC + + src = fetchFromGitHub { + owner = "twlz0ne"; + repo = "acm-terminal"; + inherit rev; + sha256 = "sha256-Flw07EwH9z0E3tqXs4mStICJmoHfp60ALrP1GmUmeuU="; + }; + + commit = rev; + + packageRequires = [ + acm + popon + ]; + + recipe = writeText "recipe" '' + (acm-terminal :repo "twlz0ne/acm-terminal" :fetcher github) + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "Patch for LSP bridge acm on Terminal"; + homepage = "https://github.com/twlz0ne/acm-terminal"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ kira-bruneau ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/default.nix new file mode 100644 index 0000000000..5879865c90 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/default.nix @@ -0,0 +1,32 @@ +{ lib +, melpaBuild +, lsp-bridge +, yasnippet +, writeText +}: + +melpaBuild { + pname = "acm"; + version = lsp-bridge.version; + + src = lsp-bridge.src; + commit = lsp-bridge.src.rev; + + packageRequires = [ + yasnippet + ]; + + recipe = writeText "recipe" '' + (acm + :repo "manateelazycat/lsp-bridge" + :fetcher github + :files ("acm/*.el" "acm/icons")) + ''; + + meta = with lib; { + description = "Asynchronous Completion Menu"; + homepage = "https://github.com/manateelazycat/lsp-bridge"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fxttr kira-bruneau ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/bqn-mode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/bqn-mode/default.nix new file mode 100644 index 0000000000..6430e56ef7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/bqn-mode/default.nix @@ -0,0 +1,22 @@ +{ lib +, trivialBuild +, fetchFromGitHub +}: + +trivialBuild { + pname = "bqn-mode"; + version = "0.pre+date=2022-09-14"; + + src = fetchFromGitHub { + owner = "museoa"; + repo = "bqn-mode"; + rev = "3e3d4758c0054b35f047bf6d9e03b1bea425d013"; + hash = "sha256:0pz3m4jp4dn8bsmc9n51sxwdk6g52mxb6y6f6a4g4hggb35shy2a"; + }; + + meta = with lib; { + description = "Emacs mode for BQN programming language"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ sternenseemann AndersonTorres ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix new file mode 100644 index 0000000000..bdfe1ed2c8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -0,0 +1,97 @@ +{ lib +, python3 +, melpaBuild +, fetchFromGitHub +, substituteAll +, acm +, markdown-mode +, posframe +, git +, go +, gopls +, pyright +, tempel +, writeText +, unstableGitUpdater +}: + +let + rev = "c5dc02f6bd47039c320083b3befac0e569c0efa4"; + python = python3.withPackages (ps: with ps; [ + epc + orjson + sexpdata + six + ]); +in +melpaBuild { + pname = "lsp-bridge"; + version = "20230311.1648"; # 16:48 UTC + + src = fetchFromGitHub { + owner = "manateelazycat"; + repo = "lsp-bridge"; + inherit rev; + sha256 = "sha256-vbSVGPFBjAp4VRbJc6a2W0d2IqOusNa+rk4X6jRcjRI="; + }; + + commit = rev; + + # Hardcode the python dependencies needed for lsp-bridge, so users + # don't have to modify their global environment + postPatch = '' + substituteInPlace lsp-bridge.el --replace \ + '(defcustom lsp-bridge-python-command (if (memq system-type '"'"'(cygwin windows-nt ms-dos)) "python.exe" "python3")' \ + '(defcustom lsp-bridge-python-command "${python.interpreter}"' + ''; + + packageRequires = [ + acm + markdown-mode + posframe + ]; + + buildInputs = [ python ]; + + checkInputs = [ + git + go + gopls + pyright + tempel + ]; + + recipe = writeText "recipe" '' + (lsp-bridge + :repo "manateelazycat/lsp-bridge" + :fetcher github + :files + ("*.el" + "lsp_bridge.py" + "core" + "langserver" + "multiserver" + "resources")) + ''; + + doCheck = true; + checkPhase = '' + runHook preCheck + + cd "$sourceRoot" + mkfifo test.log + cat < test.log & + HOME=$(mktemp -d) python -m test.test + + runHook postCheck + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "A blazingly fast LSP client for Emacs"; + homepage = "https://github.com/manateelazycat/lsp-bridge"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fxttr kira-bruneau ]; + }; +} 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 c4ad89429c..801148d32f 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 @@ -3182,10 +3182,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "22.12.20230301220803"; + version = "22.9.20230207171612"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-22.12.20230301220803.tar"; - sha256 = "0m1wyhxqsih7777hchjk4v742ar16frdjvxyspa72az881yinv5g"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-22.9.20230207171612.tar"; + sha256 = "0m633k8rx2k3gwbh3hndkmn3k804pg7j7xmqw6yf8j2a2ym4893b"; }; packageRequires = [ emacs ]; meta = { 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 04a04cec07..61557a95e1 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 @@ -204,11 +204,11 @@ "repo": "ymarco/auto-activating-snippets", "unstable": { "version": [ - 20230303, - 2214 + 20220930, + 52 ], - "commit": "ddc2b7a58a2234477006af348b30e970f73bc2c1", - "sha256": "03rqj11xdkspxcx2zjd71fnk7lpcjr0lws0i729qhsi1nr98jjn4" + "commit": "e92b5cffa4e87c221c24f3e72ae33959e1ec2b68", + "sha256": "1nl7wm4l30hjcbqrvdci66aa6ax32ih46n58q3imc46z8c6rhqxh" }, "stable": { "version": [ @@ -1061,8 +1061,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20230224, - 1507 + 20220701, + 253 ], "deps": [ "dash", @@ -1072,8 +1072,8 @@ "s", "xcscope" ], - "commit": "35eeaa3aaf1a38b183783dc693012242c7dd2053", - "sha256": "0mvmib4yscpahj7zq1w88x6gdf80y482icwdv5pr7ai3ysvb70b9" + "commit": "dc563f4b1efeac8ae75f217532f4c99b4ba417de", + "sha256": "188hisppjbpia3bmrpsxvkfi8xkirisarnrpvkk3ya4k8lv4z13p" }, "stable": { "version": [ @@ -1917,14 +1917,14 @@ "repo": "minad/affe", "unstable": { "version": [ - 20230301, - 337 + 20230215, + 715 ], "deps": [ "consult" ], - "commit": "21a6c74157b02388f429e8d5f8c910d04aa16f08", - "sha256": "0yrmz7nlclizx7z90xx8c66bqlmi43iphx3sagqrmasik671a2rj" + "commit": "69d9d05200dbf9058b3ae14e37f52944718374d7", + "sha256": "1p5hqlkhl1vi2m1wpjhzv38jbs5b1c4ji4nqsiyc37h3mp05nbbc" }, "stable": { "version": [ @@ -2556,14 +2556,14 @@ "repo": "iyefrat/all-the-icons-completion", "unstable": { "version": [ - 20230224, - 1610 + 20221130, + 2354 ], "deps": [ "all-the-icons" ], - "commit": "b08f053cee444546ab44a05fd541f59e8bc8983b", - "sha256": "1mfdhiv70ay7mlcvm6aibjx8fa9vdy75al4rmdkcms9wf9qv0g3l" + "commit": "4da28584a1b36b222e0e78d46fd8d46bbd9116c7", + "sha256": "0b5m1djwhfbjakfda72ybqrw3rzmrq154yfpv4p8wgxknc5xjxfr" } }, { @@ -3694,19 +3694,19 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20230225, - 1931 + 20230219, + 100 ], - "commit": "ffa8d5865118bb33299a429e9c25577a79410542", - "sha256": "0rcga3nq1ly5xg61zv3jxgqi0krxk86c24wcrij4vzidhn0s9ncn" + "commit": "972b9906bf6d23f5a8e92129a4572a906bdfe45e", + "sha256": "1zjnhgkjhgg58c486k6a0p3kns9kap0lfk538059r65nrv4mkbzp" }, "stable": { "version": [ 3, - 2 + 1 ], - "commit": "ffa8d5865118bb33299a429e9c25577a79410542", - "sha256": "0rcga3nq1ly5xg61zv3jxgqi0krxk86c24wcrij4vzidhn0s9ncn" + "commit": "5286b1c61c82755e9486cb210524ceed038b265f", + "sha256": "1145zh7nqadgz5r2llwjwgj2aciv08mn2cpp3zlf0rf3awg86yg7" } }, { @@ -4510,15 +4510,15 @@ "repo": "alpha22jp/atomic-chrome", "unstable": { "version": [ - 20230304, - 112 + 20220723, + 113 ], "deps": [ "let-alist", "websocket" ], - "commit": "f1b077be7e414f457191d72dcf5eedb4371f9309", - "sha256": "01024ikcy23hkxjpy6qlsa8sj3cyf4p3igx5i31qkq21dm7b8xqv" + "commit": "061958ab96c31085b5daf449b1d826b052777b59", + "sha256": "0jfmw11d18v8qjcqcfkcmq66ccaa97jq7y5v7m67kf2hcawxk2a4" }, "stable": { "version": [ @@ -6031,11 +6031,11 @@ "repo": "vutran1710/Ayu-Theme-Emacs", "unstable": { "version": [ - 20230225, - 1600 + 20200521, + 1157 ], - "commit": "16fc8d8085ca7763915fecd782ad11a596ca5773", - "sha256": "01ipwi06hqhz8zac4gc3gqjfcb3bsbx6armkf2zy31hjpz9b59kh" + "commit": "ed98a9f41d9f0e08458ee71cc1038f66c50e1979", + "sha256": "1qdw9pq1daydky0b94x248q27sjzaxpfw9d027xk6ygi9hksvcsk" } }, { @@ -6263,10 +6263,10 @@ }, { "ename": "baidu-translate", - "commit": "ffd4c67ca8cf6b45427cefa42c642399bdc86295", - "sha256": "1zmibqy35k31hmq345ryhzhg2r114wa5gl52v0b68x10v7288j5a", + "commit": "ccfcd6624cfcfa242f18c3d81127e09b34c333a3", + "sha256": "1icsbbwar20qv0cpy3qssmbnwwjm07nqn126a0vb3yyv9amh76xl", "fetcher": "github", - "repo": "suxiaogang223/baidu-translate", + "repo": "LiShiZhensPi/baidu-translate", "unstable": { "version": [ 20211130, @@ -6393,11 +6393,11 @@ "repo": "szermatt/emacs-bash-completion", "unstable": { "version": [ - 20230302, - 1959 + 20230208, + 1903 ], - "commit": "91d51ede0d9424766a0c174890a331385390f7fa", - "sha256": "00v492mnz663mhw1dzimsvswpqz9aipyp1fachjqsmgld2vh5b19" + "commit": "25611eed1e086c4e8cdd335dbd38b1d796be5b8d", + "sha256": "0hqqb7dprwbyhjmymknxcixwqk13fm6aninbjhlaxgwv93i2ghfb" }, "stable": { "version": [ @@ -6915,20 +6915,20 @@ "repo": "DamienCassou/beginend", "unstable": { "version": [ - 20230303, - 754 + 20220824, + 1605 ], - "commit": "61f1eb22718fcd9796b47a98702d161ff323a532", - "sha256": "0a5nr3zwcb36nw4j7xzknvd14gxp52ilgs07hddcjjyxmhrrfmav" + "commit": "d0aec04c05911a0d47b34625959e1950ead4e4bd", + "sha256": "17m0dv2z8yf3cnc9fbvxcbg6mbk9vycws38rw6x5b05dg4vpi1pf" }, "stable": { "version": [ 2, - 4, + 3, 0 ], - "commit": "61f1eb22718fcd9796b47a98702d161ff323a532", - "sha256": "0a5nr3zwcb36nw4j7xzknvd14gxp52ilgs07hddcjjyxmhrrfmav" + "commit": "62c75804ba7d74f4c01c0629722c061c11bed393", + "sha256": "17r8v1sjvgcmprywny9fdg54x4pssp8p7a9ivv5mrygkqjz1vykk" } }, { @@ -7757,11 +7757,11 @@ "repo": "pythonic-emacs/blacken", "unstable": { "version": [ - 20230224, - 1336 + 20220922, + 2045 ], - "commit": "1e80b970b130d5c33031f2539c89eb2f13da2572", - "sha256": "0v3ny3mrnx4b1aghg7nk62hgvv6qm7lbagh7p07hysf9m1241pcg" + "commit": "456596e00f8277eafd9a08c62a71df06e8cad2c5", + "sha256": "0ii9gib5r18cbjgg1l54m0va1c176hvv07rfn4vzwyfksrbibl4i" }, "stable": { "version": [ @@ -7804,26 +7804,26 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20230304, - 907 + 20230113, + 2009 ], "deps": [ "posframe" ], - "commit": "a8c4b8c3c8b3add17b10b7323c86228e322513c3", - "sha256": "1wn89161rrad6sc3fqimic2nrvj78i12hq5v0a2lykzb510xvmk6" + "commit": "d1d5f2dc4d9cd5a47c47b55abb1f3b38911cc2d0", + "sha256": "1djp0bdgbzlhxcajvw7znj68i64finilch24kzrxh96panaami3c" }, "stable": { "version": [ 0, - 6, + 5, 1 ], "deps": [ "posframe" ], - "commit": "85a7b2d203a8a505edd9977953fd7e902948c3ed", - "sha256": "0g7kslmlq97ys86w7zjdp5fzxmxjx5plp7h1f24rwgszmppki3v7" + "commit": "d1d5f2dc4d9cd5a47c47b55abb1f3b38911cc2d0", + "sha256": "1djp0bdgbzlhxcajvw7znj68i64finilch24kzrxh96panaami3c" } }, { @@ -8314,16 +8314,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20230304, - 1502 + 20230214, + 2035 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "1e85d6a11a756519dd4632b1bb2029a1e9c61f5a", - "sha256": "1dkhlmx567c1qys6c2bi18aqj0iqikhicb3phkjhwri340rkr40x" + "commit": "786cf085a9af60083279297c599d5ea0f744efba", + "sha256": "142gj7mxr8kg412y6xkicwicsy9y7jc3pjsmmnx3x4c7msh3hkqi" }, "stable": { "version": [ @@ -8571,21 +8571,6 @@ "sha256": "0n88kj3n8dqa7bi6y762apz88w8riqm56vnlqj0i7zcbjwxyddbd" } }, - { - "ename": "brec-mode", - "commit": "344abaffa2bb5fab9c30a769e9ab91dd47f187db", - "sha256": "0yyayymrgv1naqfnf0yjp468np0234wclmjgk757i0kj9f734q6x", - "fetcher": "github", - "repo": "Michael-Allan/Breccia.Emacs", - "unstable": { - "version": [ - 20230227, - 1146 - ], - "commit": "8672af3d473985b4ccd1d06a41ab74bf0d745655", - "sha256": "0bp4jry9ys984wzm7bvyg305jnf252hdqr7j1rhddla37pjdaz5i" - } - }, { "ename": "brf", "commit": "203e7d21e2387866107740ead4ec28787d82ebfb", @@ -8662,16 +8647,16 @@ "repo": "rmuslimov/browse-at-remote", "unstable": { "version": [ - 20230223, - 554 + 20230118, + 407 ], "deps": [ "cl-lib", "f", "s" ], - "commit": "1c2a565bb7275bf78f23d471e32dd8c696523b8c", - "sha256": "1vyybg5yvhm0b1cz7sll6x314iqwvk2zk96pv18nb1bga2nk775q" + "commit": "c020975a891438e278ad1855213d4f3d62c9fccb", + "sha256": "0g78l8jkwxmnpiwjk3yjbd7528mywwh26i3zzgy9a3904fv37rcw" }, "stable": { "version": [ @@ -10077,17 +10062,16 @@ "repo": "beacoder/call-graph", "unstable": { "version": [ - 20230222, - 525 + 20230220, + 226 ], "deps": [ - "beacon", "hierarchy", "ivy", "tree-mode" ], - "commit": "5fd5f3aad35e3561c253870e4d7fa34353b70b7b", - "sha256": "1x4s5h4qpw3cm2bqnpwz0fkpznbs2fyvdk2zssbikwn9wxvpfapi" + "commit": "18a96dbabbedcd9e55817af7b6a0f303aea09faa", + "sha256": "1xdb2fiyavhxn7m5gg5b7vr8fydlzdriz0ckhsr95v19vjylkwg4" }, "stable": { "version": [ @@ -10113,11 +10097,11 @@ "repo": "caldwell/calmer-forest-theme", "unstable": { "version": [ - 20230302, - 2149 + 20130926, + 510 ], - "commit": "09fc50730ea386d3589863f8809e02e5bdd459cf", - "sha256": "02r4526p0cdxlza39xy982ajkza3pywm0p02zv8vszri584nxcc3" + "commit": "31a0bed8e5db1e314557175a719a10804ac089f4", + "sha256": "1rqd46ngnjln6vvcx7vsmwsjn4r3wfdpip6gqjqbsznav2g74bra" } }, { @@ -10593,11 +10577,11 @@ "repo": "catppuccin/emacs", "unstable": { "version": [ - 20230223, - 808 + 20230221, + 737 ], - "commit": "cc450390d0b3a8fdbb032ee96deb0aeaa1984ce0", - "sha256": "0a182x3jzn4vkk5z2wlc7hahrvf1mdcp8mpn057w8v4gck6af5rl" + "commit": "046358639b3b6948f0779a16bef51cec44c606c3", + "sha256": "01r3xpx55i4wwk2xzrl3y7ajckkwzpxlyx4ccpzn0l3rl8dbsw9c" }, "stable": { "version": [ @@ -11718,16 +11702,16 @@ "repo": "contrapunctus/chronometrist", "unstable": { "version": [ - 20230302, - 700 + 20230203, + 557 ], "deps": [ "dash", "seq", "ts" ], - "commit": "015524bbeb4a112db7bb2af813408cc3c5c93240", - "sha256": "19gp6bcsinw8f52gasbg2c46v6sny3s0m5j5h37wrdj4khif1xz0" + "commit": "f131e996320715238e8403439a18dbc016b09520", + "sha256": "1p25way281k6ygkws1fmkz2z9imcj7p82n6zlrlfjz37192d8saq" }, "stable": { "version": [ @@ -11881,8 +11865,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20230226, - 1413 + 20230218, + 915 ], "deps": [ "clojure-mode", @@ -11892,8 +11876,8 @@ "sesman", "spinner" ], - "commit": "2e213f92d7bd84da9bf3826a42edb43a4e2fe7b3", - "sha256": "1mzp1pvy481x5i35cvdhvn421fvfzyf2pjr78xbkj8bdavkcskc5" + "commit": "1ed5163433c991c00ea83fdd4447e8daf4aeccbe", + "sha256": "1r8arjpzl12fzd5j27xdgvqk33srs0cl0nrp9lm54zhqzxc7gbw2" }, "stable": { "version": [ @@ -12191,16 +12175,16 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20230227, - 2247 + 20230218, + 2016 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "5c4310321cd955b89951f8109a573c001d830bd3", - "sha256": "159cspnzfz0fk4pb90fil1pp844zvwp02k4wnhvspq4p82j5qd29" + "commit": "5dac3d5bf287566f049b44465e415afb42f30ec3", + "sha256": "03ypp4kb6h0x2i3g22mq2vynybmd39qzfg0s31k9bx3dbxxf2j1b" }, "stable": { "version": [ @@ -12318,8 +12302,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20230228, - 1414 + 20230125, + 1818 ], "deps": [ "dash", @@ -12330,8 +12314,8 @@ "s", "string-inflection" ], - "commit": "290320fc579f886255f00d7268600df7fa5cc7e8", - "sha256": "131b6jcyyry4qpv536n4llf8d5xc3a98qq49rvsp0sqwipqhx4qs" + "commit": "2623043b2546ee09a4bd86641870ca86332c0bcf", + "sha256": "1f2bcshnccfbvbnkhnynkdpszrs4zb3z82hqrrdp9hf3ig3h5750" }, "stable": { "version": [ @@ -13289,15 +13273,15 @@ "repo": "magit/closql", "unstable": { "version": [ - 20230224, - 1619 + 20230220, + 1944 ], "deps": [ "compat", "emacsql" ], - "commit": "0a7226331ff1f96142199915c0ac7940bac4afdd", - "sha256": "1769a96nkfxlczx4sbzqab1xnn2540mwbwrcrcaxq72h3akrciq8" + "commit": "b670b88c6f2785ddfdff91439ceb332b1bf8a8ce", + "sha256": "0hffljz4353id5y7ps2saw9gsclyj1ishpvfa4vclpc9kg7mw58n" }, "stable": { "version": [ @@ -13470,11 +13454,11 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20230301, - 1443 + 20230215, + 1434 ], - "commit": "6c0b3d2b7e3cfdf62e895d6827f103e2b3fd8ef8", - "sha256": "0alnv9ffivjc0a7v96fv6h7xhh6mfpvp1dwcna823f6lfg7ncki5" + "commit": "037975ef69a0e889f9c17e5e6e6fb87111dfd9df", + "sha256": "18gwgqr71rn2klfw7b1bcbsisbrsk40pr3x832k84x9wyx6vb0ip" }, "stable": { "version": [ @@ -13482,10 +13466,10 @@ 26, 0, -1, - 5 + 3 ], - "commit": "6c0b3d2b7e3cfdf62e895d6827f103e2b3fd8ef8", - "sha256": "0alnv9ffivjc0a7v96fv6h7xhh6mfpvp1dwcna823f6lfg7ncki5" + "commit": "037975ef69a0e889f9c17e5e6e6fb87111dfd9df", + "sha256": "18gwgqr71rn2klfw7b1bcbsisbrsk40pr3x832k84x9wyx6vb0ip" } }, { @@ -13553,20 +13537,20 @@ "repo": "tumashu/cnfonts", "unstable": { "version": [ - 20230228, - 631 + 20230216, + 803 ], - "commit": "ca8ea16ac3a6faec4ff4cd20514e7d2cffdd70a2", - "sha256": "1xxdwvphz2nk08k92g0xaxj0g77hj2b3myp13gw129np7czpdr3d" + "commit": "4b1bbf854009992858e86a19de49b8dc91e924eb", + "sha256": "1sab7az9rqzylvay5ai8k2rg656hqd0ga4qwsy2plnmn0fx9iv24" }, "stable": { "version": [ 1, - 1, + 0, 0 ], - "commit": "f42f417e84af020e6dfd51ebb4b1c605001b96b6", - "sha256": "156qj5dkipa5a3f3scldf1mcfvmp1g199ds2wyi6jk5gqfv73zsd" + "commit": "102f808e500715e0cfb80905110d1f42aa7b6069", + "sha256": "1vim429ikgsh7zvh521af39xgmm6qb3fc3pwb51458fj010gf8pj" } }, { @@ -13909,14 +13893,14 @@ "repo": "ankurdave/color-identifiers-mode", "unstable": { "version": [ - 20230302, - 226 + 20230210, + 2047 ], "deps": [ "dash" ], - "commit": "1bc474bdbb1086a73638effde51f37a9da748173", - "sha256": "113nnfi8jdxp7a8m7jjsn0ww2fqymk2ai4nzfdxzdfsk0q0bp49y" + "commit": "9fd09481bbcdb35712d974d5bc3667f5a5900ddb", + "sha256": "0rj860ypsr9w9i1bq8wf8ssj54yxb3kp0q5wp0b67nh27qycywx5" }, "stable": { "version": [ @@ -14496,11 +14480,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20230303, - 2331 + 20230209, + 134 ], - "commit": "83c408b187b957f5939ee814de68d46993247d4f", - "sha256": "1h2k8vq1sv75ga17i4lr1iiq9g3csjg65fbqqna4scv7vhkqkbw1" + "commit": "2ca3e29abf87392714bc2b26e50e1c0f4b9f4e2c", + "sha256": "1z73yn7jyjxm4lf3d3r65rb549w8npjdba6iaxqawf2a8hkwjgy2" }, "stable": { "version": [ @@ -16535,8 +16519,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20230228, - 322 + 20230221, + 1603 ], "deps": [ "dash", @@ -16544,8 +16528,8 @@ "pythonic", "s" ], - "commit": "f90598f54af78469e61497560ddad05344810a35", - "sha256": "0m3fgvj415nr5ziafbc3km3kqlzifgxkpjwjbdd9xld871d83v1y" + "commit": "28f51e49fd25abff14c1b46dea196a90a77ced64", + "sha256": "1wvlpsz68m4nq499nhyspg5xls2ib5sxcha3mf7vn13kyl994si6" }, "stable": { "version": [ @@ -16699,14 +16683,14 @@ "repo": "minad/consult", "unstable": { "version": [ - 20230228, - 1346 + 20230218, + 1212 ], "deps": [ "compat" ], - "commit": "5b2b9f572a9046d3235b4fae0e70ef129f735a26", - "sha256": "12aypq3d6xm115q94wrk5qkzkxgqisdwq56blf96zv5c2gkj64cf" + "commit": "ffaaf6da909dc9ff766e5a5f16eb265635aa6149", + "sha256": "16id9w0fiavr08g9lq5am0ary7ba7p900ilf4gnkizabgji0padi" }, "stable": { "version": [ @@ -16728,26 +16712,26 @@ "repo": "yadex205/consult-ag", "unstable": { "version": [ - 20230227, - 406 + 20220419, + 1721 ], "deps": [ "consult" ], - "commit": "9eb4df265aedf2628a714610c2ade6d2f21de053", - "sha256": "1gjyxahz0mi2yf1zxwlnlyai331dq7pbw7n12c6mpk4wxqk709sf" + "commit": "2460ae6829e86c9f1186a852304d919526838cb8", + "sha256": "0f5m66xgmm306ifh794q65wm4wwyayfgvm9fn1kip7aj86n0snfh" }, "stable": { "version": [ 0, - 2, - 0 + 1, + 2 ], "deps": [ "consult" ], - "commit": "25d7a2a8fafbaa956610023e4ca17389294773fd", - "sha256": "0im966lbr3jwq6kif8cdx0sbxxjkl046vnsj7yhi1847kqb749ji" + "commit": "2460ae6829e86c9f1186a852304d919526838cb8", + "sha256": "0f5m66xgmm306ifh794q65wm4wwyayfgvm9fn1kip7aj86n0snfh" } }, { @@ -17127,15 +17111,15 @@ "repo": "jgru/consult-org-roam", "unstable": { "version": [ - 20230301, - 1555 + 20230209, + 833 ], "deps": [ "consult", "org-roam" ], - "commit": "ede01c2710836f055351d2ef0d9fac70b885ac65", - "sha256": "05crx412wnffz2069l44py4acnp3qv04zg0279z427il24lincd4" + "commit": "8f9f122627a6b4e1613401b06d707e3efdb3c2d0", + "sha256": "1wni3lsjlkhs76wx27np74qhs3k8hwq98yn6vfnkb9h4dg7d8ll0" } }, { @@ -17534,6 +17518,24 @@ "sha256": "1rq0j6ds9snv21k2lzyja96qxxz8nrai5aj1k1si9zshld28mapx" } }, + { + "ename": "corfu-doc", + "commit": "78440eba5512b37243de24364afd5d7f46f8fcca", + "sha256": "0vi12khc9c9gcz8lagw75zkx377f7f6qdlgjr6rg37nd3ip4pkj0", + "fetcher": "github", + "repo": "galeo/corfu-doc", + "unstable": { + "version": [ + 20221128, + 1533 + ], + "deps": [ + "corfu" + ], + "commit": "0e6125cd042506a048feb7b6446a5653eccfcff5", + "sha256": "1cpx9flv6m10h1rganjmbccc289c4hzss9kd9mw6krsxiik65xl7" + } + }, { "ename": "corfu-prescient", "commit": "72a84587636e291bee48d7e9ad5723791ad02d7e", @@ -18799,11 +18801,11 @@ "repo": "crystal-lang-tools/emacs-crystal-mode", "unstable": { "version": [ - 20230223, - 2257 + 20221008, + 1847 ], - "commit": "ea2da3c7701542ca4cf703c7c29eb783269d18f6", - "sha256": "11dxr6152gpns08blxzmz1vnhnsjdyz1sgr8k6sq86phc1r0lplq" + "commit": "9bfb9f0f566e937cc6a2f2913d1b56978b81dc99", + "sha256": "0d81b296ifn65h29cplvlznqjq8955a4kpsj9kyiwmg44v88afzv" }, "stable": { "version": [ @@ -19856,8 +19858,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20230226, - 1910 + 20230220, + 1618 ], "deps": [ "bui", @@ -19870,8 +19872,8 @@ "posframe", "s" ], - "commit": "2cff309019de6b49e8508b2b07e1a6c043d3df5f", - "sha256": "08j4rlmi74v3g7plwja0cvd1jl9yi3rzc2lzqhl4fa7nb1z0iq0y" + "commit": "f5a8f240d85ec4cfe87314a5ac0c245b60a7dfe0", + "sha256": "08d815lfx89wd9dligy3q9j89jhjzkcy4fffmnq0xpjdfnvmjd5n" }, "stable": { "version": [ @@ -20206,11 +20208,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20230227, - 1853 + 20230220, + 1916 ], - "commit": "243a5006d16f004d1a72b2e2e459e28ca0206fd3", - "sha256": "1vvyggwd1vakvcw9i9fsm53dwx338s2682qpssr8ikhqs1hx7abx" + "commit": "221ee4b77db77199380c519c4ba52c06abc725e9", + "sha256": "19qkly4k0j326kd4979cn1z35jpjnnbbmycxdp4v2i5h7hp76954" }, "stable": { "version": [ @@ -20604,16 +20606,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20230301, - 636 + 20230201, + 2329 ], "deps": [ "dash", "s", "spinner" ], - "commit": "ce8a6fa1952213aa4b79a7f1fc972541ccb0ae75", - "sha256": "1irwr8pjl5261a3zcmfcywmj9rcfbc8gv58wq1mpwa3wy3dvry9v" + "commit": "0d3e0725a7fe605978692076ab1d8f1870d8a269", + "sha256": "07n6f4axckxvl59ccmfsbzcn1qkaxw145274bs4izscc9x27ss07" }, "stable": { "version": [ @@ -21357,14 +21359,14 @@ "repo": "psibi/dhall-mode", "unstable": { "version": [ - 20230228, - 1005 + 20220519, + 1115 ], "deps": [ "reformatter" ], - "commit": "87ab69fe765d87b3bb1604a306a8c44d6887681d", - "sha256": "1h55bcn0csy7xacl6lqhr3vfva208rszjn15gsfq0pbwhx4n6zhx" + "commit": "c77f1c1e75b6d2725019c5275fc102ae98d25628", + "sha256": "0b0pahi122rnfqpjk2svdcyywka2md6sch609d0x7vqlpylk66dx" } }, { @@ -21681,11 +21683,11 @@ "repo": "mgalgs/diffview-mode", "unstable": { "version": [ - 20230224, - 1916 + 20220322, + 2334 ], - "commit": "8f07c0ff4a1acef990589df0d3e32288f19c9d71", - "sha256": "05jg0p5qrs77h59mq8mi6fxil8djcb53w3raj441avsywzziigvy" + "commit": "bba07de698b519c143bffb57143a780b3dac299d", + "sha256": "1hq0rx397i5vqjk69m5d7lq9qk8acnd05abxmma86nzq89xi3ba2" }, "stable": { "version": [ @@ -22862,11 +22864,11 @@ "repo": "purcell/diredfl", "unstable": { "version": [ - 20230224, - 1302 + 20220508, + 805 ], - "commit": "17e805763d57370c4eff2c92ed257b72eeb9f94a", - "sha256": "0p9fznvblw6md37lgqjpyw8ifvgp513v2sgfyh6sqwpvzz0zl80g" + "commit": "62b559e1d6b69834a56a57eb1832ac6ad4d2e5d0", + "sha256": "18ggh4x7gqdnrdaknd4vkd34jgi8aw5s7r3a2xv54p8z22ipxrhh" }, "stable": { "version": [ @@ -23273,9 +23275,9 @@ }, { "ename": "display-wttr", - "commit": "f09bbadd59823e05964c5608ee96ce3bdcee1dc1", - "sha256": "036d8339h71vikld4psyihsw8fwspp854ll3g20ka1k0625csn8x", - "fetcher": "sourcehut", + "commit": "a60a6643b6d8a5691d48b47c31eb560e0f793d26", + "sha256": "1lhnv2cqff22z7d7n2sx7pqvskyg5fbiax2dhfznf2xjmqh22lzi", + "fetcher": "github", "repo": "josegpt/display-wttr", "unstable": { "version": [ @@ -23768,8 +23770,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20230302, - 2046 + 20221023, + 1201 ], "deps": [ "aio", @@ -23778,8 +23780,8 @@ "tablist", "transient" ], - "commit": "4a308e6b2184a1b7745df5a8b8adafb29b3f7157", - "sha256": "0fa61yfr7bys4cmhhkkcpdbczn19x0b3gqyybhdfpn4cqsrfr83d" + "commit": "cc0046e6a557dce0ccc4108dd22e04f21ba8b0dc", + "sha256": "11l8jpqj6m04ndhnfz41nhph1rqjvqbfd5vw334mph776aq1baln" }, "stable": { "version": [ @@ -24127,15 +24129,15 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20230303, - 847 + 20230219, + 1605 ], "deps": [ "compat", "shrink-path" ], - "commit": "c705089c8dd689e7d19edd3c148571cee2fb2864", - "sha256": "1wyvp58wzssk38ibmy0c2d3207nwpfv46lh6y07a7yh9hh6adwzc" + "commit": "6125309c2caa3c98591a4c802e9b4dd2f7ea83e9", + "sha256": "1klyfazdqxy2kdb72mbaxy0ravpfikw030q61rbbhl47sp41yxrv" }, "stable": { "version": [ @@ -24706,19 +24708,19 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20230302, - 2151 + 20220725, + 849 ], - "commit": "07364ae07301f6f0a1713a8dff520c813849ffb3", - "sha256": "0rpl48rdmgi7rsv6kgl048vfafnfcqwmvb46ibm9z3wjxsmfg131" + "commit": "d4fd1b4977eb0d534844fddf01c3c51c70c57205", + "sha256": "16g4bv2py423l19n0kaz18a41wk5fsrpnqzifdss6amqh0dqyvmf" }, "stable": { "version": [ 1, - 9 + 8 ], - "commit": "07364ae07301f6f0a1713a8dff520c813849ffb3", - "sha256": "0rpl48rdmgi7rsv6kgl048vfafnfcqwmvb46ibm9z3wjxsmfg131" + "commit": "d4fd1b4977eb0d534844fddf01c3c51c70c57205", + "sha256": "16g4bv2py423l19n0kaz18a41wk5fsrpnqzifdss6amqh0dqyvmf" } }, { @@ -25397,11 +25399,11 @@ "repo": "earthly/earthly-emacs", "unstable": { "version": [ - 20230302, - 1709 + 20221018, + 355 ], - "commit": "a242a4d68ebefce81879823c54155e0a04d3ea4a", - "sha256": "1wycm065l60jviqvy5a5qkkcq5xdfnb8bhjcgq15ip93ks6p4bgi" + "commit": "0427c367768ab52c359c34941ed13dbf419d74d7", + "sha256": "01s1srcc1qp9x74gdjha1cmr1fjv1fbwjd2h4rk74alyrhhzhwn5" } }, { @@ -25622,14 +25624,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20230221, - 2204 + 20230211, + 2228 ], "deps": [ "parsebib" ], - "commit": "5a03e4662dccbffe63605bb8e88bfb691ebe0afa", - "sha256": "0yakr2ai341nzhvibs3r7z06wjf0wnzwdavvagklwciq693w2hz7" + "commit": "abe6ed461b334673001b930f7e30752aa8aff526", + "sha256": "03vn16nrsap8sdy4bindjr3sr1xqy8w9vffy5a970ksygfdv2j14" }, "stable": { "version": [ @@ -26159,14 +26161,14 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20230302, - 831 + 20230212, + 617 ], "deps": [ "nadvice" ], - "commit": "e1a391a618ec33d157822dbcc51d010559289f1a", - "sha256": "1w39abjjrig030330jhs12qg1gaphh4llmriii60smkwqw01aaf1" + "commit": "2d13945c8d4c0ceee1c9310a2c1c4375f88a3b1e", + "sha256": "12v6jj6nlql00xn76x080y3cb3331zr7k83pk04v67l6wlh9l813" }, "stable": { "version": [ @@ -26763,16 +26765,16 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20230228, - 102 + 20230219, + 605 ], "deps": [ "clomacs", "dash", "spinner" ], - "commit": "29308faad38e9cabd98fb5a8450df15db1e4a4cb", - "sha256": "0n3fwhj760d4cvlarkmnmys303iahrk5643wypc7p0qaai181z3c" + "commit": "c9a602efd4b3a1b607c630e55e3124d4a63048fb", + "sha256": "0pnkg8m4ba8nmxc77lcb316hnjhl205jsdfr29gls8qidlfhxwwn" }, "stable": { "version": [ @@ -26813,14 +26815,14 @@ "repo": "ahyatt/ekg", "unstable": { "version": [ - 20230304, - 619 + 20230221, + 602 ], "deps": [ "triples" ], - "commit": "f19f25279cab76d025f710ce3d373b92f9fad0ca", - "sha256": "1lmh6f0bnil197lr9pr7rka84b0ja5b42khnvqlzw30gd1b446n6" + "commit": "cb3dfbf8c6faa0aa95f603b855eb37260acdc89d", + "sha256": "1za8smby0sshl0icfjqwh6rlwvjzj0mflhf4pwnhynf5n7p3jdjg" } }, { @@ -27010,11 +27012,11 @@ "repo": "radian-software/el-patch", "unstable": { "version": [ - 20230226, - 2230 + 20230219, + 214 ], - "commit": "c4a1b435181596fe71e18b2422e07e693b75203c", - "sha256": "0sspbrnkks4bl16jz5bqdwgb75qh0kjv8j09cwr54axbd51mf078" + "commit": "ad8b18578d224cf8ebb1cce9a3b1b5a3d93a0e69", + "sha256": "0w97dqmn5imqpnwrsp442k23bssx07s5r29xspp00rwp4kjdggwa" }, "stable": { "version": [ @@ -27292,11 +27294,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20230303, - 457 + 20230203, + 101 ], - "commit": "e97283f8cdc3ca16a0179a14c78f1ba6e93cef80", - "sha256": "1pknwkvf7bvcmy048bpybyrgf1mnw3575mphycjn6r8x9glj073y" + "commit": "43ae6c375811754e640b0bae4678bf33e72988e9", + "sha256": "03ljcpy7bf08l0zdrq27h2h2mf92rwc8yv26w8bl4gam83ypkk1c" } }, { @@ -27365,11 +27367,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20230228, - 237 + 20221205, + 638 ], - "commit": "16fbf1f17f09a8308d5e5df3a3a97277baa5736a", - "sha256": "100dlzzwaf09i3vp0dj8maf1is0pnp3r21iix41ymxrfcafx6hi1" + "commit": "5c067f5c195198ffd16df2f455da95e46cc8ce02", + "sha256": "12vl8a5xqz1cbi9bg3i7h7rjb1kgwdbfin6pn7zvzajfmg0pi2qf" }, "stable": { "version": [ @@ -28034,11 +28036,11 @@ "repo": "ideasman42/emacs-elisp-autofmt", "unstable": { "version": [ - 20230223, - 2328 + 20230221, + 1124 ], - "commit": "70f7070f4e79db4117892a2c5291d101b84c0710", - "sha256": "023c32anhia1j1ici7b4g92scps16mv160k03s1q7dgf430lw5ry" + "commit": "153785d7e7d392ae07fe0f91a8ba3af6dd6d7df6", + "sha256": "1q1xbgwbsd2ma7axlajhkq20z446wk5x9an60wynsxshnsjxrlfy" } }, { @@ -28825,8 +28827,8 @@ "repo": "emacs-elsa/Elsa", "unstable": { "version": [ - 20230304, - 1228 + 20230220, + 2011 ], "deps": [ "cl-lib", @@ -28835,8 +28837,8 @@ "lsp-mode", "trinary" ], - "commit": "2126a72f6d5d632741d9f5209997fb4f11133fd7", - "sha256": "0ldf83nddj7fixd5wplbhfh9vw3a684rzbxd24qbb23nsivhpqim" + "commit": "2776cd0c0617f99cac2da3da764d2f221f62ff2a", + "sha256": "12f7svl0nikgqja87xwqhm5xw47sqwmx86f9lx90yadacw8v71qw" } }, { @@ -29140,17 +29142,17 @@ }, { "ename": "emacsql", - "commit": "2e40e3364a5dec38672753093c28ae97d85de189", - "sha256": "0chvx5y58zabp690fvxxizmvc8px62vqb88xq0s1qmi4k7w08bad", + "commit": "4872ef038dbbf67008bfa7951574ee372d6ff68d", + "sha256": "0mip1v0mrp7b538i949q9jrqlk9sl3i0qxa4jmm99llrs82mmdj0", "fetcher": "github", "repo": "magit/emacsql", "unstable": { "version": [ - 20230228, - 1040 + 20230221, + 1532 ], - "commit": "415dbfd846f46d921a70a351695f0d0e8f75da35", - "sha256": "01px4ybaywc4yl3cgry6f6anl8j4wgzr72ii7bqzvhc8yv5ml4g6" + "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", + "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" }, "stable": { "version": [ @@ -29170,14 +29172,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20230225, - 2205 + 20230221, + 1532 ], "deps": [ "emacsql" ], - "commit": "b436adf09ebe058c28e0f473bed90ccd7084f6aa", - "sha256": "1wc3j33cjshsckwk2s7xnfill6l5j5hnn0w03hqw2k81dfqvb8hc" + "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", + "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" }, "stable": { "version": [ @@ -29200,15 +29202,15 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20230224, - 1201 + 20230221, + 1532 ], "deps": [ "emacsql", "pg" ], - "commit": "7c533fb6c27c3a10b6ab05bddf663e37c109e459", - "sha256": "1jmcxj8hx7900pfg7hlpdfln3higvfl7as931ry5zb2wla5wc76l" + "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", + "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" }, "stable": { "version": [ @@ -29232,14 +29234,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20230225, - 2205 + 20230221, + 1532 ], "deps": [ "emacsql" ], - "commit": "b436adf09ebe058c28e0f473bed90ccd7084f6aa", - "sha256": "1wc3j33cjshsckwk2s7xnfill6l5j5hnn0w03hqw2k81dfqvb8hc" + "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", + "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" }, "stable": { "version": [ @@ -29262,14 +29264,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20230225, - 2205 + 20230221, + 1532 ], "deps": [ "emacsql" ], - "commit": "b436adf09ebe058c28e0f473bed90ccd7084f6aa", - "sha256": "1wc3j33cjshsckwk2s7xnfill6l5j5hnn0w03hqw2k81dfqvb8hc" + "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", + "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" }, "stable": { "version": [ @@ -29292,14 +29294,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20230224, - 1201 + 20230221, + 1532 ], "deps": [ "emacsql" ], - "commit": "7c533fb6c27c3a10b6ab05bddf663e37c109e459", - "sha256": "1jmcxj8hx7900pfg7hlpdfln3higvfl7as931ry5zb2wla5wc76l" + "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", + "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" } }, { @@ -29310,15 +29312,45 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20230224, - 1201 + 20230221, + 1532 ], "deps": [ "emacsql", "sqlite3" ], - "commit": "7c533fb6c27c3a10b6ab05bddf663e37c109e459", - "sha256": "1jmcxj8hx7900pfg7hlpdfln3higvfl7as931ry5zb2wla5wc76l" + "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", + "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" + } + }, + { + "ename": "emacsql-sqlite3", + "commit": "402d5f088111264aaca5196da9ca3ffada3220c6", + "sha256": "0kb92kgbhxllyx72igxlky5kzp9z8175zw9m8irxjb8x523sf499", + "fetcher": "github", + "repo": "cireu/emacsql-sqlite3", + "unstable": { + "version": [ + 20220304, + 1014 + ], + "deps": [ + "emacsql" + ], + "commit": "2113618732665f2112cb932a66c0e89c404d8777", + "sha256": "0r8svrd0d4cflx8a8gkynnhafcpv3ksn9rds8dhyx5yibximbzsw" + }, + "stable": { + "version": [ + 1, + 0, + 2 + ], + "deps": [ + "emacsql" + ], + "commit": "50aa9bdd76b0d18bf80526cff13a69fe306ee29c", + "sha256": "1jzvvsvi8jm2ws3y49nmpmwd3zlvf8j83rl2vwizd1aplwwdnmd6" } }, { @@ -29425,14 +29457,14 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20230301, - 1415 + 20230219, + 1700 ], "deps": [ "compat" ], - "commit": "a6ea648cac9edc06b60b9b08f9b2b2c392163bd9", - "sha256": "0qn02yk9gk3knsq6kwbkkjpcr5zf0b1v24faj1fxbh1s009n8wbn" + "commit": "8e7c53a8ec6969a8d54a22c7cb76f15e2e7fa3f9", + "sha256": "0dj0qds3mqc7bi4z945519q260mc0jrkmwjh6cz74dlw4csd0c1a" }, "stable": { "version": [ @@ -30026,11 +30058,11 @@ "repo": "isamert/empv.el", "unstable": { "version": [ - 20230226, - 2322 + 20230203, + 2159 ], - "commit": "4e42b9b066ff0cd970328d769d736655be635e7e", - "sha256": "1yjsqp00d1r3b7ykrcysgii09nywm4mampzcnh7fk00bhbmcsdlw" + "commit": "a45a2a01a7e629c9126b444d952fe71bcc9a262f", + "sha256": "04hndxiq5k3zgh0wq8xcn8dzf65fg9zjqb9gav9w53dq3l236h81" }, "stable": { "version": [ @@ -30436,8 +30468,8 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20230222, - 1304 + 20230220, + 1945 ], "deps": [ "closql", @@ -30445,8 +30477,8 @@ "emacsql", "llama" ], - "commit": "62f4763fdf6d372d0fa28ad18d5ae84112798c61", - "sha256": "0drx1svf0szqjlqb5x01kb8rgrjyjh27b3pvrvcbjx0yiaplmpw0" + "commit": "576ba9fedc360d2f7dfb724f9f767cc4688e5b7f", + "sha256": "1ghx8y814wi09zi3fa19nmxw7b0v6fp4mb49ibf46608k0vndq0y" }, "stable": { "version": [ @@ -32106,11 +32138,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20230302, - 2111 + 20221204, + 1348 ], - "commit": "86d1bce8b53522a5939924960025799e66d9414e", - "sha256": "074drba1z8h0cidj7y657905lpkxp7ysds3iipl1nz24lfx6s28n" + "commit": "b6aefb9ca231c3cbb1a6532b8afa4022c2678f81", + "sha256": "0xjj842cxqg6lka9h4a0qamdjc0iifnhcddpdafarbssh2qaxiys" }, "stable": { "version": [ @@ -32739,15 +32771,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20230304, - 949 + 20230220, + 1805 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "2b2ba3cbeabe1f239b6b0ebdaddcb68dd158bd1f", - "sha256": "018kdczyp7aq89xwwim6mr3mk60a4wdj27radkl0va5xqkgbdscd" + "commit": "22d76a4080e40381aae194c94f3bc16ba67a330a", + "sha256": "110gdl73jfy0r28vs34bipyq692h2v1wfinrgkpak1s09zwcmnd3" }, "stable": { "version": [ @@ -32940,15 +32972,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20230226, - 2219 + 20230214, + 1800 ], "deps": [ "annalist", "evil" ], - "commit": "4d10a2d3305bbe28c1e11a059e3e9c8d2cdaad01", - "sha256": "0w014pa2qfd88zq4ihsz80lgshhfya61mncafnjxbf5rz2c5cxls" + "commit": "aaf3e0038e9255659fe0455729239c08498c4c0b", + "sha256": "1791240px7n98k18cxsi2shdbjiayn80r20y86qdmb8j82rpdqcn" }, "stable": { "version": [ @@ -35190,11 +35222,11 @@ "url": "https://repo.or.cz/external-dict.el.git", "unstable": { "version": [ - 20230228, - 828 + 20221210, + 407 ], - "commit": "68ab3e5f78239774d1710874e8a68e3f8498cee3", - "sha256": "09nxvrpz26kszc57lba6acial7196vc68rh23x12jqr9mrri6vhi" + "commit": "a9ceb6c2e12df460ce1686d47cafd88f212d0291", + "sha256": "1sdnzdph6gck2ghmafad10xc99avj7i01ad2r9r6iixhpa5qbpb9" } }, { @@ -35768,11 +35800,11 @@ "repo": "ideasman42/emacs-fancy-compilation", "unstable": { "version": [ - 20230223, - 2309 + 20230109, + 536 ], - "commit": "d5d790dee6b07f866d203c5c174440ec8a2b2215", - "sha256": "0x2b5fp6f4klsnpwdgls99b1jdch1z0yqy69bgrpr51bd1axshkd" + "commit": "889e77c899cbf28673915b7b0161d45734bfdcb7", + "sha256": "1zxynjsa6h0nvlkrvbdrzvqkxq10sggsg62lpaf1gzx1wqshhfq4" } }, { @@ -36764,8 +36796,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20230225, - 1326 + 20230116, + 1124 ], "deps": [ "async", @@ -36776,8 +36808,8 @@ "s", "transient" ], - "commit": "c8143ff6d32d13f809688800e761250b113d1b0f", - "sha256": "05gwxb8w1d2kwp9yd7pcr7pqzmbal0yhkiwxqqf28m9j2vrcyn3n" + "commit": "286bea5b4f27d906aa7fe71baa35c8f2bf55c286", + "sha256": "0g8sg0d1d6p9lwxnb0agj3cjnhqwyxgddqpvpi271l2hvvdaq7y0" }, "stable": { "version": [ @@ -37638,8 +37670,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20230226, - 6 + 20230218, + 2135 ], "deps": [ "dash", @@ -37647,8 +37679,8 @@ "pkg-info", "seq" ], - "commit": "2f73050144e1ec0aca312cbe37aee3233ba45217", - "sha256": "1nhyq2n2j5k0p067cvh6qj93p8174zzq0mi11qan6df4ha231hg4" + "commit": "55614401a955e73f5c0f05c0e098d9e717e3116d", + "sha256": "1ywsdyzagwzrj0mjifn4yzyv5xxgaxrr865rxrp6dj474h054dnj" }, "stable": { "version": [ @@ -38503,28 +38535,28 @@ "repo": "falcosecurity/flycheck-falco-rules", "unstable": { "version": [ - 20230302, - 2340 + 20230213, + 1603 ], "deps": [ "flycheck", "let-alist" ], - "commit": "1ad301d497ade9556327053ca571ee51bf0c0633", - "sha256": "0z1p2np23gmd07ssaaf9mp4halazf79fldmirff09m1zckcan5p9" + "commit": "ba359f2d5968df47a100e78758f280fe0c965f07", + "sha256": "03w6alsvp7bcb2qpgva9w67c1xdbcgfgan6kfzmf6shrni93gldk" }, "stable": { "version": [ - 1, 0, - 0 + 9, + 1 ], "deps": [ "flycheck", "let-alist" ], - "commit": "1ad301d497ade9556327053ca571ee51bf0c0633", - "sha256": "0z1p2np23gmd07ssaaf9mp4halazf79fldmirff09m1zckcan5p9" + "commit": "ba359f2d5968df47a100e78758f280fe0c965f07", + "sha256": "03w6alsvp7bcb2qpgva9w67c1xdbcgfgan6kfzmf6shrni93gldk" } }, { @@ -40602,11 +40634,11 @@ "repo": "orzechowskid/flymake-eslint", "unstable": { "version": [ - 20230301, - 1441 + 20221002, + 2307 ], - "commit": "82b1345c699172b6092e13be2c4cc10551d88b90", - "sha256": "0clwrn05hkc45y46q76xv25bp2gdnrk9c96n43fzxadzhw8ivv7p" + "commit": "efbf9e1fcc6ba4959c4ad0435742c96099f4f96f", + "sha256": "0qmfwfi818l8v18srkbz7hsq59wdklgdlqx1q6824qjndbrb41nq" }, "stable": { "version": [ @@ -41599,20 +41631,20 @@ "repo": "shaohme/flymake-yamllint", "unstable": { "version": [ - 20230226, - 1024 + 20220531, + 913 ], - "commit": "020d2a33568c8069801db9dd6992b8961a58de8d", - "sha256": "0ccq6j8x43arxm43rys1mcfppmq60zlfp5hbznxbzy208jck47rv" + "commit": "f269e6614993f3c56d545e7d7b225ca2ba1da342", + "sha256": "0pw2c22nvy4fkcqbhkrj94q66sx7ggcan26wvy9z6wp04qzaiva8" }, "stable": { "version": [ 0, 1, - 5 + 4 ], - "commit": "0134f9f864749f30f8ea3c6a86865b35d4352cea", - "sha256": "00ys5k6xx3wcccj37n326749ypifc43dafjp28kmqgf218lrfng4" + "commit": "f269e6614993f3c56d545e7d7b225ca2ba1da342", + "sha256": "0pw2c22nvy4fkcqbhkrj94q66sx7ggcan26wvy9z6wp04qzaiva8" } }, { @@ -42314,8 +42346,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20230222, - 1917 + 20230220, + 1945 ], "deps": [ "closql", @@ -42329,8 +42361,8 @@ "transient", "yaml" ], - "commit": "ba35ffc9bafc6457cc95633904e53e34e544543f", - "sha256": "1s7mdprdl2rd9cwnig854gypxqgpyl4xy824vly3lp0rffw7n9v7" + "commit": "3164739dc70ee5ecf05d87dba9dc803d62a89adf", + "sha256": "01mxlikyxjl9q4gc5bp0i5vy2jvg7fc9ramilajgx37yf7nf5gn2" }, "stable": { "version": [ @@ -42385,15 +42417,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20230223, - 2008 + 20221210, + 1608 ], "deps": [ "inheritenv", "language-id" ], - "commit": "c6f33e6efb55b5e5112d3d1366fea910d3629de2", - "sha256": "07xrrkiz0mxkw4hn92j3f19ghpwljbxnkbmq77yi6mlah7lrgcqa" + "commit": "c156ffe5f3c979ab89fd941658e840801078d091", + "sha256": "0h6sv36psl9rp1xvg5xzz4w2c7xlrz5iykivf7cfnq5g48aqsihs" }, "stable": { "version": [ @@ -43534,11 +43566,11 @@ "repo": "bling/fzf.el", "unstable": { "version": [ - 20230224, - 1236 + 20230114, + 403 ], - "commit": "f90ee73f9427ddce396fdca93a5be1ea04e56a1b", - "sha256": "1zyqwd81mpc0xy63s5rkbj8r33ljd0i8bz2iqd5j7a7y26ym9r5z" + "commit": "1d80e76df0899e26196aea150c29fba95fc73ed6", + "sha256": "075v5ypn4clkgg9jb4jd9xrw3ldy7sz5f2vryf5kniwm8zhs85yi" }, "stable": { "version": [ @@ -43799,14 +43831,14 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20230228, - 345 + 20230120, + 1738 ], "deps": [ "project" ], - "commit": "bd12f2dc6c5949e260f094fb60737498cd0ae9a5", - "sha256": "16qi3vk1yps4f5v98ipdl5kq0jq5qlnlpx8c598csj9yk86p1hsw" + "commit": "e54d5e6dc659c252d10c4280f4c4d78d38623df5", + "sha256": "13q78d6pgmv7nmv0c4nfggbf29l624q73sycz3gr6hqng6kdlsvb" }, "stable": { "version": [ @@ -43829,25 +43861,25 @@ "repo": "emacs-geiser/chez", "unstable": { "version": [ - 20230228, - 2253 + 20221027, + 137 ], "deps": [ "geiser" ], - "commit": "04ab4387fed68659f21377dbe74513edac2fd134", - "sha256": "19yv5brhzf10hsazmm8s1b058d434hv60a52s08m3kxyrkwr5sca" + "commit": "d64687c46dcd12aa3225a0fa38269f79a248dfb0", + "sha256": "0hjbml8jmix32wpzjlb9wh8kkbvzzr3lrj4nrm8srnp2zibyqw4q" }, "stable": { "version": [ 0, - 18 + 17 ], "deps": [ "geiser" ], - "commit": "04ab4387fed68659f21377dbe74513edac2fd134", - "sha256": "19yv5brhzf10hsazmm8s1b058d434hv60a52s08m3kxyrkwr5sca" + "commit": "48427d4aecc6fed751d266673f1ce2ad57ddbcfc", + "sha256": "03fc9ahb0pmznkcnxzgpni4clj1zgky6vaqkc94nf8b8swniwkm9" } }, { @@ -44594,16 +44626,16 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20230301, - 1402 + 20230212, + 2209 ], "deps": [ "compat", "let-alist", "treepy" ], - "commit": "6a5de97649ff3eca9aa20b79f3526b4b3ab86b13", - "sha256": "1xn95k8fd55q5z5kv3bzhvivvgk860gxsvsrav8s7d5clrvl5ilm" + "commit": "47b7dc9bb299d50647cd24efebaf41dbc07d9e90", + "sha256": "0k9zx62cwcb3pribmj1s4f7v7d4rg3msnscv1y2pjf2x740a1vj9" }, "stable": { "version": [ @@ -46472,11 +46504,11 @@ "repo": "emacs-gnuplot/gnuplot", "unstable": { "version": [ - 20230224, - 926 + 20230218, + 1717 ], - "commit": "9a31a12903cd3d9eb413948ef206023917c0d469", - "sha256": "1g3gnbb684rhclwprrx1jm81wsn0l65zkw6zcy8mpgk0ryx1nkhz" + "commit": "663a89d263d4f26b996796d01b6a3b783449e0f5", + "sha256": "0s0k18ibi4b2vn6l7rwdk79g6ck6xafxzzbja8a8y0r8ljfssfgb" }, "stable": { "version": [ @@ -47314,11 +47346,11 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20230304, - 644 + 20230112, + 1532 ], - "commit": "cb8002277d44c6b548f7e924fa1715706b5f986a", - "sha256": "1ca7pcvfzl69qc1zsvx2ifz2za88hb79vvckaw924pxqzabrcix9" + "commit": "e8343e7d41af67f55c2da9231fb275a93382a4c8", + "sha256": "0f8d96pz676bl1b8rh2wxhdw1incaf691rkdlwzyzsar51c11dj9" }, "stable": { "version": [ @@ -47985,30 +48017,6 @@ "sha256": "1vg4sc6j0i03riwzvj8pg333fihj4g2nwd3pgahjfkxps7fbmlqv" } }, - { - "ename": "gptai", - "commit": "24a96bdf7802aacded56d84e8824d9394335a309", - "sha256": "15m3nxlgzw0was6c3f3wmq6zw98fx47ga7dlxsb5wl3pnpr8nxnc", - "fetcher": "github", - "repo": "antonhibl/gptai", - "unstable": { - "version": [ - 20230227, - 1036 - ], - "commit": "a8de3ae18fc0fcec220a236165a81dfdc042d79a", - "sha256": "0drg83jnsly60mms9l0jl50wlffv4nc810pgh6fggr1is6yq96nk" - }, - "stable": { - "version": [ - 1, - 0, - 0 - ], - "commit": "fde04c9905de2a7ded5a1590e8296fee801d313a", - "sha256": "1jb8v4fdx5kaf6jckzpfckpmkb6isl3jj8lcijh1wxcjwj7wdyjj" - } - }, { "ename": "grab-mac-link", "commit": "e4cc8a72a9f161f024ed9415ad281dbea5f07a18", @@ -48138,6 +48146,38 @@ "sha256": "1jpfyqnqd8nj0g8xbiw4ar2qzxx3pvhwibr6hdzhyy9mmc4yzdgk" } }, + { + "ename": "grails-projectile-mode", + "commit": "35d49029c1f665ad40e543040d98d5a770bfea96", + "sha256": "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn", + "fetcher": "github", + "repo": "yveszoundi/grails-projectile-mode", + "unstable": { + "version": [ + 20160327, + 1324 + ], + "deps": [ + "cl-lib", + "projectile" + ], + "commit": "8efca50ce92b556fe9d467b157d7aec635bcc017", + "sha256": "0xnj0wp0na53l0y8fiaah50ij4r80j8a29hbjbcicska21p5w1s1" + }, + "stable": { + "version": [ + 1, + 1, + 2 + ], + "deps": [ + "cl-lib", + "projectile" + ], + "commit": "8efca50ce92b556fe9d467b157d7aec635bcc017", + "sha256": "0xnj0wp0na53l0y8fiaah50ij4r80j8a29hbjbcicska21p5w1s1" + } + }, { "ename": "grammarly", "commit": "6bfa47f73110bdf2ca1b223dbed16f73c08a12f2", @@ -48348,11 +48388,11 @@ "repo": "ppareit/graphviz-dot-mode", "unstable": { "version": [ - 20230227, - 2008 + 20230213, + 1945 ], - "commit": "3199817b54ffd6644b9c1c3fdd2d9317bf95a152", - "sha256": "19jj3j6r1pjq8y7vi7aw99zcphbcicjcvhamxbb42s5ix2zafpb3" + "commit": "a3cbfa969051dd638a993e1962e2b965067896f6", + "sha256": "01f0p4gkbr2n57qkr4hxgwqm7rsflqp3y806ab4l66g42xn1lp5j" }, "stable": { "version": [ @@ -49096,11 +49136,11 @@ "repo": "Overdr0ne/gumshoe", "unstable": { "version": [ - 20230302, - 457 + 20230115, + 2105 ], - "commit": "3b65ee2496d6de3c7c47a821b38a5a19e0b64c2a", - "sha256": "1xs25f7di94fb32ahh6h5rkv37bn9vrdahkp0hp4c7s9jpvxf5im" + "commit": "0ada8c575d4e94b4f3edb0092239cfa835b17726", + "sha256": "0jq43w12j6sf6qammahfyhmzcq78y2w00lmaxr2mjqdmq435vhah" } }, { @@ -49250,14 +49290,14 @@ "repo": "hhvm/hack-mode", "unstable": { "version": [ - 20230227, - 1950 + 20220825, + 127 ], "deps": [ "s" ], - "commit": "278e4cc4032bff92060496cf1179643cfc6f9c0f", - "sha256": "0b7831sklgal1zky772qdmg6b2a1kdy4nwhz398rb8shx66fx4pm" + "commit": "26f06ffe82574f98e7da381e48202eceb8ef0793", + "sha256": "0sbrrwlr64dkb1dnfblx5l8ypwmcjxwbzf7ppqjnw0n2wx466751" }, "stable": { "version": [ @@ -49748,11 +49788,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20230304, - 921 + 20221113, + 1425 ], - "commit": "20d4e2300302a9af673e82d0185d3f489bfb0f59", - "sha256": "1n6r2y26rrb4y6c849lwfkckz8426jpcx2d4dzv5jkycvhcpzw59" + "commit": "a34ccdc54be15043ff0d253c3c20087524255491", + "sha256": "1z2jcgdm5bc13zwl4y7fn5rxqqzs3i54qw32wb2hwpa42izwq159" }, "stable": { "version": [ @@ -49998,11 +50038,11 @@ "repo": "purcell/emacs-hcl-mode", "unstable": { "version": [ - 20230302, - 1029 + 20200315, + 2129 ], - "commit": "35784854efd29fa8c9fe827654d747a2ace5cb19", - "sha256": "1glz8p89c6mfrh92wycinqr1ffk5b6skjjn9qpqw6n510ccpzhwg" + "commit": "c3d1158ad1a64f06aa8986ab1cdea6b7fbdd4bf7", + "sha256": "0qza5pgpzcabik3592dk25glsv9zcg84pn1jzm43f9b1j9w5iv4i" }, "stable": { "version": [ @@ -50075,15 +50115,15 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20230224, - 658 + 20230221, + 819 ], "deps": [ "helm-core", "popup" ], - "commit": "4d42ea5d0797696e6301ee5e193707ea394631e2", - "sha256": "1yarkycw8ly7iamj5gb0alzq8izyfizcgzym9clz7mis73v87afp" + "commit": "fb3df89c7b0a68c79d6725beb20d3dc6ccd348a1", + "sha256": "189d1ldhaw83ahvjpi1l5q6v1agglvbll9qimfyv8g2h4nj50730" }, "stable": { "version": [ @@ -50981,14 +51021,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20230227, - 649 + 20230217, + 602 ], "deps": [ "async" ], - "commit": "e8957d1b38abd554aecfb2bf87ffc88b8d3311a7", - "sha256": "1xnnslv3gdqniwakz5xlxzdbvyiq1kja4rfka6z9gav4jqbvck1a" + "commit": "dfd6403947c5cd9f32afcd6bc92a1756cc958c82", + "sha256": "03rw1j7cs7glwcnwxp69zl0csfj138csyzcg6g2yj1vsm31mx2mn" }, "stable": { "version": [ @@ -55807,6 +55847,24 @@ "sha256": "1xqrd6z015ka42b1j1kakym3qvv1m5ip450fiffkv8gmfnxi7mkj" } }, + { + "ename": "hl-fill-column", + "commit": "68c40d7b6af664e01083b78c60b6a8e66b278a4e", + "sha256": "1kv77zfz1rd60cajjgljn8b04j6szqwwc3ialfxf6wdzh1w28jd3", + "fetcher": "github", + "repo": "laishulu/hl-fill-column", + "unstable": { + "version": [ + 20200607, + 757 + ], + "deps": [ + "names" + ], + "commit": "5782a91ba0182c4e562fa0db6379ff9dd472856b", + "sha256": "0sfki2844yjlvnjlaia0n46af3c5y1bi74x91icwxccqwlkyg8jg" + } + }, { "ename": "hl-indent", "commit": "3aa6ce8f3d1349e28dd9dea8396c38257e3cea2f", @@ -58759,14 +58817,14 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20230226, - 653 + 20221114, + 616 ], "deps": [ "clojure-mode" ], - "commit": "fb9b5ea55f9ef02be32660cc29df15023968fb78", - "sha256": "0kf9hm3l95yq1mxm6has2s13jw0rhxzrv10x5ym4qvr390rc9dic" + "commit": "e5ce3839835b9b561fca5810f43f413c96c197d9", + "sha256": "04ggx767a795scidy0f58d577pm7ipgpxpi43rlqc2g9gcgzk9sd" }, "stable": { "version": [ @@ -58858,11 +58916,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20230304, - 1512 + 20230122, + 246 ], - "commit": "6f1df882ab319758af43877fa20465f6566efbf3", - "sha256": "11my63lfb3lcd2df0ych1hq3c3jcriws4ljvrmx1qqgxphli3dsm" + "commit": "0ce7f4049edcae188b4643b3163e5301f9ef09cc", + "sha256": "0ygm4y0iwvh1mz883x9727jlw0pnf0xgl4b1xysbvsyg6gplf0xv" }, "stable": { "version": [ @@ -59327,10 +59385,10 @@ }, { "ename": "insecure-lock", - "commit": "170ba8b01dbb8385260ef546ecb4e5239c6cc686", - "sha256": "0c256qyrbnanly930w1kj13mnysw0pvklnvqw51pdyjq9cs30y3x", + "commit": "1fe53161ec25badb9a4b1b415f42d2d520bb614c", + "sha256": "1j1xkwqyrcgprsnqihd7c9x85rrphskwcjnvc9firvyw8rs5k4sr", "fetcher": "github", - "repo": "kchanqvq/insecure-lock", + "repo": "BlueFlo0d/insecure-lock", "unstable": { "version": [ 20221111, @@ -59690,14 +59748,14 @@ "repo": "emarsden/ipp-el", "unstable": { "version": [ - 20230303, - 1138 + 20220830, + 1336 ], "deps": [ "cl-lib" ], - "commit": "8011ef4f550ebfbeefcacc1196a103580c730cfe", - "sha256": "05l1ryj54h5ylqia3zwncbsdqdklpj7pzvrmarnmfrs722r1s5fg" + "commit": "21d3b3fd5d1e655126ee03dac9d6b46cad9deef6", + "sha256": "1w0mbpprzrf0b24s0cdm6h3g1m6ydp844n3wyd3nx0rf3w980wsy" }, "stable": { "version": [ @@ -60821,14 +60879,14 @@ "repo": "Yevgnen/ivy-rich", "unstable": { "version": [ - 20230228, - 608 + 20210409, + 931 ], "deps": [ "ivy" ], - "commit": "4fdd4669d69c9e8248b361b6e069b27d10e809e4", - "sha256": "1marlsm5rcnsd3ddiwy82q8q05pchrjw867ngp7vrrlvi17x5hcg" + "commit": "600b8183ed0be8668dcc548cc2c8cb94b001363b", + "sha256": "1dv6vr7fv32v5m04zdy02sdajpvrnpc4i3pbh2dwfv73ff8d8yxm" }, "stable": { "version": [ @@ -61796,11 +61854,11 @@ "repo": "ianyepan/jetbrains-darcula-emacs-theme", "unstable": { "version": [ - 20230223, - 1901 + 20210602, + 1430 ], - "commit": "46f153385e50998826ca13e18056c6a972768cfd", - "sha256": "1qpjipigq320ri48ah8mnl7lq4hf8drk5lnpqr4csa7cgi83md6l" + "commit": "f57c359044ff1fa90db62a60b6691ff8d65c82f3", + "sha256": "17wd6yzhjdw5j3bpn6bnga5nkwdnqgk8nprqiavsir4ghkzw2h46" }, "stable": { "version": [ @@ -62811,14 +62869,11 @@ "repo": "FelipeLema/julia-formatter.el", "unstable": { "version": [ - 20230301, - 1807 + 20220106, + 1414 ], - "deps": [ - "session-async" - ], - "commit": "6297a3e6b4b24ec0158b43b886be346043c2772f", - "sha256": "01r1mrnxn53fbz2p2cvzn967i35qq2gph7vp1r2sp8zv06k8ybaj" + "commit": "a17490fbf8902fc11827651f567924edb22f81cb", + "sha256": "15ij7l80s847ykphdpmlcbj1jdhfx2ki6gkzqh90sbil3yby0qzs" } }, { @@ -63146,20 +63201,20 @@ "repo": "leon-barrett/just-mode.el", "unstable": { "version": [ - 20230303, - 2255 + 20221107, + 1633 ], - "commit": "d7f52eab8fa3828106f80acb1e2176e5877b7191", - "sha256": "103jwkmg3dphmr885rpbxjp3x8xw45c0zbcvwarkv4bjhph8y4vh" + "commit": "45a221063093f3461816913acdaba898e62b42ce", + "sha256": "08n2z3822g5gq2zdbj2nzmd5y4xwa8w4bpgcgdjffnc9casnjdwm" }, "stable": { "version": [ 0, 1, - 8 + 7 ], - "commit": "d7f52eab8fa3828106f80acb1e2176e5877b7191", - "sha256": "103jwkmg3dphmr885rpbxjp3x8xw45c0zbcvwarkv4bjhph8y4vh" + "commit": "45a221063093f3461816913acdaba898e62b42ce", + "sha256": "08n2z3822g5gq2zdbj2nzmd5y4xwa8w4bpgcgdjffnc9casnjdwm" } }, { @@ -63623,25 +63678,6 @@ "sha256": "114hjz7k8p8xmpfbv2img98qfkb46wn4mz5sdbl7278f973z2yqv" } }, - { - "ename": "kconfig-ref", - "commit": "2edbef3c799e7832945898d2df91464d1c9b8008", - "sha256": "0npsv07jhzav22iv7jdr04k2gqavc7m5x41qgih4m0zwqq0y031v", - "fetcher": "github", - "repo": "seokbeomKim/kconfig-ref", - "unstable": { - "version": [ - 20230220, - 1207 - ], - "deps": [ - "projectile", - "ripgrep" - ], - "commit": "dfb127fa5ac003a06f108d2e876c84a1931e5678", - "sha256": "1rzqj7if1qk59rhp9ddmw0hjf52niacdvyacpdcyc7v7m49bnwil" - } - }, { "ename": "kdeconnect", "commit": "c363866d30fb86ae636d30def8c3847711ada762", @@ -64266,14 +64302,14 @@ "repo": "debanjum/khoj", "unstable": { "version": [ - 20230301, - 423 + 20230218, + 231 ], "deps": [ "transient" ], - "commit": "e77a5ffc835dd006e17d9903307413dd495db729", - "sha256": "1pnl222qv1z1ggfhjk20x1ngi360jwkzwf5zil0v4lgrlmp6xf6i" + "commit": "61b6ee2857b92721fc2c7e1329ae476a8d41f040", + "sha256": "16rcjgyaqkncfxy8zihn339rj1dxc55pcr4h1m1z1hpq7dnk895a" }, "stable": { "version": [ @@ -64517,24 +64553,6 @@ "sha256": "1ld3ccg8q7hmjrj60rxvmmfy4dpm2lvlshjqdf9ifgjzp221g4vb" } }, - { - "ename": "kkp", - "commit": "dcae17bc6cc208122587fb2edaaedde2bc30a89c", - "sha256": "1izg1ga1djshr7vmkk0pxsywgyz64dcc7abnraianwb7005lsxgb", - "fetcher": "github", - "repo": "benjaminor/kkp", - "unstable": { - "version": [ - 20230301, - 2147 - ], - "deps": [ - "compat" - ], - "commit": "38440c0b64c12299dcf789622d59d1c9b85fca9e", - "sha256": "1vn219njvxlbcqkp0bg9y1wdsh0l46xiqih40wc3zqmpajciwpq2" - } - }, { "ename": "klere-theme", "commit": "962f7c87d0630399ea388f25ec5792fa2f2b4489", @@ -64558,11 +64576,11 @@ "repo": "vifon/kmacro-x.el", "unstable": { "version": [ - 20230303, - 2339 + 20220323, + 2215 ], - "commit": "913e08cfa377eb1537ed066e2a4f08b8d8d59a5e", - "sha256": "1dhpghbaqdjsmwkhf96qi7cakzbwm4gpw7wjr9l75dnw132fczn9" + "commit": "429abd82c97031948b7681197551bb77708bd174", + "sha256": "07yxqcq84hlj3h3b66cwlmmk4cfnwb7pfr5lqvgaxywvziv2hqng" } }, { @@ -65091,15 +65109,16 @@ "repo": "tecosaur/LaTeX-auto-activating-snippets", "unstable": { "version": [ - 20230302, - 1345 + 20220509, + 1234 ], "deps": [ "aas", - "auctex" + "auctex", + "yasnippet" ], - "commit": "7f4044918c4e0a9b71128f36f65f1d86842203f9", - "sha256": "1n2w97rskbdjgiic6wjsxdjfh536v05mpx0f14bbjasj9y0cjh1m" + "commit": "44533de4968fee924d9cc81ce9a23c9d82847db3", + "sha256": "13rflldz3684qv6xvg44sj6r1dzaqclmjcg0rxfnksf6cb47l1yg" }, "stable": { "version": [ @@ -65283,11 +65302,11 @@ "repo": "mhayashi1120/Emacs-langtool", "unstable": { "version": [ - 20230222, - 326 + 20230207, + 950 ], - "commit": "416abc7d1c1cbb31a9bddad458366215bad0089b", - "sha256": "1fw1xb7dbdv2frcnvvkplx30y20g0khp3xgb2s4p5ws97qpwqbf3" + "commit": "fc6c046af1c5e4e55331414387865f65afb1bd3c", + "sha256": "0vzs3hkhmvdrbii1hmg87brddpjfmqfqykf7a2hnwmdbkihiwwk9" }, "stable": { "version": [ @@ -65325,14 +65344,15 @@ "repo": "mhayashi1120/Emacs-langtool", "unstable": { "version": [ - 20230222, - 401 + 20230207, + 319 ], "deps": [ + "langtool", "popup" ], - "commit": "d86101eafe9a994eb0425e08e7c1795e9cb0cd42", - "sha256": "0wbjmkxlj79iffd7v64d6qpv97jc0jwfcy3849dglm8xygx9x7cg" + "commit": "25b23a2dc592cdfe498740af87d975f7ef23a854", + "sha256": "0hbvkynasz54scd1avsskxav9nlb3z571wrmz2z10kyx3z6rnr9a" }, "stable": { "version": [ @@ -66701,11 +66721,11 @@ "repo": "ligolang/ligo", "unstable": { "version": [ - 20230302, - 1616 + 20230130, + 541 ], - "commit": "d1073474efc9e0a020a4bcdf5e0c12a217265a3a", - "sha256": "0ipk7l2dhfc6qv3nqdyhxasswyl11xg9cklka6s3hv4sly0c2lma" + "commit": "fa63e64ff3de4de78f74c2d270c0c0f000abec8f", + "sha256": "1gxpdr7ssdzmax4g7fcn15l3rr4m4zm2gv695iywa5x48k4syzn8" }, "stable": { "version": [ @@ -67485,13 +67505,13 @@ "repo": "Atreyagaurav/litex-mode", "unstable": { "version": [ - 20221107, - 147 + 20221108, + 300 ], "deps": [ "units-mode" ], - "commit": "45004b3a865771799b739d17ebb7849190fffa63", + "commit": "72e20233db66cb37306bdc066c68e6d7086ab3c4", "sha256": "017lqavwks3f0q71aw0mw45k79d0ydjfdn2l9i66bmvdms5bjih5" }, "stable": { @@ -67571,11 +67591,11 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20230227, - 18 + 20221203, + 38 ], - "commit": "b0721520a55b34a86144ebee5dd3f2d8287bf34c", - "sha256": "14x1kl6bigpbfvppr1w3jxd5y0h9msxl6rc0qhcqhklbddvwj3hb" + "commit": "c02c7a5002d817d6e9cd4d7a1551c0ee412a65f1", + "sha256": "0m5v46s4n4wq730pdzhmf26r4lxj23sg24l7yzf40dhsa7pfgh4p" }, "stable": { "version": [ @@ -67911,11 +67931,10 @@ "stable": { "version": [ 1, - 6, - 1 + 6 ], - "commit": "5c31af49bfbb2f387fa505ba4aeb2004b249af2c", - "sha256": "05y2qvagcc4r3q594gvlabd37ljw51482wdhw8d49ls624fdcwyl" + "commit": "a878589fbbd291d0aa27f56c582ab900a03ca063", + "sha256": "04jw2zfbzw8qblkmxg5c4dm31i5kk8d9r3l1bqa1bld8s7pdxnp4" } }, { @@ -68703,26 +68722,26 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20230228, - 1711 + 20230121, + 1846 ], "deps": [ "lsp-mode" ], - "commit": "9200ad19c416b3945d62683dd606917d8a1b3fee", - "sha256": "1wclmi12y13hd85y76wbyh3qvny1w3cyxhg57ip73i2v8paxhn1f" + "commit": "de080d83f5759ead46dd7a26bb73b7c3a940ef40", + "sha256": "18k93vwq95zyhfp8jj6ppsks95rcqs39p3lhwshgwq9k2i33v1zi" }, "stable": { "version": [ 3, - 2, + 1, 0 ], "deps": [ "lsp-mode" ], - "commit": "9200ad19c416b3945d62683dd606917d8a1b3fee", - "sha256": "1wclmi12y13hd85y76wbyh3qvny1w3cyxhg57ip73i2v8paxhn1f" + "commit": "de080d83f5759ead46dd7a26bb73b7c3a940ef40", + "sha256": "18k93vwq95zyhfp8jj6ppsks95rcqs39p3lhwshgwq9k2i33v1zi" } }, { @@ -68809,8 +68828,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20230304, - 1615 + 20230221, + 1558 ], "deps": [ "dash", @@ -68821,8 +68840,8 @@ "markdown-mode", "spinner" ], - "commit": "eb9c9c914b50bfa281453ab1df09243b2eb0bf3b", - "sha256": "17m21i56wxg0mnqnbv4yjd8c841ibj1xy2bdd6v39xw3c8fhjfsv" + "commit": "e6293251a65554fa23f87d0e883d121b4f0aed4e", + "sha256": "1gkn3zw9h2kgpcmmpsadnh9aazgyyp9lmxkl6i7wd7gx5mg6fp49" }, "stable": { "version": [ @@ -68969,16 +68988,16 @@ "repo": "emacs-lsp/lsp-pyright", "unstable": { "version": [ - 20230225, - 1118 + 20221201, + 1501 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "54a2acddfdd7c3d31cb804a042305a3c6e60cf81", - "sha256": "1256q00zsh4q4p3qx5jwih1j7j7nfgmwvv9m0bn6j588wj97aiy2" + "commit": "4cd2adbb32287278d9d9da59a3212a53ecdf8036", + "sha256": "0ys76xd1bg9r0hkgq1h3aq6wxsjxqplxmk7cfwazzh9nwmgp9s22" }, "stable": { "version": [ @@ -69562,14 +69581,14 @@ "repo": "amake/macports.el", "unstable": { "version": [ - 20230224, - 49 + 20230215, + 142 ], "deps": [ "transient" ], - "commit": "b56f47a2ba386a4ff68d249ba9675b1a22135a45", - "sha256": "1d3j6savqgp4fgbh0lvmyspar6ic090w2js5fdrpn71vk3hmxsf4" + "commit": "e7b16e8b78db6d7fcc17eb05fa3a2a4ed439f2f2", + "sha256": "1kzxq9qcsn63lqx22d21zd4c8wm80d4nhqfsvh5m3p88as9ff29q" } }, { @@ -69756,8 +69775,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20230302, - 2135 + 20230221, + 648 ], "deps": [ "compat", @@ -69767,8 +69786,8 @@ "transient", "with-editor" ], - "commit": "b926ab0e051e497e8ed43754cfd2012d23dbfc4c", - "sha256": "1k1hdhj9nwv0ylwkwg3mvkgv5mhnyzscdck8qdfn18s7x2p5952x" + "commit": "97a95f70079b6613bf98d2306279d3e03fe51234", + "sha256": "1mm13lpq2ank0pnnf6q4qfpaw4k6fw3zjd1qgdi73l4lw8rrbvrx" }, "stable": { "version": [ @@ -70278,15 +70297,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20230302, - 2130 + 20230213, + 2018 ], "deps": [ "compat", "dash" ], - "commit": "410e4583e01b7fac31a4748e78f4c613859d3c41", - "sha256": "0g188jxvc7v8fhjwfd17i000fv1qf5mgi5bm7dvl9pjlawx2qgcn" + "commit": "deb10e984e16201182b0569f7df7d30ec3b8afa9", + "sha256": "0qh8170mb2bm2zmncpzd7zz11s7bvbw9pzpwf52cbai3qk90b544" }, "stable": { "version": [ @@ -70301,21 +70320,6 @@ "sha256": "0cxyvp2aav27znc7mf6c83q5pddpdniaqkrxn1r8dbgr540qmnpn" } }, - { - "ename": "magit-stats", - "commit": "89f49701d5760a927fd3ddfeac035f1d27c81fe8", - "sha256": "06k6jj2i2ll9kq12i3rh7097grz9vv4vkjwkjsajky0l6qild3s4", - "fetcher": "github", - "repo": "LionyxML/magit-stats", - "unstable": { - "version": [ - 20230223, - 1819 - ], - "commit": "41b18e5fc664dba93981a7931f476632c5b54a7d", - "sha256": "0ggl29cqxskmwjzj4aqahdd3a9228wxwryj1kaa613vvfc96cgyq" - } - }, { "ename": "magit-stgit", "commit": "8528698b6e61e62b35a95d9c297d5b868a81a3db", @@ -70418,8 +70422,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20230222, - 132 + 20220822, + 2224 ], "deps": [ "async", @@ -70431,8 +70435,8 @@ "s", "transient" ], - "commit": "c6f3fd03aa5b750636c2647253f21cc03329566c", - "sha256": "1nmym73i90fik9949cwzh615bm7h8vj9k6fbn6i4ms97f6wy715p" + "commit": "c5030cc27c7c1a48db52b0134bf2648a59a43176", + "sha256": "0j32zslcbiaq2a6ppyzdq4x59payya5hzd2kpw3mdj0p479byz19" }, "stable": { "version": [ @@ -70729,16 +70733,16 @@ "repo": "Olivia5k/makefile-executor.el", "unstable": { "version": [ - 20230224, - 1329 + 20220928, + 936 ], "deps": [ "dash", "f", "s" ], - "commit": "d1d98eaf522a767561f6c7cbd8d2526be58b3ec5", - "sha256": "0wm0i2m124dglwq0szp6pdh2r0dln0xpgscw2immi9cchcmgcy4f" + "commit": "170d14d834a0d163cd618d642d4580ff75b014be", + "sha256": "1g9mzic9k27fhpzcfpvlirgks2ip13z4xn8bfqabmp0xgq41ga5j" } }, { @@ -71103,14 +71107,14 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20230302, - 252 + 20230217, + 2050 ], "deps": [ "compat" ], - "commit": "6aa48ab592d209449800e1dc04c083007b5a6fcf", - "sha256": "02ycfa6j2hg11r3b92yfzyn2abydmahzgwnakbl48dca6k84xz3m" + "commit": "ccf573e2145d9deb9d734432351eefc87fc1bc16", + "sha256": "0zi3q7dd9dgrhbz6ww270i43kkqs0ddk0vzs89mfvwa5pzw32d2q" }, "stable": { "version": [ @@ -71229,11 +71233,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20230227, - 342 + 20230212, + 1208 ], - "commit": "f4567202bbe76a211e454525e6d093a86a1cef14", - "sha256": "0zbfrpqb3aa1imn746gnnr76q6gphir056aqgbin9lbzzzipw979" + "commit": "c765b73b370f0fcaaa3cee28b2be69652e2d2c39", + "sha256": "1i9qw8pyf44zvdfc8nh5gjpiihhafvjjqwgc6z7r6jl2gn4bmyri" }, "stable": { "version": [ @@ -71559,16 +71563,16 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20230301, - 2133 + 20230219, + 2053 ], "deps": [ "persist", "request", "ts" ], - "commit": "6eb7c27bef937ec76f3dba0ae19b57de4561bf8f", - "sha256": "0rh0a1bpba5zmkpa4rnyz7czdb8ggj3gwzyxqld9jb00ahwlrdfp" + "commit": "4f9a7be4926dbf3f33a717fcbed12de78c22b331", + "sha256": "0grgilbfzn1fhmzriq5wynxm119dlav8d975inhr2gi49sg8bx1d" }, "stable": { "version": [ @@ -72248,11 +72252,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20230226, - 101 + 20230213, + 200 ], - "commit": "8754857b800e0bf22c85bebad07488e85146e81d", - "sha256": "1pcg06m17nh202w0lry3mhjhy9g6m9xa87rb9fhk8dkavrff1p0m" + "commit": "1e69067c1647ea634c87c021c5acf4a81152f4b2", + "sha256": "125g3ya4n7whj88ja80gl8pfg3zwnkbmizkxyvs1hfwla1xr559p" }, "stable": { "version": [ @@ -72281,12 +72285,13 @@ "stable": { "version": [ 4, - 8, + 7, + 1, -4, 500 ], - "commit": "1fbb47f7559fd4145cee3661cb70e2fae711df53", - "sha256": "1qyzynvaz010zxmg7sq5dxlxclrr2fkirny2izan8i2j1s2vrzwr" + "commit": "f3643eab67b5d2a89c3310282b1b605eadeb1908", + "sha256": "05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01" } }, { @@ -72310,7 +72315,8 @@ "stable": { "version": [ 4, - 8, + 7, + 1, -4, 500 ], @@ -72318,8 +72324,8 @@ "auto-complete", "merlin" ], - "commit": "1fbb47f7559fd4145cee3661cb70e2fae711df53", - "sha256": "1qyzynvaz010zxmg7sq5dxlxclrr2fkirny2izan8i2j1s2vrzwr" + "commit": "f3643eab67b5d2a89c3310282b1b605eadeb1908", + "sha256": "05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01" } }, { @@ -72343,7 +72349,8 @@ "stable": { "version": [ 4, - 8, + 7, + 1, -4, 500 ], @@ -72351,8 +72358,8 @@ "company", "merlin" ], - "commit": "1fbb47f7559fd4145cee3661cb70e2fae711df53", - "sha256": "1qyzynvaz010zxmg7sq5dxlxclrr2fkirny2izan8i2j1s2vrzwr" + "commit": "f3643eab67b5d2a89c3310282b1b605eadeb1908", + "sha256": "05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01" } }, { @@ -72405,7 +72412,8 @@ "stable": { "version": [ 4, - 8, + 7, + 1, -4, 500 ], @@ -72413,8 +72421,8 @@ "iedit", "merlin" ], - "commit": "1fbb47f7559fd4145cee3661cb70e2fae711df53", - "sha256": "1qyzynvaz010zxmg7sq5dxlxclrr2fkirny2izan8i2j1s2vrzwr" + "commit": "f3643eab67b5d2a89c3310282b1b605eadeb1908", + "sha256": "05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01" } }, { @@ -73205,14 +73213,14 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20230228, - 1944 + 20230212, + 2213 ], "deps": [ "compat" ], - "commit": "199b6022f82dc54e7cd58ca302810e16dc506b53", - "sha256": "1j3jc2yryi8b32b8y9gp5qjpxd2qx0rs8s0kmfkq5xm8gf9cxrl2" + "commit": "c5e8b65620558409a79766e86e3e8263cef765df", + "sha256": "1prs6zr924smh1kiq1rljz0vim4rl2ngi5rj7lrq60k0hq1vyddl" }, "stable": { "version": [ @@ -73920,20 +73928,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20230228, - 2011 + 20230220, + 1859 ], - "commit": "d8e92a50f003908c72a2f588beb1856041dc9cda", - "sha256": "0p01ji9rnxc82pcvn80w6xs47khqyxqia4s9wm6ap8003pj2nzq6" + "commit": "f4282839d880a88062acaafbd8acea2708d3932b", + "sha256": "0nn5mkm2pn59l1bchxaz59zsl9xhvjxmqc5vizrgl77y9mjkws96" }, "stable": { "version": [ 4, - 1, - 0 + 0, + 2 ], - "commit": "829d06d9d3f6753dfcba3d811237cc138c5ffeb1", - "sha256": "1rfnn7c6qv3qmzpksdzy7623qijbldnmr7hl9ka2kwnhdarsigkk" + "commit": "ca4d92aa0dd2046a06821281b12201bcaa95bb1d", + "sha256": "05wl0310va5irc2f72d2mxq19xafxswmgc0a048mah0aam8lsv2f" } }, { @@ -74088,11 +74096,11 @@ "repo": "ananthakumaran/monky", "unstable": { "version": [ - 20230222, - 2153 + 20210417, + 12 ], - "commit": "7046eee5fc9ac625924382cb4a82b0d8efcd9ff0", - "sha256": "01k3qfhh0ly9x88azsh0skxsxsjv0b80s1ydg6m59cxis2jc7gxc" + "commit": "72c7cd21b7b995c476e938fd0b92a494aa25c3a7", + "sha256": "03khwadd3x3s9wrggdfjj8cff0nr64fj6hzc9yqbn2baxfkgrn8l" }, "stable": { "version": [ @@ -74294,11 +74302,11 @@ "repo": "takaxp/moom", "unstable": { "version": [ - 20230224, - 1234 + 20220911, + 2344 ], - "commit": "864bee4e121771a055fab2b9f3e53cb3b8a8e02a", - "sha256": "0j1v4l3kj522jcpc5xz2k1mjadgwa8jvjbk10yjpx6w5rwlh2ypz" + "commit": "9029cd76ba037ca31cc7b91453ff5f8510747cb6", + "sha256": "0p2xwsv77ygcqblc80xcdd92f37vag8zsldw4vvd9c7hr5n5m4s2" }, "stable": { "version": [ @@ -76056,11 +76064,11 @@ "repo": "kenranunderscore/emacs-naga-theme", "unstable": { "version": [ - 20230304, - 551 + 20230215, + 623 ], - "commit": "3b5a6eb800a78df66a8e1c08c2465110ec36c10c", - "sha256": "0hzqzr1fdys4v0lad24ns9gj58ha69j2qlj5ir2l1gsa3c961dgc" + "commit": "508bf3505e9bf60163b68056b89c084df97b48aa", + "sha256": "0x1n41c8bvi1ynsa9ka8wz7plk0a04c18ynyswcff3shrzayyr7d" } }, { @@ -76658,20 +76666,20 @@ "repo": "babashka/neil", "unstable": { "version": [ - 20230302, - 1337 + 20230217, + 957 ], - "commit": "350c7ce94060bb0a6e57b32d35c37d9b17d88970", - "sha256": "0fs209m3bn3jm6zwwhfx10w5f0xssddc1mpzwjdzk1q41f5wryjp" + "commit": "abea182499897eda40088d24b647e66099ef94ed", + "sha256": "19gqiynl59n2ni748f3wz212q22hnsx7xvq122hhwha0srdq8nyr" }, "stable": { "version": [ 0, 1, - 57 + 56 ], - "commit": "350c7ce94060bb0a6e57b32d35c37d9b17d88970", - "sha256": "0fs209m3bn3jm6zwwhfx10w5f0xssddc1mpzwjdzk1q41f5wryjp" + "commit": "abea182499897eda40088d24b647e66099ef94ed", + "sha256": "19gqiynl59n2ni748f3wz212q22hnsx7xvq122hhwha0srdq8nyr" } }, { @@ -77507,16 +77515,16 @@ "repo": "dickmao/nnhackernews", "unstable": { "version": [ - 20230222, - 1441 + 20220604, + 2100 ], "deps": [ "anaphora", "dash", "request" ], - "commit": "bf0ff5d4a079004f937e7440ba282c156f24dced", - "sha256": "129kp12rbggq3hy6w14264svf4a2lf3l5j9mnlf47f35w9zvwxd6" + "commit": "ec99d579b9fa26fdb5f5e00dfd77e968ed8386f0", + "sha256": "0bnalbgf3bdvwnvmdjy1vq439n6vkfzmp9a5rgn0kdr32ar75kfw" } }, { @@ -77577,24 +77585,6 @@ "sha256": "1zi73i1mhdfxrpp0vhnpzcalcqmkjv7ygx5kvam8r0j7265bn7nw" } }, - { - "ename": "no-clown-fiesta-theme", - "commit": "3004633d97d78a997b4e904b36dc13f87df1503f", - "sha256": "0cvg8ldnn90sqdkrk64im42kbr6f3z3zk9skbda9v530l456m38l", - "fetcher": "github", - "repo": "ranmaru22/no-clown-fiesta-theme.el", - "unstable": { - "version": [ - 20230220, - 1019 - ], - "deps": [ - "autothemer" - ], - "commit": "e143cdfa7cecac6383328eca88586105f308bca9", - "sha256": "1j986mbr49rlfxx3dsq5fjipif1gpkwjhx6f7sm9zppnf51r875h" - } - }, { "ename": "no-emoji", "commit": "af6b04c1f95468254f2cf361964df9fd25d23586", @@ -77663,16 +77653,16 @@ "repo": "thomp/noaa", "unstable": { "version": [ - 20230228, - 2331 + 20220812, + 1535 ], "deps": [ "kv", "request", "s" ], - "commit": "4a4f2169a840902799348e589c6f0211073c9d96", - "sha256": "1x3s25ai1g93gql5hdwbdq9lkhx4dyg4skz0xzfas12xv398pqb9" + "commit": "c691e770da0f1ed5b83c656087dfbc2ff231bef7", + "sha256": "01whmrfikxmxz2dmg1hy7myp68cvnblvb9blvk872k30y8yv074n" } }, { @@ -78846,11 +78836,11 @@ "repo": "nickanderson/ob-cfengine3", "unstable": { "version": [ - 20230226, - 1954 + 20191011, + 1721 ], - "commit": "52aa32fdfa412860837e795d17d50dac237e56e4", - "sha256": "1gskkxm3ah8x5flhwzf6x4i7v75fzls20g20bg6r8xranyp7av8v" + "commit": "195ba4694a0ec18d3fb89342e8e0988b382a5b1a", + "sha256": "0a18fv141s35vh1mza2d6q5japrfjg5g6l7gp6qq4k4im3gmaf86" } }, { @@ -79678,14 +79668,14 @@ "repo": "alf/ob-restclient.el", "unstable": { "version": [ - 20230301, - 1951 + 20220819, + 2228 ], "deps": [ "restclient" ], - "commit": "ded3b7eb7b0592328a7a08ecce6f25278cba4a1d", - "sha256": "0992xs7mkljgql7g4jrbvnm1dqkbzajfaj7jfrrxfrcd4b7i5ny6" + "commit": "1b021ce1c67c97fa1aa4d2c0816edb7add129e48", + "sha256": "1bcjj01q5n9w2cch6brbz8pzwnwsmdlgaa4sf5s97b9frmqb2ffg" } }, { @@ -80206,20 +80196,20 @@ "repo": "ocaml-ppx/ocamlformat", "unstable": { "version": [ - 20230224, - 907 + 20220718, + 1147 ], - "commit": "c94ead524c8294a8496b9efde7a6817a9a79f26b", - "sha256": "1h8pr68wql5qia3wqgfczz0m5m4ql44c39bbnhlnld039fsva42y" + "commit": "86938aa4435b251af1a3b081f7fbed90f982cf62", + "sha256": "0y1j5mwwrliy6a78cmpi6j8gw425shghqg9ylyl3qw5fx4b088pp" }, "stable": { "version": [ 0, - 25, - 0 + 24, + 1 ], - "commit": "c94ead524c8294a8496b9efde7a6817a9a79f26b", - "sha256": "1h8pr68wql5qia3wqgfczz0m5m4ql44c39bbnhlnld039fsva42y" + "commit": "86938aa4435b251af1a3b081f7fbed90f982cf62", + "sha256": "0y1j5mwwrliy6a78cmpi6j8gw425shghqg9ylyl3qw5fx4b088pp" } }, { @@ -80403,14 +80393,14 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20230225, - 556 + 20221229, + 727 ], "deps": [ "org-re-reveal" ], - "commit": "e124770d9d728155f53432f3adb47f5d2fbd17c7", - "sha256": "08q2z2d06kcg1z9mycwgwjqrfn6a8a90rzg7iqb77qlvpayf24n4" + "commit": "a2dde292e464bfb9b4d8ab470bb9a6a37b5cb6b9", + "sha256": "0nr63m4wka7q48hll0fhq8ijw7dw6g7m80r81xn62yfd7j7mfwk4" }, "stable": { "version": [ @@ -81905,11 +81895,11 @@ "repo": "inickey/org-clock-reminder", "unstable": { "version": [ - 20230222, - 1956 + 20230217, + 728 ], - "commit": "d3bf97113fd519aa08198e2283ba9c236a6df168", - "sha256": "026isn6qa4ra69ivm1b12k63dbcz4dcbz34ks6c6fby95rcbmhis" + "commit": "fd3d2ca9d5ca1a804c0e70193f89f650c69a8dc1", + "sha256": "119ad38hnj4i1wbsp9hkl5sa3s8z17aqly2y5ml37dbfid05w0ps" } }, { @@ -81982,14 +81972,14 @@ "url": "https://repo.or.cz/org-contacts.git", "unstable": { "version": [ - 20230227, - 1417 + 20221221, + 431 ], "deps": [ "org" ], - "commit": "ae45b9413e24abdc431d12858dced54e0dee6e39", - "sha256": "0dgw33db262pbm58l8z04bkh3jk21ddzziiblkbxzm736g6ckivq" + "commit": "bb4032eb12c20d34555a4e670f28696cf31a7b54", + "sha256": "149s34d4j68f8crp66xmscd22svwkar1a6zifznxlyhvszg0zl27" } }, { @@ -82915,16 +82905,15 @@ "repo": "beacoder/org-ivy-search", "unstable": { "version": [ - 20230222, - 514 + 20230220, + 812 ], "deps": [ - "beacon", "ivy", "org" ], - "commit": "7f2afd8c196e3723ae6ac4dd229367ece9acd3bf", - "sha256": "1k3l2zhwmnbxbslxrp07zsvg5xrzawiklskw90bpfvwakrbnsh88" + "commit": "e7170ff613734f24edace3309d69e23ef73f4b0f", + "sha256": "0sp6qpzj69n1hir9widxdbhz3781ld5hg1h98s23v1lqqxa6ddk9" } }, { @@ -82935,16 +82924,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20230228, - 1619 + 20220725, + 1808 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "13457755932565306f42074c69076759a428568a", - "sha256": "0syrrk7xf44hxdxa6iff31vzkvbp4lqlrmxj2rinf2rr4fp47h6q" + "commit": "9510f2010750c5c74b6c1be7e06939afd64aa39b", + "sha256": "1s91l4ibjvvc7rfvd8gldxqrcgjq00q83fdww217ck2ps5yrzyjl" }, "stable": { "version": [ @@ -82969,14 +82958,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20230224, - 1529 + 20230109, + 1217 ], "deps": [ "org" ], - "commit": "64a1fbc504269f407b9270cc2c4c5e34a85508c0", - "sha256": "1lysha39rc11skgvv74axdxsw9p16988kyg7l4l9syn7dw8zffa4" + "commit": "c84f1a771933d662695c20b73832a6415b7d3603", + "sha256": "0djypcb09iwx42mrnwq3nr381qmz0ssavwmsvzmq4rfpdj3gh5ly" }, "stable": { "version": [ @@ -83122,14 +83111,14 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20230304, - 1214 + 20230221, + 1311 ], "deps": [ "all-the-icons" ], - "commit": "8e0e45bf5bb06996895e99a223ee038fa9da5bf9", - "sha256": "0biiky3c50cbnwfyy76vwjlhdk2s6nmjwbzsy4mg21pbqq43xbxa" + "commit": "370535e4259888f686cb6cedcabb79c5b389e6bb", + "sha256": "113q1axrhl1y5lq5pf799nlh0i7vinrikphb90fwmx35y0gkpgj7" } }, { @@ -83218,11 +83207,11 @@ "repo": "aimebertrand/org-mac-link", "unstable": { "version": [ - 20230222, - 2228 + 20220616, + 2340 ], - "commit": "16734797b56b5bd1f49929b59f7cd8fcdcd268e0", - "sha256": "0cs6j6gkqkspf9g7ci37vm63bvsdl9914w4lx2y6b8mn4phd2wn2" + "commit": "0b18c1d070b9601cc65c40e902169e367e4348c9", + "sha256": "0ijlmfq6dbdmk3jpl87g4knk4l76yxf63nmk3n2nll3v3swbk22g" }, "stable": { "version": [ @@ -84166,28 +84155,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20230228, - 1655 + 20230220, + 848 ], "deps": [ "htmlize", "org" ], - "commit": "bf4e23e2ce9109d35957c9f42fafe9c9edb6bf4a", - "sha256": "0v9403zjxays4c66xq3zq2285h77pn2ha7afx70xffjyynmvnz6i" + "commit": "611d6bd1f66eedf5ee2590426990efd4ca990076", + "sha256": "1l8qjzijgbjzy4skhy9n0z05bczqlyh9lxwsd98f83mv956ghbkd" }, "stable": { "version": [ 3, - 18, - 2 + 17, + 0 ], "deps": [ "htmlize", "org" ], - "commit": "bf4e23e2ce9109d35957c9f42fafe9c9edb6bf4a", - "sha256": "0v9403zjxays4c66xq3zq2285h77pn2ha7afx70xffjyynmvnz6i" + "commit": "91cdd82c47b86990b5eb41fe34446a042194cc83", + "sha256": "1bp3kz2awy2mizs59qsa2yl7wfa0197fklnramzifz6z2zv5kbrx" } }, { @@ -84345,8 +84334,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20230301, - 1259 + 20230131, + 1743 ], "deps": [ "avy", @@ -84361,8 +84350,8 @@ "parsebib", "s" ], - "commit": "348cb860e5cfc2b32870e826218df16cf90e7d75", - "sha256": "02fmnhxag40182xcnpsiwf1r32fm13fs4j79xijgyvkdrljwrcsq" + "commit": "4c691f7b4cafbd9bf8c9608fe9d590f7c4894d67", + "sha256": "01yym610ffmf38vp3m3h9vc00y9gfx46pn83js6zwksq2rf6n96l" }, "stable": { "version": [ @@ -84509,8 +84498,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20230223, - 645 + 20221231, + 2122 ], "deps": [ "dash", @@ -84519,8 +84508,8 @@ "magit-section", "org" ], - "commit": "e73807efe135c5797d7a94c0f205a7fbd4b2e781", - "sha256": "1d75paijz6dv1qqpj68j412wbcrpxqxdlqhpp3wg4d1gx414cniy" + "commit": "74422df546a515bc984c2f3d3a681c09d6f43916", + "sha256": "0vhl69y6yk2zzfixjdwr8vxl2k921h0syshk5123r1nm9jp3i1s9" }, "stable": { "version": [ @@ -85164,15 +85153,15 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20230228, - 1622 + 20221211, + 941 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "1902d475b47b342d250c934ad26e2b35d6aafb4d", - "sha256": "0i4cr0yqry2m3grk11nqlpa9jaz8vwfa17qia5hpvnsxi9q5jzdi" + "commit": "5eb75d86c143c1801c71b54fe0da832affc3adc3", + "sha256": "17hq54v6f1b4cbjf9dsxq7f72ls5bal8lmhfjd27kkbhj2h5ky1w" } }, { @@ -85446,11 +85435,11 @@ "repo": "takaxp/org-tree-slide", "unstable": { "version": [ - 20230304, - 726 + 20221016, + 1623 ], - "commit": "badeab8bed56b41979ce65894e8c267db3ae9663", - "sha256": "0z8pgx5l16h14hal7401vq8ng64m5vzi7b533pamxcnsv1czkhxa" + "commit": "d6529bc2df727d09014e0e56abf4f15a8e8fc20f", + "sha256": "1br32mpwarmrn158y2pkkmfl2ssv8q8spzknkg2avr16fil0j1pz" }, "stable": { "version": [ @@ -89039,11 +89028,11 @@ "repo": "joostkremers/parsebib", "unstable": { "version": [ - 20230228, - 1530 + 20221007, + 1402 ], - "commit": "ace9df707108b17759c004c7387655277122d4c1", - "sha256": "02h5sbg2bqkmksj1ap4z7301hnsp5ga6951jrnwy89ds0xvrbg6l" + "commit": "1efca921cbb49380396df9d81308b32e55fc8b63", + "sha256": "054s29rbqjrsn50d8ckvg0b9581bpq5bp1yb4905p8p2sbhjgmsp" }, "stable": { "version": [ @@ -90051,20 +90040,20 @@ "repo": "Fanael/persistent-scratch", "unstable": { "version": [ - 20230225, - 1439 + 20230113, + 318 ], - "commit": "5ff41262f158d3eb966826314516f23e0cb86c04", - "sha256": "187cyl005csmmmh292km1v3ffl8x49h5qyn87i4adz9l5sqnpdgj" + "commit": "f9c1361ad69073af8133174f9e37b594df9be361", + "sha256": "1bgz6hdxwwi96pgxlxabzq6v7a63xznzd7ifmcdx9571vlbg48cc" }, "stable": { "version": [ 0, 3, - 9 + 8 ], - "commit": "5ff41262f158d3eb966826314516f23e0cb86c04", - "sha256": "187cyl005csmmmh292km1v3ffl8x49h5qyn87i4adz9l5sqnpdgj" + "commit": "f9c1361ad69073af8133174f9e37b594df9be361", + "sha256": "1bgz6hdxwwi96pgxlxabzq6v7a63xznzd7ifmcdx9571vlbg48cc" } }, { @@ -90348,14 +90337,14 @@ "repo": "wyuenho/emacs-pet", "unstable": { "version": [ - 20230301, - 111 + 20220917, + 2111 ], "deps": [ "f" ], - "commit": "9d2d747b18c3f1d330bf9f09c9f64af9446c1268", - "sha256": "18srb4m56jrbz059b0yl4ryl319pn0qwwl8kmqm010kzsg5xbjiz" + "commit": "7620c18223f126c384dbf42b0b167a6066a81dd1", + "sha256": "0azkf569fm8z8igd7wwgmf8w6wl3gd7r24j5nsbji16k8jfvq03c" }, "stable": { "version": [ @@ -91608,14 +91597,14 @@ "repo": "mtekman/planemo-mode.el", "unstable": { "version": [ - 20230227, - 1139 + 20201216, + 1122 ], "deps": [ "dash" ], - "commit": "537ebe40688ca8f3786aa1e9842265e6f34584d2", - "sha256": "0q9k8djb4f8c2q1649cxmjml2w8zzdgwnj5n7vi01n03qp85mhzd" + "commit": "9a981f79a2727f87689ae5a07368c41d35902a67", + "sha256": "1hx1mdbb25hggg4kwga97m3wysm0yj11hnnycmbwa85c9rn96jzv" } }, { @@ -92201,15 +92190,15 @@ "repo": "cybniv/poetry.el", "unstable": { "version": [ - 20230304, - 1540 + 20220915, + 801 ], "deps": [ "pyvenv", "transient" ], - "commit": "5ca52b221e57bb9dce7c89f62e7b01da1346a273", - "sha256": "1622lb747ihk24saiz9kl7k55iwa1cp4bifgg2shchhcdn7mj8vg" + "commit": "3da3990d3cea17f84c90257cc206540d4ea1b6c6", + "sha256": "0gz31v1c4v8yzl5wmzgh115083g17n9wndhgvw3wkx9xharkzhgr" }, "stable": { "version": [ @@ -92305,16 +92294,16 @@ "repo": "polymode/poly-R", "unstable": { "version": [ - 20230303, - 1140 + 20210930, + 1921 ], "deps": [ "poly-markdown", "poly-noweb", "polymode" ], - "commit": "f2e85391efe2d5a9516687422b4784d185af5241", - "sha256": "0i6wjmqanzngk3jh9lmm2i54hy0m9zg420ky2f8jqgqjykfpx6fs" + "commit": "e4a39caaf48e1c2e5afab3865644267b10610537", + "sha256": "19s99k0madr5yp9v523yj1990fmark09vixn31lzfmghi8nmdmck" }, "stable": { "version": [ @@ -92857,11 +92846,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20230302, - 2055 + 20230120, + 751 ], - "commit": "76b1a1f1bce412296d564056c76dd174bcf8ec64", - "sha256": "1x842h2yps3l0llbd8akilgr3drsh9hal603l4is270c631b6c2c" + "commit": "da70c8296a3b3b69626b11f2d202a38075f00c7b", + "sha256": "02lls6fh0fyxq3hwnwb5kih26q29fgl9g4isq1qk6j7bvv53gb04" }, "stable": { "version": [ @@ -93122,20 +93111,20 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20230222, - 53 + 20230212, + 808 ], - "commit": "dace2dcf105e9685b4085836645b3392dc7e2211", - "sha256": "1hr0hcxkqsdzl8gnn8iap67p675rlxp76dbr3yygq97475klyrk1" + "commit": "06b939cfb06168782fc378043ff35bd7fec203b8", + "sha256": "0c04005k0g0np96prff461nqkmac4l0d4sda42v2jnjh25ylhy81" }, "stable": { "version": [ 1, - 4, - 0 + 3, + 3 ], - "commit": "dace2dcf105e9685b4085836645b3392dc7e2211", - "sha256": "1hr0hcxkqsdzl8gnn8iap67p675rlxp76dbr3yygq97475klyrk1" + "commit": "06b939cfb06168782fc378043ff35bd7fec203b8", + "sha256": "0c04005k0g0np96prff461nqkmac4l0d4sda42v2jnjh25ylhy81" } }, { @@ -93304,15 +93293,15 @@ "repo": "SavchenkoValeriy/emacs-powerthesaurus", "unstable": { "version": [ - 20230304, - 1454 + 20220414, + 1453 ], "deps": [ "request", "s" ], - "commit": "0765581ee2b2b16f4f762193335630064c229477", - "sha256": "0sj0khimvzmiiwfj5dy19adwypcinjg8y0rqm9dbq7ii55cbiv26" + "commit": "88bc5229cba1604c8f74db0a1456d99259d538cc", + "sha256": "19fvibfv3skvs77k3bsd0q5cg3shn9wrdjfyrcybgc9sjfcngv7n" } }, { @@ -94248,11 +94237,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20230228, - 706 + 20230219, + 647 ], - "commit": "5143d32abd92ed111dc0cb69bf21946de7c6eadc", - "sha256": "0f8fr177s8khrd01bw6b6rqyi2g3x6a1gvsryz23xms6w0d636hl" + "commit": "fd257811c46f89f53143dd0ccbc134fc9459d6bb", + "sha256": "0rawixwdya1cva40r0ppq8c22ifdlprgyz6nw1a99w3bgny284zn" }, "stable": { "version": [ @@ -94834,11 +94823,11 @@ "url": "https://repo.or.cz/proxy-mode.git", "unstable": { "version": [ - 20230303, - 706 + 20220210, + 1410 ], - "commit": "eca6f0b8a17fcf9eb961ed0426f57a5b7ca4e1f6", - "sha256": "0mmlkci81m116gvak6z7pi8yskbl62209y3h7h3lfjb30jx77zww" + "commit": "620e48c6afaf760d0ee9f5bdf583fd91cd9d0ec6", + "sha256": "0xlla1ymqgpb15bycxl4xijlgcwir01krcvsyhxl4anmrpj2c0hm" } }, { @@ -95615,16 +95604,16 @@ "repo": "andcarnivorous/pyconf", "unstable": { "version": [ - 20230225, - 1741 + 20230127, + 2046 ], "deps": [ "pyenv-mode", "pyvenv", "transient" ], - "commit": "25adcbdc007011f2b6f4b5b0a6748298ab229fc2", - "sha256": "18sg6cgfs43mwcz7b845v3nj48q2qm7z8wgj4l6rrykz5716ihn1" + "commit": "f78e7f269210c7d7e06001752d87c8fbfd8b9084", + "sha256": "019c1hcdfr9cnpcag2qyg2lkf1scg1m6aw0nllwn31cwa8mvyyga" } }, { @@ -96106,11 +96095,11 @@ "repo": "thisch/python-cell.el", "unstable": { "version": [ - 20230224, - 1925 + 20220105, + 2315 ], - "commit": "cb8e6381b1fab16bcf475d115bb22fef503bea32", - "sha256": "11drjn5a9k25wsw3z870yvy911772v1giq7j2j0d72483kimlq0d" + "commit": "9a111dcee0cbb5922662bfecb37b6983b740950a", + "sha256": "17izy7sd7v2144yhshv0nymqx6bkrc1grb60imz5ipqhm6b6yf92" } }, { @@ -98639,11 +98628,11 @@ "repo": "alvarogonzalezsotillo/region-occurrences-highlighter", "unstable": { "version": [ - 20230221, - 1803 + 20200815, + 1555 ], - "commit": "9c2a3193ccf32f8fa48578a6b8826b2959dac120", - "sha256": "0qj9vnl5zqw288aw84nrwy21fqzi40b2yiv0g4km8y5pq7w13rw2" + "commit": "51e4c51e6078ebf0681e65f7dea4f328f0c91cfe", + "sha256": "04x0vi92bd7zz026zhk40bxh82559wzrv144rnh0yq92l6dscfm9" } }, { @@ -98752,11 +98741,11 @@ "repo": "DamienCassou/related-files", "unstable": { "version": [ - 20230225, - 1900 + 20221125, + 1824 ], - "commit": "5f0888e6427c49b9ca62e5e21f135db0966a2194", - "sha256": "0jz5gf9alp8qbywi1y509w9h7fjp1bwjsgkvwfym72hmx34v7lbw" + "commit": "0c2e38d0bb0db45a50a082d3e8362c07fc60a1f2", + "sha256": "0n87x3ilnn7kc607pa5zffrkpbnkv4xa9hlzyx8ga8xj756zk558" }, "stable": { "version": [ @@ -99522,11 +99511,11 @@ "repo": "galdor/rfc-mode", "unstable": { "version": [ - 20230302, - 1422 + 20221123, + 1643 ], - "commit": "01b37d63e498eab3ac6ad2588777438cfd4d7f60", - "sha256": "1k6zlj419zcvm84df50icy112p43ahw3g4lzr4a9k0jnnfkvyr6z" + "commit": "53ec006aa6aa4fae9c6c64004692aa3d01b38275", + "sha256": "0qfl774796wpplzsv8ns31472615sb6hh6r7z2mvqhm3i0a5d35z" }, "stable": { "version": [ @@ -99546,15 +99535,15 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20230223, - 1846 + 20230201, + 1819 ], "deps": [ "transient", "wgrep" ], - "commit": "f09de8b43ebc88e3ddce686dc717dfb79159ee90", - "sha256": "045jswyndsviagmqk0ffybhg53207g07f4p2zrzvfxh9d1ix3kr2" + "commit": "e7afc1573922dd6ec8e8ccd178e054ff8c99e5bf", + "sha256": "0cng9kra880gma19jl9c8wwrsz94qcha7ymjrw279zq3244750j1" }, "stable": { "version": [ @@ -100193,11 +100182,11 @@ "repo": "DerBeutlin/ros.el", "unstable": { "version": [ - 20230226, - 826 + 20221212, + 1047 ], - "commit": "a0d33da83424deeea484565a13c6930bda9b176a", - "sha256": "0y7zx4m3h3zm0slmmmsmrwrsv57hwc1nwfd1jn8cjl7hrrkj3z03" + "commit": "b437e46bee8f64eec1b8e61f86476977dab6cdb4", + "sha256": "0vbadwr5gmr7px40mhphm4v11ix302bj9f4m8mw7h5mwm8y84skb" } }, { @@ -102850,14 +102839,14 @@ "repo": "FelipeLema/session-async.el", "unstable": { "version": [ - 20230223, - 313 + 20220302, + 2008 ], "deps": [ "jsonrpc" ], - "commit": "e06835ea181b3a15099280527c9a4590d2fa61d1", - "sha256": "10yh94bvvnq2aszg64xvbkn8zbr4bmhj3x7q44i71qqpblb5jwj5" + "commit": "427238bdfde880106dd39cf5845b559975e52f4f", + "sha256": "0zrcfycfgy87bpfm3jcfzp72ky5marbd5w4xf4rqvnw9spml6sya" } }, { @@ -103408,20 +103397,20 @@ "repo": "redguardtoo/shenshou", "unstable": { "version": [ - 20230226, - 320 + 20230116, + 805 ], - "commit": "0a00b9f5a86a54324f88c7d27b603f136ee2fb0b", - "sha256": "0yr6pw3yglav07xg6l0dx1xc0dggcgv1xyfpds7y865iizvmc4i9" + "commit": "763f28b2d132ed94bb57ca08ef12ff1454b7f7d3", + "sha256": "083csvlx87jj96zkg5nni0rzw831xyaghl9vy76iggk9jyixd60z" }, "stable": { "version": [ 0, 1, - 2 + 1 ], - "commit": "0a00b9f5a86a54324f88c7d27b603f136ee2fb0b", - "sha256": "0yr6pw3yglav07xg6l0dx1xc0dggcgv1xyfpds7y865iizvmc4i9" + "commit": "763f28b2d132ed94bb57ca08ef12ff1454b7f7d3", + "sha256": "083csvlx87jj96zkg5nni0rzw831xyaghl9vy76iggk9jyixd60z" } }, { @@ -104544,14 +104533,14 @@ "repo": "laishulu/emacs-smart-input-source", "unstable": { "version": [ - 20230302, - 1219 + 20220721, + 1600 ], "deps": [ "terminal-focus-reporting" ], - "commit": "24360d83e25fc040792a7888ec4a032b8949e09c", - "sha256": "1g7s2qvfpxagsqylw0n0gymsc508jwfnm838fp4xpa1s2cap1pj8" + "commit": "d7a415b00bb1ddcf940d82afdd01e8b793d5466b", + "sha256": "1vj1yr6likmsapr6nrkbr3sf2bk9w16jxa8hra0328b3q8afh21f" } }, { @@ -104886,15 +104875,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20230222, - 1526 + 20230215, + 2125 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "e193bc5f3431a2f71f1d7a0e3f28e6dc4dd5de2d", - "sha256": "1ykbi3rzmh454j22gchl3z0as9ffbs0jgk9i2ry9jbgilrs8ydcl" + "commit": "5e8fc7cad5ae7dc19b434c559ebaee3185d80b98", + "sha256": "1jllc6zk1vmh7g2zq9y1a5kihclawjf9zkizqz8kzs4hsyp6racs" }, "stable": { "version": [ @@ -105125,11 +105114,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20230224, - 911 + 20230216, + 1140 ], - "commit": "f34c22289a2b3ab10e607f9f8822d62bb5c98cf5", - "sha256": "1i64iid9drc4iqmmgvgsfzm28v8128rbq29ccj2a0rn0465jk3wc" + "commit": "fa70fc8ab1bc1f1c21661d672834e41b1d0abd39", + "sha256": "1bfigrb4nnx4sv50jsx15jsyh2yfbb72g5nhjbhcpmv8apkq4818" } }, { @@ -105625,15 +105614,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20230225, - 1026 + 20230219, + 1728 ], "deps": [ "cl-lib", "dash" ], - "commit": "1d5cd5e8d46e182b935f8cd3cf29c8c4410aab0a", - "sha256": "16hfqyq7rb214v8cwixnx0jjcyhi98arzzzz2l6sg9bmqv9d1nig" + "commit": "f0c863268d296e38d4b5374f4c165cf9a823cd8c", + "sha256": "0f65wwjz4nxk2v49qmqck14xlyv1hfqnzjsf8ny1dv82l0v1by4s" }, "stable": { "version": [ @@ -106657,20 +106646,20 @@ "repo": "mssola/soria", "unstable": { "version": [ - 20230227, - 1454 + 20230102, + 1459 ], - "commit": "c5275d02fcc9f6af2cfebd69bcf69f8cdccbe3ab", - "sha256": "0zrz1n8b9hd6srwk1bjmb43y3cm9rvrkllv5030q43q0azjrhr81" + "commit": "7669770034f773bd96a71bb5e0cde93a8f0495e9", + "sha256": "05n2fjvs94s8023xmnbcrdbpqa25mh5j8l7naw4xhlggzynjfvan" }, "stable": { "version": [ 0, 4, - 2 + 1 ], - "commit": "c5275d02fcc9f6af2cfebd69bcf69f8cdccbe3ab", - "sha256": "0zrz1n8b9hd6srwk1bjmb43y3cm9rvrkllv5030q43q0azjrhr81" + "commit": "0b30ee125571a715d069846b4dafc5de8923cedd", + "sha256": "1vqhnajljx104yw11q6r1ywdxhdwsz5cf314wmq718zc58w68xrg" } }, { @@ -106950,8 +106939,8 @@ "repo": "TheBB/spaceline", "unstable": { "version": [ - 20230221, - 2314 + 20211120, + 1636 ], "deps": [ "cl-lib", @@ -106959,8 +106948,8 @@ "powerline", "s" ], - "commit": "e0f848cc116d9046a04a09f5728fabf892863b7e", - "sha256": "0pbx1s4g6hwwbf0wg8lb58h2iidrr9fpzvybjvd2yb5p9mz4l1nl" + "commit": "9a81afa52738544ad5e8b71308a37422ca7e25ba", + "sha256": "0m4542wba9zi18qv8lzhgz8f9dbf01l3dca7vv7i0wmnjsg9bsj9" }, "stable": { "version": [ @@ -107148,11 +107137,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20230224, - 116 + 20230220, + 118 ], - "commit": "66afaeda787edbb509b24fd3999763493822d3f5", - "sha256": "17h6qqglxrj11m9ck2r1cija916bsrpdlyy2iwg7xarmk9dxwpc8" + "commit": "7ae6710a95a02c90b0f13486e8f20be3a746bee2", + "sha256": "159hxs3pa9pmjbhm9i3c2271zllvajw68g8sdcggx6lf3mp5w402" } }, { @@ -107776,11 +107765,11 @@ "repo": "pekingduck/emacs-sqlite3-api", "unstable": { "version": [ - 20230228, - 2310 + 20221110, + 1050 ], - "commit": "50b814063bef617028e4ace4e2315e5d29ed62b9", - "sha256": "0xb01xvb74bflb7mklza17rkh22c7sn8hlqzzf866qqim9mlz1kj" + "commit": "108521be0242bedf232775a28728588da9699336", + "sha256": "0xcybd9470lvlw3nwlnpz0s8nx1h2r1qfwcd1sqk65p8p3gi60q9" }, "stable": { "version": [ @@ -107815,21 +107804,6 @@ "sha256": "14s66xrabj269z7f94iynsla96bka7zac011psrbcfyy4m8mlamz" } }, - { - "ename": "squirrel-mode", - "commit": "f4179f87b96fa1aaad9320c53d0e844d68e68a20", - "sha256": "07pgwadlzlz1bljcjl0fk5airakiha290p9057559qjmyf3qc2ki", - "fetcher": "github", - "repo": "thechampagne/squirrel-mode", - "unstable": { - "version": [ - 20221227, - 232 - ], - "commit": "1af79dfe70c4c8e6f0f144bfd2eb65c077aca785", - "sha256": "0pmk410i5ik8rbkn7zk4i1iq0ax7hkvdv0y7ikyi3m159rjbfnaa" - } - }, { "ename": "sr-speedbar", "commit": "ae489be43b1aee93614e40f492ebdf0b98a3fbc1", @@ -107899,11 +107873,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20230228, - 2212 + 20230205, + 2247 ], - "commit": "5599488e07c538d893e296da1f55fa24ac9f194a", - "sha256": "0yd4p45m5wrsxysgcsmwyzg0jpjq8nc5arilpj4l6s90sra5c6lm" + "commit": "7e92ae3b4c4a7f3386bf1d7d620e5cd29e6e3b37", + "sha256": "0apccq1hj4sydkd7sa5iziavpi6swzaj6w7gckp5n8pjzibnqlx8" }, "stable": { "version": [ @@ -108176,11 +108150,11 @@ "repo": "SFTtech/starlit-emacs", "unstable": { "version": [ - 20230221, - 1620 + 20230209, + 21 ], - "commit": "5ef623020e6a2d43ac82a2a9b71c434d4e8a0585", - "sha256": "0v10v89h0vhhvlkpvc3j3yfmmsmjggwq08lyyxm4r05zk1pk2wr0" + "commit": "f910112a76f0ec62f7150a3a2d4f1337a1809ff7", + "sha256": "1zcdbg69aicwsr53h6sbsms7cwq3l6zdhlb0fm8jy6r1rn9clwv8" } }, { @@ -108335,20 +108309,20 @@ "repo": "stacked-git/stgit", "unstable": { "version": [ - 20230224, - 2315 + 20221212, + 1619 ], - "commit": "327d1dbed318a21b96d8234b6ee11e58efe442cc", - "sha256": "1zzvj1wwd4dvcd1ydyanxrhf35bs9zjsc2pg2yf5jyhkigxim3sv" + "commit": "35a9822ba130613b7ae88d241df48556aaff01b3", + "sha256": "0h82dq2r0bxsv5il15nb9j2v3pikc5g7aaiwvrlkkfjc7ld563a9" }, "stable": { "version": [ 2, - 2, + 1, 0 ], - "commit": "327d1dbed318a21b96d8234b6ee11e58efe442cc", - "sha256": "1zzvj1wwd4dvcd1ydyanxrhf35bs9zjsc2pg2yf5jyhkigxim3sv" + "commit": "35a9822ba130613b7ae88d241df48556aaff01b3", + "sha256": "0h82dq2r0bxsv5il15nb9j2v3pikc5g7aaiwvrlkkfjc7ld563a9" } }, { @@ -108404,11 +108378,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20230227, - 852 + 20230209, + 1359 ], - "commit": "85bee715164c186114d986332b7d694a0c9c068c", - "sha256": "0yq6gy0k0bk1zna2scbrikg81jsyqqnirgjbmjnmf15zfbdzmqvx" + "commit": "518b7ad3b6b8234d5a34dca1301f218f786e0a1c", + "sha256": "0066ddnw8ijxbh3snqkkysalf84qj0r5rk4d5zpvzbsals6dhcr3" } }, { @@ -110016,14 +109990,14 @@ "repo": "emacs-berlin/syntactic-close", "unstable": { "version": [ - 20230225, - 1508 + 20230221, + 937 ], "deps": [ "cl-lib" ], - "commit": "290d18e12b4c485292c4e3feb3e2e4848706aa57", - "sha256": "0pw9wbhbk51r5ja93bhv78rgfv3bza7rfjwrh6xdr0n7yd0fbpr4" + "commit": "830fc4d4fb5d31a018d32319c6e0d2dc29e3de34", + "sha256": "01i3vc0a7jngfwa16yp4knlyiwnak3srxp4lxjnw5fdq2hvgwhz1" } }, { @@ -110613,11 +110587,11 @@ "repo": "11111000000/tao-theme-emacs", "unstable": { "version": [ - 20230225, - 1245 + 20230111, + 1606 ], - "commit": "4b58447097c2e0a3e5c364b1308b56b37cc3ab7f", - "sha256": "14nbx12jvkxq6zxhrp3gyc0v9jyn5zn0dnnyp57kzah5i73sgssz" + "commit": "5525e49357d066c0dca4ccc12ca69804e46577f2", + "sha256": "0vcvhksiwc2gpz90gl5911nmds4rqgdhk1v3gbpj7cbhi1imrfx5" }, "stable": { "version": [ @@ -110828,15 +110802,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20230304, - 1158 + 20230212, + 1547 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "2af8f15c6b7ef1a338a11e479d375a97b647fb45", - "sha256": "009x87dywz5l5n4hqribx5mvzfpqmzshkpff6c6jjzh234fyh093" + "commit": "37e7eb805bc247ecc644308f1f2a4ed9a6d30624", + "sha256": "0bc0v7ix59cq269raxl6pdq12qd4rnq7012mix55rmy6llb17jb4" }, "stable": { "version": [ @@ -110978,14 +110952,14 @@ "repo": "Crandel/tempel-collection", "unstable": { "version": [ - 20230303, - 942 + 20230103, + 2244 ], "deps": [ "tempel" ], - "commit": "4d0ae7b9355b45aa24dfa5e072ff50baf63f752a", - "sha256": "0ba182nbnyc7hx4vwddxrb6n9wf6acqjzc29sw8aa8wsq4m568hy" + "commit": "7ef22ea7aaf699632a1d02d47a9a505ae8bc52c3", + "sha256": "0gvvxkgmj84ivnav0v98m6nhas6mbkhxqqj1ba5gj334h7gxyl4n" } }, { @@ -111495,28 +111469,26 @@ "repo": "emacsorphanage/terraform-mode", "unstable": { "version": [ - 20230301, - 1502 + 20230130, + 2153 ], "deps": [ "dash", "hcl-mode" ], - "commit": "7b1e482530c76dcf856ec4a20aee6586eb2e8ccf", - "sha256": "0npmj39b74h1lmqbvnnwcy3jqnaifgawi9p4sb242fcngiy2ppxf" + "commit": "39d2fd5bfc86c6bf1c7bc38e6f0016d714f2d79d", + "sha256": "1ancpn3v176lzxd95xshbsna307y55idirbqjsfhpivhvcq6y9g7" }, "stable": { "version": [ - 1, 0, - 0 + 6 ], "deps": [ - "dash", "hcl-mode" ], - "commit": "7b1e482530c76dcf856ec4a20aee6586eb2e8ccf", - "sha256": "0npmj39b74h1lmqbvnnwcy3jqnaifgawi9p4sb242fcngiy2ppxf" + "commit": "6286aa42132a7fcad49271d63be33deeeb8d4efc", + "sha256": "05hn8kskx9lcgn7bzgam99c629zlryir2pickwrqndacjrqpdykx" } }, { @@ -112033,21 +112005,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20230222, - 2028 + 20230220, + 336 ], - "commit": "cbc3de581fdf36ba474b0c135b9e785e504f1c1e", - "sha256": "189rqa9vbl7469gga6rybk75rarzbmz00m3w2i6piq3ggw350pbh" + "commit": "1d01d76ff25b7d5c5d36a08f111834082277f8e7", + "sha256": "0f1cq9psqqnrxca1sh97dg4kjcqdpdjib9kwx80gg4mr5wjpcw9j" }, "stable": { "version": [ 2023, 2, - 27, + 20, 0 ], - "commit": "cbc3de581fdf36ba474b0c135b9e785e504f1c1e", - "sha256": "189rqa9vbl7469gga6rybk75rarzbmz00m3w2i6piq3ggw350pbh" + "commit": "1d01d76ff25b7d5c5d36a08f111834082277f8e7", + "sha256": "0f1cq9psqqnrxca1sh97dg4kjcqdpdjib9kwx80gg4mr5wjpcw9j" } }, { @@ -112591,11 +112563,11 @@ "repo": "kuanyui/tldr.el", "unstable": { "version": [ - 20230301, - 136 + 20221109, + 1501 ], - "commit": "1b09d2032491d3904bd7ee9bf5ba7c7503db6593", - "sha256": "0qdv5yhvs4mnb4lszglhli80pv1436mknbap9qrm9riixfg6zlvv" + "commit": "2b5d53571bd30b75d4f5a642aa129055803a6bfb", + "sha256": "0i58abjzxi6qkfclwhphp7ljdc4sx80cj7izcq76glkpkif6sysn" } }, { @@ -112621,11 +112593,11 @@ "repo": "vifon/tmsu.el", "unstable": { "version": [ - 20230304, - 59 + 20230207, + 1438 ], - "commit": "3baca29f5d8a60abac52cdd1ce2966c5cdebfbd8", - "sha256": "1xvklkl8rg1arx5zdxcwpw9ahskhkhj2j78m0wk8z7rmj97l7i5a" + "commit": "26fb81d2667c88bef4f571c87bd9842d1be21234", + "sha256": "0lkvsqgp5cwi39n37b32dfjrdsk21j6r3q5lx4px84w2sqhm5gg1" } }, { @@ -112807,11 +112779,11 @@ "repo": "topikettunen/tok-theme", "unstable": { "version": [ - 20230303, - 1924 + 20230220, + 1320 ], - "commit": "5ceaecbaf359745d7bc6d407535895b7e84217c1", - "sha256": "1dxmy8wps01kwp5w72m66kvmgp618wvq77mk9ndh0xsv486a50yx" + "commit": "4dd1efcab11576c0989c52f67c89759a43e07f0b", + "sha256": "0s4bamim86y42ahg529hj2sf7654lab1p0fb06srn1gqj8zapndj" } }, { @@ -113321,14 +113293,14 @@ "repo": "magit/transient", "unstable": { "version": [ - 20230304, - 1149 + 20230220, + 1425 ], "deps": [ "compat" ], - "commit": "75a5076def1e6f5265eb2346a951ba9d97502fc9", - "sha256": "1j5kkg3nj1zqq1g4rchxafm0k5c5cqayay5wh07insi8mrw60nal" + "commit": "0204a2432862aa187745995f1c378e6d875b35cb", + "sha256": "06qbc8ad3s4z5vihbpvyl8xdlppxkhvprnhxq0kxsasy7psfqdns" }, "stable": { "version": [ @@ -114187,20 +114159,20 @@ "repo": "emacs-elsa/trinary-logic", "unstable": { "version": [ - 20230301, - 2044 + 20230213, + 1217 ], - "commit": "d4869d260f22d13a9a71327a6d40edc6980d022e", - "sha256": "17982dsjrm1xcw1fmq64shp4qlydj6v4c4yna24l45q90fhxd6mm" + "commit": "4268556d89831889a722302241c0de680de3731b", + "sha256": "17a9asi08vi6baagmhlm8qmsh8sbb52gphyg9jdydn1hji0qlk40" }, "stable": { "version": [ 1, - 2, - 1 + 0, + 0 ], - "commit": "d4869d260f22d13a9a71327a6d40edc6980d022e", - "sha256": "17982dsjrm1xcw1fmq64shp4qlydj6v4c4yna24l45q90fhxd6mm" + "commit": "dc10294af106ff3b110c372841eef0a8ec4c29c7", + "sha256": "0a1437hkcx2ba3jvvrn7f0x0gca36wagnhbq4ll2mlkmvdkac6is" } }, { @@ -115282,11 +115254,11 @@ "repo": "purcell/unfill", "unstable": { "version": [ - 20230227, - 1349 + 20210106, + 222 ], - "commit": "075052ce0b4451d7d3ede013ce5a77e6a7a92360", - "sha256": "06wa1f3j0l2bqsqm05zfix6sl74mw3kx7vgd1d23yddz37vkcvr8" + "commit": "8375d87ec184fbe964189e2f9b7263cdb1396694", + "sha256": "0pg64nza2mp4xyr69pjq51jsq1aaym0g38g4jzaxr0hh3w0ris1n" }, "stable": { "version": [ @@ -116948,11 +116920,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20230301, - 2117 + 20221113, + 2327 ], - "commit": "0fa5259eb7e9404a5d665fb3fdf3f2c19d043189", - "sha256": "030yxnlyky89v8n4j48dh1q1zcqdmlx2xm0lm2fq93y9hpr8s7b6" + "commit": "b8ff1a0bbf84920fe26c56b9658bd289f43ad100", + "sha256": "0vmrmjfkky17sj8qrvibbnv621dnfksm21wn2h7kn40qi5h5kxb4" }, "stable": { "version": [ @@ -117710,11 +117682,11 @@ "repo": "k-talo/volatile-highlights.el", "unstable": { "version": [ - 20230301, - 1402 + 20230220, + 1415 ], - "commit": "fcf6e2778454ce514c189a7d1fe70e03ad81c325", - "sha256": "13ag9p2k7snzrc8qllr7hb3mlfqfhwzprlwhykk110nglba1hjrd" + "commit": "513c8b73cd3bc06cb9936a100468c227f649851c", + "sha256": "0a2r492plzxcl5sl2n75xqywk6yjkgj07xzbkcabvibj33bf1mz7" }, "stable": { "version": [ @@ -120304,14 +120276,14 @@ "repo": "martianh/wordreference.el", "unstable": { "version": [ - 20230304, - 1307 + 20230214, + 1735 ], "deps": [ "s" ], - "commit": "ea741be7ff0979552f7dfb591596075add0293b7", - "sha256": "0yxpj8r6cb4si298cj4i0kmnw0dl3za6w65bfs43h4jza49isrn9" + "commit": "8ccda3422fc30fba23602327cc8e7de9f53bfa1d", + "sha256": "12lhaqhri3yh2l010a2kajzys5jvvad1yg0rcwiyn6hlr6wsg60a" } }, { @@ -121894,14 +121866,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20230227, - 1504 + 20230220, + 1659 ], "deps": [ "yasnippet" ], - "commit": "ffdabd7990013718f6b765bfd5e3f1899430d2cc", - "sha256": "1jp90khhkzhyk52lkpxrvz0319d0hkgl69hb3a4n47yiayikjzf0" + "commit": "9580874944cce78b3bb2296ae10de1443b0a57e8", + "sha256": "0ig8ywpw1ql49fp1nlxrgaiadd6zxf2npxnpiv09vj6vij0pank4" }, "stable": { "version": [ @@ -122193,11 +122165,11 @@ "repo": "ryuslash/yoshi-theme", "unstable": { "version": [ - 20230225, - 740 + 20221024, + 20 ], - "commit": "ba9427329ac49fa2e060da2c16507feed62ad890", - "sha256": "0f57qz8fxn4bncmd8ak9n0s8h4b0kba7nfmkb475djlhn2n2xxl9" + "commit": "59cf53110ed73344c7f96da8136b88b039b69602", + "sha256": "0sgyq59hpib2q0yrih4l33pdcvg6hk17cwfv27khhayf4hf92cnn" }, "stable": { "version": [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix index 499da2a8f9..7b71fccd6b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix @@ -45,6 +45,7 @@ else if withAthena then "athena" else "lucid") , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd +, withTreeSitter ? lib.versionAtLeast version "29", tree-sitter ? null }: assert (libXft != null) -> libpng != null; # probably a bug @@ -58,6 +59,7 @@ assert withGTK2 -> !withGTK3 && gtk2-x11 != null && !withPgtk; assert withGTK3 -> !withGTK2 && ((gtk3-x11 != null) || withPgtk); assert withPgtk -> withGTK3 && !withX && gtk3 != null; assert withXwidgets -> withGTK3 && webkitgtk != null; +assert withTreeSitter -> tree-sitter != null; (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation (finalAttrs: (lib.optionalAttrs nativeComp { @@ -164,7 +166,8 @@ assert withXwidgets -> withGTK3 && webkitgtk != null; ImageCaptureCore GSS ImageIO ] ++ lib.optionals stdenv.isDarwin [ sigtool ] - ++ lib.optionals nativeComp [ libgccjit ]; + ++ lib.optionals nativeComp [ libgccjit ] + ++ lib.optionals withTreeSitter [ tree-sitter ]; hardeningDisable = [ "format" ]; @@ -193,6 +196,7 @@ assert withXwidgets -> withGTK3 && webkitgtk != null; ++ lib.optional withImageMagick "--with-imagemagick" ++ lib.optional withXinput2 "--with-xinput2" ++ lib.optional (!withToolkitScrollBars) "--without-toolkit-scroll-bars" + ++ lib.optional withTreeSitter "--with-tree-sitter" ; installTargets = [ "tags" "install" ]; @@ -241,6 +245,7 @@ assert withXwidgets -> withGTK3 && webkitgtk != null; passthru = { inherit nativeComp; + treeSitter = withTreeSitter; pkgs = recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage); tests = { inherit (nixosTests) emacs-daemon; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/l3afpad/default.nix b/third_party/nixpkgs/pkgs/applications/editors/l3afpad/default.nix index e047aaa270..2ccea6afc3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/l3afpad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/l3afpad/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-ly2w9jmRlprm/PnyC0LYjrxBVK+J0DLiSpzuTUMZpWA="; }; - nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; - buildInputs = [ intltool gtk3 ]; + nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook intltool ]; + buildInputs = [ gtk3 ]; meta = with lib; { description = "Simple text editor forked from Leafpad using GTK+ 3.x"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-gtk.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-gtk.nix new file mode 100755 index 0000000000..eebb980f85 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-gtk.nix @@ -0,0 +1,40 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, wrapGAppsHook4 +, pkg-config +, gdk-pixbuf +, gtk4 +, pango +, vte-gtk4 +}: + +rustPlatform.buildRustPackage rec { + pname = "neovim-gtk"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "Lyude"; + repo = pname; + rev = "v${version}"; + hash = "sha256-inva7pYwOw3bXvFeKZ4aKSQ65iCat5HxM+NME8jN4/I="; + }; + + cargoHash = "sha256-9eZwCOP4xQtFOieqVRBAdXZrXmzdnae6PexGJ/eCyYc="; + + nativeBuildInputs = [ wrapGAppsHook4 pkg-config ]; + + buildInputs = [ gdk-pixbuf gtk4 pango vte-gtk4 ]; + + postInstall = '' + make PREFIX=$out install-resources + ''; + + meta = with lib; { + description = "Gtk ui for neovim"; + homepage = "https://github.com/Lyude/neovim-gtk"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ aleksana ]; + mainProgram = "nvim-gtk"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix b/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix index 2018e1d5e2..abbfefce52 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix @@ -30,10 +30,6 @@ buildPythonApplication rec { "--suffix XDG_DATA_DIRS : $XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ]; - # Until gobject-introspection in nativeBuildInputs is supported. - # https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-472568643 - strictDeps = false; - meta = with lib; { homepage = "https://rednotebook.sourceforge.io/"; changelog = "https://github.com/jendrikseipp/rednotebook/blob/v${version}/CHANGELOG.md"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix index 436a6781e8..49fc219c34 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPluginFrom2Nix { pname = "ChatGPT.nvim"; - version = "2023-03-04"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "1ebbec2053a5d79bfbffc5291396fdbeea41329b"; - sha256 = "0finyr9xzy69pdgniwzhv08mkasg4kpay6g0viw0vskv4a5a58ki"; + rev = "783a23c70ca6b43b4591fce9bdfeda408e2d6415"; + sha256 = "0a9ys9d2b6hj0vi7x6x20s6dh09slm851wy9kn7ya43vycvx4v2h"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -293,12 +293,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-03-02"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "809c05360a0dabfc018093a090045d292d362ef4"; - sha256 = "0snw06vb1vi34j99r4ivil4byqd40hv35f0qcfsrzga25s8gi055"; + rev = "1dc606bf07e1419d785e04d6dbb8585987d817cc"; + sha256 = "0l7vmvr5rfn7bjaia505aqwwvvhpbc3f6mfn8q49an3nngwf2plh"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -353,28 +353,16 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2023-02-21"; + version = "2023-03-11"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "4c07aa025f5ec3c35159942fd4f913499cbed3cc"; - sha256 = "0grpcsdswa2ig2v3dw225qw67hz7cpvd7fhszbnnvqwfmnmzqyz9"; + rev = "e96ea26df67f57b1a1bab575f8376e14ee876016"; + sha256 = "0s30f9z0rib1wjndr57qi4xcj8m36z3y7kj44lpinbmmryba5pgg"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; - Spacegray-vim = buildVimPluginFrom2Nix { - pname = "Spacegray.vim"; - version = "2021-07-06"; - src = fetchFromGitHub { - owner = "ackyshake"; - repo = "Spacegray.vim"; - rev = "c699ca10ed421c462bd1c87a158faaa570dc8e28"; - sha256 = "0ma8w6p5jh6llka49x5j5ql8fmhv0bx5hhsn5b2phak79yqg1k61"; - }; - meta.homepage = "https://github.com/ackyshake/Spacegray.vim/"; - }; - SudoEdit-vim = buildVimPluginFrom2Nix { pname = "SudoEdit.vim"; version = "2022-11-03"; @@ -387,18 +375,6 @@ final: prev: meta.homepage = "https://github.com/chrisbra/SudoEdit.vim/"; }; - VimCompletesMe = buildVimPluginFrom2Nix { - pname = "VimCompletesMe"; - version = "2022-02-18"; - src = fetchFromGitHub { - owner = "ackyshake"; - repo = "VimCompletesMe"; - rev = "9adf692d7ae6424038458a89d4a411f0a27d1388"; - sha256 = "1sndgb3291dyifaa8adri2mb8cgbinbar3nw1fnf67k9ahwycaz0"; - }; - meta.homepage = "https://github.com/ackyshake/VimCompletesMe/"; - }; - VimOrganizer = buildVimPluginFrom2Nix { pname = "VimOrganizer"; version = "2020-12-15"; @@ -449,12 +425,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2023-02-27"; + version = "2023-03-09"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "0de94d11f9286ecd176aa8a7299aabb8646d16c9"; - sha256 = "0lfq8vsh46sdjf310fn6zvc6hpbr2z12cac6shrvvjdwn4wpbfz0"; + rev = "aaebb55b6536d780a684201e9b214c034441c98f"; + sha256 = "0xi6qp2idl168v0nb91h3pda32m2dd11zdd2bz18vnch4b48rdy5"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -535,12 +511,12 @@ final: prev: ai-vim = buildVimPluginFrom2Nix { pname = "ai.vim"; - version = "2023-03-05"; + version = "2023-03-11"; src = fetchFromGitHub { owner = "aduros"; repo = "ai.vim"; - rev = "436d3d9d490367c9f47c6ef427daca1c0942ea22"; - sha256 = "1fm02v0npvl6cfddq5yy55rw3a0h76x76vvcglgcw8w9xcq9aviv"; + rev = "512359e0935e62a7bda308bd7c16b7de2787532d"; + sha256 = "1kbjv2p1ngsd244mr0c7nl5wvg51naxxhfirgcz3fsxc90j22952"; }; meta.homepage = "https://github.com/aduros/ai.vim/"; }; @@ -559,12 +535,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2023-02-21"; + version = "2023-03-11"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "c8e914604963063b7bb827e9b6f5a6ca741dad60"; - sha256 = "1qsj1gpgg946q49awy700a5z2kdn4dhlnswqjx6qi7jdv8ly8slv"; + rev = "011e4f6590e8fb26ee2b55bd6b368f1bb784a537"; + sha256 = "0bmq01wmbnrb7ni5kyz7dr9q4s1dhhv8z5i8jnf9pnvgkvpq45mr"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -583,12 +559,12 @@ final: prev: alpha-nvim = buildVimPluginFrom2Nix { pname = "alpha-nvim"; - version = "2023-03-03"; + version = "2023-03-09"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "4b0ba68022d8612b04b26844f1ce5e708c0d23b0"; - sha256 = "06vswjzazbnybj2a6prsd9ckgk36fwj0059vhk55qjxsalrh0zfv"; + rev = "4e1c4dedf5983e84b3ed305228b2235c56c7023c"; + sha256 = "1vircxn0rlwfl6q6q087js977zy0dpd5x9riddv9px9zvpqxzcw9"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; @@ -727,12 +703,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2023-02-16"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "7c1be58365428ef18c3621bacc5aaf188f8a4b9e"; - sha256 = "196km3z2pl0zbk8sy7c8z82a7wicla15ylfdraxpxh362sry8ayq"; + rev = "560fb5aa401bee5f2ee86084f338f300ff57aede"; + sha256 = "1avznnh7z48nshxab7d3rlkcjqanwx9x95rxpzbg4vcn3fp1szb6"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -775,12 +751,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2023-02-11"; + version = "2023-03-10"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "04ccdac802200ecc363b251cf922b2b022bb515c"; - sha256 = "02xvdvy0jakpbgkp33ll21rcqpiybngwgxjsvvw6wg4wqg8dzykv"; + rev = "1d3dd70a2d48e0f3441128eb4fb0b437a0bf2cc4"; + sha256 = "1wrb5bn4dg4ava7mknil5dhkr5nn0m60l78y5q6zqdlrxfsskzhy"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -847,24 +823,24 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2023-03-02"; + version = "2023-03-10"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "b2956f1a3cb8a8e1b6cd4d3f678cc40abdb5ec92"; - sha256 = "1b57ryzcl9ff4nky8zq3lzg9g96pl3ig3c4kmiz8dg0zjgsn0x4p"; + rev = "de5682f7b7de872d1bfd02aa1368cd0c34d13b49"; + sha256 = "0g8230x3a49sj1j0c9knjd7dqs9lrm2ap24pfaxsbavc1w4zdh2m"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2023-02-23"; + version = "2023-03-11"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "23348f3979912fb36a1442fb0d07e8d2e739aea2"; - sha256 = "0lwpx013yxq28s0k5k0sbbyb8nxmjr8nl6xsy2zjillb3rkkaf7v"; + rev = "d60fb8d8e240e5be04a20636f5b35b05a0d4712c"; + sha256 = "1lf4kwzpx87hvihzgmmpgm83wpkpzf7iav5yb46b3bf3b4cfjl9j"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -1087,12 +1063,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2023-03-03"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "e66fd3a18eff0c9c4c772a5e5fd9ad68753c6d8e"; - sha256 = "0205xra3ag9x6l173y5gfxjkmhzgp02slfarx5930j50k0mmn5is"; + rev = "f99a9e49f2f3e929364850a1aaa1b23aef5fca62"; + sha256 = "1942iipkm67ibyvwbll6prsfqhjxq638spcwdw4k9hgzb1f3n3cy"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1159,12 +1135,12 @@ final: prev: clangd_extensions-nvim = buildVimPluginFrom2Nix { pname = "clangd_extensions.nvim"; - version = "2023-02-20"; + version = "2023-03-10"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "722ee39d4c1b309bef4a6c2da1749c3e3358757f"; - sha256 = "1wdni05s0d1p5wmzr30sazqm3fi8n178jf1fdwwlbjpvalgjn5kp"; + rev = "798e377ec859087132b81d2f347b5080580bd6b1"; + sha256 = "0566w1s1ffidaix14qx7d4grg0h7pnciaapg25d7nriwf2a8fqzm"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -1891,12 +1867,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2023-02-16"; + version = "2023-03-10"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "6821b3ae27a57f1f3cf8ed030e4a55d70d0c4e43"; - sha256 = "1c3qrbjzz0kl1k1gjkgil0ni944ac80ps76rdhs9jd7chbn7l0sb"; + rev = "8d3aa5c22c2d45e788c7a5fe13ad77368b783c20"; + sha256 = "0qxzy4dr9cr5q59yi7mw883id51zpb3mnrv6r0aqh9flswkljllr"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1963,12 +1939,12 @@ final: prev: compiler-explorer-nvim = buildVimPluginFrom2Nix { pname = "compiler-explorer.nvim"; - version = "2023-02-06"; + version = "2023-03-07"; src = fetchFromGitHub { owner = "krady21"; repo = "compiler-explorer.nvim"; - rev = "26009c1d6265a6b6e86d8e74a81a235892f67e87"; - sha256 = "0g2b0mxssx6sjmn2iqlipwj50jmw8hfq648xcg3f78phmn03b4s4"; + rev = "0e1c954923915e45bbd0806b65d9171a0384546b"; + sha256 = "0ag6p4k3fgwz7lzd3n8nwbnfi2nrcqandlsambcmzhgma4zi59j4"; }; meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; @@ -2119,24 +2095,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-03-05"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "3a32343a473cce5288a9732f90df67c533642427"; - sha256 = "0vr3l8f251qdn986pnwl6pwl1mf66wddd0kj8bhzcfi4zjg5sp1q"; + rev = "ee1814e2183bd424ca5528f82f3d6ce8f64e6f90"; + sha256 = "0r4hl4w29mg9yg847ivsv1xhm3lq664989l2s8gzxbwypfs3kv3v"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-03-05"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "0c42b34cf7f53bd90c378cc9ddd5b85344ac08f6"; - sha256 = "0m90yvbnr79xhj7jgkbj3qk7wdidmqf88bda94s5yl8rjjb50am7"; + rev = "e7c186c9cca268e9337077256544fa9fb86e7bbb"; + sha256 = "11wv9cgs7nbknvgc4nsgwgs4yv234wy7z78x0z58ci3r55zhablw"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2155,12 +2131,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-03-05"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "a25bbdd8fb1bf0259f255c73e1119c3a75727a93"; - sha256 = "11ddr1prx4k3vkg66h6fwwjdlr1l0zc69j73l80sgjy6v8n32dvm"; + rev = "4b4b93dbbfc871a3d32a244a4276ee06696c21bb"; + sha256 = "1fkj6ps167sq12y96cdksf7ipfgrh01z1p107x7akynfnyrlny1r"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2191,12 +2167,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2023-02-22"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "c33aae75745877ee1ef16f5781478f4f2f120623"; - sha256 = "1yd7msvgvbmvnnvv94izl33cnny36bmpnv4hkw757j7p88yxpan5"; + rev = "aa94d3844d6a12b1a8bf73c8a242ff2f540fb749"; + sha256 = "19k9p5jamm5vax66swyy594am4zw97i2p8sx57b3xhwssp6mvx48"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2299,12 +2275,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-03-06"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "d6362d5dc18caee23e580ce4b39cdca71d99a7f3"; - sha256 = "1mjlqs8pvccqrmq0wygnr7arydllyvzznj68bzki23wmbdpa256n"; + rev = "937524714999c3c5a096f839dc22dd77344e1567"; + sha256 = "0fy0pqzifkf5wsaqskjn9ca3dbnm7s0p55an47y2z101b7akbrcs"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2395,12 +2371,12 @@ final: prev: deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2023-03-03"; + version = "2023-03-09"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "28acc58a394b5faf718ad40243164e5f588f2df5"; - sha256 = "0p9fcvn1x5hng9z8ra3v7nyybdshsq53vw76gl554klwg91gn8ak"; + rev = "50a9e70da17020af11562d6eb07b310f106c4ecf"; + sha256 = "085amk2agpal2y3hd10m7wwbyhcqbqya1frvcfk0ghlxmiq0ak3s"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -2685,12 +2661,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2023-03-05"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "ffeff288c47739a1fcb411343716b993bfaa48e5"; - sha256 = "0hbcsigr7i02krr4wnbw6ib2c202iz2vrnckck32a89si01m1l38"; + rev = "ebcbe90401555272025006db00da0972f7e0db63"; + sha256 = "1zcapd1dwwqz9035h3rg2z582v7z49d03h0g28yi208xjm1wmwih"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2781,12 +2757,12 @@ final: prev: editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2023-02-07"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "1d54632f7fcad38df8e428f349bc58b15af4b206"; - sha256 = "1692rzbv64332wi0cmyf0g5m8k039vvrijxmryrqnxaf15493mbw"; + rev = "5b875ac1aeba22abce3c499c0d5e4f33558fdf2c"; + sha256 = "1pnbhhqbaxp5jhdgs4g1a6fym7x2855lss2ykj5wdd21wna77rhn"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -2867,12 +2843,12 @@ final: prev: falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2023-03-03"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "722deb460aae7f94e36bb3b069c787ed5fa357c3"; - sha256 = "04fks4xz0f50dak837775dlydphg2hxhqm69v3k1950jw7nh20q4"; + rev = "634cef5919b14d0c68cec6fc7b094554e8ef9d7f"; + sha256 = "1vrnvn7xgzdz1zn0wi516l96nkmi5jnwqzar5v9x0xdszjhqa553"; }; meta.homepage = "https://github.com/fenetikm/falcon/"; }; @@ -2917,12 +2893,12 @@ final: prev: pname = "feline.nvim"; version = "2022-12-22"; src = fetchFromGitHub { - owner = "feline-nvim"; + owner = "famiu"; repo = "feline.nvim"; rev = "d48b6f92c6ccdd6654c956f437be49ea160b5b0c"; sha256 = "1d3sj499mj63djy2bjp7yx5qyrzsq8gphzy3wl9fnfnni1bzwg4g"; }; - meta.homepage = "https://github.com/feline-nvim/feline.nvim/"; + meta.homepage = "https://github.com/famiu/feline.nvim/"; }; fennel-vim = buildVimPluginFrom2Nix { @@ -2939,12 +2915,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2023-02-08"; + version = "2023-03-10"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "1856f0390b1ae15d446b94dc47ccf5b967537ad1"; - sha256 = "06c54lhn30ibn721l6vh5gx4kdyrk39w2kkcwrlhskpx6dipava5"; + rev = "dae5eb2debe023fce0e3dfafbf879bd89946d6d0"; + sha256 = "0qa1dazlhq5157rzm3bg3i9vk6iylhccr2qrzvmqdal3c9wari9p"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -2987,12 +2963,12 @@ final: prev: firenvim = buildVimPluginFrom2Nix { pname = "firenvim"; - version = "2023-03-01"; + version = "2023-03-10"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "8a5bde3dc52c58c40ddc9784149ba21489371021"; - sha256 = "1mnf46i1xydms08kzp52d58k9hk0f8qx0h83hnxvy1yv09q4q4cr"; + rev = "87c9f70d3e6aa2790982aafef3c696dbe962d35b"; + sha256 = "0f3jsayilkhch75xdhsv3hrdydsfk5v52cb4ss4kvxbb4cnkli1w"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -3010,6 +2986,18 @@ final: prev: meta.homepage = "https://github.com/andviro/flake8-vim/"; }; + flatten-nvim = buildVimPluginFrom2Nix { + pname = "flatten.nvim"; + version = "2023-03-12"; + src = fetchFromGitHub { + owner = "willothy"; + repo = "flatten.nvim"; + rev = "17bbf3e51d67f77f6adacbfc965734a3dccb02a3"; + sha256 = "0jmkx1alfsz1xmf39alwky7l4nl2m79nsqwad7sfi1vp8y3b7p99"; + }; + meta.homepage = "https://github.com/willothy/flatten.nvim/"; + }; + flit-nvim = buildVimPluginFrom2Nix { pname = "flit.nvim"; version = "2023-03-04"; @@ -3034,6 +3022,18 @@ final: prev: meta.homepage = "https://github.com/ncm2/float-preview.nvim/"; }; + floating-input-nvim = buildVimPluginFrom2Nix { + pname = "floating-input.nvim"; + version = "2023-03-09"; + src = fetchFromGitHub { + owner = "liangxianzhe"; + repo = "floating-input.nvim"; + rev = "2ac3b4b75de72ea715a04d6d1b8d92c7718d2c64"; + sha256 = "165jk5dhi8lv6fcbfwk395vw5yikmm1v2r74l0nvpa3j6xl1h7zm"; + }; + meta.homepage = "https://github.com/liangxianzhe/floating-input.nvim/"; + }; + floating-nvim = buildVimPluginFrom2Nix { pname = "floating.nvim"; version = "2021-07-19"; @@ -3060,12 +3060,12 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2023-03-05"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "31f75ae70780cb593bbd3b5179203a9e2b05cefa"; - sha256 = "0yh8idxnsi9m6y33ma4a9zxailfvygag51i6g2nfcjx7jazijjbw"; + rev = "467847f694beb2e6496c83e56631d7dfae901a9d"; + sha256 = "0ydmd6yvwjrrsb1b13i4d2v26bdivfbzlv54ggylwyi7bzfm28xm"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3096,12 +3096,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-03-03"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "009887b76f15d16f69ae1341f86a7862f61cf2a1"; - sha256 = "01haswbnqmjb4lyg25kimy09bsnwf9dn78bgy6jib4fkhv598dpw"; + rev = "2f5b8a41659a19bd602497a35da8d81f1e88f6d9"; + sha256 = "11h9i5b675p9h7h92lcn7vkn2hnkmn1kifji1932xkh45rizyshl"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3204,12 +3204,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-02-27"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "d4c2e3f32da453afb55e1becbe4b92357576db9b"; - sha256 = "0hji2bm5d8yvz7m07bab7qb58is3n17z9xl8sfxhj19k20917bbz"; + rev = "60ce55d8546188de614cd111f4d26932c70f0fb7"; + sha256 = "15v9s2bq55nnirwpkkqb3d5ldfibnvqm4wf4afjkqj64bgk7kga2"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3252,12 +3252,12 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2023-02-08"; + version = "2023-03-11"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "8340095e5a8263494abadf5a81970ff92091e004"; - sha256 = "0glp8nnj9jsps465srn59bdc6g5pnyrs3n9kxghp0wzf8hrx2zic"; + rev = "d4659a919096a0488694338a9cf4fbb749080779"; + sha256 = "100qlgf6w0fpxfck77ag7m4rkx9k51dn2dk655rapzd1dnry241v"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -3360,12 +3360,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2023-03-01"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "3b6c0a6412b31b91eb26bb8f712562cf7bb1d3be"; - sha256 = "07r6qplvm4svc0cj4khsa83bc66dkrv93jbb1vg9l0v9h5ds8b9p"; + rev = "b1f9cf7c5c5639c006c937fc1819e09f358210fc"; + sha256 = "0069gpcvh96c2a29i9ymidsifxhjqxmm4vx1m7c5frrxxrsba5li"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3420,12 +3420,12 @@ final: prev: go-nvim = buildVimPluginFrom2Nix { pname = "go.nvim"; - version = "2023-03-06"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "0225f85e0a3246c6daf1ecbbbf9009d754879643"; - sha256 = "0pdy3856p9apll1jlm0z7knkjkx61c03pbi0997zsgaskxr3h6qr"; + rev = "3b5b6b8aacfa5be9944b4cfe2673feb68a08655a"; + sha256 = "1pd8lqqdmyy3lz8x9i6g5kh02w7wydr90rqgzdm4f4cl5lm80p96"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -3540,24 +3540,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2023-02-27"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "a0dc84816b913e9afcf6b8a5ade304bfb47a6f65"; - sha256 = "0i79v09f92vdznv2bad825kfqfa345jk81ls6imgak84vsigfvhf"; + rev = "4a6582f4137f4f303eb7d54ee31403ac0b675774"; + sha256 = "11n7hhwcjq5g583q6qq81ixhh3nprwbcgkz4r70p0sb9r6f0m1wj"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2023-02-27"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "3e31f9ab01fed42ebac75738c681daacb8c82bff"; - sha256 = "0klqcd3cdyzvbbl26yz482a3sj2qyfb9f2xkf91hnzb2dx2cazhz"; + rev = "c6ef9c5a3a2ece0f8635460291eb4a4c06ed3dcc"; + sha256 = "1cnjdzg8l1dvr8lw3d5m4v880z7wd2y08ac5cl93p6wyzkz9m12i"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3623,12 +3623,12 @@ final: prev: haskell-tools-nvim = buildNeovimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-03-05"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "29a1619e56a0ff024587e0c482d1a691576343d3"; - sha256 = "1zd50s1h44lhp6apy6nvddl0l0mapl4m96gjasgyg2bsrsyczz6l"; + rev = "47d30b754753da4b70a18dbfbcec89cf6f067dcd"; + sha256 = "1sb21nrbmyrl0ahqyjxksa34n9vbwwkd52bdhwj1nwp3yy7k4spb"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3671,12 +3671,12 @@ final: prev: heirline-nvim = buildVimPluginFrom2Nix { pname = "heirline.nvim"; - version = "2023-02-19"; + version = "2023-03-07"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "b69415d912d466db17b8ee1eb777cc7f776a9286"; - sha256 = "0pv320i23wwp58xy3lpiy4j90y6fl8frmw19nk0c8dy9c10pdg6s"; + rev = "00f7e271775362792116e252d931590a9344d6a9"; + sha256 = "1cf9av6h5xdzkvzrmwscld65257syx0mk1czi5gkwg10apyyhfzw"; }; meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; @@ -4091,12 +4091,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2023-03-06"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "193427320939d111845bd095b301d9d57e6f28f6"; - sha256 = "0wd6wkgbr9vfsji7g7b0zbsxykq1yiya8nsy9r8qkdxq1cn1isjg"; + rev = "99d9f72122e92ba816c86e10ce8e97c555be99ba"; + sha256 = "0g6kly4kxik3bqh7iisypawrp4hrp104bim72wqbik92b079swav"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -4175,24 +4175,24 @@ final: prev: lazy-lsp-nvim = buildVimPluginFrom2Nix { pname = "lazy-lsp.nvim"; - version = "2023-02-27"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "dundalek"; repo = "lazy-lsp.nvim"; - rev = "92a7cc4e4122e38f5fd5ee68f34416b3cf9f477d"; - sha256 = "0pgh22lv711iafkivbpfbpdkb3fw8zfrqpz30glxcdamva178fx5"; + rev = "f0d8f0ddf34bd7e1eb9d5ee6ed65a67138769d22"; + sha256 = "0dpgfansqili9prnp1fdnhjg6gmq5snaalh6q18gsk6c9lrw0laf"; }; meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-03-06"; + version = "2023-03-07"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "e89acede13f46a5db229133cf0c87aee74938c56"; - sha256 = "0ynhwx4q73fqzlkkyfahlxd4rd231w1bymmjj621k3dpkcw1gw7k"; + rev = "5b4444f0d7e556deba3f7ca949a2ba0e2c3369fb"; + sha256 = "0zc8k5d3pgz4xhhshwjaks7q72f61h1iix2305kybnyhi0kslsxd"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4247,12 +4247,12 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2023-03-03"; + version = "2023-03-11"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "d34680b16af977928228e57c68e5a162f1649e3c"; - sha256 = "1ykqzjakhpyr8znxilg4w0xgadkq3p93d6mkp3n4my886i6d4881"; + rev = "2ff8eac67bed41005ea2032728a0336c784de611"; + sha256 = "1sfnxias9i1s3ppxpkg084bk1dpcxyd3f34sk9jxdr6v9101zpls"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -4595,12 +4595,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-03-04"; + version = "2023-03-11"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "79d2091809a295aba94f9ea72cd622bca198d046"; - sha256 = "0vq1n4c2qk84vr4axzkqy2svc3z2kanvqd7apdiqb0zh59qc8bw6"; + rev = "63951c8f9701871abd6858d26f3bcc6b99ce5c74"; + sha256 = "09wmdrv0npkwnh8zzz0fkvn505q1rl011jr1dphiap09nhaqvrvc"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -4702,12 +4702,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-03-05"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "9b5be5e9b460fad7134991d3fd0434466959db08"; - sha256 = "197yzj8i7bqbnikhq89cza9wj1hbhd4yhyj77b5iwv26p252jnbq"; + rev = "54e06334a440b476fcc184fcf555cfd4ad9110c0"; + sha256 = "1pl7rndvvgy143aj6xc4znihp7c8skx790kah5ww94cq4mk2x6zs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4727,12 +4727,12 @@ final: prev: lush-nvim = buildNeovimPluginFrom2Nix { pname = "lush.nvim"; - version = "2023-01-02"; + version = "2023-03-09"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "b1e8eb1da3fee95ef31515a73c9eff9bf251088d"; - sha256 = "0q3prq4fm9rpczl7b1lgqnhs0z5jgvpdy0cp45jfpw4bvcy6vkpq"; + rev = "62180850d230e1650fe5543048bb15c4452916d6"; + sha256 = "1c6iw967vba4gqrbs4ki4p980avsjg0dk8kklxz26994x7y9bza0"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -4775,12 +4775,12 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-03-03"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "e4badf7984f7a5f0ac7dc10657dbedbd99a82f94"; - sha256 = "0s7jrvbd75zfhf07jf3gihv2j6rrvwfbvdwd07k14hzhm46xw914"; + rev = "a81503f0019942111fe464209237f8b4e85f4687"; + sha256 = "0cc6yb5nb9nf27dp6dzrk8ynzbzsjg0qxsagggiv1w6bk8npgj24"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -4799,12 +4799,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-03-05"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "8dbd5ca28c70f15814d1749717f86da9bfd1c8ba"; - sha256 = "0v8irgx18spljayrv1pdpnmnl4c9qsl74fny9b6kf9lrp2xbmfwk"; + rev = "10ff879fc56160e10437da5c1ca558371ddb6989"; + sha256 = "16m8iaikbfhff80f0yil330r7b0fcar346fkf1w8spkv6kj3qy3b"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -4823,12 +4823,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2023-03-02"; + version = "2023-03-10"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "bd945ff7374dedebd0868f262aa8452d5f0f1910"; - sha256 = "1pqsnnqb7byia9figdjnkqrn0ppria39d039xx772n2nsyz9n070"; + rev = "18d5e8af4c4bc77382bda5e5ae2830ab515cf5c6"; + sha256 = "0ws5mig2kwwspwl3b9abqbwwni8xzx252k7k2dhw4dm2h7hkkzsv"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -4871,12 +4871,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-03-04"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "c65901227e5a3671dbcb054745566a1c78f9f0c8"; - sha256 = "1100nsfnryg2xdjza1ar01s080jahafwwcpzn01fgkkr32kvvkrj"; + rev = "59d743370aa623ba2c5c1e48f3718058b13ec7b6"; + sha256 = "1zivc2pwr2k6ixqc8p86cf3ql0p2pf2nd7lvkhwj3904pkyfxk3h"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5207,12 +5207,12 @@ final: prev: neo-tree-nvim = buildVimPluginFrom2Nix { pname = "neo-tree.nvim"; - version = "2023-03-01"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "aec592bb1f0cf67f7e1123053d1eb17700aa9ed4"; - sha256 = "0axp9qaqczb3lir7ddb3i33c4nhyxckgln4vnv833a921hn0sg24"; + rev = "205184aa0e0f08e8a1249d9bb37b45bae85f01b9"; + sha256 = "166mgm7k7as2jppfw9x0mr64ynxqvkd4rbaq0hwbpq30najl2jlm"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5231,12 +5231,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-03-06"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "c2604560ea764ad5f72e52f38c52ef7fc2d1be98"; - sha256 = "1azfgk373wy883lmfwv7kp4y213nx9kcxn76v274mb5dl2bi4k4n"; + rev = "48178e12a8b722f36ca9f0e8ff0a5487b45de493"; + sha256 = "03lnz99vg21qpraca8y6bkbmy1m04x5idxgxlad1y4gf9a6x1cag"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5255,12 +5255,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-03-03"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "c6b8ff8f0d261c8fb99a55ec7cc5dcf9cb928293"; - sha256 = "1zsj7rbvv0sjz5sbhwp7zzbap490vgivispbqnvgafxyk0v78xni"; + rev = "abdc346ff59c414698de551f876bcf3f223ed224"; + sha256 = "0vvhay3addl5pp48k2qifj88dimkspajx4am5lypiwifgq1gnjqk"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5291,12 +5291,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2023-03-03"; + version = "2023-03-08"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "85380916cec322b1351785cac4f4e3f24de36b2a"; - sha256 = "0pyykjbwih2zswigqrganm9aaw6brdpxacy8vyr2p9xkv2nsli1k"; + rev = "c4068a22a60981f1bedd9672cdad34b79411ed7a"; + sha256 = "14nbmjvkq61plw5sc360ppnlf2qhsrxh5znjwjbi5kij9ky8p7ch"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -5351,12 +5351,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-02-28"; + version = "2023-03-10"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "764dec5de14947f2f5d08bd3e0452324538e9a4d"; - sha256 = "0qii2n70xlh5s8icnpgb1yn86w262p6smk0a2qyqrgy2m64ayjin"; + rev = "c2680e67a0aeeb9b0ef6f4d008228de63d14e46b"; + sha256 = "1hsz1yg2z498x8vsk8k4bvx0hxjj2s4hhvcd34dln7v2539pz5sk"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5399,36 +5399,36 @@ final: prev: neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2022-08-22"; + version = "2023-03-09"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "e1148589b8b9e1e72ef755d4495286c3b8516771"; - sha256 = "06k0r92qhgp1sb1jacfwxqbzn69cw604s5qla4q32a38a2spbmcr"; + rev = "eca22dc90a9db5e52d8baf91f31991ad540ffe36"; + sha256 = "097i8fv37mw0923qldsql71s1lgmbvl28gk96w0sz12adq8g4byh"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2023-02-23"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "95f95e346090ad96c657f021ad4d47f93c915598"; - sha256 = "1mimygy2815jd0k9fgh2f93dq3pgm44j6vibj5hbqz083vhvlp9m"; + rev = "631a7ccc7072fdc76e3597c2fc8030faf35771d1"; + sha256 = "14vvs18g7cy8amvy6pnq5342ryvx5h1s5078ml6ql2y04avhs1xa"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2023-03-05"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "2cbceaf57884b2548bb5516acea342944c983216"; - sha256 = "03wfi20l278yx0v95a5hwj91zcriqzjdl3hdl34hjkw6glj3sr3h"; + rev = "072f6fec596869b6cc5f58e86ef1ffd4d40135c4"; + sha256 = "1c9nmxcrlyf0qd027rdg5zhxpic8pkks7mqipkq86c23l3jyq483"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -5555,12 +5555,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2023-03-05"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "3f647a560306306cb35854d639b39717f5390175"; - sha256 = "0vlq852jr1mjaf2x1npi27jh3i6bl8npvpfkcrgjcigd8hwcr206"; + rev = "8bb6713c56458aae339575b205234d820ec2046a"; + sha256 = "1895g32d00wgnfnj5r29q01ir0kgl3psa4bpwpqy6v4jzq45xz6g"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5579,24 +5579,24 @@ final: prev: nix-develop-nvim = buildVimPluginFrom2Nix { pname = "nix-develop.nvim"; - version = "2023-01-11"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "figsoda"; repo = "nix-develop.nvim"; - rev = "ce61f6d964232c86b522c292667841f42ebee618"; - sha256 = "0yfs2iws6d370scq4jgc7gq3n5r3a0lwqfs7awcliks524768c6j"; + rev = "c66642813d1e31a6d133d78ecf964404e15a89fc"; + sha256 = "03qys9038ybc9062w5imdmrs6dlnbp1asggd5czzw7zccvw42db0"; }; meta.homepage = "https://github.com/figsoda/nix-develop.nvim/"; }; nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-03-06"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "7be82f345f82f304ae817e3910d001aa96be01b1"; - sha256 = "1skrfbn196q1vhbvkh2z57ix32lfyhycbgkzpaf80f59jkcclwrq"; + rev = "9d8dae1a780432e2bf6984515a77cc25697e45ae"; + sha256 = "1wygxab1sqinnnh527w1llcv1bb9qydns6w9vvh9bsbag7a9wgs6"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5639,36 +5639,24 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-03-03"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "c22651651da01239fc4afac4cdb7261797d5f02e"; - sha256 = "01zbk00di167npblpf126dqcsyc97k2w72nn88mkkhvhsna28x6x"; + rev = "e2a04d480a9fba6b698c01998582ea17aa213ba3"; + sha256 = "0m4iz32zr3mw8b7mdfqcrvz53xzsrf0dz17xw67knyia85m4h9l5"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; - nord-vim = buildVimPluginFrom2Nix { - pname = "nord-vim"; - version = "2022-10-08"; - src = fetchFromGitHub { - owner = "arcticicestudio"; - repo = "nord-vim"; - rev = "0748955e9e8d9770b44f2bec8456189430b37d9d"; - sha256 = "1xifxwyjwfr9z801mm9sfh2sy0xf5ydhbg8ssi5mpdilffpkghp6"; - }; - meta.homepage = "https://github.com/arcticicestudio/nord-vim/"; - }; - nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2023-01-20"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "9824b8511dcb7d89de628d7e9bab5fa65c9d59d1"; - sha256 = "0y6paf8kyj30kkkwi9w2hank27b6f68l0swnly3w6abxfariwnpz"; + rev = "be318c83a233cb877ba08faa15380a54241272b1"; + sha256 = "1wk40p9sh6i7gljixnrx57ik8fw57dh8kzmf53kqigafxayzj0sa"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -5711,12 +5699,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2023-03-04"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "456cd2754c56c991c5e4df60a807d054c1bc7148"; - sha256 = "03nhv5iby38x6whs3ialqsi16482w96mz5dhkq5qki3mkcaqin8z"; + rev = "09e99259f4cdd929e7fb5487bf9d92426ccf7cc1"; + sha256 = "05py2p82srijkvrr5nc8393v25hdgdgiqmnsy5qiiab82qkyvhhj"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5771,24 +5759,24 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2023-03-01"; + version = "2023-03-07"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "ab49517cfd1765b3f3de52c1f0fda6190b44e27b"; - sha256 = "059whyg91hi7abr14fg60pfpnm87cl1iqz31hfl5wiiwrfaa1fsf"; + rev = "e755f366721bc9e189ddecd39554559045ac0a18"; + sha256 = "07r9h19q3800r93ac4qawyl745mppp3035j9xffmx2igj5zvjmk5"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2023-03-05"; + version = "2023-03-07"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "0cab02bac9ca02a70db9e1d07e25fdb630b18a21"; - sha256 = "1id7k4kknckivgxjxp90b5hkxyyfrfka4kvyiid6aa2lz1nmcbpb"; + rev = "22bad36cd64e85afb0c9d0e9b92106b5ea6dabc6"; + sha256 = "1yv1vr32qwk0k92hwf6fjklbb1rfxzrswlsymfq6w4dvc4dc8vch"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -5807,12 +5795,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2023-02-20"; + version = "2023-03-09"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "b71e6bc220ea2ef8f09d5e6b39d52609a965f322"; - sha256 = "0kl2p55vrq1qwbk4r7mrly0gmw794h6nxivb17f4zn8lmvvcbmjc"; + rev = "1276701ed0216b94d7919d5c07845dcdf05fbde5"; + sha256 = "0vkd6vhjprb6s6mz6rgfr179yfd9s7vjd5pf4np11cbn99r57186"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -5951,12 +5939,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2023-03-04"; + version = "2023-03-08"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "c1bfcd89ef440a44d02ade7e71befb1e5aa358ca"; - sha256 = "151xls5s4zg3w0sia0wbypaqxfwyw4zmzifjvs9z9g53anb7zffv"; + rev = "73196075627a4f079c62b0dd4aff8ce0a1b7cf57"; + sha256 = "0xpg446ww6xyxwypfzcfkqfmj068xmjjrxlyqw54mnlwy3wy6fmb"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -6071,24 +6059,24 @@ final: prev: nvim-highlight-colors = buildVimPluginFrom2Nix { pname = "nvim-highlight-colors"; - version = "2023-01-20"; + version = "2023-03-07"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "af051bfe2971fc888d21cdfc59f5444904353b43"; - sha256 = "0xi4546f7qcdmyq04l1rjzyvw7rj9dlhmhskwk1pzq90rnd8xa5w"; + rev = "ce11467796389a4e5838c22384f94c624121796b"; + sha256 = "1pyhjazxl1ijg1m8gvaw92lslh61052yk12plnqyl8mlla3a9zb2"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-03-01"; + version = "2023-03-11"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "ab18169ccf4251d455edca3f6448a559c6322b10"; - sha256 = "0d4nslrj1yyddkqd09m0y6wanhlnismbzz2i876bg2v9pi8d1prg"; + rev = "9cce41f5b760ab98bb2c2b0b8a6daf353ec1bb43"; + sha256 = "0wm61s1w25inx9spy8cdif1iwmcdijjiy0j8yiywld3q7ixvdbqq"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6119,12 +6107,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2023-02-28"; + version = "2023-03-10"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "db08bfb87300fca2db91d15b64ca88a62970fb58"; - sha256 = "0rybpdkcja0kadf9arwx6r33nj7mzmadq660w7jcni3niy7545sw"; + rev = "9fcc9495b5d03f8d50e4af936fd0f905f045a6c2"; + sha256 = "00j52k5qx8lr5z2hbhb6lz1acp8si8a4xwb4kj6v7g58a9ikbdsn"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -6203,12 +6191,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-03-06"; + version = "2023-03-10"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "1a2d5f5224c65b0709bf5da0ccd9cad29272083a"; - sha256 = "1qhq71zbyz9idmm56wxq64k1i46dmn4n2cpjxmpawlab7m2wvi3c"; + rev = "4bb0f1845c5cc6465aecedc773fc2d619fcd8faf"; + sha256 = "1p014wf031wnh195jd13sxbhdcxx3z2a8d95i6fv2rqvwlhzh3yq"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6227,12 +6215,12 @@ final: prev: nvim-luadev = buildVimPluginFrom2Nix { pname = "nvim-luadev"; - version = "2022-01-26"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "bfredl"; repo = "nvim-luadev"; - rev = "2a2c242bd751c289cfc1bc27f357925f68eba098"; - sha256 = "0prwzxgg6fqkfmqqs41c1c81lch2x4qrs7287l5b104rz3alcinn"; + rev = "395b7cf3af3e543332c74e883c33eb52364b0b4f"; + sha256 = "0fxx7gn184l00hrskhcsr9dr39r4bwdkn9h5r2g79qp64i0cqmsh"; }; meta.homepage = "https://github.com/bfredl/nvim-luadev/"; }; @@ -6323,12 +6311,12 @@ final: prev: nvim-nu = buildVimPluginFrom2Nix { pname = "nvim-nu"; - version = "2023-02-18"; + version = "2023-03-07"; src = fetchFromGitHub { owner = "LhKipp"; repo = "nvim-nu"; - rev = "ebacb8363ed3c21ffd4e47e277dde8f34609585b"; - sha256 = "0wd9ddyllmrisdcbp6mxl7nhcxs449k0rbwm0vshk3wig1wz4gdi"; + rev = "f45f36a97fb0ea6e39f08cc2fac7a2fb3dc3999b"; + sha256 = "0sck8ac7f2b46yqv0v114jakf934z4z2x6pix0fiipgyfza2vfax"; }; meta.homepage = "https://github.com/LhKipp/nvim-nu/"; }; @@ -6395,12 +6383,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2023-02-18"; + version = "2023-03-10"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "80104ebd1e77d019f736bee46de2f1dbfe36f8af"; - sha256 = "144vv4yggmhsdrzqfrazj9cxm0pqcxlyqc7h535ss8cg0wqgx9bp"; + rev = "ab38022c766e440c494e18f1e7e487d6be053c9c"; + sha256 = "1ndnh2h43bjdqq7vz9963lcyxpk46j8gprdms7gzyrxf378ac7kk"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -6431,12 +6419,12 @@ final: prev: nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2023-03-03"; + version = "2023-03-11"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "8680311f6de05d45b010883db7cc1912b7f0d0e4"; - sha256 = "0svkczs2xiy72vbcnsbkd4jbivq1raspmy89mb6q3zz6b1r0p5rv"; + rev = "177c95c12542cf20a422b19a87ba1ae80254445a"; + sha256 = "0rzq7xyhrmxd8pms72vx0kr5r3wh689ccn1pdyc8n63q6akiffn1"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -6467,48 +6455,48 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-03-05"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "bbb6d4891009de7dab05ad8fc2d39f272d7a751c"; - sha256 = "1a7wjglszsssm8h31322bz05gfgp86pp4yral9za3gaib2p534v3"; + rev = "fe980baa945100d92f77fe55e2ca113cae1b1bd3"; + sha256 = "12kkn975dj634yix140qjrx4n5dbx6ga50clgbrik74gmq07nj1d"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-03-06"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "980f0816cc28c20e45715687a0a21b5b39af59eb"; - sha256 = "1w1n2z4qbp72nwg6nvsch1c4pzfsx19r8z11yqpqq19k4vky36vc"; + rev = "834f1dcb8736c82b1269227b4bfe830310b5b6a1"; + sha256 = "1gdlypc4qkxh7fghac12562l54hzwlyq74y4p3gsvqzf49m0s9w3"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2023-02-13"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "895ec44f5c89bc67ba5440aef3d1f2efa3d59a41"; - sha256 = "0d9j5wz1fqk8ipf2x8vym0m3zpydslivwsnha8h1qz6yp6zyq5hc"; + rev = "cb6252b00d19c8b57e8e66de19a601df28455dd1"; + sha256 = "06i741381w7hah0mlgg23hrlb57k3qvibgpnncqiw5c17mas01a6"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; nvim-treesitter-pyfold = buildVimPluginFrom2Nix { pname = "nvim-treesitter-pyfold"; - version = "2022-03-14"; + version = "2023-03-11"; src = fetchFromGitHub { owner = "eddiebergman"; repo = "nvim-treesitter-pyfold"; - rev = "46e0c3ebed0934fffcc2a23b52393059b76bff3f"; - sha256 = "1fwmwkpnr0cy663cy5yx5spm5hrv8xhsgvk891dqbm1pydxbpa1z"; + rev = "af8c9ef24caad5e4a57f89ae06102ea1bad64e02"; + sha256 = "0s6dgiwzyycycjd8bx434ki2qrhnyl1rahnbijjj79hd5wgzms7l"; }; meta.homepage = "https://github.com/eddiebergman/nvim-treesitter-pyfold/"; }; @@ -6527,12 +6515,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-02-25"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "4b30081d2736e09f90c890a8a7adfe4df36f5b36"; - sha256 = "1w6wv5mpw05hmx0p4y3r3nir81wwrp6alj23gjwrqpzcjhdvh4z9"; + rev = "5b2bcb9ca8315879181f468b37a897100d631005"; + sha256 = "0ij8jgvhyqrlw077296dx9ck0agjdd2p5r5fiizsvxrwv0jc6ikj"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6563,23 +6551,23 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2023-02-21"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "nvim-ts-rainbow"; - rev = "81f9a2e752edc793a34355be952dd1ebb1d5701b"; - sha256 = "1zc8p31dmlwsqrz8p9r6xnhq9zwgvq82crgr339w0ndn3m0wy508"; + rev = "840039440e012ad798ef31349b93a5d4365023ff"; + sha256 = "1w4v8s986vr0jir6rhy64s58rybvira3kbl6yyh0i64krwysd716"; }; meta.homepage = "https://github.com/mrjones2014/nvim-ts-rainbow/"; }; nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-03-03"; + version = "2023-03-12"; src = fetchgit { url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - rev = "293e12e90f0928845582b9a3db7258eaa8e92a65"; - sha256 = "069nyc2bxi5wyvbnyqmdif2vqk7fv0kfgz3b7r7xgjf6s4kgw9yl"; + rev = "7711a873d1f16a9f3049715b63cdd71973108871"; + sha256 = "0kwx3mcs3l56hvr1c0fapfdggfjg25z7nyxvn8v5ch087zfm5kjy"; }; meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; @@ -6598,12 +6586,12 @@ final: prev: nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2023-03-06"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "b2060eac2fbc84e0637ea706378ff66451e7c424"; - sha256 = "1x31lcf20cq8bb2cwdvx1cmsa18m315ni70qxrx99gncab6vwkz0"; + rev = "b8d0c99578dcb9d084a45ca4b3a4a502712c2741"; + sha256 = "1mm33s20x4mrxjzxacal2fjxjyqwc3rnbj1f7zvi4ml00wcwiaps"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6694,12 +6682,12 @@ final: prev: oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-03-06"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "b36ba91b7a4d05ee43617383f68cf6ed6fc2f08e"; - sha256 = "1xnyv6wlvh87yzjhbmxirp8agc3w1p6hgiw1gayfv9x72jvp4c8m"; + rev = "383971b0cfd8248ec3d00d4a3154d69ebd5e394e"; + sha256 = "149lcp5pjyw976r1a83mxfgz75kfnrb5nknqynjqlla191z13ddv"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -6731,12 +6719,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2023-02-14"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "1fe908fb4acdcee26573e9ccde0de94ec77e5e84"; - sha256 = "03n2109p1jpl1gjznjci8wi84b2lminvw0avxx6dx6sv5b8z2x67"; + rev = "4497678c6b1847b663c4b23000d55f28a2f846ce"; + sha256 = "05809lpabxliha56pjg0973wv3p3nmz6z76kxyw1r9x69ds9z34h"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -6755,12 +6743,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-03-04"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "435a38f7d84373584f3f3b283fe5b1d7c0fb8abf"; - sha256 = "167k6j4n01djxb39l9zq1d8xmbd7lxjz1272d112myp01ccycp3x"; + rev = "61cfeceb812ab2c616c3267090e38d0be00d0564"; + sha256 = "0zpb4h4mx1xp0d68cl2ywd1w27ww6p5fh6xr68m9hj58gmpa5saj"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6779,12 +6767,12 @@ final: prev: onenord-nvim = buildVimPluginFrom2Nix { pname = "onenord.nvim"; - version = "2023-02-06"; + version = "2023-03-11"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "71bdcdf105a8feb16cd5248b40e44c88832f75ca"; - sha256 = "0pflq1p48rd3s5vfi2bk04ick2iyl8fg1a25qpawm8wb1ds10ln4"; + rev = "9a59d47db81e566d4e254904479f129cfffe5f21"; + sha256 = "07052ni5kjm5xcc6wl1hvrwayif1srjhlaggawpn8icahhrpn25r"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -6815,24 +6803,24 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2023-02-11"; + version = "2023-03-11"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "313ce5a04e7fc3d677ad906a94fc49c1f54d1572"; - sha256 = "1d9a7ddyd09ym53nvijiy5z67mj79a93fqsm35jxfv4wkcraq9xd"; + rev = "c54f6591121d2c331ad12b4251974054332fbe36"; + sha256 = "0gc5zjcvffklc1phcnk6gv9pspnbjvjrpqs9hpkfqnbly65mdvh4"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; oxocarbon-nvim = buildVimPluginFrom2Nix { pname = "oxocarbon.nvim"; - version = "2023-03-05"; + version = "2023-03-10"; src = fetchFromGitHub { owner = "nyoom-engineering"; repo = "oxocarbon.nvim"; - rev = "149e8dec961562c63091ad6910fec4ead61eaa7f"; - sha256 = "0y628knjcc4hbqaq5vblxjfmn7ihfai1zx0axwb8rqwq13kwbpz0"; + rev = "dd29f538e6cfa0827896a4078db97119a8ca5c5e"; + sha256 = "0qv3461n1cwggw33q3wrw4sy90rplqyp6xbgk2m7gsvvqf2i6yaw"; }; meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/"; }; @@ -7261,12 +7249,12 @@ final: prev: readline-vim = buildVimPluginFrom2Nix { pname = "readline.vim"; - version = "2022-08-20"; + version = "2023-03-09"; src = fetchFromGitHub { owner = "ryvnf"; repo = "readline.vim"; - rev = "1213ebcf558b4ee2e9df2c761cc01cc076fc764f"; - sha256 = "03sn2rpadd746ax5ynidi8msp90phzb3a82w523q8b07kn32dgdw"; + rev = "a15ff3ed2aa7a44d258a1eb832465d8de53c137c"; + sha256 = "0hk6fhyizvjqjyqn8rsh9b2j1aafsir9sz8f0q6zg477f25miw7q"; }; meta.homepage = "https://github.com/ryvnf/readline.vim/"; }; @@ -7285,12 +7273,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2023-02-17"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "2d08fffeb8533d3678bd796010c13c7fa2534263"; - sha256 = "060rh1a4cdbs8w28l3lkgk8r7k80pd44dqczdb2bpnhyvc7mckn1"; + rev = "0a461e635403065b3f9a525bd77eff30759cfba0"; + sha256 = "08mg2rjbvyrgj5l1j3nzv7iwfsvm0wx5838lgk95zqb151sas4r7"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -7441,12 +7429,12 @@ final: prev: satellite-nvim = buildVimPluginFrom2Nix { pname = "satellite.nvim"; - version = "2023-01-20"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "lewis6991"; repo = "satellite.nvim"; - rev = "d522369aa50cf8c0116c952ddc55253c505e8bf7"; - sha256 = "1sbq1akv33sj3apqyw8sc7zpw36cyxk8m1inhmwdwgampzhl9sxc"; + rev = "da81fe4573ed3f203fa7aa8db6f125b6a5380390"; + sha256 = "1dgdfwij1w0q2jcvyz56pav1fhzbihpkzgvgcx8hmlxx7p30hmby"; }; meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; @@ -7487,6 +7475,18 @@ final: prev: meta.homepage = "https://github.com/cakebaker/scss-syntax.vim/"; }; + searchbox-nvim = buildVimPluginFrom2Nix { + pname = "searchbox-nvim"; + version = "2022-11-01"; + src = fetchFromGitHub { + owner = "VonHeikemen"; + repo = "searchbox.nvim"; + rev = "110949af8963185b4e732b45ae57beb731bfcede"; + hash = "sha256-Bx4Msp96hlcYVDvDC3gBv78zmde0T5XacxgiZt+LULU="; + }; + meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim"; + }; + securemodelines = buildVimPluginFrom2Nix { pname = "securemodelines"; version = "2019-02-09"; @@ -7644,6 +7644,18 @@ final: prev: meta.homepage = "https://github.com/gorkunov/smartpairs.vim/"; }; + smartyank-nvim = buildVimPluginFrom2Nix { + pname = "smartyank.nvim"; + version = "2023-02-25"; + src = fetchFromGitHub { + owner = "ibhagwan"; + repo = "smartyank.nvim"; + rev = "7e3905578f646503525b2f7018b8afd17861018c"; + sha256 = "19lp8cpnp3ynr6vc5si3gsfpdw78xs8krmaqlbjsx478ig316y7z"; + }; + meta.homepage = "https://github.com/ibhagwan/smartyank.nvim/"; + }; + snap = buildVimPluginFrom2Nix { pname = "snap"; version = "2022-08-03"; @@ -7815,12 +7827,12 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2023-01-23"; + version = "2023-03-07"; src = fetchFromGitHub { owner = "kkharji"; repo = "sqlite.lua"; - rev = "93ff5824682ecc874200e338fd8ca9ccd08508f8"; - sha256 = "07wv8shiilibgnp7l0pk9b6qwydwwfvdzdv2vvwn0k0jpaxsjvmy"; + rev = "5162c8e2cc580f66ffe4bb4a7ae97a412596faba"; + sha256 = "08ci0lyc0rzk522h09nbfwjzwqb1y0fvapd4fg73y0zxnim45z5z"; }; meta.homepage = "https://github.com/kkharji/sqlite.lua/"; }; @@ -8237,12 +8249,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2023-03-03"; + version = "2023-03-09"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "61b3769065131129716974f7fb63f82ee409bd80"; - sha256 = "0qxnr7fkjbj9f4cvdqwnq8hxv50v0z5d8dzdjpfzr0x4f3ahcdvx"; + rev = "94fe37a1ea217dd2f90d91222bc1531521146ac3"; + sha256 = "0qqck9cw709x8xbk5l2slnrmhm7dqagzvn22k5k3i6d6n37yw6qs"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -8334,12 +8346,12 @@ final: prev: telescope-manix = buildNeovimPluginFrom2Nix { pname = "telescope-manix"; - version = "2023-02-03"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "28c0100c90dc200dd42471003d458fa8a2b71428"; - sha256 = "0sd914iybjxrvfmakzw8wb6k97sjvw1nnmfli7a0wvrrbak562rk"; + rev = "a7cfacda4dc8a56383b30d402ab9eedcffc24c49"; + sha256 = "071fdpxqv0l2zxjy71p0xi8p84jacqfpi9wzv0nm5w5dv8irr304"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -8658,12 +8670,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments.nvim"; - version = "2023-01-23"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1"; - sha256 = "1k42l9ghpkds2fqxj8f0anlh4gkpiid28zwkhy29k2br21m7q5fq"; + rev = "6ccb0bebeb22dbe31940776a750db54b844ae653"; + sha256 = "1dmvry7m4rdwrqmb7kaa4zx9mcda8n1yagabyg7nds7jyld671gw"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -8695,24 +8707,24 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2023-02-26"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "31d38d11390bcd35a568fcc65a79b7d6ec89de62"; - sha256 = "1g134rc5gwrdpi2w3ab1k07v4spl5frimc68mkw7jx14ipwxf7q8"; + rev = "c8e982ad2739eeb0b13d0fecb14820c9bf5e3da0"; + sha256 = "1cg2qhzfdmw501v8w667n3i7kcl31ci3h71f7ia9p3c5fx85xbww"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2023-03-06"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "a310c1ddb3a7d8b940834238f79f7bfd494ba76a"; - sha256 = "0wz9n7jmhwz1c7fdqfbpr51qls4n464r1rrp05ygrw1f7kbcw12d"; + rev = "27203d70747094527d13575ed08f6a714e7a43f8"; + sha256 = "0mrwy3519wb59g42aafnhn8xlpc7yhwdni0q91napcbnjrx8s4r5"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -8743,12 +8755,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2023-03-05"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "19e1150d52ae16bac2465bcd7633c05702b5ae59"; - sha256 = "0d1c0674v26lnwy1q9fg1jsiiyq6lxq49dxmgm3k37z9kw3j61jy"; + rev = "bde69d35d37477dc1997f00cc08047f49aa90f7a"; + sha256 = "0fc7kayzzvz8knmrdd4wsd3vppxkd8dsasp53lm3951xyjb18mlc"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -8887,12 +8899,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-03-04"; + version = "2023-03-09"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "5f4f9e3c6c745a222d6ab9e3b7dc1ef796a3e81f"; - sha256 = "14kh6bk6dh6ilj7n2rfjfipn6r1nl2g439w0kxqw05rgidzrnnq5"; + rev = "a7aecd32c38c8fc98955bed010dfe602c994430a"; + sha256 = "1icgrkrxhz0jq002gyc7rswh3zymi6xb3i6iz3kkiawhmfjbw7pb"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -8983,12 +8995,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2023-03-05"; + version = "2023-03-10"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "d0bceccaea6bd3fe017f4f609e7c91ff712196e3"; - sha256 = "06694178b5a4yqhc6wml0wkw1qfdpn6w29cgzg726j55lizf9mi5"; + rev = "639cfcb386fa419d8e27c69f489d6fedc53ec292"; + sha256 = "0h4cpdz7li2dcciqkfy3dasg31i69mg56kq4zx1rcch1pzqw4wlb"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -9715,12 +9727,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2023-02-17"; + version = "2023-03-11"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "ee44975ea9797d932de737a770ab6b743b5aa5db"; - sha256 = "14dsjy49jngi8r851casmyg1swwlx0kmhnalkfqs59jkda7bkg33"; + rev = "8fe5c4133a1d6f08b8982688fc7361f6130c979f"; + sha256 = "109wbz36sq6m6xzr34av7dngpd38iy6j3cdvr6dbs9g93bqi7pam"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -9931,12 +9943,12 @@ final: prev: vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; - version = "2022-10-28"; + version = "2023-03-08"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "1c4b78f5512980227ca747e76f1f6c904f2eb3dc"; - sha256 = "03r3sllai2nn3zhyc2v3cyxmpxw6incv9jfy74nr2p94yz9yasqh"; + rev = "5687a7978bc80263cd03d0a667c2f56890cfb940"; + sha256 = "1bm5ay1c9jw34ax9bxivq9b3crfgizphfq40rd406jdyg72ahgbk"; }; meta.homepage = "https://github.com/ap/vim-css-color/"; }; @@ -10507,12 +10519,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2023-03-06"; + version = "2023-03-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "caf1bc99b63a80cc3a35cc9d05320dfa75d7ebfa"; - sha256 = "12ldjrmip3wgyb2sk1a9d9ikdwg642cw077pmn2x9xim9p88b6y7"; + rev = "5b52a0f395065d6cb7b65a00a5e17eaf9ebd64d5"; + sha256 = "1skvg3w7aaj0cnjx6fdrbfdn46yi62j14jcb46b832a05zgsymq7"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -11193,12 +11205,12 @@ final: prev: vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2023-02-17"; + version = "2023-03-08"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "98cf55a5074695e3fca1ccace66ab5563e35111e"; - sha256 = "1kavcc0vpzgzly39qpbcb6a1kmp456c0jz6jc3vmw3sql8c070fa"; + rev = "949ab618060ebcfcfb055c759f3ef9b8a2c6f184"; + sha256 = "19r48l3z3p1kymkm0z8g4y78bgpg8xc920hf7mr6pim2pfypacq2"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -11385,12 +11397,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2023-03-04"; + version = "2023-03-09"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "80cd62f8f2c9c571aa31027b77ab7b8aac3d6346"; - sha256 = "1sykxwg2xhv1gsrlwhv3j6mm1gyl7ph5zscw9bnb1qffs4iqd4a6"; + rev = "e82e73a5ebb7df7a9661b3ee296d1b8c5934497f"; + sha256 = "17drblghy3nynrrcbpxmr3rg7qrfczgklfg19riibz5dymv2rv8k"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -11494,12 +11506,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2023-02-19"; + version = "2023-03-07"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "3a48818a8113a502f245c29d894201421727577a"; - sha256 = "1hxsjs83i2rjkmhvsxrxk1y6as9xi8b5ji9abvwvb90p2a765987"; + rev = "fef9f334e64f024ac49eda92ef6274e826fe2de9"; + sha256 = "1lvk2q46vn4b31igvcjzxdw6s09vk48wxi7iszq9lk3p3p2dclck"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -11926,12 +11938,12 @@ final: prev: vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2023-02-26"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "14685fcc4f487ca42dfe786dd54e4b2913370085"; - sha256 = "1svilmpw4ln2734978llwgxzgn5fpnmqswfq4mmq67ibkv68205j"; + rev = "ffe827a27dae98aa826e2295336c650c9a434da0"; + sha256 = "1hj1yviw2lkinnb4l15psg2c9gmcx4csmlh0hp32kbslwmv56y92"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -12538,12 +12550,12 @@ final: prev: vim-sensible = buildVimPluginFrom2Nix { pname = "vim-sensible"; - version = "2023-02-23"; + version = "2023-03-08"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "a7eea09ba654a371a90ca77186bf10930b897e80"; - sha256 = "1pch0f3xwzm0kj70in7n9yza05sgnw34rm8fgxmjfm5n19vslrz5"; + rev = "5693bb650a26723975276bef7b1da2f00a571e0e"; + sha256 = "0m6ycmn4w2nkg42d0h9xlwcivvd5466kagimpvdzzqxjma7qczh0"; }; meta.homepage = "https://github.com/tpope/vim-sensible/"; }; @@ -12742,12 +12754,12 @@ final: prev: vim-snipmate = buildVimPluginFrom2Nix { pname = "vim-snipmate"; - version = "2022-06-11"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "garbas"; repo = "vim-snipmate"; - rev = "525f331320427bf7aeb07651e2536b1f8a23df03"; - sha256 = "0qfai0x9zg52n43ikgxx5x9y1nl3x420q8564csxirnbhnbn5xgx"; + rev = "074fe09bca0dbe49aea9c5202edba0d1c7ead10c"; + sha256 = "01h3cha6xh6srrkhsk89r7xfh577k5ivrgvnxakgnna95mf94r02"; }; meta.homepage = "https://github.com/garbas/vim-snipmate/"; }; @@ -13187,24 +13199,24 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2023-03-05"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "7c94396ca10e53b09c2c0da8e0dab0fbf5a8acf1"; - sha256 = "03pd044wqxh24c5jm2wwa15icbhf9dd1cw3645lphy1zsyy59rsx"; + rev = "c3805441a378ed3891cefebea1c2e62a66cffb73"; + sha256 = "0zml0nipnrjqibbdq5dpgn2fgf0h963841cxnlps1rbsrs2m2ss5"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; vim-trailing-whitespace = buildVimPluginFrom2Nix { pname = "vim-trailing-whitespace"; - version = "2023-02-13"; + version = "2023-02-28"; src = fetchFromGitHub { owner = "bronson"; repo = "vim-trailing-whitespace"; - rev = "41f24890005f6bce34b1603e7c0d530fd70bc2da"; - sha256 = "1ms54fyxwxh4albrdgxpv99k3rwdbb1wy5ss95l585hmk9hfr27q"; + rev = "5540b3faa2288b226a8d9a4e8244558b12c598aa"; + sha256 = "11gfrw8r0yn0qx3bb2mg1griqmqfn19vfapam8apspfi2b6rfwg4"; }; meta.homepage = "https://github.com/bronson/vim-trailing-whitespace/"; }; @@ -13379,24 +13391,24 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2022-12-20"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "8dde8c0ef10bb1afdbb301e2bd7eb1c153dd558e"; - sha256 = "09vxb458xglzrmxjahxabnqkrkb0cbl6sf9jplp01v0cy3jjfmmw"; + rev = "7753ba9c10429c29d25abfd11b4c60b76718c438"; + sha256 = "1l8myq6c5rckk6jr3s5rx9jpnrgzk1a65yky1b28mvayd6yff4vs"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; vim-vsnip-integ = buildVimPluginFrom2Nix { pname = "vim-vsnip-integ"; - version = "2022-11-09"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip-integ"; - rev = "1cf89903f12777b90dd79eb4b3d7fbc0b9a254a1"; - sha256 = "00a5kdcdlfnn5f2yv6cavy91f91w0aqckcgpqvchgs631ypjqbp4"; + rev = "1930f0fc234521945afd48db2bff09d925211571"; + sha256 = "1am4r68awdvjk51r6cyvvkkzj9zpiz394kn6qbjgz9qdc3xbsf1k"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; @@ -13523,12 +13535,12 @@ final: prev: vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2023-03-05"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "6e7ebd59489f2e4d0562850ff2ba04831a26b00b"; - sha256 = "17x5sn33kg8zg7jxm5wg4fzj0733vgz3z43d6r0f03zg5l7p27lf"; + rev = "99821a4b8ee2a05996954a2894d043af001f2d7b"; + sha256 = "1jbng45aiypb526ji6nd9d26d4zjj6il4jz808452b5q1immdrpc"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -13727,12 +13739,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2023-02-22"; + version = "2023-03-11"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "1dba52e6e886bc60184da405a11f8ec22d2f2b49"; - sha256 = "0xgjm626bzs8pf6c79syn49nriprllz289pi62jkwsnh2hxkncxn"; + rev = "93fd1058697394789b413ae70b19428533ebf7b1"; + sha256 = "1grqrpmffl0wk5fnhcp6fpykwjdvqg9qpkdni02869z4xcih9n39"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -13740,12 +13752,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-03-05"; + version = "2023-03-11"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "6f7e507ed1c397838798e43a8249612864c929ba"; - sha256 = "0qvp05ad880qpmsnxiv43yas6i2wzd344gmlg2x9ydh1h5bgm2m8"; + rev = "c39907f3caad8157b5b5fb628e9d035a8aee7d76"; + sha256 = "04n908dy9dla70kyw4a238p8qap04jbh67pfp7ddz3ic5w00y70w"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13764,12 +13776,12 @@ final: prev: vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; - version = "2022-12-05"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "fea8bee382b2051b0137fd2cacf0862823ee69b3"; - sha256 = "1iwwy7ay01jkxgq83frr1xq0y3jvvs86paa43mn1ky6gk3q57s80"; + rev = "34ceee8aaa760d2afc2b220916c8844575fd8d17"; + sha256 = "1gfyi75xxphg6b2cikq3lh353nzyrkw54gflw1pglhcrfxb34y82"; }; meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; @@ -14125,12 +14137,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-03-05"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "5e2c9cf8277c42fb634007126c36d765fd176f4a"; - sha256 = "0g9sjx5l0b71wvbgz71v3rm8y55dhi3bmx790aj8bs4f96npdvnp"; + rev = "839d015ce9b6c9447fd8b40e43a6411ccc87ebf1"; + sha256 = "1xaq3pamnvxl0fwqxzppjddgmd9453kqqsj1y1mxiqvaphsifxya"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -14149,12 +14161,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-03-05"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "1188c4a39167237d551d279c9f84a3e34c7c2329"; - sha256 = "11igiz9l5r7qj6hj1xn5wgzx6a5acgldqq6vjs9w6viwc9cvvin7"; + rev = "62028983c38d849f0b918e02538bd0feb524c5b7"; + sha256 = "11sbp59d1p3a8842b8a8ib7pcfb21y3pfsj5cjy7k5mr156jzr5y"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -14197,12 +14209,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-03-06"; + version = "2023-03-09"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "109286f8def4187c3a35494b8760fd14105e9d8c"; - sha256 = "0pf2q8m4jsh9mlxyw0788mh80lfx8wnj1k0h3xg1d0czxdlad9w8"; + rev = "db6cdf51bf5ae45e4aa65760e597cf0d587c66ee"; + sha256 = "1zpra73xf320wbi4cfrlzriyklgpgcbdmaphd88lvpkqy5shrfwy"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; @@ -14219,6 +14231,18 @@ final: prev: meta.homepage = "https://github.com/mattn/calendar-vim/"; }; + nord-vim = buildVimPluginFrom2Nix { + pname = "nord-vim"; + version = "2023-03-07"; + src = fetchFromGitHub { + owner = "nordtheme"; + repo = "vim"; + rev = "684c345b8a8bf5e37919c38be6edaaa9356dbf4b"; + sha256 = "1c6mbi0j5r1s0765jj513h5yxzp59n1brar2jsa398ig3508cv9b"; + }; + meta.homepage = "https://github.com/nordtheme/vim/"; + }; + pure-lua = buildVimPluginFrom2Nix { pname = "pure-lua"; version = "2021-05-16"; @@ -14233,12 +14257,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2023-03-04"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "f977f0885384776e5f0e3bffa51abbbfd57d90cc"; - sha256 = "1kav03xi1vwasvl56dlwcjy7bli6vynpkf0afhrm8r4dqzxfa6cc"; + rev = "1883d8b417403f1d8c56d52d90445bbbe6be4b80"; + sha256 = "1wx9bb4qhd4ap030zrbninfwk409chlr8xsr88zw77pjhc1srzv2"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 13d540a829..b4be9b396f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -299,7 +299,6 @@ rev = "ea30a05d0f0446a96d8b096ad11828ad4f8ad849"; hash = "sha256-ZiUMIsjVMxpchxmJQ3g2yXIn+/kAWPwTzMzx3IlW93o="; }; - generate = true; meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree"; }; dhall = buildGrammar { @@ -356,7 +355,7 @@ hash = "sha256-Cch6WCYq9bsWGypzDGapxBLJ0ZB432uAl6YjEjBJ5yg="; }; location = "crates/tree-sitter-ebnf"; - meta.homepage = "https://github.com/RubixDev/ebnf.git"; + meta.homepage = "https://github.com/RubixDev/ebnf"; }; eex = buildGrammar { language = "eex"; @@ -523,6 +522,17 @@ }; meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript"; }; + git_config = buildGrammar { + language = "git_config"; + version = "a01b498"; + src = fetchFromGitHub { + owner = "the-mikedavis"; + repo = "tree-sitter-git-config"; + rev = "a01b498b25003d97a5f93b0da0e6f28307454347"; + hash = "sha256-9gLmao4zmDYj7uxrngjMa4AG9yIkKyptgaCBcL4GZYA="; + }; + meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-config"; + }; git_rebase = buildGrammar { language = "git_rebase"; version = "d8a4207"; @@ -565,19 +575,18 @@ rev = "f4685bf11ac466dd278449bcfe5fd014e94aa504"; hash = "sha256-MjoY1tlVZgN6JqoTjhhg0zSdHzc8yplMr8824sfIKp8="; }; - generate = true; meta.homepage = "https://github.com/shunsambongi/tree-sitter-gitignore"; }; gleam = buildGrammar { language = "gleam"; - version = "cfcbca3"; + version = "ae79782"; src = fetchFromGitHub { - owner = "J3RN"; + owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "cfcbca3f8f734773878e00d7bfcedea98eb10be2"; - hash = "sha256-lwaTlIIh4jA92ECMuxV7NtebKrjJSNoXtCe90YIQ4eE="; + rev = "ae79782c00656945db69641378e688cdb78d52c1"; + hash = "sha256-8zxNOQnYvCHdkeyQwBGKL8fkRRinB3GUogPuw2X5n4I="; }; - meta.homepage = "https://github.com/J3RN/tree-sitter-gleam"; + meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; glimmer = buildGrammar { language = "glimmer"; @@ -621,7 +630,6 @@ rev = "b6ef0768711086a86b3297056f9ffb5cc1d77b4a"; hash = "sha256-ws/8nL+HOoPb6Hcdh4pihjPoRw90R1fy7MB0V9Lb9ik="; }; - generate = true; meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-godot-resource"; }; gomod = buildGrammar { @@ -679,6 +687,17 @@ }; meta.homepage = "https://github.com/slackhq/tree-sitter-hack"; }; + hare = buildGrammar { + language = "hare"; + version = "f0a9e62"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-hare"; + rev = "f0a9e6207a8c84bbd11143c8eb0c6cf70dc6d8b4"; + hash = "sha256-zJxkbAzAbA3aRuSHWEF26msbVszK7OxgXP6YPZBUu8w="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-hare"; + }; haskell = buildGrammar { language = "haskell"; version = "0da7f82"; @@ -1203,12 +1222,12 @@ }; php = buildGrammar { language = "php"; - version = "f860e59"; + version = "d5e7cac"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "f860e598194f4a71747f91789bf536b393ad4a56"; - hash = "sha256-j4RJUBbp2zvCHsZwnz62t2Tf6Cy1LOKrhg/pi8cqzAs="; + rev = "d5e7cacb6c27e0e131c7f76c0dbfee56dfcc61e3"; + hash = "sha256-cSCHXREt3J6RSpug2EFKWYQNDUqrQeC0vDZ3SrRmLBY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; @@ -1280,12 +1299,12 @@ }; prql = buildGrammar { language = "prql"; - version = "5f6c4e4"; + version = "4045dcf"; src = fetchFromGitHub { owner = "PRQL"; repo = "tree-sitter-prql"; - rev = "5f6c4e4a90633b19e2077c1d37248989789d64be"; - hash = "sha256-unmRen1XJgT60lMfsIsp0PBghfBGqMoiEN9nB8Hu6gQ="; + rev = "4045dcff3f8ac04669855b32584053dec065bba4"; + hash = "sha256-+uyCgWon/yCRAOTpzpcDovxyXrIZ4UDwwWG4ndMz0iY="; }; meta.homepage = "https://github.com/PRQL/tree-sitter-prql"; }; @@ -1346,12 +1365,12 @@ }; query = buildGrammar { language = "query"; - version = "0717de0"; + version = "e975044"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "tree-sitter-query"; - rev = "0717de07078a20a8608c98ad5f26c208949d0e15"; - hash = "sha256-dWWof8rYFTto3A4BfbKTKcNieRbwFdF6xDXW9tQvAqQ="; + rev = "e97504446f14f529d5a8e649667d3d60391e4dfd"; + hash = "sha256-Gv882sbL2fmR++h4/I7dFCp+g6pddRCaLyX7+loEoHU="; }; meta.homepage = "https://github.com/nvim-treesitter/tree-sitter-query"; }; @@ -1368,12 +1387,12 @@ }; racket = buildGrammar { language = "racket"; - version = "c2f7baa"; + version = "ed5369a"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "c2f7baa22053a66b4dba852cdba3f14f34bb6985"; - hash = "sha256-P6p2IOECsqCLBgtLE+xqzZuMS8d/lTfAHfTeONClVbY="; + rev = "ed5369ad17166c0749ab7241d826c438bd69338d"; + hash = "sha256-/vvmVirIXH6uAtqEGvG//3XobLFzWCYXIGe4e0N1DsU="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; @@ -1467,23 +1486,23 @@ }; scala = buildGrammar { language = "scala"; - version = "2275b75"; + version = "6f9bc5a"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "2275b754360de8539e02e84106fa38f7cb6de275"; - hash = "sha256-xc8/N2h9i7gZ+zPUzNpuwPg9++vZo8KvdOnjFF5YIo4="; + rev = "6f9bc5ab749d90bb2ac4ad083891f9d0481d768d"; + hash = "sha256-41cRG67Gb9qpaOEVtAtNkjvPurFGgtftHa0MedvJvnU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; scheme = buildGrammar { language = "scheme"; - version = "67b90a3"; + version = "9a23ff3"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-scheme"; - rev = "67b90a365bebf4406af4e5a546d6336de787e135"; - hash = "sha256-aHYOzOPK74Jd6MWFsap/k+dG+aJDTXQ05q7NoP5kfd8="; + rev = "9a23ff3df8f03da555f7679ab640a98a9e851c79"; + hash = "sha256-qEJgMSS6+q3lqks2CzG3XLZrd0Pl3b8jJiD/GA5TBOc="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-scheme"; }; @@ -1555,16 +1574,27 @@ }; sql = buildGrammar { language = "sql"; - version = "1cb7c7a"; + version = "b2f6b30"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "1cb7c7a11015983f6d173847d5a3574f8e20107b"; - hash = "sha256-zdaFE5G19MLH4W5ZF0HfRNNMJV9Evp+X70eXHDmD/pA="; + rev = "b2f6b30ce12cbddfb663473457b670f2b3bffaa9"; + hash = "sha256-moFrlfsb1kpXFXaxRB/8Mu0XAXkQZgKlZefGj+/6NX4="; }; generate = true; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; + squirrel = buildGrammar { + language = "squirrel"; + version = "3fefc6b"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-squirrel"; + rev = "3fefc6b9bb2b4de1b1c461783f675918cd957546"; + hash = "sha256-gxj6HCO1ALbQWgadmR93Ot8hxkxsQuAw5D1o8f8mo48="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-squirrel"; + }; starlark = buildGrammar { language = "starlark"; version = "8ad93a7"; @@ -1611,12 +1641,12 @@ }; swift = buildGrammar { language = "swift"; - version = "fe2e325"; + version = "449d597"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "fe2e325a45056cdb3fcda821c03b8cef0d79e508"; - hash = "sha256-ldPHpYhuAbodMPY8t8X7UiMY8kcds28r75R3Hqnlqv8="; + rev = "449d5974981d402181ca721e0573346f8c17f726"; + hash = "sha256-P7JEkB9MF9DmxQ/3G2IA2l4pzArzAP1rJQl4MNhu3Bo="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -1670,12 +1700,12 @@ }; thrift = buildGrammar { language = "thrift"; - version = "e0c3e50"; + version = "d4deb1b"; src = fetchFromGitHub { owner = "duskmoon314"; repo = "tree-sitter-thrift"; - rev = "e0c3e50e17846230e88becdce28fbb1b41dcabba"; - hash = "sha256-yqdGQabEE1unk7Rel+E3/MRXTEOz9XxrBVH9nj+mm/Q="; + rev = "d4deb1bd9e848f2dbe81103a151d99e8546de480"; + hash = "sha256-MCa7319E8bo3r2kDClBmjOvvs+yZDlE1E+52WqJqvMI="; }; meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift"; }; @@ -1725,12 +1755,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "c6e56d4"; + version = "b66d19b"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "c6e56d44c686a67c89e29e773e662567285d610f"; - hash = "sha256-usZAbf2sTNO78ldiiex6i94dh73kH6QOV0jjf5StuO0="; + rev = "b66d19b9b6ec3edf3d8aff0c20646acbdaa0afb3"; + hash = "sha256-YJrjxU2VmkVHTHta531fsJrx+K4Xih5kpFVEEqmvz34="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -1759,12 +1789,12 @@ }; typescript = buildGrammar { language = "typescript"; - version = "c6e56d4"; + version = "b66d19b"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "c6e56d44c686a67c89e29e773e662567285d610f"; - hash = "sha256-usZAbf2sTNO78ldiiex6i94dh73kH6QOV0jjf5StuO0="; + rev = "b66d19b9b6ec3edf3d8aff0c20646acbdaa0afb3"; + hash = "sha256-YJrjxU2VmkVHTHta531fsJrx+K4Xih5kpFVEEqmvz34="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -1780,6 +1810,17 @@ }; meta.homepage = "https://github.com/Philipp-M/tree-sitter-ungrammar"; }; + uxntal = buildGrammar { + language = "uxntal"; + version = "14e4760"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-uxntal"; + rev = "14e47600afef0affffcbfbe1543381b1ac8fbc5c"; + hash = "sha256-SgBWJ8b/9kMkSDafx+6eSl+FS4Hkd1Ei2ALhTLL7yRk="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-uxntal"; + }; v = buildGrammar { language = "v"; version = "66cf9d3"; @@ -1893,12 +1934,12 @@ }; yuck = buildGrammar { language = "yuck"; - version = "48af129"; + version = "c348825"; src = fetchFromGitHub { owner = "Philipp-M"; repo = "tree-sitter-yuck"; - rev = "48af129ab5411cd6f7ae2b36f53c1192572fa030"; - hash = "sha256-G/aY771G7R78FhS7WxktlMf/0K+PR80WqfwmH+gQhwQ="; + rev = "c348825d3f86dec71dee0e1223c6bd73114e3579"; + hash = "sha256-H4tsLDo9Egp1mpZGcA5Z9C9wPFNxPEBDTugUYKeYW9I="; }; meta.homepage = "https://github.com/Philipp-M/tree-sitter-yuck"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix index 28d0c8193f..9348e599a6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix @@ -831,6 +831,19 @@ self: super: { propagatedBuildInputs = [ sniprun-bin ]; }; + # The GitHub repository returns 404, which breaks the update script + Spacegray-vim = buildVimPluginFrom2Nix { + pname = "Spacegray.vim"; + version = "2021-07-06"; + src = fetchFromGitHub { + owner = "ackyshake"; + repo = "Spacegray.vim"; + rev = "c699ca10ed421c462bd1c87a158faaa570dc8e28"; + sha256 = "0ma8w6p5jh6llka49x5j5ql8fmhv0bx5hhsn5b2phak79yqg1k61"; + }; + meta.homepage = "https://github.com/ackyshake/Spacegray.vim/"; + }; + sqlite-lua = super.sqlite-lua.overrideAttrs (old: { postPatch = let libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"; @@ -1105,7 +1118,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-MR9n2+B2TUNnWxZhBbXZCBereLxYntBxLfx9g14vDUw="; + cargoHash = "sha256-BFUC6fQ5LpTKx2ztCuFVzXTWzSDl03VYsmVcxBXbiT4="; }; in '' @@ -1333,6 +1346,19 @@ self: super: { }; }); + # The GitHub repository returns 404, which breaks the update script + VimCompletesMe = buildVimPluginFrom2Nix { + pname = "VimCompletesMe"; + version = "2022-02-18"; + src = fetchFromGitHub { + owner = "ackyshake"; + repo = "VimCompletesMe"; + rev = "9adf692d7ae6424038458a89d4a411f0a27d1388"; + sha256 = "1sndgb3291dyifaa8adri2mb8cgbinbar3nw1fnf67k9ahwycaz0"; + }; + meta.homepage = "https://github.com/ackyshake/VimCompletesMe/"; + }; + vimsence = super.vimsence.overrideAttrs (old: { meta = with lib; { description = "Discord rich presence for Vim"; @@ -1357,15 +1383,6 @@ self: super: { dependencies = with self; [ vimproc-vim ]; }); - vim-trailing-whitespace = super.vim-trailing-whitespace.overrideAttrs (old: { - patches = [(fetchpatch { - # https://github.com/bronson/vim-trailing-whitespace/pull/30 - name = "fix-add-dynamic-TerminalOpen-for-both-vim-and-nvim.patch"; - url = "https://github.com/bronson/vim-trailing-whitespace/commit/99ef803ebdc01d62b418a3e9386d5f10797bfac3.patch"; - hash = "sha256-cyanHUKxhbY8c6EkAbpUq7QcEBQABCwZ6NoEUOpd2F8="; - })]; - }); - vim-zettel = super.vim-zettel.overrideAttrs (old: { dependencies = with self; [ vimwiki fzf-vim ]; }); diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names index d4557f0e4d..15184a29c6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -29,9 +29,7 @@ https://github.com/vim-scripts/ShowMultiBase/,, https://github.com/tmhedberg/SimpylFold/,, https://github.com/jaredgorski/SpaceCamp/,, https://github.com/SpaceVim/SpaceVim/,, -https://github.com/ackyshake/Spacegray.vim/,, https://github.com/chrisbra/SudoEdit.vim/,, -https://github.com/ackyshake/VimCompletesMe/,, https://github.com/hsitz/VimOrganizer/,, https://github.com/VundleVim/Vundle.vim/,, https://github.com/esneider/YUNOcommit.vim/,, @@ -251,8 +249,10 @@ https://github.com/j-hui/fidget.nvim/,, https://github.com/bogado/file-line/,, https://github.com/glacambre/firenvim/,HEAD, https://github.com/andviro/flake8-vim/,, +https://github.com/willothy/flatten.nvim/,HEAD, https://github.com/ggandor/flit.nvim/,HEAD, https://github.com/ncm2/float-preview.nvim/,, +https://github.com/liangxianzhe/floating-input.nvim/,HEAD, https://github.com/fhill2/floating.nvim/,, https://github.com/floobits/floobits-neovim/,, https://github.com/akinsho/flutter-tools.nvim/,HEAD, @@ -475,7 +475,6 @@ https://github.com/tjdevries/nlua.nvim/,, https://github.com/mcchrish/nnn.vim/,, https://github.com/shortcuts/no-neck-pain.nvim/,HEAD, https://github.com/folke/noice.nvim/,HEAD, -https://github.com/arcticicestudio/nord-vim/,, https://github.com/shaunsingh/nord.nvim/,, https://github.com/andersevenrud/nordic.nvim/,, https://github.com/jlesquembre/nterm.nvim/,, @@ -629,6 +628,7 @@ https://github.com/lewis6991/satellite.nvim/,HEAD, https://github.com/tiagovla/scope.nvim/,HEAD, https://github.com/Xuyuanp/scrollbar.nvim/,, https://github.com/cakebaker/scss-syntax.vim/,, +https://github.com/VonHeikemen/searchbox.nvim/,, https://github.com/RobertAudi/securemodelines/,, https://github.com/megaannum/self/,, https://github.com/jaxbot/semantic-highlight.vim/,, @@ -642,6 +642,7 @@ https://github.com/mopp/sky-color-clock.vim/,, https://github.com/kovisoft/slimv/,, https://github.com/mrjones2014/smart-splits.nvim/,, https://github.com/gorkunov/smartpairs.vim/,, +https://github.com/ibhagwan/smartyank.nvim/,, https://github.com/camspiers/snap/,, https://github.com/norcalli/snippets.nvim/,, https://github.com/shaunsingh/solarized.nvim/,HEAD, @@ -754,6 +755,7 @@ https://github.com/junegunn/vader.vim/,, https://github.com/jbyuki/venn.nvim/,, https://github.com/vhda/verilog_systemverilog.vim/,, https://github.com/vifm/vifm.vim/,, +https://github.com/nordtheme/vim/,,nord-vim https://github.com/dracula/vim/,,dracula-vim https://github.com/embark-theme/vim/,,embark-vim https://github.com/catppuccin/vim/,HEAD,catppuccin-vim diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix index f961001e4f..f62ab8e77c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -1267,6 +1267,23 @@ let }; }; + jellyedwards.gitsweep = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "jellyedwards"; + name = "gitsweep"; + version = "0.0.15"; + sha256 = "rKAy84Uiat5VOQXd4OXToNfxAJ6SuWPT47vuiyK4qwg="; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/jellyedwards.gitsweep/changelog"; + description = "VS Code extension which allows you to easily exclude modified or new files so they don't get committed accidentally"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jellyedwards.gitsweep"; + homepage = "https://github.com/jellyedwards/gitsweep"; + license = licenses.mit; + maintainers = with maintainers; [ MatthieuBarthel ]; + }; + }; + jkillian.custom-local-formatters = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "jkillian"; @@ -1442,8 +1459,8 @@ let mktplcRef = { name = "Ionide-fsharp"; publisher = "Ionide"; - version = "6.0.5"; - sha256 = "sha256-vlmLr/1rBreqZifzEwAlhyGzHG28oZa+kmMzRl53tOI="; + version = "7.5.1"; + sha256 = "sha256-AiDYqYF+F69O/aeolIEzqLmg20YN/I4EV6XMa8UgMns="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/language-packs.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/language-packs.nix index f97727d6c2..3c3253e2c3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/language-packs.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/language-packs.nix @@ -4,13 +4,12 @@ with vscode-utils; let - buildVscodeLanguagePack = { language, sha256 }: + buildVscodeLanguagePack = { language, version ? "1.76.2023030809", sha256 }: buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-language-pack-${language}"; publisher = "MS-CEINTL"; - version = "1.64.3"; - inherit sha256; + inherit version sha256; }; meta = { license = lib.licenses.mit; @@ -24,66 +23,66 @@ in # French vscode-language-pack-fr = buildVscodeLanguagePack { language = "fr"; - sha256 = "sha256-6ynT1sbMgKO8iZReQ6KxFpR1VL3Nuo58MvXCtp+67vA="; + sha256 = "19brasjwwgdskgwayclmsywf007i2d47vx7dwq6hq2bhx4rd6xfy"; }; # Italian vscode-language-pack-it = buildVscodeLanguagePack { language = "it"; - sha256 = "sha256-5aNFpzNMZAZJH3n0rJevke9P6AW0au5i8+r4PXsb9Rg="; + sha256 = "1s5x3w125fliimr0i218mars4xjl70hsz0ihxrjk97c66yzg3gw7"; }; # German vscode-language-pack-de = buildVscodeLanguagePack { language = "de"; - sha256 = "sha256-oEaWtsgktHKw52lnZTESkpzC/TTY8LO4yX11IgtMG5U="; + sha256 = "0ih8h3n5mcadclxxlrgajq7kprgj9fbklccc00r0z8vqnmlc0dw0"; }; # Spanish vscode-language-pack-es = buildVscodeLanguagePack { language = "es"; - sha256 = "sha256-utLWbved3WCCk3XzqedbYzmyaKfbMrAmR0btT09GlxA="; + sha256 = "077n4mlx9qxqlp018wfi6hm3syhxsp2xzyih42kpsp71xi8j113r"; }; # Russian vscode-language-pack-ru = buildVscodeLanguagePack { language = "ru"; - sha256 = "sha256-0Wr2ICOiaaj4jZ555bxUJcmXO/yWDyn0UmdvxUF3WSQ="; + sha256 = "04mdxspm8i1dra0qmim4n4qin050adm2zk9pcnn3z4qbf3yvvnf4"; }; # Chinese (Simplified) vscode-language-pack-zh-hans = buildVscodeLanguagePack { language = "zh-hans"; - sha256 = "sha256-irTSQcVXf/V3MuZwfx4tFcvBk+xhbFZTnb7IG28s/p4="; + sha256 = "0f2bg5nm4sybwf84afvhc22yjp66rzdz4s1iaa31yxb4c1ij2vsr"; }; # Chinese (Traditional) vscode-language-pack-zh-hant = buildVscodeLanguagePack { language = "zh-hant"; - sha256 = "sha256-3IA/VTTTEqS6jrDYv50GnLXOTSC1XAMvqOVfOuvIdIs="; + sha256 = "1dspg6x7n9b89cirf63m2y0p6r2m197qzgvvavqfm7bv6cpskha0"; }; # Japanese vscode-language-pack-ja = buildVscodeLanguagePack { language = "ja"; - sha256 = "sha256-rxod70ddrppEYYzukksVY1dTXR8osLFAsIPr1fSFZDg="; + sha256 = "1idiv9xqfqhz1y3pd4h3ayy3svccr4jhrm23nf9h80g38k74qayi"; }; # Korean vscode-language-pack-ko = buildVscodeLanguagePack { language = "ko"; - sha256 = "sha256-QYFaxJz1PqKKIiLosLQ8Tu3JNXzpxLFqgIHjjRLwjA4="; + sha256 = "0g980sfa386by741sxxlapc2cjsbkfvldcc5kylxvf2drigyvka7"; }; # Czech vscode-language-pack-cs = buildVscodeLanguagePack { language = "cs"; - sha256 = "sha256-eMk+syy2h+Xb3k6QB8PqYaF4I1ydaY6eRsvOXmelh9Q="; + sha256 = "0sm3xxiv8lrln051yjq6s5jmpvkbphv1i90lrx472pwknmiwx74a"; }; # Portuguese (Brazil) vscode-language-pack-pt-br = buildVscodeLanguagePack { language = "pt-BR"; - sha256 = "sha256-7Trz38KBl4sD7608MvTs02pUsdD05oHEj3Sp1LvtI7I="; + sha256 = "1k4y528im6sr8n4blh6k4xng4d534siaaflvnarizs3py9wa61d1"; }; # Turkish vscode-language-pack-tr = buildVscodeLanguagePack { language = "tr"; - sha256 = "sha256-T4CTpbve3vrNdW4VDfHDg8U8cQEtuxPV5LvNdtKrqzA"; + sha256 = "1yf59idj6g77sqkm46bdadklvbvb3ncxzd9mfm9y32h54fxffh6a"; }; # Pseudo Language vscode-language-pack-qps-ploc = buildVscodeLanguagePack { language = "qps-ploc"; - sha256 = "sha256-rPvCr3uQPfM8vwKoV7Un5aiMZClhf6TvG1PEe3xYNI0="; + sha256 = "1dmn58fx8mpbn84zqyy09a1j67b5988gn7xjmfdk73bbd7hzbmji"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json index 48592e9e6d..167f92fbed 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json @@ -1,20 +1,23 @@ { "name": "rust-analyzer", - "version": "0.3.1059", + "version": "0.3.1426", "dependencies": { - "d3": "^7.3.0", - "d3-graphviz": "^4.1.0", - "vscode-languageclient": "8.0.0-next.14", - "@types/node": "~14.17.5", + "anser": "^2.1.1", + "d3": "^7.6.1", + "d3-graphviz": "^5.0.2", + "vscode-languageclient": "^8.0.2", + "@types/node": "~16.11.7", "@types/vscode": "~1.66.0", - "@typescript-eslint/eslint-plugin": "^5.16.0", - "@typescript-eslint/parser": "^5.16.0", - "@vscode/test-electron": "^2.1.3", + "@typescript-eslint/eslint-plugin": "^5.30.5", + "@typescript-eslint/parser": "^5.30.5", + "@vscode/test-electron": "^2.1.5", "cross-env": "^7.0.3", - "eslint": "^8.11.0", - "tslib": "^2.3.0", - "typescript": "^4.6.3", - "typescript-formatter": "^7.2.2", - "vsce": "^2.7.0" + "eslint": "^8.19.0", + "eslint-config-prettier": "^8.5.0", + "ovsx": "^0.5.2", + "prettier": "^2.7.1", + "tslib": "^2.4.0", + "typescript": "^4.7.4", + "vsce": "^2.9.2" } } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix index 531e44f666..368d6ff8e0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix @@ -20,13 +20,13 @@ let # Use the plugin version as in vscode marketplace, updated by update script. inherit (vsix) version; - releaseTag = "2022-05-17"; + releaseTag = "2023-03-06"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = releaseTag; - sha256 = "sha256-vrVpgQYUuJPgK1NMb1nxlCdxjoYo40YkUbZpH2Z2mwM="; + sha256 = "sha256-Njlus+vY3N++qWE0JXrGjwcXY2QDFuOV/7NruBBMETY="; }; build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-analyzer/build-deps"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-analyzer/update.sh b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-analyzer/update.sh index 3fa4e6f4c1..fbf62c3b9d 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-analyzer/update.sh +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-analyzer/update.sh @@ -48,4 +48,4 @@ else ./"$node_packages"/generate.sh fi -echo "Remember to also update the revisionTag and hash in default.nix!" +echo "Remember to also update the releaseTag and hash in default.nix!" diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index c178aec865..79417b42f9 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -18,17 +18,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "00n7mykr8dyn9chiwsp0s8pk53c39by4wl0hyx1inb0zqxaszw25"; - x86_64-darwin = "1q41x23jbpisbwcxgmx18g0bcdsj5g1w3pbj9m6mxlssvbc2xiw6"; - aarch64-linux = "1kaj8g50m8imk34whf6sq41a2b1751mjqxvpwnprlx0i7xj2l832"; - aarch64-darwin = "1h6plmyv3xkkbpwka5rrkc1bdrgj9d8jp0q6qyhch368x8mp781m"; - armv7l-linux = "0q46nzhn8agsif9s50dbdbx6ds3ll39yp5lrp9n7y9a26m4cwjmv"; + x86_64-linux = "0dqwjc606z8qizg9hcfjlpq92hmaxh3a09368ffz7irl5sgwp300"; + x86_64-darwin = "00795gr9dmshz6sfgsp70fii6m76fqdmqskwkdwqwxddl0i07sw5"; + aarch64-linux = "04ckk6l9ym1igaqk1zfyy4zx05yryi641lc0i1l38k3mbv1k3gvw"; + aarch64-darwin = "16z96h8s9irgb17gy6ng3r6cbiwrxa7q7qazqamnmgvvahg08kvj"; + armv7l-linux = "042ihy4bg39y4m2djkqcx099w9710ikprbw3z7gh1gqvj3qyxy6i"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.76.0"; + version = "1.76.1"; 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 cd89ab7d78..5944625f68 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1qayw19mb7f0gcgcvl57gpacrqsyx2jvc6s63vzbx8jmf5qnk71a"; - x86_64-darwin = "02z9026kp66lx6pll46xx790jj7c7wh2ca7xim373x90k8hm4kwz"; - aarch64-linux = "1izqhzvv46p05k1z2yg380ddwmar4w2pbrd0dyvkdysvp166y931"; - aarch64-darwin = "1zcr653ssck4nc3vf04l6bilnjdsiqscw62g1wzbyk6s50133cx8"; - armv7l-linux = "0n914rcfn2m9zsbnkd82cmw88qbpssv6jk3g8ig3wqlircbgrw0h"; + x86_64-linux = "0q3wp1n67f8w0j35saf4mlnsfd2481f9yl28428vycq32m10q96k"; + x86_64-darwin = "1820a01a97vvv1d2553czv1g2z7mg3f6l8i8168g63zvvnad0f1c"; + aarch64-linux = "03gzfp5n6z6dzinsnwpvmmlj0lqa53152a4mylaj1rg540jv2xh7"; + aarch64-darwin = "0mbwavi3palh353i19an94hr6xs0i5bxqcvkmr5qv3xvpwlaandl"; + armv7l-linux = "0wpnjd9fqlnv360q6061kmi1z699kd4q9igdczp8gwqyz2x4d3yz"; }.${system} or throwSystem; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.75.0.23033"; + version = "1.76.1.23069"; pname = "vscodium"; executableName = "codium"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/box64/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/box64/default.nix index 12c13bb9ae..38ff3db999 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/box64/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/box64/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , gitUpdater , cmake , python3 @@ -16,24 +15,15 @@ assert withDynarec -> stdenv.hostPlatform.isAarch64; stdenv.mkDerivation rec { pname = "box64"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "ptitSeb"; repo = pname; rev = "v${version}"; - hash = "sha256-eMp2eSWMRJQvLRQKUirBua6Kt7ZtyebfUnKIlibkNFU="; + hash = "sha256-aIvL0H0k0/lz2lCLxB17RxNm0cxVozYthy0z85/FuUE="; }; - patches = [ - # Fix mmx & cppThreads tests on x86_64 - # Remove when version > 0.2.0 - (fetchpatch { - url = "https://github.com/ptitSeb/box64/commit/3819aecf078fcf47b2bc73713531361406a51895.patch"; - hash = "sha256-11hy5Ol5FSE/kNJmXAIwNLbapldhlZGKtOLIoL6pYrg="; - }) - ]; - nativeBuildInputs = [ cmake python3 diff --git a/third_party/nixpkgs/pkgs/applications/emulators/c64-debugger/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/c64-debugger/default.nix index b7c357ca27..fcd3a0aa9b 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/c64-debugger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/c64-debugger/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation { gtk3 libGL libGLU - pkg-config libX11 xcbutil ]; nativeBuildInputs = [ upx + pkg-config ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix index b9ef4682e8..13eec39fef 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix @@ -135,9 +135,6 @@ stdenv.mkDerivation rec { "--set QT_QPA_PLATFORM xcb" ]; - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; - # Use nix-provided libraries instead of submodules postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace CMakeLists.txt \ diff --git a/third_party/nixpkgs/pkgs/applications/emulators/proton-caller/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/proton-caller/default.nix index 4b5da92d1d..e0fd948eb8 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/proton-caller/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/proton-caller/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "proton-caller"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "caverym"; repo = pname; rev = version; - sha256 = "sha256-fN/8woLkTFD0aGILwweHhpey3cGQw2NolvpOmdkEEGA="; + sha256 = "sha256-srzahBMihkEP9/+7oRij5POHkCcH6QBh4kGz42Pz0nM="; }; - cargoSha256 = "sha256-2zczu9MtsDDbfjbmLXCiPJrxNoNNBN0KAGeN+a53SRg="; + cargoHash = "sha256-LBXCcFqqscCGgtTzt/gr7Lz0ExT9kAWrXPuPuKzKt0E="; meta = with lib; { description = "Run Windows programs with Proton"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix index ed6b75ad40..5aa4ff77fd 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix @@ -49,7 +49,7 @@ let mkLibretroCore = { core , src ? (getCoreSrc core) - , version ? "unstable-2022-12-20" + , version ? "unstable-2023-03-13" , ... }@args: import ./mkLibretroCore.nix ({ @@ -400,8 +400,6 @@ in core = "flycast"; extraBuildInputs = [ libGL libGLU ]; makefile = "Makefile"; - makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "platform=arm64" ]; - patches = [ ./fix-flycast-makefile.patch ]; meta = { description = "Flycast libretro port"; license = lib.licenses.gpl2Only; @@ -734,9 +732,7 @@ in picodrive = mkLibretroCore { core = "picodrive"; - version = "unstable-2023-02-15"; dontConfigure = true; - makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ]; meta = { description = "Fast MegaDrive/MegaCD/32X emulator"; license = "MAME"; @@ -822,8 +818,19 @@ in }; }; - scummvm = mkLibretroCore { + scummvm = mkLibretroCore rec { core = "scummvm"; + version = "unstable-2022-04-06"; + # Commit below introduces libretro platform, that uses libretro-{deps,common} as + # submodules. We will probably need to introduce this as separate derivations, + # but for now let's just use the last known version that does not use it. + # https://github.com/libretro/scummvm/commit/36446fa6eb33e67cc798f56ce1a31070260e2ada + src = fetchFromGitHub { + owner = "libretro"; + repo = core; + rev = "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3"; + hash = "sha256-wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew="; + }; extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU libGL ]; makefile = "Makefile"; preConfigure = "cd backends/platform/libretro/build"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix index 7befac996f..ba1bfe28b2 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix @@ -52,26 +52,17 @@ let in stdenv.mkDerivation rec { pname = "retroarch-bare"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - hash = "sha256-oEENGehbzjJq1kTiz6gkXHMMe/rXjWPxxMoe4RqdqK4="; + hash = "sha256-kJOR3p3fKqGM8a5rgDPkz43uuf5AtS5fVnvr3tJgWbc="; rev = "v${version}"; }; patches = [ ./use-default-values-for-libretro_info_path-assets_directory.patch - # TODO: remove those two patches in the next RetroArch release - (fetchpatch { - url = "https://github.com/libretro/RetroArch/commit/894c44c5ea7f1eada9207be3c29e8d5c0a7a9e1f.patch"; - hash = "sha256-ThB6jd9pmsipT8zjehz7znK/s0ofHHCJeEYBKur6sO8="; - }) - (fetchpatch { - url = "https://github.com/libretro/RetroArch/commit/c5bfd52159cf97312bb28fc42203c39418d1bbbd.patch"; - hash = "sha256-rb1maAvCSUgq2VtJ67iqUY+Fz00Fchl8YGG0EPm0+F0="; - }) ]; nativeBuildInputs = [ pkg-config wrapQtAppsHook ] ++ diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch deleted file mode 100644 index a067839c7c..0000000000 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Makefile b/Makefile -index 01d99c30..8c2dd248 100644 ---- a/Makefile -+++ b/Makefile -@@ -440,7 +440,6 @@ else ifeq ($(platform), arm64) - CPUFLAGS += -DTARGET_LINUX_ARMv8 -frename-registers - CFLAGS += $(CPUFLAGS) - CXXFLAGS += $(CPUFLAGS) -- ASFLAGS += $(CFLAGS) -c -frename-registers -fno-strict-aliasing -ffast-math -ftree-vectorize - PLATFORM_EXT := unix - WITH_DYNAREC=arm64 - HAVE_GENERIC_JIT = 0 diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json index 08c65a7dbf..e18361c0d3 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json @@ -14,38 +14,38 @@ "beetle-lynx": { "owner": "libretro", "repo": "beetle-lynx-libretro", - "rev": "9c48124dc15604b3eb6892e3616dfb77992a6fd6", - "sha256": "ZXFU4QmjVQVU5bE5TVmGm4gepZpuoS8+p60l+Ha4I9s=" + "rev": "3ca44fda26f27418c92ada1b0f38b948af2151ae", + "sha256": "f0A8gA3UT40UDaAkWQcPoDd6vAcM37tNtZ2hCOIyBJA=" }, "beetle-ngp": { "owner": "libretro", "repo": "beetle-ngp-libretro", - "rev": "00c7cb8ea97ad9a372307405d8abf34e401fec8a", - "sha256": "MtZMPjgT4dQy+E+4jSDE08PRi0pwa+q48kmTHhfIQMY=" + "rev": "65460e3a9ad529f6901caf669abbda11f437ab55", + "sha256": "+xfD1ZMKtbv5Lp12+5RM7Vl3eEF38kykKW8wj/2EN5w=" }, "beetle-pce-fast": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "d4fa4480f17f067c3aba25380717a5aee059f026", - "sha256": "t7OJuqEWec3GvNq9dsmrRhgz+GybBzt1ZO6FwZ9L5yE=" + "rev": "e480f6388375f59fd3e7aeef8ef8531c20e5c73e", + "sha256": "uURt6rB0IngWzEpl0DjbckdaTIjNwVCm3auvy7AwUdA=" }, "beetle-pcfx": { "owner": "libretro", "repo": "beetle-pcfx-libretro", - "rev": "af16dfd8353ed6cf76ef381b98a6a9abf59051ec", - "sha256": "snAA5PCU2NRsCiQtBRYEzczPSGG9OT2jDTrGaPZqhic=" + "rev": "724bd21b4524f8cf376dbc29c3e5a12cb674c758", + "sha256": "xeIVZ8FWGbETWYRIBNs3Yum7FDit5fb77hhH+RU45BY=" }, "beetle-psx": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "3827fb4bd0d36f0db7b59e0c220524c7daaf0430", - "sha256": "CGNzb6XDPsp+EitkgyvDha9DoZSy+e9JWye0nmCiOns=" + "rev": "fd812d4cf8f65644faef1ea8597f826ddc37c0a0", + "sha256": "yvMgnY2dGUk8TvvfDklN3f6b1ol7vDu6AJcYzdwy9pI=" }, "beetle-saturn": { "owner": "libretro", "repo": "beetle-saturn-libretro", - "rev": "19ce186783174b93b90845c3f0e1fa1694904912", - "sha256": "mEuv9lrDi/q2ASV9hxYptievupcv4PfUWPYlDcNzXQg=" + "rev": "9bd31a4a42d06ca0f6d30ee38a569e57c150c414", + "sha256": "RHvH9Jp6c4cgEMTo+p+dU7qgJqjPbRqJLURadjAysrM=" }, "beetle-snes": { "owner": "libretro", @@ -62,20 +62,20 @@ "beetle-supergrafx": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "787772dff157c8fe54b2e16bb770f2c344c8932b", - "sha256": "i4SnjIqA0U88FnaT7fz5fqMyp8FyfNvxxhflOaAv1mA=" + "rev": "1ff2daa9377114d5394142f75f1c388b706567ed", + "sha256": "0FCm9kURtUQpyPb8cSmRAxttnUJnhE3EWV8DPvlj8HE=" }, "beetle-vb": { "owner": "libretro", "repo": "beetle-vb-libretro", - "rev": "3e845666d7ce235a071eb306e94074f1a72633bf", - "sha256": "ukKzG+O2o6EAF0l7cmMQOkemJ1oweIpRH5rle1gqaFk=" + "rev": "dd6393f76ff781df0f4e8c953f5b053b1e61b313", + "sha256": "C8OtTNdC7GNFsY2EH56in35IX8d6ou/1R04kMvM9674=" }, "beetle-wswan": { "owner": "libretro", "repo": "beetle-wswan-libretro", - "rev": "cccee4217e53e164fd70196e56dfb24b967e5fd8", - "sha256": "RpGYQwDWkfYY0qnrTuAMzVuOSfTX5AZph7FD8ijUggc=" + "rev": "81e8b2afd31b7f0f939a3df6d70c8723bcc8a701", + "sha256": "xmDtMC5pId5X4vf9kHO55HmRpp/4ZruOM8QJSl//9R8=" }, "blastem": { "owner": "libretro", @@ -92,8 +92,8 @@ "bsnes": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "dabf6679024124b2f819c79f279dbb85a5263255", - "sha256": "iv8gxC48i8JMzby3vR4eYDViqCwSf8JGlPekQE6AF4c=" + "rev": "4da970a334ba4644cef72e560985ea3f31fa40f7", + "sha256": "Bu5j1wrMNVMmxQULZwTdXyWi2i6F5C6m8wFDxvtjYdI=" }, "bsnes-hd": { "owner": "DerKoun", @@ -110,8 +110,8 @@ "citra": { "owner": "libretro", "repo": "citra", - "rev": "f0b09a5c0cb3767d43f5f8ca12a783012298fd44", - "sha256": "v86R5TLmNNMhuTMCwU3mAAtLK5H0sP//soh4x+cFgTQ=", + "rev": "d7e1612c17b1acb5d5eb68bb046820db49aeea5e", + "sha256": "u2XwAudFgI7j/k6Bq5fk874aI6KpZawlBoIs2+M+eZY=", "fetchSubmodules": true }, "desmume": { @@ -153,14 +153,14 @@ "fbneo": { "owner": "libretro", "repo": "fbneo", - "rev": "ef17049274a21239e5f21198b026dacbb38d7b90", - "sha256": "2N7c5L9grp+Rkhj25SoB9K9rVHq4H9IzU2KSeb1O7/E=" + "rev": "ffcd114b8ea3f3387b66997263ea5df358675aa5", + "sha256": "a4hXRluHQY5hC5jFU2mlqUAI5GmQk6Rbl1HNRA929CI=" }, "fceumm": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "8c3f690e61a1d65dfb25510426ae88eeae93e1ae", - "sha256": "vzPrAEII8SWj3Ki2OaZb0/9gbQDz04rp2dXf2LE1sXg=" + "rev": "1fa798b220a6df8417dcf7da0ab117533385d9c2", + "sha256": "B1iHZ7BVaM/GBgdD2jNZIEmXcRqKC6YaO9z1ByocMtE=" }, "flycast": { "owner": "libretro", @@ -183,20 +183,20 @@ "gambatte": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "7e02df60048db0898131ea365f387a026e4e648d", - "sha256": "RnFuD8PL+/uPhWe+sSXMPm5+XH8FzCwY+MSquR/AB+o=" + "rev": "ea563fac40e281b29d37f6b56657abef8f1aaf0d", + "sha256": "2jVbEsGkvdH1lA2//mb2Rm3xeh4EyFUcOUXdydSisvk=" }, "genesis-plus-gx": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "74a2f6521aea975a51f99497b57c5db500d61ed9", - "sha256": "qTNbFXg5QFKSzMOWhDdDfc0FinF/D7n2OruG5zv+ANY=" + "rev": "f6a9bd72a56a11c2068be2d15fa52dda3e1e8027", + "sha256": "4siJGPRMpXHfP6mBPoDJArNaISTNjPKT69cvtGldadI=" }, "gpsp": { "owner": "libretro", "repo": "gpsp", - "rev": "81649a2c8075201bb823cce8fdf16a31c92a3b6c", - "sha256": "De9Tke+fp6CtXzm0w6Qzts3jj1j/1uB0kYZfaWyNqA0=" + "rev": "541adc9e1c6c9328c07058659594d6300ae0fa19", + "sha256": "2iv/gMOgTZReDgVzEc3WyOdAlYgfANK08CtpZIyPxgA=" }, "gw": { "owner": "libretro", @@ -207,8 +207,8 @@ "handy": { "owner": "libretro", "repo": "libretro-handy", - "rev": "517bb2d02909271836604c01c8f09a79ad605297", - "sha256": "Igf/OvmnCzoWjCZBoep7T0pXsoBKq3NJpXlYhE7nr3s=" + "rev": "63db085af671bad2929078c55434623b7d4632a1", + "sha256": "N6M3KSU4NPJCqoG/UMrna9/6H5PsBBMUQLrvqiIdxpE=" }, "hatari": { "owner": "libretro", @@ -219,8 +219,8 @@ "mame": { "owner": "libretro", "repo": "mame", - "rev": "85581d60bb24fea14542b154aef2c7b624f5b60f", - "sha256": "AUqJAXJCvddv9vPqXt5EZncKNdeLaXoc6xhYWqOMebY=" + "rev": "f7761a9902d59030882c58d4482446196e748c50", + "sha256": "g37WAMt9iBbAYq4DfeTlHWmdW5/Vl7g90v6vCLmMQ3g=" }, "mame2000": { "owner": "libretro", @@ -237,8 +237,8 @@ "mame2003-plus": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "3249de7ceaaa92ee18e93cbd8c2ace9f1ee34c08", - "sha256": "mBF1j4em4e/fKEmPA8MmAZrXXYQiqFfAloOHdMbVq+k=" + "rev": "0b9309d9d86aea2457df74709e997bea37899475", + "sha256": "US0nkEH4EeKRejuN8UoDeLt5dhafuo7PEVx0FnpeUG0=" }, "mame2010": { "owner": "libretro", @@ -267,7 +267,7 @@ "mesen": { "owner": "libretro", "repo": "mesen", - "rev": "c89474c9d87df967d21b7b7d5971dc9475fec028", + "rev": "caa4e6f14373c40bd2805c600d1b476e7616444a", "sha256": "cnPNBWXbnCpjgW/wJIboiRBzv3zrHWxpNM1kg09ShLU=" }, "mesen-s": { @@ -285,45 +285,45 @@ "mgba": { "owner": "libretro", "repo": "mgba", - "rev": "ec5ecb26deba8d7ac830fc66ade9fac0eeaeb4ae", - "sha256": "kDDs+M7TPu6UhFnj9+XGI9whQFQ5/+7fSb0YUN7oMsg=" + "rev": "a69c3434afe8b26cb8f9463077794edfa7d5efad", + "sha256": "rmitsZzRWJ0VYzcNz/UtIK8OscQ4lkyuAwgfXOvSTzg=" }, "mupen64plus": { "owner": "libretro", "repo": "mupen64plus-libretro-nx", - "rev": "bc241538b9ef85d8b22c392d7699dc73f460e283", - "sha256": "eCosI2yL1HJpHWvZLYZQe6+1rmmyHLFYCY7bX+3hPec=" + "rev": "5a63aadedc29655254d8fc7b4da3a325472e198b", + "sha256": "QNa8WGJFShO4vc4idUntCUaLik4xQXBA+X7z5sjZ2NE=" }, "neocd": { "owner": "libretro", "repo": "neocd_libretro", - "rev": "53f5453311a1ac43700fedb2317c810586f9ccf5", - "sha256": "BZBpojShHk+j5wz/d7FnykpX562TgH6PAqTUigE+zUU=" + "rev": "2070f5258c9d3feee15962f9db8c8ef20072ece8", + "sha256": "X+lS1zW5oTzp7wwurM5xjVqIBwEOCIdj/NX/+33K2qg=" }, "nestopia": { "owner": "libretro", "repo": "nestopia", - "rev": "d30c55052292826836f6dbaa2adc46fdf1a2d93c", - "sha256": "R2Kbtr2EqNUyx5eGBYyyw/ugSxVRM70TP/IsIsU0EZM=" + "rev": "16b14865caf1effca030630e2fc73d2d4271fc53", + "sha256": "dU9X8sK/qDA/Qj0x1GicmSAzQyRqVmLiTcfCPe8+BjM=" }, "np2kai": { "owner": "AZO234", "repo": "NP2kai", - "rev": "606fafa7081b62df5f4727c34560da23927c21cd", - "sha256": "qS7OrY8bFkAmRgbzLCw9PqgxtKuVNKI+tsDVU7PqWIw=", + "rev": "6089943a80a45b6c18d765765f7f31d7a5c0d9c6", + "sha256": "tdF0Qb+smWAVoPmI0dd5s51cnYxMmqM36rQNMiEjU9A=", "fetchSubmodules": true }, "nxengine": { "owner": "libretro", "repo": "nxengine-libretro", - "rev": "e271c6262d73f07e5d92d285503f1c049801c51a", - "sha256": "PfzHV6/nGUdbnfZ8+aHuoIQhvKcxdbuKnjIMWIIFt7Q=" + "rev": "1f371e51c7a19049e00f4364cbe9c68ca08b303a", + "sha256": "4XBNTzgN8pLyrK9KsVxTRR1I8CQaZCnVR4gMryYpWW0=" }, "o2em": { "owner": "libretro", "repo": "libretro-o2em", - "rev": "3303cc15e4323280084471f694f6d34c78199725", - "sha256": "xH8Dlsg84q8awxjObMPXKZcJSwmix1YdRXIpee7rw6o=" + "rev": "a2a12472fde910b6089ac3ca6de805bd58a9c999", + "sha256": "0cZYw3rrnaR+PfwReRXadLV8RVLblYqlZxJue6OZncg=" }, "opera": { "owner": "libretro", @@ -340,59 +340,59 @@ "pcsx2": { "owner": "libretro", "repo": "pcsx2", - "rev": "d2e37b80cfe6f6eecfe0356c7537d8e98bee7a8d", - "sha256": "rHXJG2wGoyNGvxxeZVF/I1CpaSBPUwZNERJtkG/z7MU=" + "rev": "f3c8743d6a42fe429f703b476fecfdb5655a98a9", + "sha256": "0piCNWX7QbZ58KyTlWp4h1qLxXpi1z6ML8sBHMTvCY4=" }, "pcsx_rearmed": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "aced3eb3fcaa0fe13c44c4dd196cdab42555fd98", - "sha256": "RzcrSADagi3AIPINQxc36BfMjWjatP/JL6HY744XnZk=" + "rev": "4373e29de72c917dbcd04ec2a5fb685e69d9def3", + "sha256": "727//NqBNEo6RHNQr1RY5cxMrEvfuJczCo+cUJZVv7U=" }, "picodrive": { "owner": "libretro", "repo": "picodrive", - "rev": "b2d43acfbc288038749d8a8fdfbcb0474568e043", - "sha256": "kDSQgF8G/IpZ9NkSwuOjFSkirkum7foRT01qIbNJmJI=", + "rev": "7ab066aab84f15388a53433ea273420bcf917e00", + "sha256": "NK9ASiiIkGZmi2YfCqEzZallVfS7nprLRrBk4dlGyAI=", "fetchSubmodules": true }, "play": { "owner": "jpd002", "repo": "Play-", - "rev": "0483fc43da01b5b29883acb2cf1d02d33bba1e30", - "sha256": "OxBQFTQP0L8k0lH88Ey6KWybW912Ehsv7XjWrvFivxo=", + "rev": "b33834af08a4954f06be215eee80a72e7a378e91", + "sha256": "IxZk+kSdrkDAabbzdFM8QUrjaJUc1DHjSfAtDuwDJkw=", "fetchSubmodules": true }, "ppsspp": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "1fa2f7a97191d2a73f243bfc464edef69b26f652", - "sha256": "BDX2eHtFbsloC9XYORHwpix8tbRSQUbcoP7DKFIohW4=", + "rev": "7df51c3d060a780b7383c5c1380e346ad9304bb4", + "sha256": "GK3W0/yWaID3s0W0v6TcgJ0ZU984YspWMS6+XLyThjM=", "fetchSubmodules": true }, "prboom": { "owner": "libretro", "repo": "libretro-prboom", - "rev": "4e671fa0a4b7b892e17ac4e1803c9d627653a4c1", - "sha256": "d2/cpfhNczZkHzMGQIxO9jw65AMs9Jmh4ItiLLdDYsk=" + "rev": "d9c3975669b4aab5a1397e0174838bcbbc3c1582", + "sha256": "klSJ7QIpNjlfyjhfeEQZ3j8Gnp4agd0qKVp0vr+KHVA=" }, "prosystem": { "owner": "libretro", "repo": "prosystem-libretro", - "rev": "cf544d3c8e40ff197ea5bb177a1269db31077803", - "sha256": "A7yQwzM8ewI+UCPQVyO7DNyiQCTw2yG1soi6l7T3pDE=" + "rev": "763ad22c7de51c8f06d6be0d49c554ce6a94a29b", + "sha256": "rE/hxP8hl9lLTNx/WympFDByjZs46ekyxLKRV4V8D9E=" }, "puae": { "owner": "libretro", "repo": "libretro-uae", - "rev": "af9e35383c00980aabb38c929e679704b624dee0", - "sha256": "hp4XOQUKktmUfLtRfVv1Oe1vqHUYu+vagxSSef55APs=" + "rev": "ae58c0f226b654d643b9f2dce58f64657f57cb76", + "sha256": "6oMTwCYGdVhh+R853gOQRzZfa7slDwe6aGVCvdm6NDU=" }, "quicknes": { "owner": "libretro", "repo": "QuickNES_Core", - "rev": "1b88a09f1c386ff9ee46bb371583ae04c5cb5dd0", - "sha256": "Q7DDufGTdP+R05ND56PxMNR96ZacJFxPi0ETieV2B58=" + "rev": "75d501a87ec2074e8d2f7256fb0359513c263c29", + "sha256": "yAHVTgOt8SGyPXihp4YNKKAvxl9VBBAvHyzLW86zSCw=" }, "sameboy": { "owner": "libretro", @@ -403,8 +403,8 @@ "scummvm": { "owner": "libretro", "repo": "scummvm", - "rev": "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3", - "sha256": "wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew=" + "rev": "ab2e5d59cd25dfa5943d45c2567e8330d67fad8b", + "sha256": "9IaQR0prbCT70iWA99NMgGAKPobifdWBX17p4zL0fEM=" }, "smsplus-gx": { "owner": "libretro", @@ -415,8 +415,8 @@ "snes9x": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "3c4982edddfdba482204ed48cf0b1d41ccae5493", - "sha256": "d4luyBSU/4PdsDd2jLwWSyckBPAqXMJ3C1sNmLO+E6U=" + "rev": "cc0a87711a7a208cabefc9fd1dbb90e31fe51684", + "sha256": "1m6QvYl5Z0WM1XeXCYLvQaXH8A15P3x8ZzwdFeVPeWo=" }, "snes9x2002": { "owner": "libretro", @@ -433,26 +433,26 @@ "snes9x2010": { "owner": "libretro", "repo": "snes9x2010", - "rev": "e86e54624a7910a64a9a744e3734d4067c48d240", - "sha256": "U1eeXuhYssAOgiNOZ7fr/8rkPScts3GmWgK6ki39PVA=" + "rev": "d8b10c4cd7606ed58f9c562864c986bc960faaaf", + "sha256": "7FmteYrAYr+pGNXGg9CBC4NFlijGRf7GdtJfiNjmonU=" }, "stella": { "owner": "stella-emu", "repo": "stella", - "rev": "82da36dd685c68b09047d7c835175879edb68653", - "sha256": "y7AOSY2VUe4Jv+wteplvA1ul5iXHoeYQhgycD+nfIuc=" + "rev": "93ea39d6155f08c21707a85a0b04b33008a7ab15", + "sha256": "9dCBaLxb1CBbngBd3tJ0x5lT+dnzzhK2DO4Gk/S6WW4=" }, "stella2014": { "owner": "libretro", "repo": "stella2014-libretro", - "rev": "1351a4fe2ca6b1f3a66c7db0df2ec268ab002d41", - "sha256": "/sVDOfP5CE8k808lhmH3tT47oZ1ka3pgDG5LglfPmHc=" + "rev": "8ab051edd4816f33a5631d230d54059eeed52c5f", + "sha256": "wqssB8WXXF2Lu9heII8nWLLOvI38cIfHSMA7OOd6jx0=" }, "swanstation": { "owner": "libretro", "repo": "swanstation", - "rev": "f2e335bfd4751410dfb24d933f762b9a4fd7fdeb", - "sha256": "l3A1Xb6YD+OOTZEF6whst1Kr8fSRnXuIVIUN1BCa2Bw=" + "rev": "e24f21196cdcd50321475c4366b51af245a6bbe6", + "sha256": "DjAB0Z0yY9IGESeNNkkbdoAO5ItJ/8cZ5ycRofHG978=" }, "tgbdual": { "owner": "libretro", @@ -463,8 +463,8 @@ "thepowdertoy": { "owner": "libretro", "repo": "ThePowderToy", - "rev": "ac620c0a89a18774c3ad176a8a1bc596df23ff57", - "sha256": "C/X1DbmnucRddemEYml2zN3qr5yoXY3b+nvqfpboS0M=" + "rev": "f644498193c4c8be689d8a1d2a70e37e4eff4243", + "sha256": "aPUqrrrH2Ia56A3Kx6ClMcZO9nbHGJIcEQ6nFyIMamo=" }, "tic80": { "owner": "libretro", @@ -476,20 +476,20 @@ "vba-m": { "owner": "libretro", "repo": "vbam-libretro", - "rev": "7e30b038893de63e674944f75581d57c7685ea3a", - "sha256": "CmmiKiy0mFqAiagUHFV5wRSZ0MkzADrHRAG+h82dWAQ=" + "rev": "640ce45325694d1dc574e90c95c55bc464368d7e", + "sha256": "aiIeleZHt95Y/kigLEbRaCb3KM0ezMB7yzO16FbuBNM=" }, "vba-next": { "owner": "libretro", "repo": "vba-next", - "rev": "4191e09e2b0fcf175a15348c1fa8a12bbc6320dd", - "sha256": "IG2oH4F17tlSv1cXYZobggb37tFNE53JOHzan/X0+ws=" + "rev": "0c310082a6345790124e9348861b300bcccbeced", + "sha256": "RQx/WR83EtPcQkx0ft4Y0/5LaKIOST3L/fh4qoPxz78=" }, "vecx": { "owner": "libretro", "repo": "libretro-vecx", - "rev": "b5c17bb7fd4a704f58160bc699322a16d0643396", - "sha256": "nICXrVyoMWs2yDcewHd7z6rBt+haY/Dqf5lvF6RLnyg=" + "rev": "8e932c1d585ae9e467186dea9e73ce38fe1490f7", + "sha256": "2Vo30yiP6SfUt3XHCfQTKTKEtCywdRIoUe6d0Or21WM=" }, "virtualjaguar": { "owner": "libretro", @@ -500,7 +500,7 @@ "yabause": { "owner": "libretro", "repo": "yabause", - "rev": "c7e02721eddb3de0ec7ae0d61e9e3afa5f586a62", - "sha256": "Y2YsPpgBA021pRDOFqH29zsRSbFIpRo5fq+tkknJbSA=" + "rev": "4c96b96f7fbe07223627c469ff33376b2a634748", + "sha256": "7hEpGh2EcrlUoRiUNntaMZEQtStglYAY1MeCub5p8f8=" } } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/libretro-core-info.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/libretro-core-info.nix index 79f9002ed4..308f78c08e 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/libretro-core-info.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/libretro-core-info.nix @@ -5,12 +5,12 @@ stdenvNoCC.mkDerivation rec { pname = "libretro-core-info"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-core-info"; - hash = "sha256-3nw8jUxBQJxiKlWS6OjTjwUYWKx3r2E7eHmbj4naWrk="; + hash = "sha256-WIgcHuZgAOrlg+WyOS4TyzWziNzjyQB2sPDM9fR6kwA="; rev = "v${version}"; }; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/mkLibretroCore.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/mkLibretroCore.nix index 829b96387f..bc457d0cb7 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/mkLibretroCore.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/mkLibretroCore.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation ({ "ARCH=${{ armv7l = "arm"; armv6l = "arm"; + aarch64 = "arm64"; i686 = "x86"; }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name}" ] ++ (args.makeFlags or [ ]); diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/appdir.patch b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/appdir.patch deleted file mode 100644 index 696077d29d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/appdir.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/Ryujinx.Common/ReleaseInformations.cs b/Ryujinx.Common/ReleaseInformations.cs -index 35890406..cca77163 100644 ---- a/Ryujinx.Common/ReleaseInformations.cs -+++ b/Ryujinx.Common/ReleaseInformations.cs -@@ -42,12 +42,14 @@ namespace Ryujinx.Common - - public static string GetBaseApplicationDirectory() - { -- if (IsFlatHubBuild()) -- { -+ //if (IsFlatHubBuild()) -+ //{ -+ // This needs to be a mutable path, while CurrentDomain.BaseDirectory refers to the nix store. -+ // AppDataManager.BaseDirPath refers to ".config/Ryujinx" on Linux. - return AppDataManager.BaseDirPath; -- } -+ //} - -- return AppDomain.CurrentDomain.BaseDirectory; -+ //return AppDomain.CurrentDomain.BaseDirectory; - } - } - } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix index 0ede7db9f1..0153a4faa8 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix @@ -29,13 +29,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.489"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.651"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "37d27c4c99486312d9a282d7fc056c657efe0848"; - sha256 = "0h55vv2g9i81km0jzlb62arlky5ci4i45jyxig3znqr1zb4l0a67"; + rev = "f0562b9c75308c8cfcaa2458dfd37ac42751a374"; + sha256 = "1bkfncms8lagxhpnafyahrghzvpklsgxddqq7w1wzjzyxp6pxc51"; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; @@ -79,16 +79,12 @@ buildDotnetModule rec { SDL2 ]; - patches = [ - ./appdir.patch # Ryujinx attempts to write to the nix store. This patch redirects it to "~/.config/Ryujinx" on Linux. - ]; - projectFile = "Ryujinx.sln"; testProjectFile = "Ryujinx.Tests/Ryujinx.Tests.csproj"; doCheck = true; dotnetFlags = [ - "/p:ExtraDefineConstants=DISABLE_UPDATER" + "/p:ExtraDefineConstants=DISABLE_UPDATER%2CFORCE_EXTERNAL_BASE_DIR" ]; executables = [ @@ -113,11 +109,11 @@ buildDotnetModule rec { mkdir -p $out/share/{applications,icons/hicolor/scalable/apps,mime/packages} pushd ${src}/distribution/linux - install -D ./ryujinx.desktop $out/share/applications/ryujinx.desktop - install -D ./ryujinx-mime.xml $out/share/mime/packages/ryujinx-mime.xml - install -D ./ryujinx-logo.svg $out/share/icons/hicolor/scalable/apps/ryujinx.svg + install -D ./Ryujinx.desktop $out/share/applications/Ryujinx.desktop + install -D ./mime/Ryujinx.xml $out/share/mime/packages/Ryujinx.xml + install -D ../misc/Logo.svg $out/share/icons/hicolor/scalable/apps/Ryujinx.svg - substituteInPlace $out/share/applications/ryujinx.desktop \ + substituteInPlace $out/share/applications/Ryujinx.desktop \ --replace "Exec=Ryujinx" "Exec=$out/bin/Ryujinx" ln -s $out/bin/Ryujinx $out/bin/ryujinx diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix index 214d0ee747..264b60dcf4 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix @@ -24,6 +24,7 @@ (fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; }) (fetchNuGet { pname = "Fizzler"; version = "1.2.1"; sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; }) (fetchNuGet { pname = "FluentAvaloniaUI"; version = "1.4.5"; sha256 = "1j5ivy83f13dgn09qrfkq44ijvh0m9rbdx8760g47di70c4lda7j"; }) + (fetchNuGet { pname = "FSharp.Core"; version = "7.0.200"; sha256 = "1ji816r8idwjmxk8bzyq1z32ybz7xdg3nb0a7pnvqr8vys11bkgb"; }) (fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.1"; sha256 = "0ffywnc3ca1lwhxdnk99l238vsprsrsh678bgm238lb7ja7m52pw"; }) (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.1-preview.108"; sha256 = "0xs4px4fy5b6glc77rqswzpi5ddhxvbar1md6q9wla7hckabnq0z"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.1-preview.108"; sha256 = "16wvgvyra2g1b38rxxgkk85wbz89hspixs54zfcm4racgmj1mrj4"; }) @@ -32,40 +33,38 @@ (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.108"; sha256 = "0n6ymn9jqms3mk5hg0ar4y9jmh96myl6q0jimn7ahb1a8viq55k1"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) (fetchNuGet { pname = "jp2masa.Avalonia.Flexbox"; version = "0.2.0"; sha256 = "1abck2gad29mgf9gwqgc6wr8iwl64v50n0sbxcj1bcxgkgndraiq"; }) - (fetchNuGet { pname = "LibHac"; version = "0.17.0"; sha256 = "06ar4yv9mbvi42fpzs8g6j5yqrk1nbn5zssbh2k08sx3s757gd6f"; }) + (fetchNuGet { pname = "LibHac"; version = "0.18.0"; sha256 = "19d5fqdcws0730580jlda6pdddprxcrhw7b3ybiiglabsr7bmgdv"; }) (fetchNuGet { pname = "MicroCom.CodeGenerator.MSBuild"; version = "0.10.4"; sha256 = "1bdgy6g15d1mln1xpvs6sy0l2zvfs4hxw6nc3qm16qb8hdgvb73y"; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.10.4"; sha256 = "0ccbzp0d01dcahm7ban7xyh1rk7k2pkml3l5i7s85cqk5lnczpw2"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.9.6"; sha256 = "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; sha256 = "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.4.0"; sha256 = "12rn6gl4viycwk3pz5hp5df63g66zvba4hnkwr3f0876jj5ivmsw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.4.0"; sha256 = "0lag1m6xmr3sascf8ni80nqjz34fj364yzxrfs13k02fz1rlw5ji"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.5.0"; sha256 = "0hjzca7v3qq4wqzi9chgxzycbaysnjgj28ps20695x61sia6i3da"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.4.0"; sha256 = "0rhylcwa95bxawcgixk64knv7p7xrykdjcabmx3gknk8hvj1ai9y"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.4.0"; sha256 = "0wjsm651z8y6whxl915nlmk9py3xys5rs0caczmi24js38zx9rx7"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0"; sha256 = "1l6v0ii5lapmfnfpjwi3j5bwlx8v9nvyani5pwvqzdfqsd5m7mp5"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.4.0"; sha256 = "1h2f0z9xnw987x8bydka1sd42ijqjx973md6v1gvpy1qc6ad244g"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.4.0"; sha256 = "195gqnpwqkg2wlvk8x6yzm7byrxfq9bki20xmhf6lzfsdw3z4mf2"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.4.1"; sha256 = "0bf68gq6mc6kzri4zi8ydc0xrazqwqg38bhbpjpj90zmqc28kari"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.5.0"; sha256 = "0briw00gb5bz9k9kx00p6ghq47w501db7gb6ig5zzmz9hb8lw4a4"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { pname = "Microsoft.DotNet.InternalAbstractions"; version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.25.1"; sha256 = "0kkwjci3w5hpmvm4ibnddw7xlqq97ab8pa9mfqm52ri5dq1l9ffp"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.25.1"; sha256 = "16nk02qj8xzqwpgsas50j1w0hhnnxdl7dhqrmgyg7s165qxi5h70"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.25.1"; sha256 = "1r0v67w94wyvyhikcvk92khnzbsqsvmmcdz3yd71wzv6fr4rvrrh"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.25.1"; sha256 = "0srnsqzvr8yinl52ybpps0yg3dp0c8c96h7zariysp9cgb9pv8ds"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.4.1"; sha256 = "02p1j9fncd4fb2hyp51kw49d0dz30vvazhzk24c9f5ccc00ijpra"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.27.0"; sha256 = "053c1pkx9bnb9440f5rkzbdv99wgcaw95xnqjp09ncd2crh8kakp"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.27.0"; sha256 = "103qvpahmn1x8yxj0kc920s27xbyjr15z8lf5ikrsrikalb5yjx9"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.27.0"; sha256 = "1c3b0bkmxa24bvzi16jc7lc1nifqcq4jg7ild973bb8mivicagzv"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.27.0"; sha256 = "0h51vdcz6pkv4ky2ygba4vks56rskripqb3fjz95ym0l0xg20s1a"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.5.0"; sha256 = "00gz2i8kx4mlq1ywj3imvf7wc6qzh0bsnynhw06z0mgyha1a21jy"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.4.1"; sha256 = "0s68wf9yphm4hni9p6kwfk0mjld85f4hkrs93qbk5lzf6vv3kba1"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.4.1"; sha256 = "1n9ilq8n5rhyxcri06njkxb0h2818dbmzddwd2rrvav91647m2s4"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.5.0"; sha256 = "17g0k3r5n8grba8kg4nghjyhnq9w8v0w6c2nkyyygvfh8k8x9wh3"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; }) (fetchNuGet { pname = "MsgPack.Cli"; version = "1.0.1"; sha256 = "1dk2bs3g16lsxcjjm7gfx6jxa4667wccw94jlh2ql7y7smvh9z8r"; }) @@ -75,13 +74,13 @@ (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) - (fetchNuGet { pname = "NUnit3TestAdapter"; version = "3.17.0"; sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6"; }) - (fetchNuGet { pname = "OpenTK.Core"; version = "4.7.5"; sha256 = "1dzjw5hi55ig5fjaj8a2hibp8smsg1lmy29s3zpnp79nj4i03r1s"; }) - (fetchNuGet { pname = "OpenTK.Graphics"; version = "4.7.5"; sha256 = "0r5zhqbcnw0jsw2mqadrknh2wpc9asyz9kmpzh2d02ahk3x06faq"; }) - (fetchNuGet { pname = "OpenTK.Mathematics"; version = "4.7.5"; sha256 = "0fvyc3ibckjb5wvciks1ks86bmk16y8nmyr1sqn2sfawmdfq80d9"; }) - (fetchNuGet { pname = "OpenTK.OpenAL"; version = "4.7.5"; sha256 = "0p6xnlc852lm0m6cjwc8mdcxzhan5q6vna1lxk6n1bg78bd4slfv"; }) + (fetchNuGet { pname = "NUnit3TestAdapter"; version = "4.1.0"; sha256 = "1z5g15npmsjszhfmkrdmp4ds7jpxzhxblss2rjl5mfn5sihy4cww"; }) + (fetchNuGet { pname = "OpenTK.Core"; version = "4.7.7"; sha256 = "1jyambm9lp0cnzy2mirv5psm0gvk2xi92k3r5jf0mi2jqmd2aphn"; }) + (fetchNuGet { pname = "OpenTK.Graphics"; version = "4.7.7"; sha256 = "1hrz76qlyw29cl5y917r65dnxwhcaswbq9ljzgc6fsnix4lngbvv"; }) + (fetchNuGet { pname = "OpenTK.Mathematics"; version = "4.7.7"; sha256 = "1xdagkfbs8nbs9lpqbr062pjmb5my1gj5yg2vbfw9xz238619lz2"; }) + (fetchNuGet { pname = "OpenTK.OpenAL"; version = "4.7.7"; sha256 = "1zqdk1iplqmchvm42k71z6y8fdz0lg2cd1xw9h0asf760qa9aq5z"; }) (fetchNuGet { pname = "OpenTK.redist.glfw"; version = "3.3.8.30"; sha256 = "1zm1ngzg6p64x0abz2x9mnl9x7acc1hmk4d1svk1mab95pqbrgwz"; }) - (fetchNuGet { pname = "OpenTK.Windowing.GraphicsLibraryFramework"; version = "4.7.5"; sha256 = "1958vp738bwg98alpsax5m97vzfgrkks4r11r22an4zpv0gnd2sd"; }) + (fetchNuGet { pname = "OpenTK.Windowing.GraphicsLibraryFramework"; version = "4.7.7"; sha256 = "1f33yqf5lr8qkza56xm1kqhs59v706yan2i3bkdlc56609gf8qy9"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) @@ -133,9 +132,9 @@ (fetchNuGet { pname = "Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK"; version = "1.2.0"; sha256 = "1qkas5b6k022r57acpc4h981ddmzz9rwjbgbxbphrjd8h7lz1l5x"; }) (fetchNuGet { pname = "Ryujinx.GtkSharp"; version = "3.24.24.59-ryujinx"; sha256 = "0dri508x5kca2wk0mpgwg6fxj4n5n3kplapwdmlcpfcbwbmrrnyr"; }) (fetchNuGet { pname = "Ryujinx.PangoSharp"; version = "3.24.24.59-ryujinx"; sha256 = "1bdxm5k54zs0h6n2dh20j5jlyn0yml9r8qr828ql0k8zl7yhlq40"; }) - (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.24.2-build21"; sha256 = "11ya698m1qbas68jjfhah2qzf07xs4rxmbzncd954rqmmszws99l"; }) + (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.26.1-build23"; sha256 = "1qnz15q2g6qknjgbv3pb53llqpb4lcwfwmgfvm6325zxjm79r792"; }) (fetchNuGet { pname = "shaderc.net"; version = "0.1.0"; sha256 = "0f35s9h0vj9f1rx9bssj66hibc3j9bzrb4wgb5q2jwkf5xncxbpq"; }) - (fetchNuGet { pname = "SharpZipLib"; version = "1.4.1"; sha256 = "1dh1jhgzc9bzd2hvyjp2nblavf0619djniyzalx7kvrbsxhrdjb6"; }) + (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; }) (fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.18"; sha256 = "1i97f2zbsm8vhcbcfj6g4ml6g261gijdh7s3rmvwvxgfha6qyvkg"; }) (fetchNuGet { pname = "Silk.NET.Core"; version = "2.16.0"; sha256 = "1mkqc2aicvknmpyfry2v7jjxh3apaxa6dmk1vfbwxnkysl417x0k"; }) (fetchNuGet { pname = "Silk.NET.Vulkan"; version = "2.16.0"; sha256 = "0sg5mxv7ga5pq6wc0lz52j07fxrcfmb0an30r4cxsxk66298z2wy"; }) @@ -165,18 +164,11 @@ (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; }) - (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) - (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) - (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) - (fetchNuGet { pname = "System.ComponentModel.EventBasedAsync"; version = "4.3.0"; sha256 = "1rv9bkb8yyhqqqrx6x95njv6mdxlbvv527b44mrd93g8fmgkifl7"; }) - (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) - (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) (fetchNuGet { pname = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.0.0"; sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; }) - (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) @@ -186,14 +178,12 @@ (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.25.1"; sha256 = "03ifsmlfs2v5ca6wc33q8xd89m2jm4h2q57s1s9f4yaigqbq1vrl"; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.27.0"; sha256 = "0fihix48dk0jrkawby62fs163dv5hsh63vdhdyp7hfz6nabsqs2j"; }) (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.0.1"; sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) @@ -228,7 +218,7 @@ (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.1"; sha256 = "0fjqifk4qz9lw5gcadpfalpplyr0z2b3p9x7h0ll481a9sqvppc9"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) @@ -249,7 +239,6 @@ (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.0.1"; sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) @@ -270,30 +259,24 @@ (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; sha256 = "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; }) (fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; 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"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) - (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) - (fetchNuGet { pname = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) - (fetchNuGet { pname = "System.Xml.XPath.XmlDocument"; version = "4.3.0"; sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; }) (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; }) + (fetchNuGet { pname = "UnicornEngine.Unicorn"; version = "2.0.2-rc1-f7c841d"; sha256 = "1fxvv77hgbblb14xwdpk231cgm5b3wl0li1ksx2vswxi9n758hrk"; }) (fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.5.1"; sha256 = "11sld5a9z2rdglkykvylghka7y37ny18naywpgpxp485m9bc63wc"; }) ] diff --git a/third_party/nixpkgs/pkgs/applications/emulators/vbam/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/vbam/default.nix index 4f480e67ee..932f8a59e7 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/vbam/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/vbam/default.nix @@ -57,6 +57,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lassulus netali ]; homepage = "https://vba-m.com/"; platforms = lib.platforms.linux; - badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix index 28efcf5875..f01843e7c4 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix @@ -1,7 +1,7 @@ { stdenv, lib, pkgArches, callPackage, makeSetupHook, pname, version, src, mingwGccs, monos, geckos, platforms, bison, flex, fontforge, makeWrapper, pkg-config, - autoconf, hexdump, perl, nixosTests, + nixosTests, supportFlags, patches, moltenvk, @@ -54,11 +54,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { fontforge makeWrapper pkg-config - - # Required by staging - autoconf - hexdump - perl ] ++ lib.optionals supportFlags.mingwSupport (mingwGccs ++ lib.optional stdenv.isDarwin setupHookDarwin); diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix index 19c230dc85..43863f73e5 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix @@ -73,9 +73,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "8.1"; + version = "8.3"; url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz"; - hash = "sha256-QSDuaz8pTZeq8scwNM8cLL8ToZXJTFx0pkaoH5JBJZg="; + hash = "sha256-QQJpAAKSw7+t0lYf3eBtm8sryVi0mwPpY/FBd6J2MfA="; inherit (stable) gecko32 gecko64 patches; mono = fetchurl rec { @@ -105,7 +105,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - hash = "sha256-5AzXXaRGyvfYxd3yXtAlZREv1wp6UqWdDRdnwmKVaUg="; + hash = "sha256-b49WFyiEbkJFUp1n9rz+A1c6iseSfV+5DrpA6AwKa+4="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; @@ -113,7 +113,7 @@ in rec { disabledPatchsets = [ ]; }; - wayland = fetchFromGitLab rec { + wayland = fetchFromGitLab { # https://gitlab.collabora.com/alf/wine/-/tree/wayland version = "8.0"; hash = "sha256-whRnm21UyKZ4AQufNmctzivISVobnCeidmpYz65vlyk="; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/staging.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/staging.nix index c6bdb40124..b36d4862a7 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/staging.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/staging.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, wineUnstable }: +{ lib, callPackage, autoconf, hexdump, perl, python3, wineUnstable }: with callPackage ./util.nix {}; @@ -9,17 +9,16 @@ in assert lib.getVersion wineUnstable == patch.version; (lib.overrideDerivation wineUnstable (self: { buildInputs = build-inputs [ "perl" "util-linux" "autoconf" "gitMinimal" ] self.buildInputs; + nativeBuildInputs = [ autoconf hexdump perl python3 ] ++ self.nativeBuildInputs; name = "${self.name}-staging"; prePatch = self.prePatch or "" + '' patchShebangs tools - cp -r ${patch}/patches . + cp -r ${patch}/patches ${patch}/staging . chmod +w patches - cd patches - patchShebangs gitapply.sh - ./patchinstall.sh DESTDIR="$PWD/.." --all ${lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets} - cd .. + patchShebangs ./patches/gitapply.sh + python3 ./staging/patchinstall.py DESTDIR="$PWD" --all ${lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets} ''; })) // { meta = wineUnstable.meta // { diff --git a/third_party/nixpkgs/pkgs/applications/emulators/xemu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/xemu/default.nix index bc3828fc03..099fc5acca 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/xemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/xemu/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (self: { pname = "xemu"; - version = "0.7.84"; + version = "0.7.85"; src = fetchFromGitHub { owner = "xemu-project"; repo = "xemu"; rev = "v${self.version}"; - hash = "sha256-pEXjwoQKbMmVNYCnh5nqP7k0acYOAp8SqxYZwPzVwDY="; + hash = "sha256-sVUkB2KegdKlHlqMvSwB1nLdJGun2x2x9HxtNHnpp1s="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/lf/ctpv.nix b/third_party/nixpkgs/pkgs/applications/file-managers/lf/ctpv.nix index 7f5e2a6e08..36a0107883 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/lf/ctpv.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/lf/ctpv.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { buildInputs = with pkgs; [ ffmpegthumbnailer ffmpeg - ] ++ lib.optional waylandSupport [ chafa ] - ++ lib.optional x11Support [ ueberzug ]; + ] ++ lib.optionals waylandSupport [ chafa ] + ++ lib.optionals x11Support [ ueberzug ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix b/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix index 51aa407b04..33b9182a48 100644 --- a/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix @@ -130,7 +130,7 @@ in python.pkgs.buildPythonApplication rec { vobject werkzeug xlrd - XlsxWriter + xlsxwriter xlwt zeep ]; diff --git a/third_party/nixpkgs/pkgs/applications/gis/zombietrackergps/default.nix b/third_party/nixpkgs/pkgs/applications/gis/zombietrackergps/default.nix index f73748d420..47a4329ae1 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/zombietrackergps/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/zombietrackergps/default.nix @@ -62,5 +62,6 @@ mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ sohalt ]; platforms = platforms.linux; + broken = true; # doesn't build with latest Marble }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix index 1d7863df05..387cb97a3c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix @@ -47,13 +47,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.0-62"; + version = "7.1.1-2"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-K74BWxGTpkaE+KBrdOCVd+m/2MJP6YUkB2CFh/YEHyI="; + hash = "sha256-5B8grg05n+MkHZU76QBsrrU5Z3VZRGMRHX35HXtTbe8="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/third_party/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix index f63b3b1709..13a8ef1a02 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix @@ -22,7 +22,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ cadquery - Logbook + logbook pyqt5 pyparsing pyqtgraph diff --git a/third_party/nixpkgs/pkgs/applications/graphics/curtail/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/curtail/default.nix index 118703afc6..1d7df76c21 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/curtail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/curtail/default.nix @@ -37,24 +37,30 @@ python3.pkgs.buildPythonApplication rec { meson ninja pkg-config + gobject-introspection + ]; + + buildInputs = [ + appstream-glib + gettext + gtk3 ]; propagatedBuildInputs = [ - appstream-glib python3.pkgs.pygobject3 - gobject-introspection - gettext ]; - # Currently still required for the gobject-introspection setup hook - strictDeps = false; - preInstall = '' patchShebangs ../build-aux/meson/postinstall.py ''; - postInstall = '' - wrapProgram $out/bin/curtail --prefix PATH : ${lib.makeBinPath [ jpegoptim libwebp optipng pngquant ]} + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + "--prefix" "PATH" ":" "${lib.makeBinPath [ jpegoptim libwebp optipng pngquant ]}" + ) ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix index 6b75bf11d4..0adc585603 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix @@ -34,6 +34,9 @@ stdenv.mkDerivation { patches = [ ./poppler-22_09-build-fix.patch ]; + # Required for the PDF plugin when building with clang. + CXXFLAGS = "-std=c++17"; + preConfigure = '' patchShebangs . ''; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/displaycal/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/displaycal/default.nix index 3f5fc3d12f..e5fc811d43 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/displaycal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/displaycal/default.nix @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { wxPython_4_2 dbus-python distro - PyChromecast + pychromecast send2trash ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/eddy/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/eddy/default.nix index 6b8f465a10..58b8777bb2 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/eddy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/eddy/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { wrapQtAppsHook python3Packages.setuptools python3Packages.rfc3987 - python3Packages.JPype1 + python3Packages.jpype1 python3Packages.pyqt5 ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix index 6a31bfd028..611033c590 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix @@ -6,18 +6,20 @@ , enableSwftools ? false , swftools , python3Packages +, qtbase +, qtcharts }: python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "503"; + version = "519"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-nJn5EphbmVYAAOisV3fym/nHlJl/aPZ2Iyp+Z2/N3Jc="; + hash = "sha256-q5pPRMBuB6hqDGuOl0kMyXjMKze5dw+3kdmA2FPJTPU="; }; nativeBuildInputs = [ @@ -25,6 +27,11 @@ python3Packages.buildPythonPackage rec { python3Packages.mkdocs-material ]; + buildInputs = [ + qtbase + qtcharts + ]; + propagatedBuildInputs = with python3Packages; [ beautifulsoup4 cbor2 @@ -37,8 +44,10 @@ python3Packages.buildPythonPackage rec { opencv4 pillow psutil + pympler pyopenssl - pyside2 + pyqt6 + pyqt6-charts pysocks python-dateutil python3Packages.mpv @@ -82,6 +91,7 @@ python3Packages.buildPythonPackage rec { -e TestHydrusServer \ -e TestHydrusSessions \ -e TestServer \ + -e TestClientMetadataMigration \ ''; outputs = [ "out" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/kodelife/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/kodelife/default.nix index 45688725c2..a165d0d3e0 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/kodelife/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/kodelife/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "kodelife"; - version = "1.0.6.163"; + version = "1.0.8.170"; suffix = { aarch64-linux = "linux-arm64"; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; hash = { - aarch64-linux = "sha256-BbNk/YfTx/J8ApgdiY/thnD2MFUUCSQt/CMjkewLcL0="; - armv7l-linux = "sha256-fp4YM2BgyTr4vvxw5FaqKyGm608q8fOpB3gAgPA9UQ4="; - x86_64-linux = "sha256-sLRdU/UW2JORAUOPzmr+VUkcLoesrshjdLvDCizX0iM="; + aarch64-linux = "sha256-FHE87B34QSc7rcKHE3wkZq1VzcZeKWh68rlIIMDRmm8="; + armv7l-linux = "sha256-OqomlL7IFHyQQULbdbf5I0dRXdy3lDHY4ej2P1OZgzo="; + x86_64-linux = "sha256-QNcWMVZ4bTXPLFEtD35hP2LbuNntvF2e9Wk2knt4TBY="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/mcomix/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/mcomix/default.nix index fbc80d0da6..2cec147fb3 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/mcomix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/mcomix/default.nix @@ -25,17 +25,13 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-Nok4oqTezO84q9IDZvgi33ZeKfRL+tpg7QEDmp2ZZpU="; }; - buildInputs = [ gobject-introspection gtk3 gdk-pixbuf ]; - nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ gtk3 gdk-pixbuf ]; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; propagatedBuildInputs = (with python3.pkgs; [ pillow pygobject3 pycairo ]); # Tests are broken doCheck = false; - # Correct wrapper behavior, see https://github.com/NixOS/nixpkgs/issues/56943 - # until https://github.com/NixOS/nixpkgs/pull/102613 - strictDeps = false; - # prevent double wrapping dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/photoflow/CMakeLists.patch b/third_party/nixpkgs/pkgs/applications/graphics/photoflow/CMakeLists.patch deleted file mode 100644 index 7d3d62b41b..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/photoflow/CMakeLists.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9b48beea..078ba20d 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -603,7 +603,7 @@ ENDIF(APPLE) - # - # photoflow executable - # --add_executable(photoflow main.cc ${RESOURCE_OBJECT}) -+add_executable(photoflow main.cc version.cc ${RESOURCE_OBJECT}) - IF(APPLE) - set_target_properties(photoflow PROPERTIES LINK_FLAGS " -framework ApplicationServices ") - ENDIF(APPLE) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/photoflow/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/photoflow/default.nix deleted file mode 100644 index 43d47cb077..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/photoflow/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ automake -, cmake -, exiv2 -, expat -, fetchFromGitHub -, fetchpatch -, fftw -, fftwFloat -, gettext -, glib -, gobject-introspection -, gtkmm2 -, lcms2 -, lensfun -, libexif -, libiptcdata -, libjpeg -, libraw -, libtiff -, libxml2 -, ninja -, openexr -, pcre -, pkg-config -, pugixml -, lib -, stdenv -, swig -, vips -, gtk-mac-integration-gtk2 -}: - -stdenv.mkDerivation rec { - pname = "photoflow"; - version = "2020-08-28"; - - src = fetchFromGitHub { - owner = "aferrero2707"; - repo = pname; - rev = "8472024fb91175791e0eb23c434c5b58ecd250eb"; - sha256 = "1bq4733hbh15nwpixpyhqfn3bwkg38amdj2xc0my0pii8l9ln793"; - }; - - patches = [ - (fetchpatch { - name = "fix-compiler-flags.patch"; - url = "https://sources.debian.org/data/main/p/photoflow/0.2.8%2Bgit20200114-3/debian/patches/ftbfs"; - sha256 = "sha256-DG5yG6M4FsKOykE9Eh5TGd7Z5QURGTTVbO1pIxMAlhc="; - }) - ./CMakeLists.patch - ./fix-build.patch - ]; - - nativeBuildInputs = [ - automake - cmake - gettext - glib - gobject-introspection - libxml2 - ninja - pkg-config - swig - ]; - - buildInputs = [ - exiv2 - expat - fftw - fftwFloat - gtkmm2 # Could be build with gtk3 but proper UI theme is missing and therefore not very usable with gtk3 - # See: https://discuss.pixls.us/t/help-needed-for-gtk3-theme/5803 - lcms2 - lensfun - libexif - libiptcdata - libjpeg - libraw - libtiff - openexr - pcre - pugixml - vips - ] ++ lib.optionals stdenv.isDarwin [ - gtk-mac-integration-gtk2 - ]; - - cmakeFlags = [ - "-DBUNDLED_EXIV2=OFF" - "-DBUNDLED_LENSFUN=OFF" - "-DBUNDLED_GEXIV2=OFF" - ]; - - meta = with lib; { - description = "A fully non-destructive photo retouching program providing a complete RAW image editing workflow"; - homepage = "https://aferrero2707.github.io/PhotoFlow/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ MtP wegank ]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/photoflow/fix-build.patch b/third_party/nixpkgs/pkgs/applications/graphics/photoflow/fix-build.patch deleted file mode 100644 index ac0516b203..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/photoflow/fix-build.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/src/external/librtprocess/src/include/librtprocess.h b/src/external/librtprocess/src/include/librtprocess.h -index 47691a09..b1c63dbd 100644 ---- a/src/external/librtprocess/src/include/librtprocess.h -+++ b/src/external/librtprocess/src/include/librtprocess.h -@@ -21,6 +21,7 @@ - #define _LIBRTPROCESS_ - - #include -+#include - - - enum rpError {RP_NO_ERROR, RP_MEMORY_ERROR, RP_WRONG_CFA, RP_CACORRECT_ERROR}; -diff --git a/src/operations/denoise.cc b/src/operations/denoise.cc -index 10050f70..16b340c1 100644 ---- a/src/operations/denoise.cc -+++ b/src/operations/denoise.cc -@@ -27,7 +27,7 @@ - - */ - --#include -+//#include - - #include "../base/new_operation.hh" - #include "convert_colorspace.hh" -diff --git a/src/operations/gmic/gmic.cc b/src/operations/gmic/gmic.cc -index 876e7c20..fc6a8505 100644 ---- a/src/operations/gmic/gmic.cc -+++ b/src/operations/gmic/gmic.cc -@@ -28,13 +28,31 @@ - */ - - //#include -+#include - - #include "../../base/processor_imp.hh" - #include "../convertformat.hh" - #include "gmic.hh" - --int vips_gmic(VipsImage **in, VipsImage** out, int n, int padding, double x_scale, double y_scale, const char* command, ...); -- -+int vips_gmic(VipsImage **in, VipsImage** out, int n, int padding, double x_scale, double y_scale, const char* command, ...) -+{ -+ VipsArrayImage *array; -+ va_list ap; -+ int result; -+ -+#ifndef NDEBUG -+ printf("vips_gmic(): padding=%d\n", padding); -+#endif -+ -+ array = vips_array_image_new( in, n ); -+ va_start( ap, command ); -+ result = vips_call_split( "gmic", ap, array, out, -+ padding, x_scale, y_scale, command ); -+ va_end( ap ); -+ vips_area_unref( VIPS_AREA( array ) ); -+ -+ return( result ); -+} - - PF::GMicPar::GMicPar(): - OpParBase(), -diff --git a/src/vips/gmic/gmic/src/CImg.h b/src/vips/gmic/gmic/src/CImg.h -index 268b9e62..5a79640c 100644 ---- a/src/vips/gmic/gmic/src/CImg.h -+++ b/src/vips/gmic/gmic/src/CImg.h -@@ -32843,7 +32843,7 @@ namespace cimg_library_suffixed { - \see deriche(), vanvliet(). - **/ - CImg& blur_box(const float boxsize, const bool boundary_conditions=true) { -- const float nboxsize = boxsize>=0?boxsize:-boxsize*std::max(_width,_height,_depth)/100; -+ const float nboxsize = boxsize>=0?boxsize:-boxsize*std::max({_width,_height,_depth})/100; - return blur_box(nboxsize,nboxsize,nboxsize,boundary_conditions); - } - diff --git a/third_party/nixpkgs/pkgs/applications/graphics/photoqt/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/photoqt/default.nix index 767b749ef7..3b17ce8fd4 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/photoqt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/photoqt/default.nix @@ -1,35 +1,28 @@ -{ mkDerivation, lib, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch -, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects -, extra-cmake-modules, poppler, kimageformats, libarchive}: +{ mkDerivation, lib, fetchurl, cmake, exiv2, graphicsmagick, libraw +, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols2, qttools, qtgraphicaleffects +, extra-cmake-modules, poppler, kimageformats, libarchive, pugixml, wrapQtAppsHook}: mkDerivation rec { pname = "photoqt"; - version = "1.7.1"; + version = "3.1"; src = fetchurl { url = "https://${pname}.org/pkgs/${pname}-${version}.tar.gz"; - sha256 = "1qvxdh3cbjcywqx0da2qp8z092660qyzv5yknqbps2zr12qqb103"; + hash = "sha256-hihfqE7XIlSAxPg3Kzld3LrYS97wDH//GGqpBpBwFm0="; }; - patches = [ - # Fixes build with exiv2 0.27.1 - (fetchpatch { - url = "https://gitlab.com/luspi/photoqt/commit/c6fd41478e818f3a651d40f96cab3d790e1c09a4.patch"; - sha256 = "1j2pdr7hm3js7lswhb4qkf9sj9viclhjqz50qxpyd7pqrl1gf2va"; - }) - ]; - - nativeBuildInputs = [ cmake extra-cmake-modules qttools ]; + nativeBuildInputs = [ cmake extra-cmake-modules qttools wrapQtAppsHook ]; buildInputs = [ - qtbase qtquickcontrols exiv2 graphicsmagick poppler + qtbase qtquickcontrols2 exiv2 graphicsmagick poppler qtmultimedia qtdeclarative libraw qtgraphicaleffects - kimageformats libarchive + kimageformats libarchive pugixml ]; cmakeFlags = [ "-DFREEIMAGE=OFF" "-DDEVIL=OFF" + "-DCHROMECAST=OFF" ]; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix index 0d3a86663b..774a8b19dd 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -37,10 +37,6 @@ buildPythonPackage rec { gtk3 ]; - # https://github.com/NixOS/nixpkgs/issues/56943 - # this must be false, otherwise the gobject-introspection hook doesn't run - strictDeps = false; - preDistPhases = [ "fixupIconPath" ]; fixupIconPath = '' diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix index b7ee6d200a..5571585e32 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { pname = "sane-backends"; - version = "1.1.1"; + version = "1.2.1"; src = fetchurl { # raw checkouts of the repo do not work because, the configure script is @@ -25,8 +25,8 @@ stdenv.mkDerivation { # unfortunately this make the url unpredictable on update, to find the link # go to https://gitlab.com/sane-project/backends/-/releases and choose # the link under the heading "Other". - url = "https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/sane-backends-1.1.1.tar.gz"; - sha256 = "sha256-3UsEw3pC8UxGGejupqlX9MfGF/5Z4yrihys3OUCotgM="; + url = "https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1fdc7360dd87/sane-backends-1.2.1.tar.gz"; + sha256 = "f832395efcb90bb5ea8acd367a820c393dda7e0dd578b16f48928b8f5bdd0524"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix index e32226ad2f..1887d542fb 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Tom94/tev/releases/tag/v${version}"; license = licenses.bsd3; platforms = platforms.unix; - badPlatforms = [ "aarch64-linux" ]; # fails on Hydra since forever broken = stdenv.isDarwin; # needs apple frameworks + SDK fix? see #205247 maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix index cbfde434e1..438bd15e1a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.14.0"; + version = "2.15.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-Pmfdz6jGWuRS76/35/+Al5gAbJ7rFyQQLB9tQr1Ecv8=" "zip"; - i686-linux = fetch "linux_386" "sha256-UQfoof5yuSiMjIWcbSuE45dhJ41MionPcMn8uAwP6I8=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-sx3wgAvazgWjSQMQxVE0irDXCNnDAPBivKQTUC3bZ08=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-pFoOoE329jSzshaHo/XFTIirKsxfdz1yOA0Ljb9VNkY=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-D+i+RrPBwFHDL7ExiZUL/xc7vBcfHI7C6z0gNIs/Brs=" "zip"; + i686-linux = fetch "linux_386" "sha256-Y19dbv9eQJF3V+94bByfWLUeDuJ78fUM9vJf1/Nd3rI=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-Mxp6wCwBUNNucN0W0awghUzg2OQTkrwXsZgS/nVP41M=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-KJVXW2Ze1AmDWNeTEfr7SsZMBmLyMfBv/FgC+XAds0A=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix index 61b46e7081..d7909c64a2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -13,15 +13,20 @@ buildDotnetModule rec { pname = "archisteamfarm"; # nixpkgs-update: no auto update - version = "5.4.2.13"; + version = "5.4.3.2"; src = fetchFromGitHub { owner = "justarchinet"; repo = pname; rev = version; - sha256 = "sha256-4DaqIsHfijA0hkhlsC6qQ1n+HC0zwdMtXiswOPOVpM4="; + sha256 = "sha256-SRWqe8KTjFdgVW7/EYRVUONtDWwxpcZ1GXWFPjKZzpI="; }; + patches = [ + # otherwise installPhase fails with NETSDK1129 + ./fix-framework.diff + ]; + dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; dotnet-sdk = dotnetCorePackages.sdk_7_0; @@ -59,6 +64,7 @@ buildDotnetModule rec { } buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher + buildPlugin ArchiSteamFarm.OfficialPlugins.MobileAuthenticator buildPlugin ArchiSteamFarm.OfficialPlugins.SteamTokenDumper ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix index d5bbfee0b6..e9f36ba984 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -61,7 +61,7 @@ (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.4.1"; sha256 = "0bf68gq6mc6kzri4zi8ydc0xrazqwqg38bhbpjpj90zmqc28kari"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.5.0"; sha256 = "0briw00gb5bz9k9kx00p6ghq47w501db7gb6ig5zzmz9hb8lw4a4"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) @@ -71,11 +71,11 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.4.1"; sha256 = "02p1j9fncd4fb2hyp51kw49d0dz30vvazhzk24c9f5ccc00ijpra"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.5.0"; sha256 = "00gz2i8kx4mlq1ywj3imvf7wc6qzh0bsnynhw06z0mgyha1a21jy"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.4.1"; sha256 = "0s68wf9yphm4hni9p6kwfk0mjld85f4hkrs93qbk5lzf6vv3kba1"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.4.1"; sha256 = "1n9ilq8n5rhyxcri06njkxb0h2818dbmzddwd2rrvav91647m2s4"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.5.0"; sha256 = "17g0k3r5n8grba8kg4nghjyhnq9w8v0w6c2nkyyygvfh8k8x9wh3"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.0.2"; sha256 = "1pzn95nhmprfvchwshyy87jifzjpvdny21b5yhkqafr150nxlz77"; }) (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.0.2"; sha256 = "1yiwi0hi8pn9dv90vz1yw13izap8dv13asxvr9axcliis0ad5iaq"; }) @@ -86,9 +86,9 @@ (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.1.1"; sha256 = "19m1ivp1cxz1ghlvysrxdhxlj7kzya9m7j812c3ssnxrfrr1077z"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.2.1"; sha256 = "1z9ayqag1xncn4cs0cz27gxa5cqk6caq5fd81bczlj4sqff7ah4p"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.2.1"; sha256 = "10y03374lza6cjsi01xmql1v6hcjf6x2r7wfnnckzhzs70x2hhnl"; }) + (fetchNuGet { pname = "NLog"; version = "5.1.2"; sha256 = "1hgb5lqx9c10kw6rjldrkldd70lmkzij4ssgg6msybgz7vpsyhkk"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.2.2"; sha256 = "09y37z05c8w77hnj2mvzyhgprssam645llliyr0c3jycgy0ls707"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.2.2"; sha256 = "1ig6ffc1z0kadk2v6qsnrxyj945nwsral7jvddhvjhm12bd1zb6d"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; }) @@ -112,7 +112,7 @@ (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.0"; sha256 = "15s9s6hsj9bz0nzw41mxbqdjgjd71w2djqbv0aj413gfi9amybk9"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.1"; sha256 = "1nq9ngkqha70rv41692c79zq09cx6m85wkp3xj9yc31s62afyl5i"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) (fetchNuGet { pname = "zxcvbn-core"; version = "7.0.92"; sha256 = "1pbi0n3za8zsnkbvq19njy4h4hy12a6rv4rknf4a2m1kdhxb3cgx"; }) diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/fix-framework.diff b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/fix-framework.diff new file mode 100644 index 0000000000..6c525e735b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/fix-framework.diff @@ -0,0 +1,24 @@ +diff --git a/Directory.Build.props b/Directory.Build.props +index 89137fba..bce300a4 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -29,16 +29,16 @@ + $(PackageProjectUrl).git + LatestMajor + linux-arm;linux-arm64;linux-x64;osx-arm64;osx-x64;win-arm64;win-x64 +- net7.0 ++ net7.0 + true + + + +- $(TargetFrameworks);net481 ++ $(TargetFramework);net481 + + + +- $(TargetFrameworks);netstandard2.1 ++ $(TargetFramework);netstandard2.1 + + + 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 dfea7f1ffd..ca12a2c596 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 = "22692a1f115e8ca86f83fa17be55d9b20985570f"; - sha256 = "0k0msk1r7ih092cwjngy1824bxkbjwz0d5p3k2r2l67r2p9b3lab"; + rev = "b30b3f5bcea53019bab1d7a433a75936a63eef27"; + sha256 = "0ba4jjf1lxhffj77lcamg390hf8z9avg9skc0iap37zw5n5myb6c"; }; 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 b93726e1b9..6ef71a0741 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,13 +4,13 @@ let sources = { - "@ampproject/remapping-2.1.1" = { + "@ampproject/remapping-2.2.0" = { name = "_at_ampproject_slash_remapping"; packageName = "@ampproject/remapping"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.1.tgz"; - sha512 = "Aolwjd7HSC2PyY0fDj/wA/EimQT4HfEnFYNp5s9CQlrdhyvWTtvZ5YzrUPu6R6/1jKiUlxu8bUhkdSnKHNAHMA=="; + url = "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz"; + sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="; }; }; "@babel/code-frame-7.18.6" = { @@ -31,13 +31,13 @@ let sha512 = "KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g=="; }; }; - "@babel/core-7.20.12" = { + "@babel/core-7.21.0" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.20.12"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz"; - sha512 = "XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz"; + sha512 = "PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA=="; }; }; "@babel/eslint-parser-7.19.1" = { @@ -49,13 +49,13 @@ let sha512 = "AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ=="; }; }; - "@babel/generator-7.20.7" = { + "@babel/generator-7.21.0" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz"; - sha512 = "7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.21.0.tgz"; + sha512 = "z/zN3SePOtxN1/vPFdqrkuJGCD2Vx469+dSbNRD+4TF2+6e4Of5exHqAtcfL/2Nwu0RN0QsFwjyDBFwdUMzNSA=="; }; }; "@babel/helper-annotate-as-pure-7.18.6" = { @@ -130,13 +130,13 @@ let sha512 = "eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg=="; }; }; - "@babel/helper-function-name-7.19.0" = { + "@babel/helper-function-name-7.21.0" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.19.0"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz"; - sha512 = "WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz"; + sha512 = "HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg=="; }; }; "@babel/helper-hoist-variables-7.18.6" = { @@ -166,13 +166,13 @@ let sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; }; - "@babel/helper-module-transforms-7.20.11" = { + "@babel/helper-module-transforms-7.21.0" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.20.11"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz"; - sha512 = "uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.0.tgz"; + sha512 = "eD/JQ21IG2i1FraJnTMbUarAUkA7G988ofehG5MDCRXaUU91rEBJuCeSoou2Sk1y4RbLYXzqEg1QLwEmRU4qcQ=="; }; }; "@babel/helper-optimise-call-expression-7.18.6" = { @@ -274,13 +274,13 @@ let sha512 = "95NLBP59VWdfK2lyLKe6eTMq9xg+yWKzxzxbJ1wcYNi1Auz200+83fMDADjRxBvc2QQor5zja2yTQzXGhk2GtQ=="; }; }; - "@babel/helpers-7.20.7" = { + "@babel/helpers-7.21.0" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz"; - sha512 = "PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz"; + sha512 = "XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA=="; }; }; "@babel/highlight-7.18.6" = { @@ -292,13 +292,13 @@ let sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/parser-7.20.7" = { + "@babel/parser-7.21.0" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz"; - sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.21.0.tgz"; + sha512 = "ONjtg4renj14A9pj3iA5T5+r5Eijxbr2eNIkMBTC74occDSsRZUpe8vowmowAjFR1imWlkD8eEmjYXiREZpGZg=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { @@ -913,31 +913,31 @@ let sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; }; }; - "@babel/traverse-7.20.12" = { + "@babel/traverse-7.21.0" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.20.12"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.12.tgz"; - sha512 = "MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.0.tgz"; + sha512 = "Xdt2P1H4LKTO8ApPfnO1KmzYMFpp7D/EinoXzLYN/cHcBNrVCAkAtGUcXnHXrl/VGktureU6fkQrHSBE2URfoA=="; }; }; - "@babel/types-7.20.7" = { + "@babel/types-7.21.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz"; - sha512 = "69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.21.0.tgz"; + sha512 = "uR7NWq2VNFnDi7EYqiRz2Jv/VQIu38tu64Zy8TX2nQFQ6etJ9V/Rr2msW8BS132mum2rL645qpDrLtAJtVpuow=="; }; }; - "@discoveryjs/json-ext-0.5.5" = { + "@discoveryjs/json-ext-0.5.7" = { name = "_at_discoveryjs_slash_json-ext"; packageName = "@discoveryjs/json-ext"; - version = "0.5.5"; + version = "0.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz"; - sha512 = "6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA=="; + url = "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz"; + sha512 = "dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw=="; }; }; "@eslint/eslintrc-1.4.1" = { @@ -949,40 +949,40 @@ let sha512 = "XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA=="; }; }; - "@fortawesome/fontawesome-common-types-6.2.1" = { + "@fortawesome/fontawesome-common-types-6.3.0" = { name = "_at_fortawesome_slash_fontawesome-common-types"; packageName = "@fortawesome/fontawesome-common-types"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz"; - sha512 = "Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ=="; + url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.3.0.tgz"; + sha512 = "4BC1NMoacEBzSXRwKjZ/X/gmnbp/HU5Qqat7E8xqorUtBFZS+bwfGH5/wqOC2K6GV0rgEobp3OjGRMa5fK9pFg=="; }; }; - "@fortawesome/fontawesome-svg-core-6.2.1" = { + "@fortawesome/fontawesome-svg-core-6.3.0" = { name = "_at_fortawesome_slash_fontawesome-svg-core"; packageName = "@fortawesome/fontawesome-svg-core"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.1.tgz"; - sha512 = "HELwwbCz6C1XEcjzyT1Jugmz2NNklMrSPjZOWMlc+ZsHIVk+XOvOXLGGQtFBwSyqfJDNgRq4xBCwWOaZ/d9DEA=="; + url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.3.0.tgz"; + sha512 = "uz9YifyKlixV6AcKlOX8WNdtF7l6nakGyLYxYaCa823bEBqyj/U2ssqtctO38itNEwXb8/lMzjdoJ+aaJuOdrw=="; }; }; - "@fortawesome/free-brands-svg-icons-6.2.1" = { + "@fortawesome/free-brands-svg-icons-6.3.0" = { name = "_at_fortawesome_slash_free-brands-svg-icons"; packageName = "@fortawesome/free-brands-svg-icons"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.2.1.tgz"; - sha512 = "L8l4MfdHPmZlJ72PvzdfwOwbwcCAL0vx48tJRnI6u1PJXh+j2f3yDoKyQgO3qjEsgD5Fr2tQV/cPP8F/k6aUig=="; + url = "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.3.0.tgz"; + sha512 = "xI0c+a8xnKItAXCN8rZgCNCJQiVAd2Y7p9e2ND6zN3J3ekneu96qrePieJ7yA7073C1JxxoM3vH1RU7rYsaj8w=="; }; }; - "@fortawesome/free-solid-svg-icons-6.2.1" = { + "@fortawesome/free-solid-svg-icons-6.3.0" = { name = "_at_fortawesome_slash_free-solid-svg-icons"; packageName = "@fortawesome/free-solid-svg-icons"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.1.tgz"; - sha512 = "oKuqrP5jbfEPJWTij4sM+/RvgX+RMFwx3QZCZcK9PrBDgxC35zuc7AOFsyMjMd/PIFPeB2JxyqDr5zs/DZFPPw=="; + url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.3.0.tgz"; + sha512 = "x5tMwzF2lTH8pyv8yeZRodItP2IVlzzmBuD1M7BjawWgg9XAvktqJJ91Qjgoaf8qJpHQ8FEU9VxRfOkLhh86QA=="; }; }; "@fortawesome/vue-fontawesome-2.0.10" = { @@ -1021,6 +1021,15 @@ let sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; }; }; + "@jridgewell/gen-mapping-0.1.1" = { + name = "_at_jridgewell_slash_gen-mapping"; + packageName = "@jridgewell/gen-mapping"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"; + sha512 = "sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w=="; + }; + }; "@jridgewell/gen-mapping-0.3.2" = { name = "_at_jridgewell_slash_gen-mapping"; packageName = "@jridgewell/gen-mapping"; @@ -1030,13 +1039,13 @@ let sha512 = "mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A=="; }; }; - "@jridgewell/resolve-uri-3.0.5" = { + "@jridgewell/resolve-uri-3.1.0" = { name = "_at_jridgewell_slash_resolve-uri"; packageName = "@jridgewell/resolve-uri"; - version = "3.0.5"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz"; - sha512 = "VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew=="; + url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"; + sha512 = "F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="; }; }; "@jridgewell/set-array-1.1.2" = { @@ -1048,22 +1057,22 @@ let sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; }; }; - "@jridgewell/sourcemap-codec-1.4.11" = { + "@jridgewell/sourcemap-codec-1.4.14" = { name = "_at_jridgewell_slash_sourcemap-codec"; packageName = "@jridgewell/sourcemap-codec"; - version = "1.4.11"; + version = "1.4.14"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz"; - sha512 = "Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg=="; + url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"; + sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; }; }; - "@jridgewell/trace-mapping-0.3.13" = { + "@jridgewell/trace-mapping-0.3.17" = { name = "_at_jridgewell_slash_trace-mapping"; packageName = "@jridgewell/trace-mapping"; - version = "0.3.13"; + version = "0.3.17"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz"; - sha512 = "o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w=="; + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz"; + sha512 = "MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g=="; }; }; "@leichtgewicht/ip-codec-2.0.3" = { @@ -1795,13 +1804,13 @@ let sha512 = "DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="; }; }; - "axios-1.2.6" = { + "axios-1.3.4" = { name = "axios"; packageName = "axios"; - version = "1.2.6"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-1.2.6.tgz"; - sha512 = "rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ=="; + url = "https://registry.npmjs.org/axios/-/axios-1.3.4.tgz"; + sha512 = "toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ=="; }; }; "babel-loader-9.1.2" = { @@ -2740,13 +2749,13 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-8.33.0" = { + "eslint-8.34.0" = { name = "eslint"; packageName = "eslint"; - version = "8.33.0"; + version = "8.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.33.0.tgz"; - sha512 = "WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.34.0.tgz"; + sha512 = "1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg=="; }; }; "eslint-config-airbnb-base-15.0.0" = { @@ -5386,13 +5395,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sass-1.57.1" = { + "sass-1.58.3" = { name = "sass"; packageName = "sass"; - version = "1.57.1"; + version = "1.58.3"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.57.1.tgz"; - sha512 = "O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.58.3.tgz"; + sha512 = "Q7RaEtYf6BflYrQ+buPudKR26/lH+10EmO9bBqbmPh/KeLqv8bjpTNqxe71ocONqXq+jYiCbpPUmQMS+JJPk4A=="; }; }; "sass-loader-13.2.0" = { @@ -6205,13 +6214,13 @@ let sha512 = "piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ=="; }; }; - "webpack-bundle-analyzer-4.7.0" = { + "webpack-bundle-analyzer-4.8.0" = { name = "webpack-bundle-analyzer"; packageName = "webpack-bundle-analyzer"; - version = "4.7.0"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz"; - sha512 = "j9b8ynpJS4K+zfO5GGwsAcQX4ZHpWV+yRiHDiL+bE0XHJ8NiPYLTNVQdlFYWxtpg9lfAQNlwJg16J9AJtFSXRg=="; + url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.8.0.tgz"; + sha512 = "ZzoSBePshOKhr+hd8u6oCkZVwpVaXgpw23ScGLFpR6SjYI7+7iIWYarjN6OEYOfRt8o7ZyZZQk0DuMizJ+LEIg=="; }; }; "webpack-cli-4.10.0" = { @@ -6410,10 +6419,14 @@ let version = "0.0.0"; src = ./.; dependencies = [ - sources."@ampproject/remapping-2.1.1" + (sources."@ampproject/remapping-2.2.0" // { + dependencies = [ + sources."@jridgewell/gen-mapping-0.1.1" + ]; + }) sources."@babel/code-frame-7.18.6" sources."@babel/compat-data-7.20.5" - (sources."@babel/core-7.20.12" // { + (sources."@babel/core-7.21.0" // { dependencies = [ sources."debug-4.3.4" sources."json5-2.2.3" @@ -6427,7 +6440,7 @@ let sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.20.7" + sources."@babel/generator-7.21.0" sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.6" (sources."@babel/helper-compilation-targets-7.20.7" // { @@ -6448,11 +6461,11 @@ let }) sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-explode-assignable-expression-7.18.6" - sources."@babel/helper-function-name-7.19.0" + sources."@babel/helper-function-name-7.21.0" sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-member-expression-to-functions-7.18.9" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.11" + sources."@babel/helper-module-transforms-7.21.0" sources."@babel/helper-optimise-call-expression-7.18.6" sources."@babel/helper-plugin-utils-7.20.2" sources."@babel/helper-remap-async-to-generator-7.18.9" @@ -6464,9 +6477,9 @@ let sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" sources."@babel/helper-wrap-function-7.18.10" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.21.0" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.0" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" sources."@babel/plugin-proposal-async-generator-functions-7.20.1" @@ -6539,14 +6552,14 @@ let sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.14.6" sources."@babel/template-7.20.7" - (sources."@babel/traverse-7.20.12" // { + (sources."@babel/traverse-7.21.0" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.20.7" - sources."@discoveryjs/json-ext-0.5.5" + sources."@babel/types-7.21.0" + sources."@discoveryjs/json-ext-0.5.7" (sources."@eslint/eslintrc-1.4.1" // { dependencies = [ sources."debug-4.3.3" @@ -6554,10 +6567,10 @@ let sources."ms-2.1.2" ]; }) - sources."@fortawesome/fontawesome-common-types-6.2.1" - sources."@fortawesome/fontawesome-svg-core-6.2.1" - sources."@fortawesome/free-brands-svg-icons-6.2.1" - sources."@fortawesome/free-solid-svg-icons-6.2.1" + sources."@fortawesome/fontawesome-common-types-6.3.0" + sources."@fortawesome/fontawesome-svg-core-6.3.0" + sources."@fortawesome/free-brands-svg-icons-6.3.0" + sources."@fortawesome/free-solid-svg-icons-6.3.0" sources."@fortawesome/vue-fontawesome-2.0.10" (sources."@humanwhocodes/config-array-0.11.8" // { dependencies = [ @@ -6568,10 +6581,10 @@ let sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" sources."@jridgewell/gen-mapping-0.3.2" - sources."@jridgewell/resolve-uri-3.0.5" + sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/sourcemap-codec-1.4.11" - sources."@jridgewell/trace-mapping-0.3.13" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.17" sources."@leichtgewicht/ip-codec-2.0.3" sources."@nicolo-ribaudo/eslint-scope-5-internals-5.1.1-v1" sources."@nodelib/fs.scandir-2.1.5" @@ -6655,7 +6668,7 @@ let sources."array.prototype.flatmap-1.3.1" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - sources."axios-1.2.6" + sources."axios-1.3.4" (sources."babel-loader-9.1.2" // { dependencies = [ sources."ajv-8.12.0" @@ -6790,7 +6803,7 @@ let sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."eslint-8.33.0" // { + (sources."eslint-8.34.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7186,7 +7199,7 @@ let sources."safe-buffer-5.1.2" sources."safe-regex-test-1.0.0" sources."safer-buffer-2.1.2" - sources."sass-1.57.1" + sources."sass-1.58.3" sources."sass-loader-13.2.0" sources."schema-utils-3.1.1" sources."select-hose-2.0.0" @@ -7318,7 +7331,7 @@ let sources."watchpack-2.4.0" sources."wbuf-1.7.3" sources."webpack-5.75.0" - (sources."webpack-bundle-analyzer-4.7.0" // { + (sources."webpack-bundle-analyzer-4.8.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" diff --git a/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix index 8758e5fe92..c7ee188568 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.26.2"; + version = "1.26.3"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - hash = "sha256-jN4xKgdNO+LyDy+ySM13M5YCaijDq8zAxS+x4Io1ThE="; + hash = "sha256-YI9/rMoe5Waw2e/tObvu+wi9dkmhEoG9v3ZQzkn4QH4="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix index 01374737f5..59fd3f9156 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -95,6 +95,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_ALEMBIC=ON" + # Blender supplies its own FindAlembic.cmake (incompatible with the Alembic-supplied config file) + "-DALEMBIC_INCLUDE_DIR=${lib.getDev alembic}/include" + "-DALEMBIC_LIBRARY=${lib.getLib alembic}/lib/libAlembic.so" "-DWITH_MOD_OCEANSIM=ON" "-DWITH_CODEC_FFMPEG=ON" "-DWITH_CODEC_SNDFILE=ON" diff --git a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix index 8a031a2200..a6ea647240 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -99,11 +99,11 @@ stdenv.mkDerivation rec { setupPyBuildFlags = [ "--enable=load_extension" ]; })) beautifulsoup4 - cchardet css-parser cssselect python-dateutil dnspython + faust-cchardet feedparser html2text html5-parser diff --git a/third_party/nixpkgs/pkgs/applications/misc/citations/default.nix b/third_party/nixpkgs/pkgs/applications/misc/citations/default.nix index 928978ef47..8e32459559 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/citations/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/citations/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { gtksourceview5 libadwaita poppler - ] ++ lib.optional stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix index 55bca8aa80..a1430a8b5e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix @@ -13,7 +13,7 @@ , pango , gst-python , kiss-headers -, Logbook +, logbook , pillow , poetry-core , pygobject3 @@ -47,7 +47,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ gst-python kiss-headers - Logbook + logbook pillow poetry-core pygobject3 diff --git a/third_party/nixpkgs/pkgs/applications/misc/confy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/confy/default.nix new file mode 100644 index 0000000000..b015d7059e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/confy/default.nix @@ -0,0 +1,57 @@ +{ appstream-glib +, desktop-file-utils +, fetchurl +, gobject-introspection +, gtk3 +, lib +, libnotify +, libhandy +, meson +, ninja +, pkg-config +, python3 +, stdenv +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "confy"; + version = "0.6.4"; + + src = fetchurl { + url = "https://git.sr.ht/~fabrixxm/confy/archive/${version}.tar.gz"; + sha256 = "0v74pdyihj7r9gb3k2rkvbphan27ajlvycscd8xzrnsv74lcmbpm"; + }; + + nativeBuildInputs = [ + desktop-file-utils + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gobject-introspection + gtk3 + libhandy + libnotify + (python3.withPackages (ps: with ps; [ + icalendar + pygobject3 + ])) + ]; + + postPatch = '' + # Remove executable bits so that meson runs the script with our Python interpreter + chmod -x build-aux/meson/postinstall.py + ''; + + meta = with lib; { + description = "Conferences schedule viewer"; + homepage = "https://confy.kirgroup.net/"; + changelog = "https://git.sr.ht/~fabrixxm/confy/refs/${version}"; + license = licenses.gpl3; + maintainers = with maintainers; [ michaelgrahamevans ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix index db18ec5d13..9ae6e96d5d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix @@ -7,7 +7,7 @@ }: rustPlatform.buildRustPackage rec { - name = "cotp"; + pname = "cotp"; version = "1.2.3"; src = fetchFromGitHub { @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Pg07iq2jj8cUA4iQsY52cujmUZLYrbTG5Zj+lITxpls="; }; - cargoHash = "sha256-gH9axiM0Qgl2TdJUpnDONHtU2I5l03SrKEe+2l5V21Y="; + cargoHash = "sha256-9jOrDFLnzjxqN2h6e1/qKRn5RQKlfyeKKmjZthQX3jM="; buildInputs = lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/databricks-sql-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/databricks-sql-cli/default.nix index be798894ba..ae118501f4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/databricks-sql-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/databricks-sql-cli/default.nix @@ -1,20 +1,10 @@ { lib -, buildPythonApplication , fetchFromGitHub , fetchpatch -, poetry-core -, pandas -, prompt-toolkit -, databricks-sql-connector -, pygments -, configobj -, sqlparse -, cli-helpers -, click -, pytestCheckHook +, python3 }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "databricks-sql-cli"; version = "0.1.4"; format = "pyproject"; @@ -22,8 +12,8 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sql-cli"; - rev = "v${version}"; - sha256 = "sha256-gr7LJfnvIu2Jf1XgILqfZoi8CbXeQyq0g1wLEBa5TPM="; + rev = "refs/tags/v${version}"; + hash = "sha256-gr7LJfnvIu2Jf1XgILqfZoi8CbXeQyq0g1wLEBa5TPM="; }; patches = [ @@ -37,27 +27,32 @@ buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ --replace 'python = ">=3.7.1,<4.0"' 'python = ">=3.8,<4.0"' \ - --replace 'pandas = "1.3.4"' 'pandas = "~1.4"' + --replace 'pandas = "1.3.4"' 'pandas = "~1.5"' ''; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ - prompt-toolkit - pandas - databricks-sql-connector - pygments - configobj - sqlparse - cli-helpers - click + nativeBuildInputs = with python3.pkgs; [ + poetry-core ]; - nativeCheckInputs = [ pytestCheckHook ]; + propagatedBuildInputs = with python3.pkgs; [ + cli-helpers + click + configobj + databricks-sql-connector + pandas + prompt-toolkit + pygments + sqlparse + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ]; meta = with lib; { description = "CLI for querying Databricks SQL"; homepage = "https://github.com/databricks/databricks-sql-cli"; + changelog = "https://github.com/databricks/databricks-sql-cli/releases/tag/v${version}"; license = licenses.databricks; maintainers = with maintainers; [ kfollesdal ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/deckmaster/default.nix b/third_party/nixpkgs/pkgs/applications/misc/deckmaster/default.nix index 34da4fe939..773b1b36e5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/deckmaster/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/deckmaster/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "deckmaster"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "muesli"; repo = "deckmaster"; - rev = "v${version}"; - sha256 = "sha256-q2rUHfAvTGXBAGrZUtHMuZr6fYWmpha+al2FG8sCC0Y="; + rev = "refs/tags/v${version}"; + hash = "sha256-1hZ7yAKTvkk20ho+QOqFEtspBvFztAtfmITs2uxhdmQ="; }; - vendorSha256 = "sha256-kj4lRHuQ9e0TOC4p4Ak3AB3Lx0JN1jqXaVKlee9EtCg="; + vendorHash = "sha256-d38s5sSvENIou+rlphXIrrOcGOdsvkNaMJlhiXVWN6c="; proxyVendor = true; @@ -39,6 +39,7 @@ buildGoModule rec { meta = with lib; { description = "An application to control your Elgato Stream Deck on Linux"; homepage = "https://github.com/muesli/deckmaster"; + changelog = "https://github.com/muesli/deckmaster/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ianmjones ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix index 24bfaf785e..18110a07c3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "dunst"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "sha256-fRPhu+kpwLPvdzIpXSjXFzQTfv4xewOMv/1ZqLJw3dk="; + sha256 = "sha256-oCeC/rbI/sydcQ7Rv9feEzw2Gcl7mUde4OOv50dyUSg="; }; nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/electron-cash/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electron-cash/default.nix index 0644471c5f..16eb89cb5a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electron-cash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electron-cash/default.nix @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { cython trezor keepkey - btchip + btchip-python hidapi pyopenssl pyscard diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix index 40f67c02c7..08d887f7e9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -71,7 +71,7 @@ python3.pkgs.buildPythonApplication { requests tlslite-ng # plugins - btchip + btchip-python ckcc-protocol keepkey trezor diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/grs.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/grs.nix index a4166a3fe6..fd1e6706e4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/grs.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/grs.nix @@ -54,7 +54,7 @@ python3.pkgs.buildPythonApplication { requests tlslite-ng # plugins - btchip + btchip-python ckcc-protocol keepkey trezor diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix index abb88796dd..ed573d1322 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix @@ -71,7 +71,7 @@ python3.pkgs.buildPythonApplication { requests tlslite-ng # plugins - btchip + btchip-python ckcc-protocol keepkey trezor 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 32319d08b6..a301b12506 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix @@ -11,14 +11,14 @@ let version = "2.0.3"; src = old.src.override { inherit version; - sha256 = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0="; + hash = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0="; }; }); flask-wtf = super.flask-wtf.overridePythonAttrs (old: rec { version = "0.15.1"; src = old.src.override { inherit version; - sha256 = "ff177185f891302dc253437fe63081e7a46a4e99aca61dfe086fb23e54fff2dc"; + hash = "sha256-/xdxhfiRMC3CU0N/5jCB56RqTpmsph3+CG+yPlT/8tw="; }; disabledTests = [ "test_outside_request" @@ -33,7 +33,7 @@ let version = "2.0.3"; src = old.src.override { inherit version; - sha256 = "b863f8ff057c522164b6067c9e28b041161b4be5ba4d0daceeaa50a163822d3c"; + hash = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw="; }; }); }; @@ -44,7 +44,7 @@ in python.pkgs.buildPythonApplication rec { src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "a4e2ee83932755d29ac39c1e74005ec289880fd2d4d2164f09fe2464a294d720"; + hash = "sha256-pOLug5MnVdKaw5wedABewomID9LU0hZPCf4kZKKU1yA="; }; propagatedBuildInputs = with python.pkgs; [ 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 4da566bcfc..aaf5ec9049 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.24.5"; + version = "1.25.0"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-P71JiGI9PpWMAlgk5TwQa/h3AUEZSEZ6/MahY+IIy9M="; + sha256 = "sha256-WxmH6uAMnbmXZWOkLh4B6rR6RV2xfSVBZ7v47AwlwRY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-secrets/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gnome-secrets/default.nix index 1b8a7e706d..676a19641b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gnome-secrets/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gnome-secrets/default.nix @@ -18,7 +18,6 @@ python3Packages.buildPythonApplication rec { pname = "gnome-secrets"; version = "7.2"; format = "other"; - strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index e71daa754a..a5eccb239e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -10,6 +10,7 @@ , qtlocation ? null # qt5 only , qtpositioning ? null # qt6 only , qtpbfimageplugin +, qtserialport , qtsvg , qt5compat ? null # qt6 only , wrapQtAppsHook @@ -21,13 +22,13 @@ let in stdenv.mkDerivation rec { pname = "gpxsee"; - version = "11.12"; + version = "12.2"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - hash = "sha256-W35KBPYvTKrSi7UnzcUz8MsUwoq8rY5g/+hL1/gVpbI="; + hash = "sha256-d+hQNI+eCSMRFMzq09wL+GN9TgOIt245Z8GlPe7nY8E="; }; patches = (substituteAll { @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { inherit qttranslations; }); - buildInputs = [ qtpbfimageplugin ] + buildInputs = [ qtpbfimageplugin qtserialport ] ++ (if isQt6 then [ qtbase qtpositioning @@ -55,6 +56,8 @@ stdenv.mkDerivation rec { postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv GPXSee.app $out/Applications + mkdir -p $out/bin + ln -s $out/Applications/GPXSee.app/Contents/MacOS/GPXSee $out/bin/gpxsee ''; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/misc/hamster/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hamster/default.nix index dbf7e1aee7..925d246ba8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hamster/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hamster/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages, intltool, glib, itstool +{ lib, fetchFromGitHub, python3Packages, intltool, glib, itstool, gtk3 , wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }: python3Packages.buildPythonApplication rec { @@ -28,6 +28,7 @@ python3Packages.buildPythonApplication rec { pango gdk-pixbuf atk + gtk3 ]; propagatedBuildInputs = with python3Packages; [ @@ -37,10 +38,6 @@ python3Packages.buildPythonApplication rec { dbus-python ]; - # Setup hooks have trouble with strict deps. - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - dontWrapGApps = true; # Arguments to be passed to `makeWrapper`, only used by buildPython* diff --git a/third_party/nixpkgs/pkgs/applications/misc/haxor-news/default.nix b/third_party/nixpkgs/pkgs/applications/misc/haxor-news/default.nix index aa9b530dee..bb4c528827 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/haxor-news/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/haxor-news/default.nix @@ -12,7 +12,7 @@ let version = "1.0.18"; src = oldAttrs.src.override { inherit version; - sha256 = "09h1153wgr5x2ny7ds0w2m81n3bb9j8hjb8sjfnrg506r01clkyx"; + hash = "sha256-3U/KAsgGlJetkxotCZFMaw0bUBUc6Ha8Fb3kx0cJASY="; }; }); # Use click 7 @@ -20,7 +20,7 @@ let version = "7.1.2"; src = old.src.override { inherit version; - sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; }; }); }; @@ -37,7 +37,7 @@ buildPythonApplication rec { owner = "donnemartin"; repo = pname; rev = "811a5804c09406465b2b02eab638c08bf5c4fa7f"; - sha256 = "1g3dfsyk4727d9jh9w6j5r51ag07851cls7v7a7hmdvdixpvbzp6"; + hash = "sha256-5v61b49ttwqPOvtoykJBBzwVSi7S8ARlakccMr12bbw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/hue-plus/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hue-plus/default.nix new file mode 100644 index 0000000000..4cb4adcafd --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/hue-plus/default.nix @@ -0,0 +1,42 @@ +{ python3Packages +, fetchFromGitHub +, lib +, wrapQtAppsHook +, qtbase }: + +python3Packages.buildPythonApplication rec { + pname = "hue-plus"; + version = "1.4.5"; + + src = fetchFromGitHub { + owner = "kusti8"; + repo = pname; + rev = "7ce7c4603c6d0ab1da29b0d4080aa05f57bd1760"; + sha256 = "sha256-dDIJXhB3rmKnawOYJHE7WK38b0M5722zA+yLgpEjDyI="; + }; + + buildInputs = [ qtbase ]; + + nativeBuildInputs = [ wrapQtAppsHook ]; + + propagatedBuildInputs = with python3Packages; [ + pyserial pyqt5 pyaudio appdirs setuptools + ]; + + doCheck = false; + dontWrapQtApps = true; + + makeWrapperArgs = [ + "\${qtWrapperArgs[@]}" + ]; + + meta = with lib; { + homepage = "https://github.com/kusti8/hue-plus"; + description = "A Windows and Linux driver in Python for the NZXT Hue+"; + longDescription = '' + A cross-platform driver in Python for the NZXT Hue+. Supports all functionality except FPS, CPU, and GPU lighting. + ''; + license = licenses.gpl3Only; + maintainers = with maintainers; [ garaiza-93 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix index 559fa75e45..3603bc1366 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.111.2"; + version = "0.111.3"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - hash = "sha256-UVxE5f+WLIoCEhFh1lbOE8LoXVN/+BzHCpJ61Gqknzc="; + hash = "sha256-PgconAixlSgRHqmfRdOtcpVJyThZIKAB9Pm4AUvYVGQ="; }; - vendorHash = "sha256-xiysjJi3bL0xIoEEo7xXQbznFzwKJrCT6l/bxEbDRUI="; + vendorHash = "sha256-2a6+s0xLlj3VzXp9zbZgIi7WJShbUQH48tUG9Slm770="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix new file mode 100644 index 0000000000..b7354278c2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix @@ -0,0 +1,74 @@ +{ stdenv +, lib +, fetchzip +, copyDesktopItems +, makeDesktopItem +, makeWrapper +, runCommand +, appimageTools +, patchelf +}: +let + pname = "jetbrains-toolbox"; + version = "1.27.3.14493"; + + src = fetchzip { + url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz"; + sha256 = "sha256-aK5T95Yg8Us8vkznWlDHnPiPAKiUtlU0Eswl9rD01VY="; + stripRoot = false; + }; + + appimageContents = runCommand "${pname}-extracted" + { + nativeBuildInputs = [ appimageTools.appimage-exec ]; + } + '' + appimage-exec.sh -x $out ${src}/${pname}-${version}/${pname} + ''; + + appimage = appimageTools.wrapAppImage { + inherit pname version; + src = appimageContents; + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.targetPkgs pkgs); + }; + + desktopItem = makeDesktopItem { + name = "JetBrains Toolbox"; + exec = "jetbrains-toolbox"; + comment = "JetBrains Toolbox"; + desktopName = "JetBrains Toolbox"; + type = "Application"; + icon = "jetbrains-toolbox"; + terminal = false; + categories = [ "Development" ]; + startupWMClass = "jetbrains-toolbox"; + startupNotify = false; + }; +in +stdenv.mkDerivation { + inherit pname version src appimage; + + nativeBuildInputs = [ makeWrapper copyDesktopItems ]; + + installPhase = '' + runHook preInstall + + install -Dm644 ${appimageContents}/.DirIcon $out/share/icons/hicolor/scalable/apps/jetbrains-toolbox.svg + makeWrapper ${appimage}/bin/${pname}-${version} $out/bin/${pname} --append-flags "--update-failed" + + runHook postInstall + ''; + + desktopItems = [ desktopItem ]; + + # Disabling the tests, this seems to be very difficult to test this app. + doCheck = false; + + meta = with lib; { + description = "Jetbrains Toolbox"; + homepage = "https://jetbrains.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ AnatolyPopov ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/kupfer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kupfer/default.nix index 47e310fb76..fbb33c7e09 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kupfer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kupfer/default.nix @@ -11,6 +11,8 @@ , shared-mime-info , wrapGAppsHook , wafHook +, bash +, dbus }: with python3Packages; @@ -33,14 +35,12 @@ buildPythonApplication rec { itstool # for help pages desktop-file-utils # for update-desktop-database shared-mime-info # for update-mime-info + docutils # for rst2man + dbus # for detection of dbus-send during build ]; - buildInputs = [ docutils libwnck keybinder3 ]; + buildInputs = [ libwnck keybinder3 bash ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; - # without strictDeps kupfer fails to build: Could not find the python module 'gi.repository.Gtk' - # see https://github.com/NixOS/nixpkgs/issues/56943 for details - strictDeps = false; - postInstall = '' gappsWrapperArgs+=( "--prefix" "PYTHONPATH" : "${makePythonPath propagatedBuildInputs}" diff --git a/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix index d476024553..35dbf1fcb4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix @@ -84,13 +84,12 @@ buildPythonApplication rec { sha256 = "sha256-rsiXm7L/M85ot6NrTyy//lMRFlLPJYve9y6Erg9Ugxg="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; buildInputs = [ atk gdk-pixbuf glib-networking gnome-desktop - gobject-introspection gtk3 libnotify pango @@ -139,9 +138,6 @@ buildPythonApplication rec { "--prefix PATH : ${lib.makeBinPath requiredTools}" "\${gappsWrapperArgs[@]}" ]; - # needed for glib-schemas to work correctly (will crash on dialogues otherwise) - # see https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; meta = with lib; { homepage = "https://lutris.net"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix index 89179b88a8..533e05264b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { qtsvg qtwayland quazip - ] ++ lib.optional (qtVersion == "6") [ + ] ++ lib.optionals (qtVersion == "6") [ qt5compat ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/megacmd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/megacmd/default.nix index 2d5b6ee8f2..704d927afd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/megacmd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/megacmd/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "megacmd"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAcmd"; rev = "${version}_Linux"; - sha256 = "sha256-qOXw/KGt3DyWQGBe/pbMujQITCMItHobxuK+1r00ZIs="; + sha256 = "sha256-EPY2BjTECia0eBGmv8tmeil1WibIA6R+DK7MmOMufLw="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix b/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix index 7f51f7d102..79800a6c46 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix @@ -28,13 +28,13 @@ }: mkDerivation rec { pname = "megasync"; - version = "4.6.7.0"; + version = "4.9.0.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - sha256 = "sha256-vJSXvSTYEhxuG3KUQ+lBcppC8M70UnYlBLPHhYJSNOE="; + sha256 = "sha256-s0E8kJ4PJmhaxVcWPCyCk/KbcX4V3IESdZhSosPlZuM="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix index 743c92407e..4dffe9e08e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix @@ -31,18 +31,14 @@ python3Packages.buildPythonApplication rec { runHook postCheck ''; - # Cannot find GSettings schemas when opening settings, - # probably https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - nativeBuildInputs = [ gettext wrapGAppsHook + gobject-introspection ]; buildInputs = [ glib-networking - gobject-introspection gtk3 ]; @@ -64,6 +60,7 @@ python3Packages.buildPythonApplication rec { ]; # Run Linux games using the Steam Runtime by using steam-run in the wrapper + # FIXME: not working with makeBinaryWrapper postFixup = '' sed -e 's#exec -a "$0"#exec -a "$0" ${steam-run}/bin/steam-run#' -i $out/bin/minigalaxy ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix index 195c083fbf..4c2527cad1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4906"; + version = "4907"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-N1VU5XOENCQiUnDCFpotx+8Pr3VFuWLu1ABcbm0feOM="; + sha256 = "sha256-2DwIH6GNsK2XwaVxzPvN1qt4XRSi5fCQDwltBCBg4gI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/monitorcontrol/default.nix b/third_party/nixpkgs/pkgs/applications/misc/monitorcontrol/default.nix new file mode 100644 index 0000000000..f9002b10b0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/monitorcontrol/default.nix @@ -0,0 +1,33 @@ +{ lib, fetchurl, stdenv, undmg }: + +# This cannot be built from source due to the problematic nature of XCode - so +# this is what it's like when doves cry? + +stdenv.mkDerivation rec { + pname = "MonitorControl"; + version = "4.1.0"; + + src = fetchurl { + url = + "https://github.com/MonitorControl/${pname}/releases/download/v${version}/MonitorControl.${version}.dmg"; + sha256 = "iaxM9j78Sq1EH5TCY240N+D5bG6quk2dZj8T7nt9ATo="; + }; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "MonitorControl.app"; + + installPhase = '' + mkdir -p "$out/Applications/MonitorControl.app" + cp -R . "$out/Applications/MonitorControl.app" + ''; + + meta = with lib; { + description = "A macOS system extension to control brightness and volume of external displays with native OSD"; + longDescription = "Controls your external display brightness and volume and shows native OSD. Use menulet sliders or the keyboard, including native Apple keys!"; + homepage = "https://github.com/MonitorControl/MonitorControl#readme"; + license = licenses.mit; + maintainers = with maintainers; [ cbleslie ]; + platforms = platforms.darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix index c1a4f6aec9..4c740852f6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix @@ -38,6 +38,17 @@ let nativeBuildInputs = [ ]; format = "setuptools"; outputs = [ "out" ]; + patches = [ ]; + }); + # downgrade needed for flask-babel 2.0.0 + babel = super.babel.overridePythonAttrs (oldAttrs: rec { + version = "2.11.0"; + src = super.fetchPypi { + pname = "Babel"; + inherit version; + hash = "sha256-XvSzImsBgN7d7UIpZRyLDho6aig31FoHMnLzE+TPl/Y="; + }; + propagatedBuildInputs = [ self.pytz ]; }); } ) diff --git a/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix index 472af0caf4..9d88d6331c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix @@ -108,9 +108,6 @@ python3.pkgs.buildPythonApplication rec { python3.pkgs.nose ]; - # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - doCheck = false; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/openlp/lib.nix b/third_party/nixpkgs/pkgs/applications/misc/openlp/lib.nix index 4a61ab6537..045211c3af 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/openlp/lib.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/openlp/lib.nix @@ -4,7 +4,7 @@ # python deps , python, buildPythonPackage -, alembic, beautifulsoup4, chardet, lxml, Mako, pyenchant +, alembic, beautifulsoup4, chardet, lxml, mako, pyenchant , pyqt5_with_qtwebkit, pyxdg, sip_4, sqlalchemy, sqlalchemy-migrate }: @@ -37,7 +37,7 @@ buildPythonPackage rec { beautifulsoup4 chardet lxml - Mako + mako pyenchant pyqt5_with_qtwebkit pyxdg diff --git a/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix b/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix index bbd8aaaa84..8fa0a8e757 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix @@ -15,17 +15,19 @@ , zlib , icu , freetype +, pugixml +, nix-update-script }: mkDerivation rec { pname = "organicmaps"; - version = "2023.01.25-3"; + version = "2023.03.05-5"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - sha256 = "sha256-4nlD/GFOoBOCXVWtC7i6SUquEbob5++GyagZOTznygU="; + sha256 = "sha256-PfudozmrL8jNS/99nxSn0B3E53W34m4/ZN0y2ucB2WI="; fetchSubmodules = true; }; @@ -55,6 +57,7 @@ mkDerivation rec { zlib icu freetype + pugixml ]; # Yes, this is PRE configure. The configure phase uses cmake @@ -62,6 +65,13 @@ mkDerivation rec { bash ./configure.sh ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + extraArgs = [ "-vr" "(.*)-android" ]; + }; + }; + meta = with lib; { # darwin: "invalid application of 'sizeof' to a function type" broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pe-bear/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pe-bear/default.nix index 06642f7e49..a50b53378e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pe-bear/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pe-bear/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pe-bear"; - version = "0.6.5"; + version = "0.6.5.2"; src = fetchFromGitHub { owner = "hasherezade"; repo = "pe-bear"; rev = "v${version}"; - sha256 = "sha256-qFEfrXX2Rpmo4eF1Z/dKBN/NxMovK3mDfQPxYp85eB8="; + sha256 = "sha256-00OebZZUUwQ1yruTKEUj+bNEKY/CuzdLEbejnnagPnY="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix b/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix index 79ffb3fdbf..3fedad7478 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix @@ -52,7 +52,7 @@ let }); in stdenv.mkDerivation rec { pname = "phoc"; - version = "0.21.1"; + version = "0.25.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -60,7 +60,8 @@ in stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HPqhro6TE/Ukh4txBPrDoIuDaxSxd/ZkDVZU3+m3GFg="; + sha256 = "sha256-1cbv4vzQ+RcRoT1pOT8Q0nxuZzKUlec38KCNMYaceeE="; + fetchSubmodules = true; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/printrun/default.nix b/third_party/nixpkgs/pkgs/applications/misc/printrun/default.nix index 7ae8662e2c..546c0544cf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/printrun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/printrun/default.nix @@ -32,8 +32,6 @@ python3Packages.buildPythonApplication rec { ''; dontWrapGApps = true; - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") diff --git a/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix b/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix index 2af5e9d692..f7f94d9940 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix @@ -26,7 +26,7 @@ let src = self.fetchPypi { pname = "Flask-Migrate"; inherit version; - sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38"; + hash = "sha256-ri8FZxWIdi3YOiHYsYxR/jVehng+JFlJlf+Nc4Df/jg="; }; }); flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (old: rec { @@ -43,7 +43,7 @@ let version = "1.0.1"; src = old.src.override { inherit version; - sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; + hash = "sha256-bICx5a02ZSkOo5MguR4b4eDV9gZSuWSjBwIW3oPS5Hw="; }; nativeCheckInputs = old.nativeCheckInputs ++ (with self; [ requests @@ -55,18 +55,18 @@ let version = "2.11.3"; src = old.src.override { inherit version; - sha256 = "sha256-ptWEM94K6AA0fKsfowQ867q+i6qdKeZo8cdoy4ejM8Y="; + hash = "sha256-ptWEM94K6AA0fKsfowQ867q+i6qdKeZo8cdoy4ejM8Y="; }; patches = [ # python 3.10 compat fixes. In later upstream releases, but these # are not compatible with flask 1 which we need here :( (fetchpatch { url = "https://github.com/thmo/jinja/commit/1efb4cc918b4f3d097c376596da101de9f76585a.patch"; - sha256 = "sha256-GFaSvYxgzOEFmnnDIfcf0ImScNTh1lR4lxt2Uz1DYdU="; + hash = "sha256-GFaSvYxgzOEFmnnDIfcf0ImScNTh1lR4lxt2Uz1DYdU="; }) (fetchpatch { url = "https://github.com/mkrizek/jinja/commit/bd8bad37d1c0e2d8995a44fd88e234f5340afec5.patch"; - sha256 = "sha256-Uow+gaO+/dH6zavC0X/SsuMAfhTLRWpamVlL87DXDRA="; + hash = "sha256-Uow+gaO+/dH6zavC0X/SsuMAfhTLRWpamVlL87DXDRA="; excludes = [ "CHANGES.rst" ]; }) ]; @@ -76,21 +76,21 @@ let version = "2.0.1"; src = old.src.override { inherit version; - sha256 = "sha256-WUxngH+xYjizDES99082wCzfItHIzake+KDtjav1Ygo="; + hash = "sha256-WUxngH+xYjizDES99082wCzfItHIzake+KDtjav1Ygo="; }; }); itsdangerous = super.itsdangerous.overridePythonAttrs (old: rec { version = "1.1.0"; src = old.src.override { inherit version; - sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19"; + hash = "sha256-MhsDPQfypBNtPsdi6snxahDM1g9TwMka+QIXrOe6Hxk="; }; }); flask = super.flask.overridePythonAttrs (old: rec { version = "1.1.4"; src = old.src.override { inherit version; - sha256 = "0fbeb6180d383a9186d0d6ed954e0042ad9f18e0e8de088b2b419d526927d196"; + hash = "sha256-D762GA04OpGG0NbtlU4AQq2fGODo3giLK0GdUmkn0ZY="; }; }); sqlsoup = super.sqlsoup.overrideAttrs ({ meta ? {}, ... }: { @@ -100,13 +100,13 @@ let version = "7.1.2"; src = old.src.override { inherit version; - sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; }; }); # Now requires `lingua` as check input that requires a newer `click`, # however `click-7` is needed by the older flask we need here. Since it's just # for the test-suite apparently, let's skip it for now. - Mako = super.Mako.overridePythonAttrs (lib.const { + mako = super.mako.overridePythonAttrs (lib.const { nativeCheckInputs = []; doCheck = false; }); @@ -165,7 +165,7 @@ python3'.pkgs.buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-SYXw8PBCb514v3rcy15W/vZS5JyMsu81D2sJmviLRtw="; + hash = "sha256-SYXw8PBCb514v3rcy15W/vZS5JyMsu81D2sJmviLRtw="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/process-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/process-viewer/default.nix index 528fe1aec0..f453009e0c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/process-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/process-viewer/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "process-viewer"; - version = "0.5.6"; + version = "0.5.8"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ELASfcXNhUCE/mhPKBHA78liFMbcT9RB/aoLt4ZRPa0="; + sha256 = "sha256-mEmtLCtHlrCurjKKJ3vEtEkLBik4LwuUED5UeQ1QLws="; }; - cargoSha256 = "sha256-K2kyZwKRALh9ImPngijgpoHyLS+c5sDYviN74JxhJLM="; + cargoSha256 = "sha256-lgVByl+mpCDbhwlC1Eiw9ZkHIDYJsOR06Ds790pXOMc="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix index f51f53e9b7..86aaae625c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix @@ -1,5 +1,5 @@ { lib -, python3 +, python310 , fetchFromGitHub , gdk-pixbuf , gnome @@ -17,11 +17,19 @@ }: let - python = python3.override { + python = python310.override { packageOverrides = (self: super: { matplotlib = super.matplotlib.override { enableGtk3 = true; }; + sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec { + version = "1.4.46"; + src = self.fetchPypi { + pname = "SQLAlchemy"; + inherit version; + hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; + }; + }); }); }; in python.pkgs.buildPythonApplication rec { @@ -77,7 +85,7 @@ in python.pkgs.buildPythonApplication rec { TZ=Europe/Kaliningrad \ LC_ALL=en_US.UTF-8 \ xvfb-run -s '-screen 0 800x600x24' \ - ${python3.interpreter} setup.py test + ${python.interpreter} setup.py test ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/shell-genie/default.nix b/third_party/nixpkgs/pkgs/applications/misc/shell-genie/default.nix index 7225eb4c3f..4bb4c439d7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/shell-genie/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/shell-genie/default.nix @@ -1,20 +1,19 @@ { lib , python3 , fetchFromGitHub -, poetry }: with python3.pkgs; buildPythonPackage rec { pname = "shell-genie"; - version = "0.2.6"; + version = "0.2.8"; format = "pyproject"; src = fetchPypi { pname = "shell_genie"; inherit version; - hash = "sha256-MgQFHsBXrihfWBB/cz45ITf8oJG2gSenf1wzdbrAbjw="; + hash = "sha256-6miqTjiGLK7r6evfchwuAXTHj+JwoH/CqgRoa5+jDJI="; }; nativeBuildInputs = [ @@ -28,7 +27,7 @@ buildPythonPackage rec { rich shellingham typer - ]; + ] ++ typer.optional-dependencies.all; # No tests available doCheck = false; @@ -40,8 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Describe your shell commands in natural language"; homepage = "https://github.com/dylanjcastillo/shell-genie"; - # https://github.com/dylanjcastillo/shell-genie/issues/3 - license = licenses.unfree; + license = licenses.mit; maintainers = with maintainers; [ onny ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix index 9f098efef8..fe2d8546cf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "ttdl"; - version = "3.6.3"; + version = "3.6.5"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${version}"; - sha256 = "sha256-IR0cDXQHnMDI71Vg50atS98YorqAQKc95EF1+m9cxFY="; + sha256 = "sha256-mplV++N+us6IntNJsZoH4yyKZ8eYplUYuVJeac0ZIkQ="; }; - cargoSha256 = "sha256-658mN3R3opjvqfnIDcbh11ZSOTDbpYnhCgGGx46Mrrc="; + cargoHash = "sha256-mgvMQjScXCmr3HIQtGJ2YWRUhiSP5resL96LUCe8D+c="; meta = with lib; { description = "A CLI tool to manage todo lists in todo.txt format"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix b/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix index 839b100383..2c7aaa18ee 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "usql"; - version = "0.13.9"; + version = "0.13.10"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-hcAwwu1bp7QJLt+mrUZYK6YeX/uRmfRa8JnUfrTzf3k="; + hash = "sha256-epfEw62OXWiJqqvxJ8U9tRy0ZrQkSqa8GL4TluO9Df4="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-BehI6O+WpCcgMGabTFMCpYHN3CIo3Zb5rBQuGLsWRc0="; + vendorHash = "sha256-mOe0rREiqOxwVwVo4S0889cbqVLknVRCW4bSiIh6IdQ="; proxyVendor = true; # Exclude broken impala & hive driver diff --git a/third_party/nixpkgs/pkgs/applications/misc/valent/default.nix b/third_party/nixpkgs/pkgs/applications/misc/valent/default.nix new file mode 100644 index 0000000000..ebd5a7a750 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/valent/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitHub +, desktop-file-utils +, meson +, ninja +, pkg-config +, wrapGAppsHook +, evolution-data-server-gtk4 +, glib +, gnutls +, gst_all_1 +, json-glib +, libadwaita +, libpeas +, libportal-gtk4 +, pulseaudio +, sqlite +}: + +stdenv.mkDerivation rec { + pname = "valent"; + version = "unstable-2023-03-02"; + + src = fetchFromGitHub { + owner = "andyholmes"; + repo = "valent"; + rev = "4b60f28f46bc948c5f3b30189bb9b5fbe29d2745"; + fetchSubmodules = true; + sha256 = "sha256-ltf/srQLqtqE71sxEh7VTQqXy2wOpTSdGDsjITOt3f8="; + }; + + nativeBuildInputs = [ + desktop-file-utils + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + evolution-data-server-gtk4 + glib + gnutls + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + json-glib + libadwaita + libpeas + libportal-gtk4 + pulseaudio + sqlite + ]; + + mesonFlags = [ + "-Dplugin_bluez=true" + ]; + + meta = with lib; { + description = "An implementation of the KDE Connect protocol, built on GNOME platform libraries"; + homepage = "https://github.com/andyholmes/valent/"; + changelog = "https://github.com/andyholmes/valent/blob/${src.rev}/CHANGELOG.md"; + license = with licenses; [ gpl3Plus cc0 ]; + maintainers = with maintainers; [ federicoschonborn ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/wike/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wike/default.nix index c3e5a50572..00cd8dcf05 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wike/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wike/default.nix @@ -12,7 +12,6 @@ python3.pkgs.buildPythonApplication rec { pname = "wike"; version = "1.7.1"; format = "other"; - strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchFromGitHub { owner = "hugolabe"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix index a8848bc338..939611a562 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "zine"; - version = "0.12.0"; + version = "0.13.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ioWgEl+bMaEDjtEQq/4vURS6Q/V9+r72NTWstyHm4mI="; + sha256 = "sha256-N+0FEZ8TUbMs9cwPmURr39wRA+m7B4UbUOkpNmF1p9A="; }; - cargoHash = "sha256-2BeImBebeO4kLXmBrGjPmAjbrsLUaS2y52KSazVITb0="; + cargoHash = "sha256-2Mc1hrVJ3a1tE/Jo6MYjCfd03889raVTyLBzhCQi8ck="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix index 6ef894c168..543a4d3d28 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.9.10"; + version = "1.9.11"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-lzobtncxL/7Lf/+kVzIdyP0dTzerMJRAoT7OBFdeEgc="; + hash = "sha256-fgjuLQNw5Em+wEJSmote6TuFH8dUVDtkQTgCcGhh2ro="; }; vendorHash = "sha256-IxPJBpOSqcramegQ+M/U9p6ls6dStOi0OUdddDj11d0="; 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 b5528c31b4..d7a0e1c5e6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.48.171"; + version = "1.49.120"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-3dFOBl+Iomn8NnCYZ2owrTPQlqqj4LFdtnN4IXhbRps="; + sha256 = "sha256-KSu6HaNKc7uVY1rSyzU+VZSE2dbIOOrsUx1RYKnz8yU="; }; dontConfigure = true; 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 0152a7ed09..202b0cab0e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,4 @@ { newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_14 , llvmPackages_15 , ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit @@ -19,7 +18,7 @@ }: let - llvmPackages = llvmPackages_14; + llvmPackages = llvmPackages_15; stdenv = llvmPackages.stdenv; upstream-info = (lib.importJSON ./upstream-info.json).${channel}; @@ -54,9 +53,6 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); - } // lib.optionalAttrs (chromiumVersionAtLeast "111") rec { - llvmPackages = llvmPackages_15; - stdenv = llvmPackages_15.stdenv; }); browser = callPackage ./browser.nix { 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 65881b9ae8..d867b05d02 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,8 +1,8 @@ { "stable": { - "version": "110.0.5481.177", - "sha256": "1dy9l61r3fpl40ff790dbqqvw9l1svcgd7saz4whl9wm256labvv", - "sha256bin64": "0sylaf8b0rzr82dg7safvs5dxqqib26k4j6vlm75vs99dpnlznj2", + "version": "111.0.5563.64", + "sha256": "0x20zqwq051a5j76q1c3m0ddf1hhcm6fgz3b7rqrfamjppia0p3x", + "sha256bin64": "0rnqrjnybghb4h413cw3f54ga2x76mfmf1fp2nnf59c1yml4r4vf", "deps": { "gn": { "version": "2022-12-12", @@ -12,29 +12,16 @@ } }, "chromedriver": { - "version": "110.0.5481.77", - "sha256_linux": "1bdc4n9nz3m6vv0p4qr9v65zarbnkrbh21ivpvl7y7c25m7fxl20", - "sha256_darwin": "1scv9vvy5ybgbgycyz2wrymjhdqnvz0m6lxkax107437anxixs00", - "sha256_darwin_aarch64": "0gqayzhlif6hvsmpx04mxr1bld6kirv5q1n5dg42rc16gv954dkn" + "version": "111.0.5563.41", + "sha256_linux": "160khwa4x6w9gv5vkvalwbx87r6hrql0y0xr7zvxsir1x6rklwm2", + "sha256_darwin": "0z5q9r39jd5acyd79yzrkgqkvv3phdkyq4wvdsmhnpypazg072l6", + "sha256_darwin_aarch64": "0xiagydqnywzrpqq3i7363zhiywkp8ra9ygb2q1gznb40rx98pbr" } }, "beta": { - "version": "111.0.5563.64", - "sha256": "0x20zqwq051a5j76q1c3m0ddf1hhcm6fgz3b7rqrfamjppia0p3x", - "sha256bin64": "1cl7zbsl0ndp5x1g0p1q511mn72iy72sqxycmlrccs9j8jmaiqgw", - "deps": { - "gn": { - "version": "2022-12-12", - "url": "https://gn.googlesource.com/gn", - "rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8", - "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30" - } - } - }, - "dev": { - "version": "112.0.5615.12", - "sha256": "1kkpfaqr3rzxlj7kn2l8gchvq17w03mcf3aajqv193jazcb083ci", - "sha256bin64": "1ci3vmr6q665rp8h7b1y7gmkv4zczjw5ryf0yycwfcll087ym6g6", + "version": "112.0.5615.20", + "sha256": "0qxifnc2xk2zkmpzc1pzd95ym3i829qzgzd83qh7ah9p64c76f9y", + "sha256bin64": "11c7k87fnfhaynhpp2rjzpzydrl096fjx3gw589nvq1lckbg9nsd", "deps": { "gn": { "version": "2023-02-17", @@ -44,10 +31,23 @@ } } }, + "dev": { + "version": "113.0.5638.0", + "sha256": "0v4hminx765swv0iakg5qw7rk6zc67cn5p9x625jaizz50ahpfib", + "sha256bin64": "07snjlizj30mzcm5fbsg6ibd4jqmcwiykdwrpqmdqq902c3gwc3r", + "deps": { + "gn": { + "version": "2023-02-24", + "url": "https://gn.googlesource.com/gn", + "rev": "fe330c0ae1ec29db30b6f830e50771a335e071fb", + "sha256": "0fj8kfck53hbfz30m8p0mfcqbjs9cjrlfzi03l3h7n7yd88js8i4" + } + } + }, "ungoogled-chromium": { - "version": "110.0.5481.177", - "sha256": "1dy9l61r3fpl40ff790dbqqvw9l1svcgd7saz4whl9wm256labvv", - "sha256bin64": "0sylaf8b0rzr82dg7safvs5dxqqib26k4j6vlm75vs99dpnlznj2", + "version": "111.0.5563.65", + "sha256": "1wg84pd50zi5268snkiahnp5191c66bqkbvdz2z8azivm95lwqwp", + "sha256bin64": null, "deps": { "gn": { "version": "2022-12-12", @@ -56,8 +56,8 @@ "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30" }, "ungoogled-patches": { - "rev": "110.0.5481.177-1", - "sha256": "0rsvkbsrnfkdp3iw4s54kddw8r771h14hf1ivgahmn42yjafkk3n" + "rev": "111.0.5563.65-1", + "sha256": "06mfm2gaz1nbwqhn2jp34pm52rw1q99i9fq7wh19m0qasdpidis9" } } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index dbc63c9dbf..cc3b89f51b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,1005 +1,1005 @@ { - version = "111.0b7"; + version = "111.0b8"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/ach/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ach/firefox-111.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "03323cca47227fea5dfdaf567ccc0e6f627b2f683f227c1a425986661cfc23eb"; + sha256 = "e4b6897f7b966db543f1b2280bfa148302f6bc41c10b36fe558c7b1c93b6c41d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/af/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/af/firefox-111.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "a154e60e529aeca55945dca39f103f24209bd333ea03532717a9a1c913e8cd60"; + sha256 = "402c4cc64a64d852306d3f4fe24c7a7298a2a4d8b8c7bd283f988e5b5355e96a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/an/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/an/firefox-111.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "1ce08e8e075c0be8a1d9b788138f768a8418e1f9c84e8c46d637ecb998eff9f6"; + sha256 = "0b6f6ac27ddbc58ccbdd841fd82ad090df1bf0f4adc014273086a77015dc3575"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/ar/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ar/firefox-111.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "a122c1f05d5b0757d330d12b4ce9ad95e99dec74a4614239f1c38bdb1ec7e192"; + sha256 = "5348a341bc7200fef4f7417eb56895f49c84d0ac7510f747843e2c06dcba012f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/ast/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ast/firefox-111.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "2fff230b93c47380caf1b5ac6bc1de74d32ad31c95a48f15d27727eef65cc696"; + sha256 = "5fa0e650a914a995bfd7527e204ddb76bc8645b905cebe059e6a9611c36e0fe2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/az/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/az/firefox-111.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "5ea933152e6d75bbc18be0b27bd935b7a0878277b507e38ceb80301e77a577ee"; + sha256 = "be7cdc1981f47ec5b58794c69d2c9af3dd79172f51522c9be83dbcf0bba461d0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/be/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/be/firefox-111.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "c16a13db20af472912184c456cd57f6eff39ed4175ae2d6582cce765578bab27"; + sha256 = "0ab859b1a17d60be0daa785bb0c07bf756a65b868b7a3fc2cdbf978705c9907a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/bg/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/bg/firefox-111.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "a9ba17b939b0122e6b27105a4e947ec72f2ebef7e15c1a138be32a888b38261c"; + sha256 = "7c3a6c15da67366b7ccd169e3f8b99aeded81273ae2d24a9f6249e7e8f8a85f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/bn/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/bn/firefox-111.0b8.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "626bf0c80b2b06cd8ff87c035cf7fbb06889c102ea61d4b3f39fa52f23ec0cc8"; + sha256 = "38d7c927b9a1eec5cff34891852642ae597fdff11b823f88ccf0c442a218fbfe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/br/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/br/firefox-111.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "dafc1219e89bbca8c6ca2ccd6f627f52c95bdea5758915d30886ea9e319a80ca"; + sha256 = "abc952c5836fb089a63aef6a0226ec5899c381e803f603e76308105929437772"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/bs/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/bs/firefox-111.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "afdab91c47b60d099a57886c547e0307a8e4eef15fcecba154e988774be4f0b7"; + sha256 = "d888020f7c33bf4fe6a0597f08d82e8690de278c557b8e1d97535735fc05f45c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/ca-valencia/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ca-valencia/firefox-111.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "34e2e43e8a03887b72a59cf4d90d77725b4f6dc579dbb821b3f6aaceb5ae020a"; + sha256 = "315364e1cf5a9dfcd8d96389659fd82183a9190c7cc4e15ef351f8550a3e162d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/ca/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ca/firefox-111.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "b468227055956ae0b86c7a739726c2fb7e76e0c6d08a7a2cfd437fa56376ee8a"; + sha256 = "6a25a6daba3888437978a62a2bd269034b022fc7969e1145ace5d5d05e568f54"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/cak/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/cak/firefox-111.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "d5acac2a67c1fa8df27e4822973d9cd17e4a2c7ec9926839e3ee6a26edd6af6b"; + sha256 = "add65d41e303f9325979ecceb178f86158a15df11535b3dd395ab92294862da6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/cs/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/cs/firefox-111.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "09e4e9b41c6f2ce8023b9397a13c3ed7a255d2e500160d21933bba1b82e72093"; + sha256 = "b8cf05148129eae6f903f47adb20f4853451e7a1929cfb59faf48f1978a6166a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/cy/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/cy/firefox-111.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "8d9b04a2b4c4fcaabada8fa1ab5d2782a43a9255b0cbb719164afb1c2db6d114"; + sha256 = "8018352aa6d09dcb1528510ae343f2d0ebad32e6c8afd2f2e62ae06edcd28fa9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/da/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/da/firefox-111.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "b74bf314cdeba0a93aef629333c4dcf29c34f8da3ddeb4fc22fd0b87ca735018"; + sha256 = "fbd8db1662cbd578b12ad1bf46c010f7229439be362c670776a9ece2e66a84c5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/de/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/de/firefox-111.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "9ef0f3f230e524525f688f6e26b6aedbd3ddc6cac900137d338cdf60bd36e3c4"; + sha256 = "5ff08217efb014e644375daf52635e225080618c43f6e26953bb7ec7e69ce196"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/dsb/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/dsb/firefox-111.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "78ec9d3326a45a43a2633f5460625f44a9f8110a168c049c46bd27b19981ce13"; + sha256 = "2c963a71b2bc50ac31c8988f97d490467c082212f67dd9f8e5049fce49ec67cb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/el/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/el/firefox-111.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "282c80375313f43012181b498c11fbeb6c00237ca0dbea02771956ef2a52d0e9"; + sha256 = "aab3dbf0d32df431693a82e7d3b832274e4ac989a55702bc61994d212ca2c64a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/en-CA/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/en-CA/firefox-111.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "383ea02e247b769d6ff27a0d1148418aac8d050734094c19fb23731835413be3"; + sha256 = "374410ef85dbe4cab0b93af1808878e214d612410c464bfa74f8f65245c4936e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/en-GB/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/en-GB/firefox-111.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c74ed121d357ea4d612cf9334ef36a2d60fb2bcdb3f0b704fb749acb82a45753"; + sha256 = "bb48c387e3e8ee6b6ebfdf888ebda7ee58f1bac97541e3f9b88e6ca0eed84fbb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/en-US/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/en-US/firefox-111.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "9e10dbab89d0e58100c367ba142ff9b3fb02bdfbe70fc341345bbce1374a3efa"; + sha256 = "6aee747b92f5fd6d1d37413e456aac45d1b77f692089316bf5b00b894a83e27b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/eo/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/eo/firefox-111.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "4379116bd321e7d8c61d102b0e8a92864f82f465ac8d5a057eb51a80c75d00fb"; + sha256 = "b0692b9f6c69a78e3fca895432b16a55c5876e412470b22b4c53e3e96a246970"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/es-AR/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/es-AR/firefox-111.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "cd129318793e8946ee79bd454a84b906eda20564ec6ce733d0da42a9959e990e"; + sha256 = "11db0b0617d6217e5be38958b84a91db379883967f31ae872b947a965b330714"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/es-CL/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/es-CL/firefox-111.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "e3df3a1322d0fbb050a6d6ca2a21b7ad938b87d0c234937b3950783ee31d4400"; + sha256 = "490a7989700246760aa4ad7716a8326900905716e24ee34d58b97dd0a8d03adc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/es-ES/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/es-ES/firefox-111.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "57a90d5345afead418602934688d713993ce5432cae031e83f37d31875367f71"; + sha256 = "c74d97c15231f7eefe32c96d91fb519a3099399ba7a0c8d0b520e300afd137bb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/es-MX/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/es-MX/firefox-111.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "74dda6bf670bbd1773df4887dc3ca187a9275ab89f92135d11806294fbf15833"; + sha256 = "0cd9d9b8e3abcac86665ad66125664e596341712ff65765aa490b04563146665"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/et/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/et/firefox-111.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "3444ce4b370e9fef41ea65cdc899093071a54aca1a653c74234bc4df3b1d149a"; + sha256 = "bae9e6b3b9fb9813a36a5a6d92ed125d7e6b70095a6df6f40a700442f08b06f4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/eu/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/eu/firefox-111.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "6000cc8f6aa627267b9e6bcbb29fa2aa38f63b7544823db84b846519ac039511"; + sha256 = "aa5df25429c0dd7370113ecde7f3b79185663a1ea7ec5c79ddcd36de0631354d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/fa/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/fa/firefox-111.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "4098b57767a6f9e497023373a3e9d0aeb686ae8ee036665496e3cf5a7f627905"; + sha256 = "1b6596ab5ca5542f1e81fd6636d3ebd5b653b36e0d1309f74acc65cc6b0f6026"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/ff/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ff/firefox-111.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "6f371af2b72c6578bea62595fdb956325cd41bd1815433c63882a1d5a1e966e8"; + sha256 = "991fc136c1deff6f9f53b94c49e5ad3a4539a07c557f81a8176cab16328b1bd1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/fi/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/fi/firefox-111.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "7052fc5c21f34bc7e523b0b8c0c1a4953cdb670bb4f6077d2f0e12dc6f806a83"; + sha256 = "73d64e461ac095654d26cedd274b6d0567bb3848f8b07257d0047df869be26b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/fr/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/fr/firefox-111.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "41bc16f40329eca892e4725d1e0037005fe7cddbbe9948695ce4bcc8742ff98d"; + sha256 = "ab4ba364b58c05943535a2fd52d8d62b43552226087d29add7ceafc08f8ee080"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/fur/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/fur/firefox-111.0b8.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "81442c2a48ac73020a6da3d55c102f6cf338ed148a57dd32edff2b3c66811ad2"; + sha256 = "e72c18c7101886abcbca3d0b8365743ea1207bf29e45133bf64cfcf52755e7fa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/fy-NL/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/fy-NL/firefox-111.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "8c0114d1e2d31abdcdef066f4e8fcac48b586c729c6202d7bb084ceabb717e49"; + sha256 = "2f33e358fd958655346e9f5b067a7ea41e2ee399692ca4ac50ab24a487944378"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/ga-IE/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ga-IE/firefox-111.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "cbad1c11033cd7a5c684618e27d14a7724dae22e4e524eb3a26bd64c007afe1c"; + sha256 = "d0e0d93511c4ee96e79dd7892d2bf9e752ce895c16401ef4fc0c62deaa70d48b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/gd/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/gd/firefox-111.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "60a3d24bc397e19dbd3bd17f4be1a762c26955f2c994a0bfb44cd9b783786714"; + sha256 = "f1fc1e0e072e815b3c5f7ca78c6a19e07e9b9738574df3dfe14bc81aac27ff7f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/gl/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/gl/firefox-111.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "f48249c71a384c808b901b32eedcaf064ecc76284350fcb17ca8403802ff590a"; + sha256 = "30b3f3d6ea7c7707b9506468caa9a4960106bc8d4362122138400102ad5f21cf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/gn/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/gn/firefox-111.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "3dbc3c4122a321a0181972d018c1aca33f27ea0453a6bf5d4fafdf0a845e19a2"; + sha256 = "c50a71c3c84f5136918565828f4836f0ea27e8622e3d0fecf7589ae0fae30529"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/gu-IN/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/gu-IN/firefox-111.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "f3be43f4fea3574daedd57c4b7af4b74b1ef08c475f0145dcbd5d99b38f64e29"; + sha256 = "f51baa081d66fb9e93c9e27e9170eee86a1a213f9fc9b06c5326e45c8fa1ad98"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/he/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/he/firefox-111.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "296898c4e31dd21feba3e65eb17d5bb2c6a8381c26b7d54c4c5bc0a73be448fb"; + sha256 = "d8ce0bb347e9ec8d0863c7e65a9882cfbb0a2e5ec56101e21e1fd0b639d9cbe8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/hi-IN/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/hi-IN/firefox-111.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "f3b60df7076ea0bbf92c925bd747169cd904a5baa849eab0f814304ba831c60e"; + sha256 = "377104492757f930acdb10e82d79da3a71a0fdd140629f21a3b8bfc2b4d2fda8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/hr/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/hr/firefox-111.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "02673a4fc6de04b0e4f653c4c9340c538135cbc609d0e051b73c135f0607548c"; + sha256 = "3fe52d6eaa6db9c0ac2e65628eda8dc138cc220dba338f0dfecdc6732ae96bfb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/hsb/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/hsb/firefox-111.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e827a941751878a067ffe77a7f3ee468feaa5c9b4bcece1827e086fcdb9910e3"; + sha256 = "efb66ffb24e1b629fbbe30d83c47a0c18aeded0707b13b4a17dd7f8adc57a5e6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/hu/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/hu/firefox-111.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "9f7bcd2fcbe3d51f7e04b07f79401bfe5b5d49115aed0b4edf0c489b65f4b0ad"; + sha256 = "6fa3aeacdb245ec6d2bde07e8a421e4bbbe62a2d8cfbc04ace0d8a5ee16582ea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/hy-AM/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/hy-AM/firefox-111.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "294edc568d549de4146154aebf2b732b215818dd58fc20288eb2d4a8a9a14eeb"; + sha256 = "f0ae32d1e74880bcf30f976ae5eabf6aa1a388d034f5ec3f836422b5b4750379"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/ia/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ia/firefox-111.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "53c573313e82fdb5089ad18338a8ce3a2eab3f2809454a5b0cdf445497642736"; + sha256 = "afb6623a136d855f5ff2b98b88e82279171211e0e5611c7090b491a818ba5ae0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/id/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/id/firefox-111.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "ed8c1568bc2583b6fc7cc159f16a0d92c978f4e88dc48468e54f7e31c058d32b"; + sha256 = "76178cb800ea33812cb38f9cc959c37e3110af5b9c14a0d2d19236d4399c14c2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/is/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/is/firefox-111.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "d7044d53495372d52a5eb68c5c265cdfe0d32be6848a6f7395841c09c602eda9"; + sha256 = "6b5116ea4b958fc0f9ec22399a12fb726338ba24fbc9900370aea1134e9b9124"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/it/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/it/firefox-111.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "080a4ed2955d580940f73453cb884460c3e10c1bcffc8a88250653bb6d485513"; + sha256 = "d117003d31f9c407520a5c37240fe6697a1b5fb58ace318f8e8ed3270d8e30e3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/ja/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ja/firefox-111.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "05e008b714bf195f62c908773a51a4d9c4c08e6001171c11ba73de27b0e061d8"; + sha256 = "64e7c43a3e8ab8ad846879d734989555c63a457535ebf8f2424fe1cd5b37df7f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/ka/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ka/firefox-111.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "431853e0cafc6ec5ac6ffe6bb9eda3107ca590428134905e73623cc1aa17c9b7"; + sha256 = "8314418e43ff9e445d80a18fd01b0507f33baf9e436da664adcb11aaeda9c1f5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/kab/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/kab/firefox-111.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "c25234e46cb0cce5f87cc867e231643dcef4c4ee5931ce0b1c3224a735d72890"; + sha256 = "068c704578f587a1e36022f17b1bc80847dae4e7f7b31f45c37ef2c881f2d8a5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/kk/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/kk/firefox-111.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "2503fd2d0d55dbf3099fa5d36251614cd2b452cfb4224ffabba14916d712337c"; + sha256 = "e86c4b7ea854a7f3994da65ff76178f9cbc22b12da00575f37b5af0c0de42543"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/km/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/km/firefox-111.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "a21df65711f77b348ae05cbe21ee99635908fcdb94e750e9942f0db9c0a17851"; + sha256 = "8278bb53a8e6052b94a41b5618b3d7068b5a4b192962184e1021e46522b3eede"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/kn/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/kn/firefox-111.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "1a167462c3e7b0daf370de0c94e60e40330996b5066a37bb8dd3f8e9ad1ed69c"; + sha256 = "7ae5be43c6d04725b8d5c34006e8c5bd0802646d9dd5161260374ff8df76eb49"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/ko/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ko/firefox-111.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "9553175146f63177e8e57377cf71c48edadfa19a9e918257de486f74dc313959"; + sha256 = "443a9b948ed2f28f105cd34184eabb7b960888b1ae7278d4d7511ee66f86fafe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/lij/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/lij/firefox-111.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "46a751ab29fc99ca9cf49b037848cc4c14d2b674776b9a2b845afffeb6fbb089"; + sha256 = "d202a6f116731917082b76551833cee6163f1804c1ee06cc9dc0a6eef1996ac0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/lt/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/lt/firefox-111.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "76eb297fe59f2623aeaedb55a081305bc7f4871d1fc3cffe7ed720dc0bffb8f4"; + sha256 = "96baff753368ec614498cba4280996361fe0017610e062ee4abf67139ba186ee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/lv/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/lv/firefox-111.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "3a610a80e882f428ffc69b4ea54bd22ea5091156c5b99af71ec4b9389d00c38c"; + sha256 = "a194099005d8d9ae9c81e0d87f5ddc6fa6493aebe72e439f8cade62e3686d23d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/mk/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/mk/firefox-111.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "3676d5b8e3ac072ed1914bb67eaafb3186cd428e3ff6333f9ab631f2bd747254"; + sha256 = "a40b9280719b9f01077d2d5a66c6901f12c0acbd3d6d0b99e358724c15950777"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/mr/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/mr/firefox-111.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "e9d79de0e64244b1318fd9aceceea660d28f42c4980a224e748b482f50f43ce7"; + sha256 = "aa352748e78e9505426595caf84b5f69b09045b0575aa81c384353aebb20fec1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/ms/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ms/firefox-111.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "749979d66c0299078136619525d7ef5a55c73c95c4557f3f56f97c7c7c24c7bd"; + sha256 = "58cb4814186e716bfb3e998828fe332343908875f60a7e82d41867d9922f154b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/my/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/my/firefox-111.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "8dbea79a3bfa11e9a6aadb890013a7851699ab05ef4a83b91752f7fb6cfb0d9f"; + sha256 = "939abe00dfec7f1c9df70c5a4c3a3faabc3664731a26740fc7f14af7a46e33f5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/nb-NO/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/nb-NO/firefox-111.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "6a20637167b63d983eaaf7015f93fa4878860935cce669b07f6620ab9e325bee"; + sha256 = "5d905f9996816a89e9c82d74f9dbd8ee724eda8748e9e2717f14d1ae6e5dab57"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/ne-NP/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ne-NP/firefox-111.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "445153cfa8360b31cd3167cfd4e1c6d9d2bc3dab49d410b81e965dd481e72b96"; + sha256 = "0b5d81104f0d509b1e826ef2297cb53218e94bb58c882937b3d07e047d31fb7a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/nl/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/nl/firefox-111.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "ab25e6d049b78ba01efbbeb34368ace50eb23709fd3797cddf639cfaa2b1589c"; + sha256 = "158a03de2fab149b76b60e2b93336b04a0cdbbeaf9f63a3d3ea79c8e0c36a682"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/nn-NO/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/nn-NO/firefox-111.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "c033778a930f4b6ec5d8d56f64da781840c0c80f4ff159cf3f356c76b733d8cb"; + sha256 = "dd931c658f0d6461e357f2b0762704b7d51d8ddff83c79d9ad1474ee495bd916"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/oc/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/oc/firefox-111.0b8.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "b52c190dbce1c9b99daa284fc598e4f7edb379a87d79103ed4ffd9dd59581932"; + sha256 = "236bff2b99a3bc1b7db39886733a019b20b3af074888e31331687694722ad47c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/pa-IN/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/pa-IN/firefox-111.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "33e8265837fd363ca033893e8f7ee79a0f67c21110e12d2d367edb0117a8c256"; + sha256 = "3457624fc5483f8d357fe6020cb3a1c25cc8574b0b914047b58764397bce8317"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/pl/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/pl/firefox-111.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "7bb9720afb3464cf7c1b422e3ff695c6e6bab2827e4d36fa273ad936ec09bac4"; + sha256 = "2a97af06b75f4ba948c02cd78ab1750fb347c84db2fa09d971d0c83d19ee7e7a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/pt-BR/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/pt-BR/firefox-111.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "42b2cf930c5533b70462314c3b5b28e4c10f341fc366f96911e9ab913ca5bcbe"; + sha256 = "1273e711a3168029aeb60b96ca127c42082dba67415b96ebffb0a5bc05fa961b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/pt-PT/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/pt-PT/firefox-111.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "da54129c3994374ad657002d721a03bed4da0ee5ce0d44fb39bb897c520ca03b"; + sha256 = "01e882cfc7d7e5209a3c769599ae06684cbb2a43fc8b158e0ce2d88ed81c0227"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/rm/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/rm/firefox-111.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "94cdb20667c4031d20561eb4b37f538681cb9d32b7335fc0d9bf2323a01a4abf"; + sha256 = "b55225d89f3987646595637a1e86ae51f158408f4c3d2c2f3abf20eeadefe804"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/ro/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ro/firefox-111.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "5becf148418d41d5f0d87aada1023f0c97302cc3be74d7c7071250de5faa7997"; + sha256 = "3db42b0bbc15c4caf1591f21df0968c289375ac6de5ffbeb5ce2776078a64c9d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/ru/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ru/firefox-111.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "ce417567d6623d1c7b331c68a57aa8615c4264ab8a92c21447ca92af1ce139ad"; + sha256 = "69117125ea2a0df6605d225bfed5aca36c7c696a5e954d9aaeef4b5dcf27d98b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/sc/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/sc/firefox-111.0b8.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "ed8eda80fb5940180f962efdc3ab6e958137bcfbbbabb196729cbb4d06656d61"; + sha256 = "2505e835ad763c275b6238a9a3ae4370ea88671f09fc295abe6868f32ddfd73f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/sco/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/sco/firefox-111.0b8.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "105a4e64c4552a498b0139641e13042c5a4344e8b5dd6ef5c7b27df07926a8ac"; + sha256 = "9798d76b83bebfb94434113816fdae34430741bea99c7b6c5490fdef83309837"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/si/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/si/firefox-111.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "b8b4a68d3fa53c16a408318f9edf4977ae4026355306c4e58e3762b6c7402f38"; + sha256 = "4dd622a082f89e50c05a7f4388ce686f8f41dd04b4d063d4bef9d66d1c3c7066"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/sk/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/sk/firefox-111.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "00c58df90e7893d3842754baaea11c0040f85c2b013cb05cd1ef98cd26f3be74"; + sha256 = "dd7a1db7e909bfa9b89054084fafda3e0b9956a5e379a5321dd1bc4de7379672"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/sl/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/sl/firefox-111.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "f2f28e218ad67c979238a080793ffb264ae30eed470984fea621fbae8853e854"; + sha256 = "68618ea7b56e5d1d633feecc78651a7b08aaee385bb27033d10dc6e6c3f64954"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/son/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/son/firefox-111.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "0148e1932cc6bca138ea2bb258f92fade70b4d0b1de5e3ee9568e21ecd9781fe"; + sha256 = "c65c8c558daa2acb2631b7ef3ca8608507286b3a7fa27f178d523566196d3bb2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/sq/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/sq/firefox-111.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "fbe22ba71a19bc7af54d54640f1980685a008461443e6d7d1fbbf954b13dcf75"; + sha256 = "ba2dfcffabd6d4a9b37b7205586371e33facedcbb6de5b6734ac0071e2ee1f69"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/sr/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/sr/firefox-111.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "4b90d65fc6f544031923e6a07861b82b86c2c59a402cd8f8c47731a8f9bd4d40"; + sha256 = "c68cfea022918652a8e0346b477d0fe97ac93d9239648ba2f085e603d54b195f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/sv-SE/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/sv-SE/firefox-111.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "40e3916f43d686c1f547da8a2386110844f127d7ff13f19fe5b9cbd1e8cce6ca"; + sha256 = "5977903e8770010d72a1329c596751d364e938eacec7f01d9e3d9b47c09d979c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/szl/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/szl/firefox-111.0b8.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "9ac6187af67b1ed9b4892af86449957373012c649c720d8570066c9e99def8ac"; + sha256 = "c5e6daf0e3b17d694c32251bf4f59ef80e005d59afdefd8aec2b62bf0b9ef808"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/ta/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ta/firefox-111.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "c48fd45ee9dbaf3337a60ef2958ff46f6598f7a85a2bd0b99828c19c92c3b67a"; + sha256 = "5ba1ba64f83d1e664257de52613c7025dbedf7140503da0c45d5566c13406554"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/te/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/te/firefox-111.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "61be38b875d23a9395aad5ffd9fc504a6105169d055b67b6e4f8823e6c8f8dec"; + sha256 = "03680fe793073667591a89515d64bfeca23b86daed379ef9b8087323a5ddc043"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/th/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/th/firefox-111.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "23bbc813fe19df09dfe44b5f43518da7863b2893dd12e8d56f31b589877c7bec"; + sha256 = "06048d2b6780d9f4d6641a274fbea4f3ca11e43445a5482fb994fb0909dc7ee5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/tl/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/tl/firefox-111.0b8.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "61d6b813439f68e447617cbf9b557c64725218dce3798eb3fdad9996706c4787"; + sha256 = "a5785db8a15480a9129ab6f5596fe1b3bb01b4634adf23cfe02ddce609f7f25f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/tr/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/tr/firefox-111.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "f5b0b5e23ba1f9e08279591b6ae14e40fc71580779048f2a4ad8c7aa11194514"; + sha256 = "4c71698850877baa9a985569fc63f25bef75570615c4e18c39c9363338ebbb63"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/trs/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/trs/firefox-111.0b8.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "043de6c600754cca34eeeeb9748797285b3da5878399b4008be4c0b26ab29ee5"; + sha256 = "ece0b6f46b94ccedef60ae6d2802369131e4f95a6bca84206d8c46fac2de4800"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/uk/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/uk/firefox-111.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "619d496420c6f82abc246a3f56d945b7d985f42770004f785331359db0a75387"; + sha256 = "4186086dc1fe2faabcdfe0166163068c4ca3c25ed73004c32d81dde90bc47f30"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/ur/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ur/firefox-111.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "111c5f18e0b2fca458d935ad5ebf65b06253fcd4dccff47248a2a9a3bbb79874"; + sha256 = "77ca5c38415decf028a4dfd1689d992758160b6db3c083834b4a043f35f46377"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/uz/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/uz/firefox-111.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "a29885df7d02110d2a138130b544bbf84b22b219218f8d37f468206ffdb7ec10"; + sha256 = "1d62ef67c28db53fd0821bbbc97ef301bb201a7e2680cea83ca979c3d2d8436f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/vi/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/vi/firefox-111.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "a0b96cb4f57c7de0761893fb24baaab8e1f681e5ea4e33f9b37f99331881e168"; + sha256 = "cf08f391fc6e4197f6f601104fa0ebbef04ba25c3aaaf79daacd4a96e3c43773"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/xh/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/xh/firefox-111.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "fbeb2b5bd20519172aed67c1db923ae664513b21e30dee2ab82e36fd7e28ab1d"; + sha256 = "45213c9492edf8fe84ee54ece540c1c74976274b61f96d06fd1893fb133c7600"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/zh-CN/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/zh-CN/firefox-111.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "e6a33571c3d45842bc9f572e4716a9e394f6d0f94c7a3ee2383b581df484e9dc"; + sha256 = "5ee5479bd327499e37a1015b20115145599b5d146d3d706ad9a174f438ae1079"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-x86_64/zh-TW/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/zh-TW/firefox-111.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7aa5b801e39e26ad97e0c5f464a16e2b9c8d30de4ae7cb5bffde4458723ce348"; + sha256 = "4b8c64268b976d45ae0ae828f72ecb361f48827821acad7e48e8494f01b5280d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/ach/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ach/firefox-111.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "27dd50ccfa471c78feac14fbc5e731c654e730b787876efd3f746f0ccc2d0499"; + sha256 = "6f69fb8054a6453473b49f83bf456326daba3bfd643c01484660914da7c57cdd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/af/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/af/firefox-111.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "5445b0e64248b23641c4b6ea40b66cbcc943bb0816a95ff3466a6d0697a56285"; + sha256 = "36ebcc435c3348676fd3b8a1e9ba698367592c262018ad5ad0a9ea123c465af8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/an/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/an/firefox-111.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "80ee13f8a125b97c447bb9863e3a1bec979cddf878f7ab7aedc88cb06ce8a935"; + sha256 = "5995a45cd573129ca4f7b15a6574764fc2099b8dcca0e8a5f6c37fd30f6e86e1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/ar/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ar/firefox-111.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "6605e71ba2aee52d2b3d95b1de25756e8f6bd59123a3c7b6737dd27b2ba3bbb4"; + sha256 = "c09722c62b777d1a4af58346afba51b98c199319bf3cbcd4965a43e4d1d6e5ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/ast/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ast/firefox-111.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "eb4b3e1edfc302d07d4cfce343037d50dee23afe10111b2a495587bb7f1ed883"; + sha256 = "a4de9d5d8d1e7c3fcf057cbc14ff1eee417cb694e33a577c546ef0262277f852"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/az/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/az/firefox-111.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "818cb400371969ef040c9b786947c75eca217950204e7750f0b0130e36852828"; + sha256 = "5ee41730dd46f3a763e7e25b206bcdddb19bbed83b9378dc6446efa1e34a9e05"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/be/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/be/firefox-111.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "da7420e296f1f166e5bbf8a5a102eaa8b28674ebe8e93faff54a0c1142896f5d"; + sha256 = "fd4191fb2e53bd5c7c9aa4980fc239f79cd08fea3172d7200081f10b32dea9dc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/bg/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/bg/firefox-111.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "47fab959f0851c37a67da8499466291b07b57548898a8520099148c419355674"; + sha256 = "2a3bdd69bd544f4ce25f0413e236a4a6a14a880a101e4c3e08a53436a25e5cb5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/bn/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/bn/firefox-111.0b8.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "790861b52526f1c51a7a4e0bfcc9446485478c679223e5c21567326b83275d86"; + sha256 = "3f900e507cdc6497bce9dff1e44061095a9f1e4e134ba8997f3c8216da3df8bd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/br/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/br/firefox-111.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "aba8676580bc2cf6e5d68d4ac9fa6df17be4c83763724ccb21888f6ee5135dfc"; + sha256 = "994675a5486f9dde504cf2070503261740c069dfc7c76c592ffaeea50a50a29e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/bs/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/bs/firefox-111.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "7df38533b1ccbb5af2dc56ab2145da2bdde87939792752a4366f75a013ce1716"; + sha256 = "7c75af45a5445cecbc6a79eb0d496c6368672ad2ba49ed97d825f3c1aeb483b4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/ca-valencia/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ca-valencia/firefox-111.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "6387aa189a7b3cf1d63ea7f5c371844c1f2793e85b1f3b6259f6919040b4a697"; + sha256 = "22b4e45392146a87af87cb3e05db8855f5106fa940977e5f5e43692ccef132a0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/ca/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ca/firefox-111.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "0fdf6a492975e132076d51778865029c29ead230574ab5fb517b3bbfe6099e7c"; + sha256 = "b39958dba542d85a84d6aa8ad584a6c10da72c195f3ebc94c411847912b58396"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/cak/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/cak/firefox-111.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "a36f53a96a96c3239baa945e62cee43dcc2f4a4b0772c9526a9b6abcd64920de"; + sha256 = "30952c36bc1db47adc823571f1a747245c7d6d755f5413d073b3d65c04b129e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/cs/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/cs/firefox-111.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "74895cbedd1107295571747ae0a1d95e75ba472f88b5b3ef7162d12173089e27"; + sha256 = "c5e9970c55fb57765ed539e42ad5d301801497e1027947dc6404bef834a6cf4a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/cy/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/cy/firefox-111.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "7a5fcd4868b7d5c2d70302f93053fe37e5977cd811d6e4be19d3e18dcf28f1b0"; + sha256 = "b73016a0d6cd924dbba755ab642568962236d50d07439c637e7756187e1af917"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/da/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/da/firefox-111.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "54e69ab2d8d73fcba58cff8da80c5b1b048a97cd5de19677136ce251974de789"; + sha256 = "f0e04f6947048b892ee580b81db8f4402c63a7b2dbcd95606619e1789021ecdd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/de/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/de/firefox-111.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "76534410d345d142327d8f31bc92567f221f142a690a257eda559bdb3652e4a8"; + sha256 = "484ee318ffaef22cca94d8c246933951c1b23fdc4f26cbd0d5f7b53ace864aab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/dsb/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/dsb/firefox-111.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c840cc828e9fbde15d7d9d2a94c95e8c3ce9b5218c7d33c1e26b049afe4f9ad9"; + sha256 = "7376bf70cc23715a1338ee6a5666a7f60a753fcb91868de6ad4991a33988a5d5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/el/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/el/firefox-111.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "d110d50c0998a6eb9b886705da16ef9cde873ae49f27b8e6c71b3d07d423f96e"; + sha256 = "c4aa68b64047397803b0f2faf7d32ed464ecca587324d3e57e05de32ab9fad03"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/en-CA/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/en-CA/firefox-111.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "5c14b0c26fb9071819848349dc6468098b62a4d316f65634a873db8187570bef"; + sha256 = "cd304731d2eda48e6bf6fe4f2cf8385e2d88a1e9ba433e83ec50fe21c241b329"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/en-GB/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/en-GB/firefox-111.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "265aaad01d22e86d2804a4401137d7b57787e63a97e7cb65cee043d095751b4c"; + sha256 = "91f1b42e9fa2fbef7e9c897d7783d9d440f5d8dcf21331acd8afbf5fe36aadbc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/en-US/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/en-US/firefox-111.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "ed918ace08f9e5401db1c96080a952dd6dfdd8303dc54634b7633268fd498482"; + sha256 = "a2bd2526ad771145339f95a1557e3a2d71f860275535c523d7b335515bbee952"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/eo/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/eo/firefox-111.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "4db591c553c6a8fc964a4e75418df2ad13f868ba41c6efd9e240d9f73ca84e8f"; + sha256 = "03b3ef9929f865057e67e09d6fa80476d29e59afd08d4cd126ad301659e97cba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/es-AR/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/es-AR/firefox-111.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "0ff496e38264d33a4a94afe4962284b376b3fb97ca03297648f4bdd27d3f5406"; + sha256 = "a5235dfaacf198d0da283681aa44f4e1f82a5a346becb40222cd736622872343"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/es-CL/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/es-CL/firefox-111.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "6efcc8756664b03192932482e05636cb7c0da49dafb2fe38f8ad3ff3993078a7"; + sha256 = "91bcc64fd63a2bc16526237419888206e26daed3e72e69419563f5ff29a097ae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/es-ES/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/es-ES/firefox-111.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "6deb30732cd6e954c2017eb4fba23d98a1d5035fcdada2fdb91b340b97ad585c"; + sha256 = "2c967151f35113f090b860562c0df0ca46399974338424a279b5dee1d924d3ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/es-MX/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/es-MX/firefox-111.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "71e68bd346c7bb1f96502b463bc489e36e1458e0d085921d2eea883740ffb516"; + sha256 = "bdfbdc5281f706033c5dc1c05d4c8432aa6abe954703627a41620725cc0597b9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/et/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/et/firefox-111.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "9a6c3aea25cfda936de9251be87c49cefa5e14c2e4fd0e999d82c04a3c873ca7"; + sha256 = "9caf986653aee4623085c4c8e673a9576cece30edc5ca51f913b1e636dda70b1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/eu/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/eu/firefox-111.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "cc4a03da979132f42b62b684f38dab846aa32a5e928e2426506447960cba8cee"; + sha256 = "2a28f0a6e0eb4562a356bce60686a0afc0ad53fb2a3dc0b058c5bf40bd4e6d77"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/fa/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/fa/firefox-111.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "7199e938097646ca34c59d5b2e3ccb988da6fa287ebd7e2e7d542b791cdf9c1b"; + sha256 = "d33fae3e59561bb7562ebbbc79e48a5766079d3db79f7487d3ab6080ed2452d0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/ff/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ff/firefox-111.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "fc2a4425287c8b720e15fda3090356424328713bd3a50967e467ad76c3162096"; + sha256 = "9435504067c5b71332d787db2f2c8b521a12511f8ae5c8a79967b14e663b492c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/fi/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/fi/firefox-111.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "a2a0830a4495dcd558fa14b6a5622e3862287734543f2e6a2198e416008078cd"; + sha256 = "6fa836e2178a036d2862776615eccab57139149f1295d13e273e1cc35b32f177"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/fr/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/fr/firefox-111.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "ff8011a352503b5c27d8357761435117dac4bfcb5b5d22e762b46a81b102ae9d"; + sha256 = "4e1caef75cbb5a6a13fbdc2a2d7bcdeac0f2b4e83f476f6081c36692623a1341"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/fur/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/fur/firefox-111.0b8.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "22f49eab513ab30f9317227f9c336a2659a8836828d44edaed86d5051f48bc98"; + sha256 = "1990ac58a9225ab9b9c84f03784abb0c8f1c2699ebf3bc8dfdbc89a922079c7e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/fy-NL/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/fy-NL/firefox-111.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "1672f324770d0550f66cd9ddc0b7b5791b011623d22772d2501de11ae0f63b3e"; + sha256 = "9fa1a0402e890f53bef344c019b424df792d2d1df2cc8987b765ded3bba260f5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/ga-IE/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ga-IE/firefox-111.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b79d202c6f5f042f853ab5a122d1e2a0a5a0f1a1a46d8d95654e9234940d5758"; + sha256 = "89335e314cbda962869cec01e5aeb6d909b83146c940f057be48eb346c6a38ee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/gd/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/gd/firefox-111.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "52b0b327bc6147bbf0b7c3487265a11eb1309600671fe3d403d881f754a35bb7"; + sha256 = "6d4a8c3db3d0dacb8b73b102134e76aaa765cb4a5bd7b02966ec1f0afc426e5e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/gl/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/gl/firefox-111.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "bdfc9b57365eaa6dcf0ae0d0994d1c74bc4e8467aa3e17e13cff09095e5ef0ae"; + sha256 = "d630fb3b3ab82def3caf22c641fb38e0ae8baf7d02a35529b8524c59c10cfaad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/gn/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/gn/firefox-111.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "3b11d51c18aa43f7e95d69add0aafc71415f5d53f49ba5a161837b972ba0f972"; + sha256 = "dc61f2ab9cd63e1289ed603fbdcebeae93194983a522b5a8491da6fc99c7b894"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/gu-IN/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/gu-IN/firefox-111.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "60805a58b8d2af520cc0dcf7cec48dd259eb50906da751c642d0c6df70393f2c"; + sha256 = "a757b7ebdfe26ceaa22e920760cd24354c5192682fffa76650f7b95e612cea9a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/he/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/he/firefox-111.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "12eaa70794869bfb7bb28267283f90189aafefbcce855034107f8317e47b4b84"; + sha256 = "d118a5b1bc0b8db1caf16052eff92d846c0e3acfe22b994c448fcdec38eb346d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/hi-IN/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/hi-IN/firefox-111.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "2203a842f696d6f1af8b68b037780e9b1dd574b01f6be08bc44b721242a54e39"; + sha256 = "76c0726ea657ab747ad40a18975c20802298429c82bd94d47a9750100bcb7022"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/hr/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/hr/firefox-111.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "2a9796c3a66b36a6a591a7fe74abf42bf783166ed17dec586abe00ecccc4268d"; + sha256 = "ca920ec313bc7bb6155cafde4c99f935ad8eb6eb2a633b20cee9ca8b449942fb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/hsb/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/hsb/firefox-111.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "77ed83ca33c0a7ce4d5edfbbef143a4e5643000f661d593384db94bdcbb920e7"; + sha256 = "31ddb7a5dd2cc4284f8cc6ec5ccdc027645ba9e293e31a173f10966fc21b63c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/hu/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/hu/firefox-111.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "9c2180f5e34fc30088a35c413d17db43a9a948ad69ce7c214ee8348a37721733"; + sha256 = "63bacd5c6583e6aa2ab5a483756c2a664e6996fe46b5298cccbcf33fd049bf5a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/hy-AM/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/hy-AM/firefox-111.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "6ce264f3031760b8709501e60dbbc4bef01c2235b625ef8137d0446c6d9dbb15"; + sha256 = "64c30c1c3d2f05fefabfa549c8c3227f226fc548f3a29f6a275c18680061f379"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/ia/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ia/firefox-111.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "58c05cb70b7533a3bf2c7b63edabe695dc52fe820ecb1eebd7bf91c239cea81e"; + sha256 = "a5e78f3457227cf9fb79d1fcb64afff0001aa47906d55c5f14933c66214394a8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/id/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/id/firefox-111.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b37998989e665f2483b1f2d0cf119a246b66f91324952315d75b568b7b0b1daf"; + sha256 = "389a926f0bd71c3d40efda1e1011508aaef293a6ae6cd0b641b3f4a9000be96f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/is/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/is/firefox-111.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "aac045a8d3924890ad1df750964ae35ba07a1ab9cd7c38975c8ccddb417d46a7"; + sha256 = "49f0897868f7cdcee43ba135e4e2a20e806ca3a5ada71eb972785ec735935594"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/it/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/it/firefox-111.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "4020a7dd5debc153f22a236782a2134b262e0c90a6a68e88ce25feda0c32f263"; + sha256 = "64652575da342f32467db043511a8c6956070852866787109d7dbf6146d5cdc8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/ja/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ja/firefox-111.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ffa1908b4772f750c1d4b918029af78fd7dcc7f8822db002e3b6672882dad6c7"; + sha256 = "817168208831288e66e5dc81ff667589697de72880c12f5c2d6b5ed70d44f502"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/ka/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ka/firefox-111.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "468fa72312058537a099566d705a11ed0420ad157c091644170bbb755151ee6a"; + sha256 = "aa0cb69f29174e6f54294aec40ab3d0a5d998f59b389b8334f042dd78f7c6f3f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/kab/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/kab/firefox-111.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "2e1338112fd7f97aef8489a17dfd877278a7da70f11dc9f3dd10c823a64c57f7"; + sha256 = "d0a97dbc0df5ca32ad211e81fff35104c166b5104fef28eaa376991e9a8c6e5f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/kk/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/kk/firefox-111.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "c8a7a17229a3d66f59f4c6484bc6e4a463c46a8cc80b05373f370e18255ad916"; + sha256 = "438be59920decfe557e1552ef749babe6b56a344710b893490607339f42e1161"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/km/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/km/firefox-111.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "9e29b5329673e6d0e9413644b5f987662f9e2ae7225341d449d3997e703a7b12"; + sha256 = "655f9d2bab1498453e81bc9154820e9b90479c588852c207b05c249918b97120"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/kn/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/kn/firefox-111.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "6448b89fc23810be56b2614ccc6701796d1f288a863e30c686cbc6b6cc790fe6"; + sha256 = "3c46577c779871f730af69e6a63a0687d8adca3a0975e7b36c49d408a459e7dd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/ko/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ko/firefox-111.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "cde300e33b80ae4f8bfd1b120ffb33738800d2539e50fd06c3e1ba18acc91bf2"; + sha256 = "c4f92c9e58ae19e2f536bef3c8af2c4b26a6f4ecadf5bfd0327361d92569327f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/lij/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/lij/firefox-111.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "f2d941acb7a6405d679f79f8339bf2b7ea9eae56b7b939d6b616e70478becf02"; + sha256 = "510ae40ddcf9192779aedd4ad28bb73e62cc16bcab9d93e9eec4497e4c558d2d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/lt/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/lt/firefox-111.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "296465f5ba7b1b736ba080c24834dd61f274d4d14c3b636f519658ffd8ad3d36"; + sha256 = "108480900b7d7f387ef601c6a185323052a8527fc00e6034f3be768149e6b212"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/lv/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/lv/firefox-111.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "dcc28b8e84432b36f86f24319dbbbfb5a3c9b25b1a9e0410a6beb97dff85d6d1"; + sha256 = "a73a2f6b6bb8f3bde245f52d3c420500ef231bef0727553bddff25881ed882ab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/mk/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/mk/firefox-111.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "1406e9c578eaf35c8f74091eda189f21c6314a2f4d434de15e88f20d3f349af2"; + sha256 = "7371d79a75a7c9cb3fc59e9ee1a40b36ac1d438c0e1075f4c0783cac3ab16ed4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/mr/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/mr/firefox-111.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "890871f10fd7cb7d2fc1a6257b4fb452a22dcef0da667328c878a05cf24eed35"; + sha256 = "63f07ea1ba8628cb0a44dcf0808c53c4a2fb81a186902b33b4345fc3e9cd7d1b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/ms/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ms/firefox-111.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "4a7a68cca69a6e758d229cc1da64c2d9c49c2a6238ba5658e8582a357ad98283"; + sha256 = "325f6724072108011d4664f687040538bf88f3a0e9218aa727155e1fdcedde42"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/my/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/my/firefox-111.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "ad05b3774c49d58dc498cef758f09cbf4805502172678d8feac30b55b6434886"; + sha256 = "63f0fc40b3d950d61ba9ee9a78d6e9fae59fdba10f2b1bf8cf9bf90bbcbf2fe1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/nb-NO/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/nb-NO/firefox-111.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "317ec0833d7b65baa63ddee02b2056cbfb7a4eca4ef4d270e91c3d1183205727"; + sha256 = "af32243b16b1fef4806982e0ba5dbed64dde4150f7c91590f74503f5c3b782c1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/ne-NP/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ne-NP/firefox-111.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "cb2f2e55c7fd4e5e672660fb34549282983d3591743a170149acc01bf2e36847"; + sha256 = "19d3151164c72c9ce792fc3cf94086eb523db5a77e4c077e18bf5a38153be611"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/nl/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/nl/firefox-111.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "451310f13749c149be18f1cbd504c2885fbe55460774c6763f8239d6c8693c35"; + sha256 = "e602d6893ec553e14474c61a918ba3423bdcb7bdd38e630fb031017cb9a7cede"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/nn-NO/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/nn-NO/firefox-111.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "04f35f51b6a777619edcd5ce0d7f6e6c00d6612ce670d37057963405fa9b9d93"; + sha256 = "b601172d67252d83317a3f58523f2273530b0c7fa7b3edb1ce3fc6bde6b700a4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/oc/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/oc/firefox-111.0b8.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "cce490ae558e4e9b0d4de5d272b38cb4632e8aebc27572b10f416011d8c61456"; + sha256 = "6e9366506b6f71f3cd26c797b70a7b13266be64dee185dbb048c6c00832191aa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/pa-IN/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/pa-IN/firefox-111.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "dccf37b2bc029a8a185766497817d6bf5a3c241d5f66b0b039cbeee93e58b2a3"; + sha256 = "8f5099c9d4ae4e5296d0d826f9c46045c8489c23f6cf1579f8bcf7b3cc26ffde"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/pl/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/pl/firefox-111.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "f6eea6379e6790265f2c696fd9fd2b50ab152ae03e094e68eaf1fbc268c0e1e7"; + sha256 = "0a5d3730799ad485c09df28d9a6425af9d4553decddb9d15ebad5a527704030b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/pt-BR/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/pt-BR/firefox-111.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "fde1398d37426180b04abae803625145ed400434d2baae5fc230d47955764832"; + sha256 = "7bc8f6b0222ce4504dd3749545f1d3e7c5f50b2bf35d0c779477df85bd02e8a9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/pt-PT/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/pt-PT/firefox-111.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "41bac1a23d23e4b1558b1a7a20898f4f30b13f847a1e4313ddc0d4a58e50b7d4"; + sha256 = "8802dc061e9a97496db5d88d217f5251fc00c7db61eb94ef773a01550cc87c8e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/rm/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/rm/firefox-111.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "1ffed3c5d34bf37ef6f26d1b48f8e2c235afbd5467e40be78b3939eaa0e41e67"; + sha256 = "5e56f1dfe94c347b5daa52141785ae3c2ae6d85ff01cde69af7549e0eba5767f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/ro/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ro/firefox-111.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "cb1e492354a89aff68fab738076da864db92b627f9b1a4ad9c7441e43f604593"; + sha256 = "7a81f507868bca0e7fff5cc9e31d00b1e74fa9ce23b4b027bb15fdb2536bc0a6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/ru/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ru/firefox-111.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "024eaeac39e6d756423ba44c3ec14aec1ca036985cdf3e6d0c1fbf57153219f2"; + sha256 = "82184d2b055bc4206441cbf426a0592e0db4e2940e7dd75a368bb0adbc7cfb05"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/sc/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/sc/firefox-111.0b8.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "949c4e3e519d2255e1ce4a855dafe404cce413449d88b60a5a7f5e4780c01c00"; + sha256 = "4189a8125a485490b3595c0752ba935baf378c716caefd4be1880d1804a448cc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/sco/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/sco/firefox-111.0b8.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "f35e9434d6660685ae4dffc14017e194b65597c5e8555a0b9b5f7e49448cbbfe"; + sha256 = "724ec1e60ebf284db7f7c9b3b42804d9d7d36fa3bc139b0f95febaa4349d32d1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/si/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/si/firefox-111.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "9ccb0725909c96fa01b8c0bd1d24acb6d14b66a863c23c8de27fdd21e80f4124"; + sha256 = "73b93ba26e319c174953dd3a35c7096e25405f9767aa1c86d65f578288d2b005"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/sk/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/sk/firefox-111.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "f7796a1ed37284fd2e171be492cc0d9879ab2272d21bac2e420df4dfca39928a"; + sha256 = "e6f897097a92b3d38f019a3d21999b30fd511dbed37a7e4629fea038783422e9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/sl/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/sl/firefox-111.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "d5d252bc0d1cc85e0343f64d32e640b5e7ac51ffe858a08d7b33fa0d8b584687"; + sha256 = "5b29e785c41bfa0570881cc3efd4b93d5ac1416fd9bf5f7a1c817133f14d23e2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/son/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/son/firefox-111.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "3fc328b73c32468473d22fe79214cf96b15e7fe81a3bfe90cf310b4e5923b308"; + sha256 = "eef9c2bcc4fa10c8473d66711580424f021025a8ce7c5d2c4bf96c96c45ea451"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/sq/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/sq/firefox-111.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "5f852aa346c55630333f3915e009d0e51b782c7fc13ab3b1374eb898b3028c0b"; + sha256 = "7aee66a28ebe89d41cbfdda8650541b98414ffe5179e122bafab730c370d91cf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/sr/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/sr/firefox-111.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "a189c6486508d2e61b279237396b6e52dae0db99a0f9381893e87c16652b5e48"; + sha256 = "e90b307e3b2ec5824483b9db02d55f833659793c5dac5bd53eeac623fed51eb7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/sv-SE/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/sv-SE/firefox-111.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "afe6b71a3c86ed6d105f6d949bf0c14f5c6acac052835e15db9db772ceca6ca1"; + sha256 = "17aef104f240537c5a850a4a6bd321b3354c2b871a96fa221a2dcea79af640c9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/szl/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/szl/firefox-111.0b8.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "3dbedc96cd85f53bdcca5bad397cb91a4d394376fe2a6705df680ce2658ae697"; + sha256 = "9264ec69afad6e195cb19ff2aa0c5e66e37a14ceea62ac8f6031e6ab8f1a4fda"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/ta/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ta/firefox-111.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "426a85838a623fa3d5ff084e33b1492a7b44bf982ec438ea880b3faafc8318b6"; + sha256 = "9ec6f648f46b681a6bb19e955aefb7e31ed341074b3c41b4c6db3bdc2bf96144"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/te/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/te/firefox-111.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "4fcffd4628ad227aec9ec857611c932faec102936d8d9537e3f393eb5330e3a1"; + sha256 = "59bb33a1ef60d43f274da7c809125c49e446947df932fcd33a062eb5956eda09"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/th/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/th/firefox-111.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "3434b2ebd3daa325da592bce1e7c1ecde4ebf545c907f912b53ed4ce282d7f15"; + sha256 = "f745dad817683afe89aa89e6d86773353d21d0bb59366927238c25f90f96189d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/tl/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/tl/firefox-111.0b8.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "ad90ef3b795b45747b5c23238e24d97213eba85eac327a24c525d9ff466991b3"; + sha256 = "3380aa1f1f267980e97c828d8877dcb210230fa00863bff2489c7fb84699e732"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/tr/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/tr/firefox-111.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "c65b30ea9329c09506aa8f878373b6cb82aece2ecd84d48b63972e61471f253e"; + sha256 = "46ddb752092c7d00a68de0167c23ca04ad156feee57c54f677bb0eea1f7ac06a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/trs/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/trs/firefox-111.0b8.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "c44bc0d89f5c2c3dfeb7c2aaf60ec9a66f582e3174e1ae380ea796a7c8df1eea"; + sha256 = "25e8f27c52c99d5ead7481b8f3f26d92f1ab5715fc4ba1c6ca5ee2f01ea6f659"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/uk/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/uk/firefox-111.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "e7ec72c0c489da16251a2e677a29864fe9e2ab68ab0cdb11089791ffd7d9bcf7"; + sha256 = "4b102bade2fe9cf589f098a29f72aa993a256acadb7326648c167f2bee381153"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/ur/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ur/firefox-111.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "821d6d854509b0d5b5b59eddf6f00d99e9b8dce2dc4903d4fa9f8a1c1567b93b"; + sha256 = "ca73db1c3865298c851b7d74ccda685954a5c98123100cbf95a292c09c5dbfe4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/uz/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/uz/firefox-111.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "d280e58d1fd7da8141345d19ad744021269cd6fc822b55090532e7ba083eb936"; + sha256 = "18feee2b0eb9c03ad065d42389f5684778399169cca59dddb443e1a6d5af8547"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/vi/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/vi/firefox-111.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "c2c43372baf06531c06660e5ad4ead18567aa6fa6bbbba9387c71c1b1d600489"; + sha256 = "fadf2e73f49ee4b77b204e9140ca6272727e5213386482cc8ad1803a2034cc57"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/xh/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/xh/firefox-111.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "61df25d9506e0f03219ca8fe0417072110c2f67380df4497c625bf1fbebc0921"; + sha256 = "d3b659de184295da22231304c781ae3bf9bd1a86973eb7a85ee0c72b003a5cc8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/zh-CN/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/zh-CN/firefox-111.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "c2a4d764a642d52876e13bcf24eea6c5e389f65c172782a63b307c744958df1f"; + sha256 = "2e0f4a12c484cde191f44b55756627463ebb0328a065853eb76468745d171f0e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b7/linux-i686/zh-TW/firefox-111.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/zh-TW/firefox-111.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "fa4963ca13131d68a0303cbba6fe4df4e271270e8648ddec0b81c18d9d68c711"; + sha256 = "419a41dcbf11ca41c44bea73988c9c1305654ad8ed48a00cc2c753e36252cac0"; } ]; } 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 7ca36be5b3..2e9fd3ce74 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,1005 @@ { - version = "110.0.1"; + version = "111.0"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/ach/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/ach/firefox-111.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "aee2414870ba55a6462582f9ad605c5e0bf5404411147d224cbd12ae31f09cac"; + sha256 = "afefb6cebc83ba96cb02ff7d92e53f7068f129a7c1df076fc0e775328a6753b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/af/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/af/firefox-111.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "3609df8bb5f158471883f592796d69995178f1ce8a3bf6fad5541830296f9474"; + sha256 = "45af4f5760aff38d4cd925e636a90b80c4299bb7dd14c662e4763c703ff03be4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/an/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/an/firefox-111.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "53502baff2b712342f577ab27bdc70a887457dd31066e948574d36cfab3678f6"; + sha256 = "5809e05e5fa33c51abc69a697ce0db26270e1028cee40ddb5cb305259faae6d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/ar/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/ar/firefox-111.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "9bceacc52ac85b66cc0a5f68df52eb8854fe1e1808ffe8220f0d87ba5d50acd7"; + sha256 = "8d76bdf776089d686f7a120a390cff51aed6b9c8d1d994dbdf87309e7872514f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/ast/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/ast/firefox-111.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "663974c7f4d980d13568f2f70dd1c1bd2840111ecbeaec402eed5699c9677233"; + sha256 = "dcb2a442f5694a3417dff3d0b901e3f548f9b856b48043debda2ca3f3c41c30f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/az/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/az/firefox-111.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "ed9e00041de1b8dd53f8bd1de72b2252073943a2e12c09306f71fe6657c70952"; + sha256 = "5c5154b8c9b3f69d4977f8128b7a245be6442d53a8119c71610a811ffc45191e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/be/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/be/firefox-111.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "93d36d2b6f0f9d9fb0dacd442274de5fd51dbf9704062cf6145df6e22c81947d"; + sha256 = "e21652109f0fefd30d9492f3dac2dd22f1a0d89ff525ee7cb3bb8c791f1af42d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/bg/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/bg/firefox-111.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "da8071eabffe88ce48557e71fbd2e109b6bd48dc7671183d9b7c9754d37feae3"; + sha256 = "d5cab77c1054ab627a42a92a4afde061c170d9ebc2ffd12dd497dd11b7f2a8c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/bn/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/bn/firefox-111.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "374e6090dcbe6ed4110623470c47519696bd77c4ad4084a442c41840d05fc1d3"; + sha256 = "fe159cfe5935a0e80b6f2f1c391ba38e53203e7b5c38456b0bcc166b850bb4f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/br/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/br/firefox-111.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "54de2f80e371f0f34e439d068db805089c57c635b13507488b714ec1894dd437"; + sha256 = "fa269a954e340eff4f81347fa29e52f0cf8f738dd15780435b89b9436e09940d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/bs/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/bs/firefox-111.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "a79d8f7a8e7237831f35427a948364fedce6469e85fac106e97d2a976fb1ef52"; + sha256 = "612995e89075135cd0a553440601a34695f2c1f29af818624171d2ddc2479208"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/ca-valencia/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/ca-valencia/firefox-111.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "8ae65481fb5117c24670c7582fdce65032086ee999a5da491e3d4702b4be73bc"; + sha256 = "66cce3329b69bb27d5ffcb723d5aa63af95cabaff0529ae21458a0937ba052f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/ca/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/ca/firefox-111.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "03b9aa6d6e7c5a60abe1ce4c03fa3f514663600ed6cfa279bb3f0f945ed6a2df"; + sha256 = "1ccb1cfdf46c77a8ac2a450bc015ba6555b59edd5371a98e649fa69e45d70321"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/cak/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/cak/firefox-111.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b31a8da7920f335640ea3fb25cc4b35b5a1d02a0a136884dbc065a7f89a331c7"; + sha256 = "e387b01a3ccf421563fdf2884380c89b90a450b8a19c6aec9749cb9f4b2b50c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/cs/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/cs/firefox-111.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "b75405477fc50e0a415ef5f765d2ba2fa20ca2891bc385f58c6393ae5ea9e94d"; + sha256 = "0442b63e8765806a6d0b7f26e3c0a5353c702782d6fb0ede4f4cdca395544eab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/cy/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/cy/firefox-111.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "3aaea31f86f5f31db563452de8285cae8457a2d8d7a6ffb29b04499a3df20e74"; + sha256 = "117738e3bfef38afc360cbb618620c42aeb46ce4b1b5789cda33b3cdd05e9ad4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/da/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/da/firefox-111.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "8bdd20205aad476a535d805acb8a2747624a105e4ff71013fdaa37fc475fa93d"; + sha256 = "e049d1619346bcd9aa604136dc37762a4363aa852f38dfac8d5172ba5d626b95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/de/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/de/firefox-111.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "7b6abc598a385af6e3afbc6d52232891b4ac1592bf2c9532c80dfa39c2f2d878"; + sha256 = "bee54aeb3056f55d15a510830cbd864ba287e682a6b9aeb0fd4d2d62f1ba0153"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/dsb/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/dsb/firefox-111.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "38f416dabb43e9ca6e715833c2691345424e1470a7450027e1a7d183cc6247c1"; + sha256 = "76235bcb385e6b7f6d034543a9c5547c3bdcce57070a90c378e410635c839fd2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/el/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/el/firefox-111.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "50376bfaadf0b860724483a41df176ca07d02ce6f32fdea88ab29d8281804b47"; + sha256 = "4a365b6ac0aa0329badb6e1d11a43f6aa009f3b1d9a77f6b4d66f745c1dab84a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/en-CA/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/en-CA/firefox-111.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "6e87a695c187c0b923fe75ed6d800e32691dc4883b3b56d302a0329b5a2ecb2e"; + sha256 = "c628a5369923952647f8ac8550835b14609b861ba5f7c53ecac51f596906cdc6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/en-GB/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/en-GB/firefox-111.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "a0fa6cd503346767806980039dfe9d1c24601bb5b7cf167e50e25463a690dcba"; + sha256 = "a66a4a795c872b08eb7d5bfd9c51da2014b4f9d5d7e2d11fea4940f915dc7761"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/en-US/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/en-US/firefox-111.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "0ffd6499f8e2bb31d5321a6ec1ed5c2fcfb22f917a49a2b0c2d8b6fd379a1e7f"; + sha256 = "49599b5b0b24400b564af91f4578314c0e069347aea76602e7eca9d8055b6fc0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/eo/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/eo/firefox-111.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "e63984b4a5f704537d684a9f4bf9ca520921e0d43a3d9fe92bbd7cbe31960fa5"; + sha256 = "a1fca264db6ca00c181060cb63b80aa06b076a23001af8cd030771f0810514d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/es-AR/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/es-AR/firefox-111.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "2767d33a6f38b2b94ff0d81cd1e4d72f90b7ed183c3dc11dcf270366f00e22f3"; + sha256 = "7f79140fed2f84ab284e2337d7e107683878877bb2483a26097f0c2981719a7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/es-CL/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/es-CL/firefox-111.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "1313ea0eaf5cf33e4316a6636288554bdc70424c50380a24633c553e35811d1c"; + sha256 = "bed5a2fd201072f0e6f388910c923b0c10715d3931e068eddd2016d5ead01fa8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/es-ES/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/es-ES/firefox-111.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "a0b86d43f36e6f0135506564896e405873687de3818c75bbabf0ca07801cd53b"; + sha256 = "70fe15810648f97d35a6c50db9841c73d8500fa71cb7ac499a367901f8e6e83c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/es-MX/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/es-MX/firefox-111.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "2d4fbf65a31a8b307dfab66b403126c9c15f42b9a02791f78fd2433b7ffd439e"; + sha256 = "043d5c3cbf028ee3c0ab2564783b09fc7df6c3e03e9d4f48aa62d60debdd2f18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/et/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/et/firefox-111.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "7e58f3decd3a65bbbe0fe44c5ad327cf0fa200dd637c6c415df487f698412746"; + sha256 = "87a3a6619ef17352cfb77018fe03cc0a75d6a55acc02bb2ff07cc9b96282dc96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/eu/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/eu/firefox-111.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "b8acb262ba413ecc1de401fe15905a5e74255279e804f1dab537d23045391b61"; + sha256 = "ec0fe2a82f795f076ab8026fa6cc47401eae098afceb7ffe7c70d010ae961344"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/fa/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/fa/firefox-111.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "0216660023dfbb6135974a2cd772c600001ab9e00ded2fbe23ec61accbd98f00"; + sha256 = "cc358a937e33c810b099afcd5118f35c77476c2642379fd4a9095eafe5966517"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/ff/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/ff/firefox-111.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "1d9db6aed86d42cc66785c7b29359ed37ec12af6533c4d5883d20f3d00581254"; + sha256 = "5a30cd7ca1e07580a54f8c4e2b8c40025048b56814c4e79e91e01b70477fe4b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/fi/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/fi/firefox-111.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "43649cb1d383f123e1fb380180c85fcbfe92cbe2fc1b09d9b497150b61b51e9c"; + sha256 = "f8f4687610e36f0c2b107fc553d0157e322637e66f86c6f086d8eb8b49ae2326"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/fr/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/fr/firefox-111.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "9eaabf6eec0dda6be37890778bb762bb43b94f246d111b6d3208340cb94ff048"; + sha256 = "7e54d5e4a758cb99526c3f4a394bc0cb744452a845eac8cd969987ea2f51a3c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/fy-NL/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/fur/firefox-111.0.tar.bz2"; + locale = "fur"; + arch = "linux-x86_64"; + sha256 = "92f67ecfd105448cb14fcde2dd4293ef05c4980e45d61f3044e4462c5851745e"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/fy-NL/firefox-111.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "e28cf365c39dcc146182077dacbc6b55da26a0f7e83587e9fd127e388fe56eb4"; + sha256 = "4e4890b9d53fe619934e0b91d59788ad2297fc3404626e8021f92cba8ec993fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/ga-IE/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/ga-IE/firefox-111.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "685cbfdf971846bd2e5faf08aefe02add6723e0313b48009c2a5ec8a4b2553e2"; + sha256 = "6e16daad967c3c566bd97bfd2abc55d1a53beb523b27c03b71f09efbd2ce7d2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/gd/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/gd/firefox-111.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "219653e42f00e1314ac99d97dddd88407d4201caff80772c7c71d8f3fc628bac"; + sha256 = "44f615de18617b592bb5dcc553ecba172b2b57e63dcde333f13abccb2d0ce26e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/gl/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/gl/firefox-111.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "3d6bf7007316ed8d7f195901fc2631ac9c761a03853ce1f21cb2dd6cd776469e"; + sha256 = "7f703e629c02f3ef53cad9bed6536f5897e92beb4713cf7f2a373bc2a3139f4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/gn/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/gn/firefox-111.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "47ad433f8e9a7839b2c399423db2587062dc3d0de73d34291f5bb1c03d8df677"; + sha256 = "cb300a4c54b3df24d5f395d8d15fb3410b00b17b5dbfdc9c1c9568fda5ede86d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/gu-IN/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/gu-IN/firefox-111.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "ba3b9f4f92513959e2319e24e5029d8d27d1c50d4b147c5a82919107d80090cb"; + sha256 = "116e0a07cf3ee16170135a4b05a011868b898aa8f3f3f58011c09395307132c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/he/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/he/firefox-111.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "5a1fed9c85f142e17ef6c29bdf9ca800b5d1048240038e45178ea0d408e7bf89"; + sha256 = "5440c637b9a37af1d13d128cded438e04be3bf83a11b1d8bf0b998211edac9ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/hi-IN/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/hi-IN/firefox-111.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "c8232fc0f15ea17ec64ee92900c7bf264938249511ab186d47d6b5e414887e5a"; + sha256 = "a50e5a379ae0e2cfd62db0a1d03c8b40889431c5dba7506edfdffc24c0198a6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/hr/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/hr/firefox-111.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "9d240713d96ee9b633734c14c0b5bd028ec8c472f845d6fdf6ac22e13685426a"; + sha256 = "c6b6ed98fbe8f6e89a906aa2c117b88bb197d4e97683af786d2a6cb4c8b01af2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/hsb/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/hsb/firefox-111.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "c164d2a9a9c914a29f8f6437f508bcc981d4954058dfe2eaf0685f7de9dde6f7"; + sha256 = "3246ff5ec617437f948620eba5538f7a3678cfcf997f72b918192a7569b36cc5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/hu/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/hu/firefox-111.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "5a8478a32a58a0b76c1c67de86f2e6f6e0b0e241e2ef997dbec38ddec3bffa5f"; + sha256 = "3d2a559a1dbf9cf2723bc52eb37dd79b1a8b5998b90b6f2ed5621d267e913e8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/hy-AM/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/hy-AM/firefox-111.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "a16e9b49ee29a801d9558ef8b77ae29799104df2a7bc7fc30eb0fa260c9ff271"; + sha256 = "860c333cfbb1bda62d26792972a8c2220290871cb28e53d27385c9da22798ad8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/ia/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/ia/firefox-111.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "106f675467258d663d5d323c40194159f6ee583fb0ce3aab00a78c29a5a26ded"; + sha256 = "efd6dbf3c92acb060d687f2227df9e1ab4c191f37224792323aa1596cdff5100"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/id/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/id/firefox-111.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "6ed0a5e5e60c0d001588b51661d31e0ea4b5318e49d40a8420ba045d2f0db875"; + sha256 = "0c02a5bbe2b6a408b87721887ce118b93c0bde4090b295a55d09b0e3f8db8be7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/is/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/is/firefox-111.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "c9d5a22b59dd0d1637d81eead0608b19ce6a0dabdc2b11cfe749857143bdb7b8"; + sha256 = "84fac1984d6590c550cd17189367c801f39d6d6f7c651555480b1d19a0a9f79e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/it/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/it/firefox-111.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "e0c4275f64d5f064f65416a2dcc676c99ed3f51b34a293cfefe452713c29397b"; + sha256 = "017411001d2a23b1dcc4a1f9cae201b0387028c777244707d19ac704906a4219"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/ja/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/ja/firefox-111.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "45c2256e7f4034a80116ccb601ccc0186650eae153511a9ce2d8c328a03fe4ed"; + sha256 = "144d4f1458dc5fded8722d4182f7635fa50266c151141f94a6e9c5e2d504434e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/ka/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/ka/firefox-111.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "b766346f5439ea2ab2b953e0e40be66a1c4a5dbf27af1a9cc9d440074238a590"; + sha256 = "19da32917438739b4c6036abba906ea7569da59000e15a8caa11592a06618fad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/kab/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/kab/firefox-111.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "42d1b54c373b5f85969b65ccc93543a0609733f0ce9065052ff27a87e53a1112"; + sha256 = "014af62d094671a7a3ee8d350920617ecdc93cf4db52afc51b27c64b51f33515"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/kk/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/kk/firefox-111.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "f2dcdac43c74e7405e390b58869e7ed2d884f3ab615eaa09f893d9d45b75cbdc"; + sha256 = "2731feaa80eefe056fd2354efdbed55ece27d9c65a8e66124f14b8ca074fad54"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/km/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/km/firefox-111.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "eedb7823d456c811d5053a73f48fd93bb7d5a712e6a62ce25fd1dd85f3122735"; + sha256 = "cb3fe0679fb824fb6cb1ffddd684fa4edb36565520fb41a82ff9b2df3487c63a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/kn/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/kn/firefox-111.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "9d1f73333e734efcaccff5e2a12cf0bede0718111fa1eac19117e8fd5ee71536"; + sha256 = "98b36344e7788afc1f1a1f15b3e3059b0e31f329ed047fc5c9251e405578638f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/ko/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/ko/firefox-111.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "af1ebb3287db1c46550eb4d651f7cc0b30c0007363a5bde1cadb0dad8e38876d"; + sha256 = "d62373b033229459bafa760c69706cb331c506e955cb0b6bfd06e9e15e99e2cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/lij/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/lij/firefox-111.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "666163ad1c9e731d670447de78565437964c5065fef5ce9c4e4efd6ec46ea0fb"; + sha256 = "6f6706846281dc2d061df92ae937dd449523c3cb0d513c02e7a6255cc7edc1a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/lt/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/lt/firefox-111.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "28193a958282799470ac2adf3afeefb4d38ae0306a63d1cb65583fea6d7f7574"; + sha256 = "50c1123e650fcf0ae6443b7e5a54c198802f7f8353e53f544fc1a0a87369d221"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/lv/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/lv/firefox-111.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "54343931381b89fefff35335fcbabdab076cb9dee11e13de7f57127ba2e7f9fd"; + sha256 = "efdbbaf7627ae197e8fbcc2e5258646096fa35a341b9a2d980d376211aa1d644"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/mk/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/mk/firefox-111.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "2a8dac04fff428d3e1b746fe5b8d83d7ccc8622940844895c0c93db03efcd8a8"; + sha256 = "9430c27e9f282c0c610c5ebda7f09326d6220253a04922d8e7af1038a3b759a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/mr/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/mr/firefox-111.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "3d1b31ff55cd463b1f3a990714cd9ef72161ec03aafcf9e7182ee553ac876743"; + sha256 = "ae5dc0c04981fac869000263e68a08b2f7254265b9a0f136edaf4da19b1bfaa3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/ms/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/ms/firefox-111.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "6d71fb4410cb77b9cfa9f809737ae786b6c53805fc6e6812387fe2edf08b83fc"; + sha256 = "8e97bc2e7bb63d16d8c3a16d2445455e47c1d10c3f6761c00848e020e86b2550"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/my/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/my/firefox-111.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "0217a44049d6cfb01f533e0592da11683c422ffbc1787ddca3568aa70bed3572"; + sha256 = "e72f08c2b1a275e3776ac10c1308951a071123bcd53e0365911715e008d1a42b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/nb-NO/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/nb-NO/firefox-111.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "09fdac6940bebbf3a962eb7c30a7e4ae7a1f897fcb5b22770695ad5d176fa528"; + sha256 = "ca91a2d32433e6caf76044bb693cab553b22b00f58fc3b553e1c714433b12d19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/ne-NP/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/ne-NP/firefox-111.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "d2d4d086255ae1b8ae1f20778fb5819d8fbaecb8ae8c5806c0eae0d6c3bd5b8c"; + sha256 = "1c055f3ff8392dbaeb2b17d1a1eb4c3d6d57c3d37b69d9cc0ed38e2267ffe6c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/nl/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/nl/firefox-111.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "af19c46d124be6e721a6fc186309478bc27d20e5a5f8689706c0a1ad9e02d2c7"; + sha256 = "696afea6f607f7c17c79051ba25ff86c8d4f8e662dafb34d7ad52fdcdbafa9fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/nn-NO/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/nn-NO/firefox-111.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "c583ee566a3bbe21a27fd329997164e882ecff7fc80188c33b0bc5e8e7d9c635"; + sha256 = "80031795e447eafac303fea9858a13922466f99c6abcc3ede76603a008a368eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/oc/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/oc/firefox-111.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "81011185fbaf072aab953f81501c1aa2ab019a23d59ad1beaa3fddf9566c786e"; + sha256 = "e9a57f5b9441318430f30513bac3a15a265ac3866054a08dac4debe26389b7c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/pa-IN/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/pa-IN/firefox-111.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "10d11ce29294a59de23a2f5ef646ac08503ce722c3451aef343fce456ebe8f5a"; + sha256 = "94dc3b687191c9b214c581dbf475b43b1e7e006d1c968000af63cf1fd1045cda"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/pl/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/pl/firefox-111.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "4bac2dc20c8910c79656c9ed6a8d6fc0db96d4f0a9549a90e5fab1889e23a46d"; + sha256 = "f897abf0fd26e54aa88c0a54f1286eeb185ab3577318529b113044bea5d8ef7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/pt-BR/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/pt-BR/firefox-111.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "c2b101310b293ad5cdcf4131a4c91637cfcaef0cd086a33a74bbccd9e2e10775"; + sha256 = "e775ddfa51b267454ca068db56939214f350ae370aedd8b33c7ff6ba627722ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/pt-PT/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/pt-PT/firefox-111.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "62329f3deb8b6bc1c1ceaf2a88725c646e9f8efa7098c39d4c5039f10d2cba0d"; + sha256 = "da2407c38ad5f67e9bcacc2a752d6755dd60f97cc90c8b62c8e15fdff48dd391"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/rm/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/rm/firefox-111.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "d52f03b472ed42d84429c6f765c4459924f4aad10c1d75cd4c9309200af74b8d"; + sha256 = "42180094e90c4be2bf350a081f5d1755c2674783402ef71c74f4ebdc934727b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/ro/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/ro/firefox-111.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "9d0478217633bbcc2f303e60b4a65bca988dbd2a28c8454b7a0b38cc53f54746"; + sha256 = "9728c18734f61109ccf303fc5a02b94f2fc1409415f4f4e18cc56532dba95d3f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/ru/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/ru/firefox-111.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "46bd433be9cf054a8719b57390d0067e8011b9bab07291358dde50b4e17aa06e"; + sha256 = "8b1504361d770f9172df29d1de6f89d8f85de7a9e2f7a43304c256f544c219b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/sco/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/sc/firefox-111.0.tar.bz2"; + locale = "sc"; + arch = "linux-x86_64"; + sha256 = "ab34aa83308ce3119fe89353ed826374c7d7332b82f9a2f77aa2d337d326aa57"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/sco/firefox-111.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "d3a7fe48e737f8cd13e45367cd56243260fbe85785fb79a5d5230840e4d14b69"; + sha256 = "7cffe7426a65a809acdfbfebcbdbc5a6e8915307bc061873b6ee528015d02319"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/si/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/si/firefox-111.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "033582cad6393a264569d814f676e7c5c0bf836183bd0d12ad9d0fceed2869e7"; + sha256 = "72fc27400234ad3cf25a334afa295a4e7de1a78551343eec240953816e424d80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/sk/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/sk/firefox-111.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "1ec1e6550d98016c148f28838af10bbb2edaf8f2f77ca708579620b487638a0f"; + sha256 = "bef4f7b91af046c0f908210e2643f2cec4991a016a9ce2dddb3c2a7d3c028f3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/sl/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/sl/firefox-111.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "977a5a562d526b54affb1ba93f9d74b504e173661d5d1a1a5c37695536f15948"; + sha256 = "cacabc1bb2142070b3833f95b8adcc36f14bafd0254263bb245b56d5a3438a6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/son/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/son/firefox-111.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "c7e560464e54002933706cca407896ef8a4b5e9b0274dd1237cce594389cfac6"; + sha256 = "50b5a60972d0f9ba7deb768cf0147e0c9107885a023238e9e853b08868454493"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/sq/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/sq/firefox-111.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "df1ed45b3271a2c390bfb094421e738e91a701dc56fbc6876bc61679a01c88d9"; + sha256 = "c5587ed36e11082b7232251a9918b2edd4ebe8f455456e1c43ae951089fc16ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/sr/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/sr/firefox-111.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "99df5d045f5aa6aba6c89f31f5d485477df8ce022422f995001aa393d3b0b695"; + sha256 = "ce218ddac2f9c6d5db2f3b25234578c38dfb93ce158e00fe506431b9db3261a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/sv-SE/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/sv-SE/firefox-111.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "2c54f990591d57ce39ccbebb5240599c8378409b9d97296f37dfe2c2c5954c02"; + sha256 = "3ec80748ef14a5f575e4120f7ac8083ef6a1b5510147296930e42f926cb4ca24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/szl/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/szl/firefox-111.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "e5ea61617c7089b4ea7eaa475e253050126738c8fba38a4ef8d7e2fade6cb7d3"; + sha256 = "953df7d933e39c4f6e76600bfab762f5438789dba335e9256cf3b512fb99f16c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/ta/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/ta/firefox-111.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ea146ecc244d5e35fa06f973c0bb86b528e708380ffe0ae5675e7426422ed4ac"; + sha256 = "646a9c33ba9c9fd77ec655f00ca60c3c41a054afe38fccfa31a304d9d356ef0b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/te/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/te/firefox-111.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "af9cefbf4ea3b3a9bbd25d5f39a47468192a44bed5f7bdf43c48a02cc1690f72"; + sha256 = "757ed7120834d236023104cb548cc4d4b9f459c4216083be1dfe734e2638da1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/th/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/th/firefox-111.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "f66f4781183221a6ac7f3e856b34220c53ee6a499c30489c13a1709dc68a77be"; + sha256 = "e55cd8e25b2d3c91c64a146c0be3ca09323bde960bd3cecd36e0f66ead0d66f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/tl/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/tl/firefox-111.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "70e45c122559b109917d92b5e4a9fbe0539ef24aeb0182344cee4ca2697e4b64"; + sha256 = "55368061387cff4ed175ccd1bc24e0f1047333bdaa57b974985f69082b5e412b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/tr/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/tr/firefox-111.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "5b4987e0643fec426b90e71e93b7cf54663e8e1dde59036e818d2896023d6392"; + sha256 = "0d0054c160b915603a5b5e8d491e4929febc911a7f3dd6c29fb78a13125be08d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/trs/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/trs/firefox-111.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "d351899395fa985666bdb8769f4ad0e7a61e6c8e79e67e063612f8b4680085b7"; + sha256 = "3a8f982ba868a9305cf47c3f16ef8b3645292d36ad206f603faff70b1fbc2e67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/uk/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/uk/firefox-111.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "12f5fbe0c935cd035937314dc6b727249ec07b507ff4ddd84c3e589f04e8e9a8"; + sha256 = "6bc78bb1064fbad687b71875f63d0edffd664b3eefbc4c10955faa0675785a87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/ur/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/ur/firefox-111.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "5a19d4ffbaf674f158d66e983bcc32e526210ca700db8ae55f9b2a5863dc0108"; + sha256 = "9003d49d3693595735fa32f3d3be2b817b1b938a78cdbca533898887a89f49c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/uz/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/uz/firefox-111.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "c8862a1fb4ade589a98866c15ff62e5646346eebd19d258dd357169c11e7194e"; + sha256 = "b37d867a32a8db632c4741522bddd7e0df284a6c117f58b3eec510013a24e279"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/vi/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/vi/firefox-111.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "fa83d60d40f002174676e3597b1bf1f9af8cff78afd5b5cc9519a36e662d0dac"; + sha256 = "f8434917998728025b4974500651edd91adbd10be8ad4b334582af6a2416bbef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xh/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xh/firefox-111.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "4811525fde4ab03c207577770c2c47e3171bcdd1aa3649a268fad4416e80712f"; + sha256 = "f4e90092a134d578697fd44b802db4259c6ab0d077d189fa22f930ecd3df561c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/zh-CN/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/zh-CN/firefox-111.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "ca01902a7454020cff490cd4edfc3d61e3a6aaa2b152d19aa8074ed1f7016c96"; + sha256 = "c1d870d2357d55de760ce1d5db2c304c00b7325958d800c0a28b701798c8566a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/zh-TW/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/zh-TW/firefox-111.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7474d92159cb6c44b8c7e09574564bad56a9a8c601de9f5b09e29a1b10716ab6"; + sha256 = "8e2946fea13a94ac3c2e19a9295b7f87ca217987c801959eaf0cb4b5cb270338"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/ach/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/ach/firefox-111.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "cfb69e1779605ae67bb4e13f629d27f914f34872d05d7452b7fc51c14ddbd703"; + sha256 = "2edd033a3dfc8cae6faca2bffacc5214808ff1ab3c71eae339ab1eca87283ab0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/af/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/af/firefox-111.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "160b3c1f949b5a1add9db24802b1d2bdd4a27deb43d6e66a3fa3e3c8dd159740"; + sha256 = "7b535d02e41bbe3f6d111c03773114b5cc5486eecf607556f35218c387591029"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/an/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/an/firefox-111.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "f150f5e48597fcbd784b406ece78b3b8a21bd3c5b07a63b666b598805e39b42b"; + sha256 = "7388104d4ee5f54ab19502eab3200542ce46f341a1b32888e0468681c7e6d437"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/ar/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/ar/firefox-111.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "b8df8eca46484dc9c0e4a489ec4c063837621a6a0eb866d8bee7d318de94f0f0"; + sha256 = "a2f48730993a4b0c181af176a5dab354aee555c8ed9a650c38d77dd458249998"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/ast/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/ast/firefox-111.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "515c2e1e32e79c9d74bab2e24b2b5f6acb2b5c93615a093d0d0e7b8607c03c05"; + sha256 = "7a336be253cd46d88b601fdce3a8edb65421c3fa4d51975d7d80577aad71137f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/az/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/az/firefox-111.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "f65c57d7519b14526814b3a50e3d668ee67ea6a6c14319d58350fee6d60291c2"; + sha256 = "6509b02a539bee0b5d6238bb2e94e5111d2f39fcda2430c28c4b8f1e88446f9b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/be/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/be/firefox-111.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "8603a3044a380abddebec6e24d9f441df881048eabf4d966ea713f777cdbeac1"; + sha256 = "07965cdf25d163b17786eb7df112ec9b32ce547443d5543395e4b3dca2edf5d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/bg/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/bg/firefox-111.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "e0865748ff320f3bdf9071cd1a7aca50ff96899eb8e5ca6d1b8fed60e12bf989"; + sha256 = "b4270cd64d158caaac1ecd0503baebd01ecca58c3d2164cdfa20d05c7547b0ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/bn/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/bn/firefox-111.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "5c516f470d8f905d0c692d2523a6601ccd118bc6c1ab2afcd70d4c075fca8ee9"; + sha256 = "22e1e3b0ebe4500e37bb257a6433a4dd0ec68d7d03f49984b120adf8d7465566"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/br/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/br/firefox-111.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "96710942807a99cd56cc4504f02963a32df25f97ada4f8ff03f4edc803bc4b60"; + sha256 = "c4586afd90bc359ed3665595b7959be7f39dd19720bf130fb9a45ff328e09b6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/bs/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/bs/firefox-111.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "e389fcaf5cb29c7af11ec14d2e1e7df18d9d04a2ed76b703d3cfb639fc23d95c"; + sha256 = "cffde25504eab63469568a4f17c725e496ff08646f709c4fd2dbfb025bca2ae2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/ca-valencia/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/ca-valencia/firefox-111.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "c7fdc1e3a766e0062fc01a45c65596f65e6579bef3a61be1afed18d05bddad9e"; + sha256 = "eb14e88f47e3113170f9853ae9c679761fb4510a942787a18793d40da48dc2fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/ca/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/ca/firefox-111.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "e5b908033c342fbd523a35f644e894abf5634340fc13039fb3c61077143fbbc2"; + sha256 = "44b8f7cfab0007adeefaa2d5aada49e2e4aebd9c5170e2975b2ed6489c7d9bf0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/cak/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/cak/firefox-111.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "826ccbf68054e9239546b9997f79bda598453e4f027ef58baf008b133c979ec7"; + sha256 = "b3a9ade3967383195429851d59af018b9b95ddb15d5f37d666dcdec1d80e4ddd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/cs/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/cs/firefox-111.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "0561761eaac2b32808bce0a2b31f06530f491b4e1defb8cc15d2e4b7118dea2f"; + sha256 = "ad3498ed7526abffc0e6102427a196d8fd5a476fb4e86cdb54a07ca688ca6f43"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/cy/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/cy/firefox-111.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "38c9b8d39b010bb16c38767143f04333108d0333d20374f5201b428e153eae30"; + sha256 = "dff10cdd1f5a167f855aeea40d80a5f60fc10b86820e7fd4e2d5855334060190"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/da/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/da/firefox-111.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5a9dbb8d9852db2f080a53d51cef08c6199ae54cf114fa1fc00bcbd8cf364f3e"; + sha256 = "5434f2e9cf31d4d8d53f11b3750ed5d8694ba447b10bee6f6731c336e06abc3d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/de/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/de/firefox-111.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "3efda2a645234606b241c92c791d89f94d795e4e62dd1c8c5e5fd04ff1eb43f2"; + sha256 = "686676283dfb43ae880ed92ae107800fdf486dc0e3e2331a87d60e3411fc3175"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/dsb/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/dsb/firefox-111.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "f2e14d6d6c2b2d62c6b28cacce288228ffe1e0a495abf0f59270afb1cabc9ce8"; + sha256 = "ea85e5accbbfae39c8bac5c6eef0b501961270e6bd1a813b408c802d1f6575ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/el/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/el/firefox-111.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "7dc431400b9895cea661d1cf6f74b2cc13a5aff1b01e6519b71b206f27e35486"; + sha256 = "f836f8905729374d19cb9b1a8b27db7f13d42bd96606c563e1ec9d372a7d12b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/en-CA/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/en-CA/firefox-111.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "e3d10b71b380a3ef9ed8cd6df81bac17d08fdeba079114bebf067e9d43b1219a"; + sha256 = "a9f5c3602e09e345d9e0ec2b0f2f675f585279d8157461b42dd98836b40c28f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/en-GB/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/en-GB/firefox-111.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "53f982d6f10e74f1d59e955f7c4ecd74d0a8fe4c6e08b67915a79e66ce7d8c6b"; + sha256 = "31d555c5410cb0d1676bc37fec0aea26b1693fd83360d1e630d5857e40bcaecd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/en-US/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/en-US/firefox-111.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "08cfc602c791275ecf705937f80497568d23c9404eb83af4acda538f892065a4"; + sha256 = "ff03b4429f4d1000a8caf9d7958600d03322874ccfe1b51ccf44fd53c7ecad18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/eo/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/eo/firefox-111.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "0f39885c326f14b87440cf7f2d2e077d65a560a2b0b098e4a8bbb103d7b4340b"; + sha256 = "aea289bfe913a19d7ef6a29f5209c5b4849cd3c4383bead02f359743b35ab774"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/es-AR/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/es-AR/firefox-111.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "798672daf44c4bc1d25162d2a92817ca442d29b68d93dde325b8f5d97ee2730c"; + sha256 = "162c65c62dca5666230b6c8c5b312e2c5a37230ff26919176cd830b8b7ca3ddd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/es-CL/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/es-CL/firefox-111.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "3527dd719a1a402f575309344fda3cef9731c7703809d04904bcc83db83858d8"; + sha256 = "8b1d4166fd40f0dfc21ee09b81d6d6e6b083b3bd8160eb5567d5e97229c95c63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/es-ES/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/es-ES/firefox-111.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "3cca343ae1a9770c8ce5c80b69f10fbde3f86dd7269ef669437b0395d81c7b70"; + sha256 = "15b1af9175050f45d4c8cc1607a13d154f7bf7c933e5819e1ffefee260a72ac6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/es-MX/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/es-MX/firefox-111.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "b56980b3e1f65978602f9484c6380dcd8d2dc33f097b089e233854279cffd131"; + sha256 = "8d6354b7aa8d07f88533b9db8e11eea17248312dfd043e87292277539b2fece7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/et/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/et/firefox-111.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "d9a8817fb3f061105ef52e6023dbc0620faf70b7489b9d45894b340ca729b46f"; + sha256 = "e3e8437db0576c5b12067d9f862a7313d9354f94661dd84e86b2b23f1fb442d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/eu/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/eu/firefox-111.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "080dbd4a36d85d6676f3293aa1f4ba042edba42dfda1159d8946ce349993859d"; + sha256 = "8e360e7afc70fc2cd069d414aecb02591af750b3101203593556b76a655b2bc9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/fa/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/fa/firefox-111.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "faec798a20e2e87049e8e20de1308d17a6eecac6bbe7c730edad9ad59a28f241"; + sha256 = "1d416ebc39f76066c67b645f057cc076d527bb5964926c0c6f2bcd31a721c331"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/ff/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/ff/firefox-111.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "dd732fb832fd4fba701def010af6c46be5be66d404ed267cf394a7cfa0d47f1f"; + sha256 = "50b1a48c8def2ce403f4a05d69768511f26a66b1d3f3464ad1a6a8c512a461f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/fi/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/fi/firefox-111.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "3a5fa5c571fa71545bac42f403ae378f47f9063ce760b089a6864819722ca62d"; + sha256 = "0e1c6d46e481613573b57ea94276582d986583295850f460f7803096d5ee8bb2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/fr/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/fr/firefox-111.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "36c4fb165e579e0e4e5e6c48ac88e2367cbc72da6b1474225b363496a1fc260c"; + sha256 = "7c39efc4c8ffd14dfbcf99fc678e22864821a549d2a3e1e8d70ad1f55d99977e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/fy-NL/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/fur/firefox-111.0.tar.bz2"; + locale = "fur"; + arch = "linux-i686"; + sha256 = "5bb52cccc0882b164b358d4151963b244870e89e4b9d483f9dbfc42a52266eda"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/fy-NL/firefox-111.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "1b425c04e641a90a61f2336b14c372a8fde306787aebf40e46de280a63f42ae3"; + sha256 = "1bc572fde073998c45642bcbd3f6fdf263d90696d6b26a16554eecca5c12da3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/ga-IE/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/ga-IE/firefox-111.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "e5bde201bff8147ac972ed8308dacd85eb4827d10dd4eceaf329d2e5a486abf7"; + sha256 = "ab4e7244539e4c74a5ed9d4c1f5c940d4b19ec50add3cdfd8f4ae82355018631"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/gd/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/gd/firefox-111.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "dfcb533cf488252bbd76a1ced62b18c022736bdac248416c39b335054ca8723e"; + sha256 = "aacef4c1c494b5cdb03ad1d304c3e3846202a2bae88a2a518e09ead717ff93f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/gl/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/gl/firefox-111.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "f5cd2f8f87e1b05a84be33d62ae86384a0d6d10bb3abe217a0ca434377cf3232"; + sha256 = "92a6211f9c5f589e3cccf9e5251ae1830290404bf5e798bf2e976e123cf30a25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/gn/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/gn/firefox-111.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "c2bf597bd7e3efa3951db2d67f6bff59d4050b5952539d8bb483872105f63664"; + sha256 = "6d730a0a907776ac9d7ef0f2307a1c50580e2bc3ac18e1632acf0df0bf71431e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/gu-IN/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/gu-IN/firefox-111.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "5495a6809928d8d78c1e0db8454f5218882db33746fc8b5d6926540857804b3a"; + sha256 = "73b85bb939fc9b060609c388af4fdfec0d688b3cf049aa3f367767a28338de95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/he/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/he/firefox-111.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "a29770debd0e80b7132da1b81465d380a1c80ae2a0abb6ac7930cc7c6dde203f"; + sha256 = "daddd138196c51c1c1cc7d078f6ca7fd5d1ef79c98cd837ff77c6c0bb792fec1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/hi-IN/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/hi-IN/firefox-111.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "b6bfaac310a37214bc38f7fd18992235e9cdd3c62013398b8cfc41cbab48ffc3"; + sha256 = "0b24705e24c7bc567e8906ff249c18156a563c131f5839942f5de95bf6681498"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/hr/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/hr/firefox-111.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e0d24e996b73822d1a7ec91aae6f4b10a0acb2ba53c1350d4bed458f36f84635"; + sha256 = "1f1e422623a33e3f1dd9730f39aa556afbd52cf3a262983142fca62e70aa5b33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/hsb/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/hsb/firefox-111.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "6899cc19d4685a132b582360cc4824003965ce4753296fb5469e5ea52aadf586"; + sha256 = "5a2395f3fba9c8cb958e3582b5c310ff219a61aef237962be2c0c704f4f3841e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/hu/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/hu/firefox-111.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "64d1790c3abd18fe9b26f4e9d5cc4d0217c45df75bbb2a160d00ffb8f183d574"; + sha256 = "a4f7cacf5266ab6e9d01828bad5449d678ac02d8ed2afe7e757e8969551ee522"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/hy-AM/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/hy-AM/firefox-111.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "7e3d167dfc6691ceb16f0da3374b912c3b90b74f9e935d7853ee6937d333d673"; + sha256 = "e096ea3bdba3feef50a7c1306158d19d726cacbad0ecf1fbbc816a47e9fc0a99"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/ia/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/ia/firefox-111.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "bf816bc34a83b7db5cb395c750ab710661525eac5bc0699a83769906baa940ed"; + sha256 = "1f80532dc5fe6befad5e97c1d716b04afd1c3219ab2c339bc160270e4a79720b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/id/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/id/firefox-111.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "7542cc44e579849254186b400e112746f370b577e85d47015855123e6a87a6c2"; + sha256 = "ca770c4785387cc9cc49e0889f713a9b338c37aedd2786ab3ed3d2c31c750fc5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/is/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/is/firefox-111.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "3bccdf0780a90a7e44b6db0ddf9437029605f0fb8ec528e3f3ef26a248674d1e"; + sha256 = "d7ba61e087082abeec88ec86299820600228ab106a8716b7688dad521520a8a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/it/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/it/firefox-111.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "a449e9d73bc045f973a2d52c81f04eec8a68391a73087154db0f89fb15ff4c9b"; + sha256 = "c1e9969129b81006b20be4e18f2367b371f979d9e4698baf93fd98519da7b0b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/ja/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/ja/firefox-111.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "0254937757d3786fa88a50dea01a17936fd654d406ecab7b439d97cb3df80153"; + sha256 = "29024317efc65466dd87985202a85e1a3594244c341749c7eea2d41228629583"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/ka/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/ka/firefox-111.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "2c7753e3abe5086c4fc7664a483bc0484db6714a3057fa6f2e6cc8117701b572"; + sha256 = "ccfbf252806d78b47cd033d565a731cc9fed7e7909f89403b974b2569b10628a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/kab/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/kab/firefox-111.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "37cf5da5aa7265eac18adab820a12994837bb0cd29584a327a2d5ed9013194a3"; + sha256 = "f8ca6a0101e895e5c323f9fa79863c18e680c9ffbbcc964d0e1768d6258bac51"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/kk/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/kk/firefox-111.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "cba06557cc37b50f4a391740ec86160ba43f1fa9411980d40847245d9cc7498f"; + sha256 = "675272a6ddecd1cb6467b7a1ff3b5483d4d142ad965c50583fa1db1619a811ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/km/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/km/firefox-111.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "71a57640cd67addc9335169cad5bfdfdd303efe1df0be4769cb92e56df51df85"; + sha256 = "a268bbc5ddc70406bca694c12682b58aa62762379d8ebbe1d4c0c2373d1c380b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/kn/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/kn/firefox-111.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "fcdbcdf8dd81eb7eda8dd92a641ee8224bbf0ec4c1d485c8bd1f762df8790dbb"; + sha256 = "34803e76b443991a428c28c0c505c441278833afd4fc2dcbba8c94126611cd26"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/ko/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/ko/firefox-111.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "c716f598a066fc15ef39f6a5a761dfac9c726e6b784e362a480871344792901a"; + sha256 = "e9b75fd75e50599a80a7285e6ad0887895f9b74b111d646ea1099b3a9789e1cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/lij/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/lij/firefox-111.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "9cac575c41fb1b4d205efdc87b91a3a9352c346d727312960e991e0c7ca7376b"; + sha256 = "005d6bb5d08fda7bbddc59c2cdeec283cb17f714ca3e6693abab461ef237f21a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/lt/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/lt/firefox-111.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "717e617008e070466f302e996cfe42ad4712b43c053d0dec15a439487b29d469"; + sha256 = "dfea7e7644c1a69b129b23242cce0f3ea3d9587035d2ec0a33550528ecfdd7ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/lv/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/lv/firefox-111.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "f8a3d4958da734082e387b527a923394347d7fd0a00e14e481133f9af1cc66f1"; + sha256 = "1ecb7618776760060481535641b9905850d8a66d2496fc332a326bf216da1461"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/mk/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/mk/firefox-111.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "a27d701552d33bad24ccad6e51a34fee75014c0a06b5be908e4592ae2e82d423"; + sha256 = "2708e52d1d6c047ec6ac9b98a714056a50e3e9c5f5f15855b13ecfa71e8b583e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/mr/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/mr/firefox-111.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "a3d93fb33371a025e5656ff0b58bea71e217f7e44362192341cd1ea1662516f3"; + sha256 = "1cb1899d4638c7db3a52c44020f4ed7b3a81711bdf045b2f022c3ef9bb16883f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/ms/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/ms/firefox-111.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "9a2a28e3c81d633beca33035e9def402d13264baaa503e2d0bd972de033ff56e"; + sha256 = "abdb0ff3cf77146be3487c0009e645b916ef40aac8ef7b263f726988fcc5e536"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/my/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/my/firefox-111.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "9dee4039c80feb9547927b1980a9cd365566d6e7a72b8e375d6090394e89f2f3"; + sha256 = "ade7e016e889fded2ac53ddd53aa74ff342eec3d09c72251194565398574972b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/nb-NO/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/nb-NO/firefox-111.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "2023fd246edee0669d8bbec2b9e9c1dd1a57575de00291cd4de099bb978fa7ec"; + sha256 = "ec75b1c853699624de4f9c3f1457aa39af8e1f3dc5cce9ded36c04b838bee02e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/ne-NP/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/ne-NP/firefox-111.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "2d222f4784d476150e4be610d9d6cb55bcf0043cf4feafaf124b2b27508e21bc"; + sha256 = "d6a04cdd3d8e0408862969521af28a64d62c3a73f60a4a9b28d935abddd239c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/nl/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/nl/firefox-111.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "bb69b0d847f177b397432818699d40f311db1502f13cb60d91f1097833e663e9"; + sha256 = "c63738bc818d0b9db1c445b96259f198a0747ab68a8a89fe7d6165a95c731db5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/nn-NO/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/nn-NO/firefox-111.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "6bc51b91191df259b91050f91970f38932ce36f9a23428683082ae725c049879"; + sha256 = "d63d9e431ba6f7c9f1be51bdaf84a3e819d3660ac71a69c01cbbe65b025469fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/oc/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/oc/firefox-111.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "c2c8c8892b0403b80bb6cd968e5c43414c60e31b907a97bbc25b596db8a93d02"; + sha256 = "5eabe6b94c56df1371ce2ecafb6812d87c167aa4204be40bb277164f5c0ab2c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/pa-IN/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/pa-IN/firefox-111.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "80dfcee2d199352fc714329c72190562bd97ae8cbb930f6bf2f94feac5e1b9a2"; + sha256 = "0f85bd21115fa09e1a26b3b811ded0d4974a6d99fb47a323940d39fb3e289955"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/pl/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/pl/firefox-111.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "71f207e7f60d43e6263eccfc263e679a9ee7570495098074cb14dfb428d3949b"; + sha256 = "29c3a67c89c462863d3ff25681ea4f80231417141e32939d712b4f68fc565539"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/pt-BR/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/pt-BR/firefox-111.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "0aa8481dfc8ad4624c78908dbbb8ccbcf1f3e720b893226864f3db164c993af7"; + sha256 = "c7206f5979e904bf27ca77ca6998e3cc0220c698ff41c2cf647e0421f75645f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/pt-PT/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/pt-PT/firefox-111.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "2469ccc397cafe295a28939406b93eb5fc874d584d25f5e2c4399660490fd098"; + sha256 = "8d9c7b5e5869615199ed71deea9696369e7a1a4b46d067c295c940baea449944"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/rm/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/rm/firefox-111.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "bf4780cd3a8ba6f6f0415cc1871f8ae4fc039f72876744bd66cd126c05bd7753"; + sha256 = "77262880e59bd51d3f5dbff95b0deaddda9e32f6b10b2bb53b96a40c0c3595cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/ro/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/ro/firefox-111.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "19112cdb4d803cc68bac9a3bf268d798c9194fc2f4479304709ba429b722a903"; + sha256 = "47211ad1e395f45bcdd95eb2ad648d63fda25b7eac6a86aa43c40798530ee215"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/ru/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/ru/firefox-111.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "ab55c6629cc527e841a51e5b6861a7b12d795f01713ed7da81e99feafc05eb32"; + sha256 = "8ab2cbb516d649c130e6c582a031d39f0adfb18dfd3753a4c5e8a7a45075fbd7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/sco/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/sc/firefox-111.0.tar.bz2"; + locale = "sc"; + arch = "linux-i686"; + sha256 = "afe2f0e0525a0baff3072d72122ba40526081c4d77982061d5d67d2af073a296"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/sco/firefox-111.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "2142823a5eca00f42264acc3861db4efcdb2151a762d7c80af5495e57146bd34"; + sha256 = "81b34620ed7a6b4e1e138faf8d239ac019ab419f859a65f8a92fdc74381b655c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/si/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/si/firefox-111.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "33bc048675145983427b3a684a59c8c2ed627ec6ba1a6ff4df9b079ea9b3c87a"; + sha256 = "65cd1ac50ab9946024f301ebb20a1b31f9ae782d151e02adc3598a32cdc42f07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/sk/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/sk/firefox-111.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "66ba3f607d2d5a3f71cdcc3c93a2f8519619ee0495cc9674d3a7e5de0593ad88"; + sha256 = "0f589bc376f0eb1686f101efb9fd5da988a171f7938b974061d98fdcc4414877"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/sl/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/sl/firefox-111.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "e238bc6d16959ad7eec41f2654557b8d4751f5b9c9b13c55376987cd934a9106"; + sha256 = "a5577a8fe2acb01e4855d5452ba3dc04373ae2d58774bb6d5b5e5e7c72307508"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/son/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/son/firefox-111.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "1e77ac72d72810ce3bd1ec748279fc7fb9575b77e14f3317079836ed3c5800c7"; + sha256 = "1a7de2a74ee7cec14e4d645190b203ee0b7a99e1960a370ad08cea23699ba116"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/sq/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/sq/firefox-111.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "08fc79deda6e9c9db8b3beda3a7d6a17c14706e4f37ede4010ef42bb70d592a7"; + sha256 = "1a96908eb887cc9cd610d8c8e04e4db63ca01f1ea6c18c85c642c0d8104ec7d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/sr/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/sr/firefox-111.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "827dec7e394fe085012d023677b9ef05579a6db4a2d273eefec2ca05d08657bd"; + sha256 = "b3c149d0cb0cdb964dbee5520b6b10233ea76c566ad49d2399619bcc0899cdac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/sv-SE/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/sv-SE/firefox-111.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "c26d0240c2a4cb16ee3722bd06dea24a690c3fb5b51cb90c2b85621fb33a52c5"; + sha256 = "07ef7c75ee2b53c9a219b4d825a9abb5a3f00deae8b6ed248d3caae3ebd88336"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/szl/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/szl/firefox-111.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "3509e57f1822ce8484641076a82c206c8b74e73aef6d34e42de40585116d9acd"; + sha256 = "111c95b0fffc5850fab54b92339c7397ef12b3a0ea084c22570ea9488f8053f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/ta/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/ta/firefox-111.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "436b50b8b6cfebf53416030c824a9b54d9401b8f3fd12059fbf3f42879ad0864"; + sha256 = "921907453ad0d590142b71327202efe88736975e23abf96960de27f6577a77bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/te/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/te/firefox-111.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "9e54999f4d2869ea6d8621836d5eede5d137bd4534a24b47437ec5efc1941329"; + sha256 = "a7a11c969f38bbcc8cf41d208c87d528c94c1808fd1e58d8878a730acd0ec831"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/th/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/th/firefox-111.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "e9fa7e7de8c6d3e58acc8baf564236950407712c403d9b4d89f20d089274bb47"; + sha256 = "4f3d560492b1e7e484edd39e281324007df211e836228e953fdda2e025da2de3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/tl/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/tl/firefox-111.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "eb79ae4d482eb35f15b139e08cbceb04b2dc5b21c71c7642db6293b149f4fe95"; + sha256 = "6df020e1ddf18899f28cf5a1305a7c6720bc3e3e48b9685ef849c6277df0edbf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/tr/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/tr/firefox-111.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "d6d4ecb98cda3c307c1b92f1c8a61ccc4810f386dd52e7b5acb7c114ab88b1ba"; + sha256 = "5cb90ccdae0d3a5de79767d471fa3f753f7f8eb3941caee7b99ca6b2a5e8e5fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/trs/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/trs/firefox-111.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "1552a7f3f720b02e3ffe3ff27481e44f732d05a4dce84017ecdde5c92f68ce3f"; + sha256 = "682c8ac7c88003675f2e8964b5d0c4e09b1596b67247b4bc4c05a79a37560ede"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/uk/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/uk/firefox-111.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "6a45c6708193287303e26cc238828a564b37906a646f8a8f9307106ee30f7180"; + sha256 = "badf22eb39bc44a712af0260b3115b5b40aead85a22bbe723f183ec597e974d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/ur/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/ur/firefox-111.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "f5c3ddd80f4a6e6e531e93a3a331d4a4bde946c787bf9118f8d49d97d918dea0"; + sha256 = "d9d1452f33314c14090b3205b3e91991a82f337a46f554659daec4f75d057365"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/uz/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/uz/firefox-111.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "151ef96d16ffb388239afcf426234d5fd289944443f8ea0e042fadeb55a94b05"; + sha256 = "0cc2508bc15f6329c1cdced01c892332d003280650eb3d713e3cefe412b5e8b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/vi/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/vi/firefox-111.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "582206af1f6de7db79f1cc3e96944f0548ade58163181c4b236eef56c62e048e"; + sha256 = "5b98a99d2139502a4dd53aef49ab2464a94e579a2c7b9a5134e41b9721bf6cf7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/xh/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/xh/firefox-111.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "f5512a7461203fe123ef15553463e93d80f47d384615011cbbc0f3ed2b3f07ce"; + sha256 = "5822cbb3adaeefc7f7058f4b80a78a91b2c7ad762a7bb7ee3d445aabeede8e4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/zh-CN/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/zh-CN/firefox-111.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "1a7006c1bdfc34a802574286e3e68e55a5a389975399c3cd8ecb400eae57db4c"; + sha256 = "5c427ecb9f0d8e06611f5301d704dc4ffa74aa50f588ab751d33b2cf73191816"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/zh-TW/firefox-110.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0/linux-i686/zh-TW/firefox-111.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "0965f15fa6fcaa799a7879a77ae7c521920484613e6e93e04b70fc18f8c1214a"; + sha256 = "4348f3c2f563ffb8fd5e253206a934f1506c8ec0fe1f0f48b437e66eae047b69"; } ]; } 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 948b321724..1666195bd7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -228,7 +228,8 @@ buildStdenv.mkDerivation ({ hash = "sha256-+wNZhkDB3HSknPRD4N6cQXY7zMT/DzNXx29jQH0Gb1o="; }) ] - ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch + ++ lib.optional (lib.versionOlder version "111") ./env_var_for_system_dir-ff86.patch + ++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch ++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch ++ extraPatches; @@ -471,9 +472,6 @@ buildStdenv.mkDerivation ({ separateDebugInfo = enableDebugSymbols; enableParallelBuilding = true; - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null; - # tests were disabled in configureFlags doCheck = false; @@ -500,41 +498,6 @@ buildStdenv.mkDerivation ({ gappsWrapperArgs+=(--argv0 "$out/bin/.${binaryName}-wrapped") ''; - # Workaround: The separateDebugInfo hook skips artifacts whose build ID's length is not 40. - # But we got 16-length build ID here. The function body is mainly copied from pkgs/build-support/setup-hooks/separate-debug-info.sh - # Remove it when https://github.com/NixOS/nixpkgs/pull/146275 is merged. - preFixup = lib.optionalString enableDebugSymbols '' - _separateDebugInfo() { - [ -e "$prefix" ] || return 0 - - local dst="''${debug:-$out}" - if [ "$prefix" = "$dst" ]; then return 0; fi - - dst="$dst/lib/debug/.build-id" - - # Find executables and dynamic libraries. - local i - while IFS= read -r -d $'\0' i; do - if ! isELF "$i"; then continue; fi - - # Extract the Build ID. FIXME: there's probably a cleaner way. - local id="$($READELF -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')" - if [[ -z "$id" ]]; then - echo "could not find build ID of $i, skipping" >&2 - continue - fi - - # Extract the debug info. - echo "separating debug info from $i (build ID $id)" - mkdir -p "$dst/''${id:0:2}" - $OBJCOPY --only-keep-debug "$i" "$dst/''${id:0:2}/''${id:2}.debug" - - # Also a create a symlink .debug. - ln -sfn ".build-id/''${id:0:2}/''${id:2}.debug" "$dst/../$(basename "$i")" - done < <(find "$prefix" -type f -print0) - } - ''; - postFixup = lib.optionalString crashreporterSupport '' patchelf --add-rpath "${lib.makeLibraryPath [ curl ]}" $out/lib/${binaryName}/crashreporter ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff111.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff111.patch new file mode 100644 index 0000000000..71f5272a18 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff111.patch @@ -0,0 +1,22 @@ +diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp +index 6db876975187..5882c5d7f1d6 100644 +--- a/toolkit/xre/nsXREDirProvider.cpp ++++ b/toolkit/xre/nsXREDirProvider.cpp +@@ -11,6 +11,7 @@ + + #include "jsapi.h" + #include "xpcpublic.h" ++#include "prenv.h" + #include "prprf.h" + + #include "nsIAppStartup.h" +@@ -309,7 +310,8 @@ static nsresult GetSystemParentDirectory(nsIFile** aFile) { + "/usr/lib/mozilla"_ns + # endif + ; +- rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir)); ++ const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR"); ++ rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast(dirname), false, getter_AddRefs(localDir)); + # endif + + if (NS_SUCCEEDED(rv)) { 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 2d821a6d13..d8a2361858 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ rec { firefox = buildMozillaMach rec { pname = "firefox"; - version = "110.0.1"; + version = "111.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "42c6a99a3874a0f60121188c43788fb35577734d9366c3f89ad41b8328cc542ce172ec81ca35b9ea551eaa698197ccdb43922ec3215d311e0770aaaa59625d21"; + sha512 = "cdb300fdbb2b60068b0fc10a18df587b417e484901d36f52dd174d320d3440a42b02ea000f325c5781fd8853a5171b1a5184562fb535ece90619e4c64d46bb82"; }; meta = { @@ -29,11 +29,11 @@ rec { firefox-esr-102 = buildMozillaMach rec { pname = "firefox-esr-102"; - version = "102.8.0esr"; + version = "102.9.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "93ea87997b66088b94c6e943b6e99e9a71d1908444d096c0f65b6876d2c584e55ff6120266f3851f986b664bd1f12fa31206b03479c2b751e7c3ca097ac14275"; + sha512 = "3923212ce4b7d1f589129025961ff1b380b8aaf1dd074674f3bd63cf14e9a44ff051bda556b7796c25634e153de00ce62243ece15a520f63dd0791a19b2a6685"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix index da5f183867..c4e16d4326 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix @@ -57,9 +57,6 @@ stdenv.mkDerivation { "-Daligned_alloc=_mm_malloc" ]); - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; - # https://github.com/SerenityOS/serenity/issues/10055 postInstall = lib.optionalString stdenv.isDarwin '' install_name_tool -add_rpath $out/lib $out/bin/ladybird 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 4a3d98d647..601d807179 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.15.3"; + version = "1.15.4"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-BKDN2DtLoG+E+R+yBSBpF4PWv+pRLNYZvX/3BqEIxVQ="; + hash = "sha256-l69h0+yMX4vzQ1GYB1AqhZc1ztMKF/7PthxEDarizek="; }; nativeBuildInputs = [ cmake pkg-config zip ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix index 636d1a1379..685bd7e42a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix @@ -3,6 +3,7 @@ { stdenv , fetchurl , lib +, makeWrapper , binutils-unwrapped , xz @@ -62,6 +63,10 @@ stdenv.mkDerivation rec { inherit sha256; }; + nativeBuildInputs = [ + makeWrapper + ]; + unpackCmd = "${binutils-unwrapped}/bin/ar p $src data.tar.xz | ${xz}/bin/xz -dc | ${gnutar}/bin/tar -xf -"; sourceRoot = "."; @@ -170,7 +175,7 @@ stdenv.mkDerivation rec { --replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName} substituteInPlace $out/opt/microsoft/${shortName}/xdg-mime \ - --replace "''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \ + --replace "\''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "\''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \ --replace "xdg_system_dirs=/usr/local/share/:/usr/share/" "xdg_system_dirs=/run/current-system/sw/share/" \ --replace /usr/bin/file ${file}/bin/file @@ -178,8 +183,13 @@ stdenv.mkDerivation rec { --replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName} substituteInPlace $out/opt/microsoft/${shortName}/xdg-settings \ - --replace "''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \ - --replace "''${XDG_CONFIG_DIRS:-/etc/xdg}" "''${XDG_CONFIG_DIRS:-/run/current-system/sw/etc/xdg}" + --replace "\''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "\''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \ + --replace "\''${XDG_CONFIG_DIRS:-/etc/xdg}" "\''${XDG_CONFIG_DIRS:-/run/current-system/sw/etc/xdg}" + ''; + + postFixup = '' + wrapProgram "$out/bin/${longName}" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.pname}-${gtk3.version}" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/offpunk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/offpunk/default.nix index 6945ce5245..e9f2ea4261 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/offpunk/default.nix @@ -3,10 +3,8 @@ installShellFiles, less, lib, - makeWrapper, offpunk, - python3, - stdenv, + python3Packages, testers, timg, xdg-utils, @@ -14,7 +12,7 @@ }: let - pythonDependencies = with python3.pkgs; [ + pythonDependencies = with python3Packages; [ beautifulsoup4 cryptography feedparser @@ -30,40 +28,34 @@ let xsel ]; in -stdenv.mkDerivation (finalAttrs: { +python3Packages.buildPythonPackage rec { pname = "offpunk"; - version = "1.9"; + version = "1.9.2"; + format = "flit"; + + disabled = python3Packages.pythonOlder "3.7"; src = fetchFromSourcehut { owner = "~lioploum"; repo = "offpunk"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-sxX4/7jbNbLwHVfE1lDtjr/luby5zAf6Hy1RcwXZLBA="; + rev = "v${version}"; + sha256 = "sha256-CYsuoj5/BaaboDRtcOrGzJoZDCfOLs7ROVWLVjOAnRU="; }; - nativeBuildInputs = [ makeWrapper installShellFiles ]; - buildInputs = otherDependencies ++ pythonDependencies; + nativeBuildInputs = [ installShellFiles ]; + propagatedBuildInputs = otherDependencies ++ pythonDependencies; - installPhase = '' - runHook preInstall - - install -D ./offpunk.py $out/bin/offpunk - - wrapProgram $out/bin/offpunk \ - --set PYTHONPATH "$PYTHONPATH" \ - --set PATH ${lib.makeBinPath otherDependencies} - - installManPage man/*.1 - runHook postInstall + postInstall = '' + installManPage man/*.1 ''; passthru.tests.version = testers.testVersion { package = offpunk; }; meta = with lib; { description = "An Offline-First browser for the smolnet "; - homepage = finalAttrs.src.meta.homepage; + homepage = src.meta.homepage; maintainers = with maintainers; [ DamienCassou ]; platforms = platforms.linux; license = licenses.bsd2; }; -}) +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix index e4730e1869..1634c72b27 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { # "Illegal instruction (core dumped)" gtk3 gtk4 - ] ++ lib.optional proprietaryCodecs [ + ] ++ lib.optionals proprietaryCodecs [ vivaldi-ffmpeg-codecs ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix index b20cb19bf1..0c3bf4cd5c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -38,7 +38,7 @@ buildPythonApplication = if isQt6 then python3Packages.buildPythonApplication else mkDerivationWith python3Packages.buildPythonApplication; pname = "qutebrowser"; - version = if isQt6 then "unstable-2022-09-16" else "2.5.2"; + version = if isQt6 then "unstable-2022-09-16" else "2.5.3"; in @@ -60,7 +60,7 @@ buildPythonApplication { # the release tarballs are different from the git checkout! else fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-qb/OFN3EA94N6y7t+YPCMc4APgdZmV7H706jTkl06Qg="; + hash = "sha256-hF7yJDTQIztUcZJae20HVhfGlLprvz6GWrgpSwLJ14E="; }; # Needs tox 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 ec9ba8dddb..49be24bc5e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -21,11 +21,19 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.7.2921.53"; + version = "5.7.2921.63"; + + suffix = { + aarch64-linux = "arm64"; + x86_64-linux = "amd64"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_amd64.deb"; - sha256 = "sha256-qkKCoHJCRji3XfXk71n4BfjFyQpXZ+BariHmbYPAuv8="; + url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; + hash = { + aarch64-linux = "sha256-Os2A3kbeuMIn9TFp8Ze+TwHDYLkVvECJF3UDMsQq5yU="; + x86_64-linux = "sha256-t9CYf3I+IrKjOD96tBZQGR3xwzPrZvnD1JvPMgTjz0M="; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; unpackPhase = '' @@ -100,12 +108,14 @@ in stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = ./update-vivaldi.sh; + meta = with lib; { description = "A Browser for our Friends, powerful and personal"; homepage = "https://vivaldi.com"; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ otwieracz badmutex ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/update-vivaldi.sh b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/update-vivaldi.sh new file mode 100755 index 0000000000..6e1d68f139 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/update-vivaldi.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts + +set -eu -o pipefail + +version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)-1_amd64\.deb.*/\1/p') + +update_hash() { + url="https://downloads.vivaldi.com/stable/vivaldi-stable_$version-1_$2.deb" + hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$url")) + update-source-version vivaldi 0 sha256-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB= --system=$1 + update-source-version vivaldi "$version" "$hash" --system=$1 +} + +update_hash aarch64-linux arm64 +update_hash x86_64-linux amd64 diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/update.sh b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/update.sh index ec8a9d7d66..56b0e10352 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/update.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/update.sh @@ -14,26 +14,23 @@ version() { vivaldi_version_old=$(version vivaldi) vivaldi_version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)-1_amd64\.deb.*/\1/p') -if [[ "$vivaldi_version" = "$vivaldi_version_old" ]]; then - echo "vivaldi is already up-to-date" +if [[ ! "$vivaldi_version" = "$vivaldi_version_old" ]]; then + echo "vivaldi is not up-to-date, not updating codecs" + (cd "$root" && nix-shell maintainers/scripts/update.nix --argstr package vivaldi) exit fi -# Download vivaldi and save hash and file path. +echo "vivaldi is up-to-date, updating codecs" + +# Download vivaldi and save file path. url="https://downloads.vivaldi.com/stable/vivaldi-stable_${vivaldi_version}-1_amd64.deb" mapfile -t prefetch < <(nix-prefetch-url --print-path "$url") -hash=${prefetch[0]} path=${prefetch[1]} nixpkgs="$(git rev-parse --show-toplevel)" default_nix="$nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix" ffmpeg_nix="$nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix" -(cd "$root" && update-source-version vivaldi "$vivaldi_version" "$hash") - -git add "${default_nix}" -git commit -m "vivaldi: ${vivaldi_version_old} -> ${vivaldi_version}" - # Check vivaldi-ffmpeg-codecs version. chromium_version_old=$(version vivaldi-ffmpeg-codecs) ffmpeg_update_script=$(bsdtar xOf "$path" data.tar.xz | bsdtar xOf - ./opt/vivaldi/update-ffmpeg) diff --git a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix index 6475480b21..250355aa42 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pname = "calls"; - version = "43.2"; + version = "43.3"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-gHlhbQGtdIjKLMAkTxfc2QOjvNUPGKKL+OK8/vm0Oac="; + hash = "sha256-GNICAk9SPrLc+zm3tHVwkQdiS20j4MVktGIbNWEEMHs="; }; outputs = [ "out" "devdoc" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/circumflex/default.nix b/third_party/nixpkgs/pkgs/applications/networking/circumflex/default.nix index 4dab874fd8..9cdce79a2b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/circumflex/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/circumflex/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circumflex"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "bensadeh"; repo = "circumflex"; rev = version; - hash = "sha256-hFhK1/ck37lfZJ2wpk1MGCfYEANhh8qzTb8m1t7EoBo="; + hash = "sha256-6g1x19FLC7IdShlcCNlKMuPQX1sBU5+eFr0CzTSu4nE="; }; - vendorHash = "sha256-rwqY6illp5+h/oHOnVg6QfZ6tRFJOamwqJxQx/zlpyI="; + vendorHash = "sha256-rztg2mIuyoqpI9SKQsp0ASMT4HO4h0/bxLX7+xtfLzo="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix new file mode 100644 index 0000000000..b75f850f73 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "eks-node-viewer"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-utn0OJX3NLCyAV4F01GIkvh/KFPv7vfLQMwso7x7yCw"; + }; + + vendorSha256 = "sha256-28TKZYZM2kddXAusxmjhrKFy+ATU7kZM4Ad7zvP/F3A"; + + meta = with lib; { + description = "Tool to visualize dynamic node usage within a cluster"; + homepage = "https://github.com/awslabs/eks-node-viewer"; + changelog = "https://github.com/awslabs/eks-node-viewer/releases/tag/${version}"; + license = licenses.afl20; + maintainers = [ maintainers.ivankovnatsky ]; + }; +} 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 a10761578c..dbfcebfe6d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }: let - version = "0.40.2"; - sha256 = "00rzd9i9dd13wsr2f8y6b7q5zphrfx3bgigfinmzcfdinydv3bm4"; - manifestsSha256 = "05bkqkhyb3mgd68w2zr9bav6dfibfzfw65anzkz269wqrkf0d86k"; + version = "0.41.1"; + sha256 = "0nrwhq336n0aj1c51difgxk9an8d1j4yfkxn9sgzw9dq50rrrinf"; + manifestsSha256 = "1rrmdbaian8wskcyaa2nifp4mp4bz0nqgwz6ah5r0ywg48cfq2gm"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-crFBOWRjgFIm4mrX3Sf9ovodG5t8hhJUbMr2qpIt7LQ="; + vendorSha256 = "sha256-Oh1FBTHkICQZ79qf8XCL7ifi5Wd3jrIDupBKzYo+AEA="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests 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 12868dcc5a..5c8b9be54b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.11.1"; + version = "3.11.2"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-TrjPpKFHMF+dPz9AqXVkYPUNWeWEeH8bA37Dpxr7b8s="; + sha256 = "sha256-aUzVICPCxAUoPvnE7pqz+bscfukbEwB+iGmXAYuQ/eE="; }; - vendorSha256 = "sha256-LRMDrBSl5EGQqQt5FUU4JJHqdwfYt5qsVpe76jUQBVI="; + vendorSha256 = "sha256-Hf4ElC3H5sJkzKFELeDygTmfuqBHLqRhaHG1bfnqigM="; subPackages = [ "cmd/helm" ]; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/default.nix index 1b8b5a1b2a..ecd8b40056 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/default.nix @@ -46,10 +46,10 @@ # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.26.1+k3s1"; # k3s git tag - k3sCommit = "f10af367c3c96863c081ada4018e94e085c9404d"; # k3s git commit at the above version - k3sRepoSha256 = "13h20yb9gyrclhv2r0vv7fnsr73i06686rm6r0pcvy72hw26i848"; - k3sVendorSha256 = "sha256-WvkuXHG6NM9eScuu7qG3HDZbBPAJ6xVPz3RRuAxP994="; + k3sVersion = "1.26.2+k3s1"; # k3s git tag + k3sCommit = "ea094d1d497b26538b61b5cbc27c1a4a1f2f3f24"; # k3s git commit at the above version + k3sRepoSha256 = "13jrxr0imgkwl7bay4rrq9iv7ipak9hlmn82x9shr63hihlw7z9l"; + k3sVendorSha256 = "sha256-4uIOjHStU/DZk6YBdfC0F4L9z+csekMTjENJKpMmgx0="; # nix generated by update.sh # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/scripts/download#L29-L32 diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/karmor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/karmor/default.nix index 88967da07e..31285ee707 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/karmor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/karmor/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "karmor"; - version = "0.11.7"; + version = "0.12.4"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${version}"; - hash = "sha256-sXiv+aCYuN6GJB+6/G4Z1Oe/fB3OO+jhSvCAFUaiD3g="; + hash = "sha256-mz4RWKq3HNpxNl7i8wE1q2PoICUQrzTUSmyZII3GhS4="; }; - vendorHash = "sha256-9yCT9GspX2Tl6dISF8qvDF/Tm2mfwuDH+DrouFmxpj8="; + vendorHash = "sha256-Nxi6sNR7bDmeTcrg7Zx7UIqLvzNY6HK5qSSdfM2snj0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kluctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kluctl/default.nix index 6df6b472a4..755209adc9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kluctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kluctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kluctl"; - version = "2.19.2"; + version = "2.19.3"; src = fetchFromGitHub { owner = "kluctl"; repo = "kluctl"; rev = "v${version}"; - hash = "sha256-7+hXjYaCqInhP3O8IS8IwkUTGhnmcIWRR1qqvA6UQoc="; + hash = "sha256-yp471eWrwnJiCAVwqnZzq1rN1Mt4d42ymVvsUtTyOsc="; }; - vendorHash = "sha256-xBUrY8v4yHtWGaaRXHxQRGdZHzMGoJX2hFLL+0Vb1QY="; + vendorHash = "sha256-Ws0Qaw2hk8alOF/K5Wd0ZcMGr6Q3JiQIo/kHOXiGvmg="; ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; 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 c2818505a8..0b38759af9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "kubebuilder"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - hash = "sha256-AT7BrLVe5sSqAnQyhrkDktxVhuh1e0o5eB8oWWVbL8Q="; + hash = "sha256-sX+MYMZTRJ3udCtW3yeGBlYpJV35UDQwtcgi7/pXhek="; }; vendorHash = "sha256-wxKEywUs5ezeOlIRT2k3C4G0XaX6h1ORt9/G6+FzVic="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedog/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedog/default.nix index 9c1b14e6dd..d3c60e7e6c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kubedog"; - version = "0.9.6"; + version = "0.9.9"; src = fetchFromGitHub { owner = "werf"; repo = "kubedog"; rev = "v${version}"; - hash = "sha256-mwITvv2MuqzH1aB4iTVaFfZljyqOAu7vl4cORHT/OXQ="; + hash = "sha256-j7LR6+c2ZZJCqmHihXodtiF5bJhNR8eizDEqwm9IUn0="; }; - vendorHash = "sha256-HBo26cPiWJPDpsjPYUEBraHB2SZsUttrlBKpB9/SS6o="; + vendorHash = "sha256-UPfB3nOzJpqh14xLKZP2mLfg7C55nQivrkmh3B7aKzo="; subPackages = [ "cmd/kubedog" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix index 1b1dc175d3..7dcd1b3297 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "kubelogin"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "int128"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A8J381KNhQbWZ+68P8+1xj/lEEc/+YiJ80LqRQatdFQ="; + sha256 = "sha256-oBgth4lAQP4UrFIk/AErlfyyCgPrugs5wQJDFxqGum0="; }; subPackages = ["."]; - vendorSha256 = "sha256-V+O3yFxGJTcFETD2qYOurQUbME5NvRNQTr43OkxXFFE="; + vendorHash = "sha256-IJCbh1ryyk0r72SrVEiI7K5nIFf1+UGjTkXaNKpGsmo="; # Rename the binary instead of symlinking to avoid conflict with the # Azure version of kubelogin diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix new file mode 100644 index 0000000000..d9a8e0693e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubernetes-metrics-server"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "kubernetes-sigs"; + repo = "metrics-server"; + rev = "v${version}"; + sha256 = "sha256-TTI+dNBQ/jKt6Yhud3/OO+zOkeO46CmUz6J6ByX26JE="; + }; + + vendorSha256 = "sha256-lpSMvHYlPtlJQUqsdXJ6ewBEBiwLPvP/rsUgYzJhOxc="; + + preCheck = '' + # the e2e test breaks the sandbox, so let's skip that + rm test/e2e_test.go + ''; + + meta = with lib; { + homepage = "https://github.com/kubernetes-sigs/metrics-server"; + description = "Kubernetes container resource metrics collector"; + license = licenses.asl20; + maintainers = with maintainers; [ eskytthe ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix index 7af197a999..ade54ae4b7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - sha256 = "sha256-i8uKhzvU9ftlzgzU4ViYg6z+OUNNHGbiFhFAwDKwtnw="; + sha256 = "sha256-FHSvouD/7jZ70O3td6HLqXlOhMDbKPwqTy41Xwijyk4="; }; ldflags = [ @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00" ]; - vendorHash = "sha256-BGIh1wzHIk1kSvk/sQ/tDBhGIOOx0o6Dk4LbK9Z1FAQ="; + vendorHash = "sha256-jE1v9Ec4lEVcx+YjVtcsuNPCqr3x1pt8BMmC+OTwlRM="; subPackages = [ "cmd/cli/kubectl-kyverno" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/openlens/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/openlens/default.nix new file mode 100644 index 0000000000..42d3aab634 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/openlens/default.nix @@ -0,0 +1,40 @@ +{ lib, fetchurl, appimageTools, wrapGAppsHook }: + +let + pname = "openlens"; + version = "6.4.5"; + + src = fetchurl { + url = "https://github.com/MuhammedKalkan/OpenLens/releases/download/v${version}/OpenLens-${version}.x86_64.AppImage"; + sha256 = "sha256-Lwl4unhXSyYCEImiPncAnmIQt26CD4horsREMyi6nuA="; + }; + + appimageContents = appimageTools.extractType2 { + inherit pname version src; + }; + +in +appimageTools.wrapType2 { + inherit pname version src; + unshareIpc = false; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/open-lens.desktop $out/share/applications/${pname}.desktop + install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/open-lens.png \ + $out/share/icons/hicolor/512x512/apps/${pname}.png + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Icon=open-lens' 'Icon=${pname}' \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "The Kubernetes IDE"; + homepage = "https://github.com/MuhammedKalkan/OpenLens"; + license = licenses.mit; + maintainers = with maintainers; [ benwbooth sebtm ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/rancher/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/rancher/default.nix index 8c195ec2ff..c1712d6ffb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/rancher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/rancher/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rancher"; - version = "2.6.9"; + version = "2.6.11"; src = fetchFromGitHub { owner = "rancher"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-co4LVd5A0bJ4CIuCfv6WyV8XCMbPCFAAcV12WekYrw4="; + sha256 = "sha256-1hIYFQ9Uwrm6chPXka0yK2XoZYHqv5lJoyENZmgMAwc="; }; ldflags = [ @@ -19,7 +19,7 @@ buildGoModule rec { "-static" ]; - vendorSha256 = "sha256-oclMnt6uJa8SG2fNM0fi+HCVMMi4rkykx8VpK/tXilQ="; + vendorHash = "sha256-oclMnt6uJa8SG2fNM0fi+HCVMMi4rkykx8VpK/tXilQ="; postInstall = '' mv $out/bin/cli $out/bin/rancher diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix index b19b93e48f..2ad528f1f7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rke"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-4aT9SguxN7oaewnrxme1nCFfaQytSJ9Aeb0WEQACtUA="; + hash = "sha256-UTvDrrveFDrPD0ar87Q3NZSxTyCAe5gpp3e2QPeMMm4="; }; vendorHash = "sha256-zV1lrJhzrUAcEk6jYLCFrHcYw3CZart46qXErCTjZyQ="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/roxctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/roxctl/default.nix index 5ef93e307c..971f43117e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "roxctl"; - version = "3.73.2"; + version = "3.73.3"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-5MMSQy7SUFZhUycv1Kfkz46aY2tMldNZOH63wlQjq6o="; + sha256 = "sha256-ri4ir5mOfefB23gVk+XltXNYEz1jMoIVbJ5b0sS444k="; }; vendorHash = "sha256-YRNOOn/Ei0rHLZrTtQxlBBn48pePDHllnI65Iil160k="; 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 8ac7cd692e..3c0ebda08c 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 @@ -110,13 +110,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-ouS+0fLs4Zo17ZIqsd7CiYUKQMSNtuwVs3qdZ52qbns=", + "hash": "sha256-dOcsD5yJrn+zpX5F0ImIqD9d+iC228Wem/668RtsQNY=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v4.57.1", + "rev": "v4.58.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-X4fgw0AJMDDsRuS9MlMu+pnnjxJ33P9QXnpqDXfvfuA=" + "vendorHash": "sha256-nNQmiPBkIuQSBGDujMZI+dZMwv6xQcd8+nc1cMKrJws=" }, "azuread": { "hash": "sha256-MGCGfocs16qmJnvMRRD7TRHnPkS17h+oNUkMARAQhLs=", @@ -128,11 +128,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-PvlW3BB2ZATZA18nOGgxMSWzjC8YIjUY9ofw7XwnbmU=", + "hash": "sha256-XcqBkb+de+ikNtrDe33OZHhhv6ed2pXhbXXb7L661RI=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.46.0", + "rev": "v3.47.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -210,22 +210,22 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-gUOWUvdlmn+u6IL6UrzA8MKErl43VmtIqnilzUTKuis=", + "hash": "sha256-W+TuJhLP1bFTjSzLrkq9cqtt4uQB0yA/evFi8p4P0vs=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.24.0", + "rev": "v1.24.1", "spdx": "MPL-2.0", "vendorHash": "sha256-V5nI7B45VJb7j7AoPrKQknJbVW5C9oyDs9q2u8LXD+M=" }, "cloudflare": { - "hash": "sha256-fHugf+nvel/bSyh+l94q0iE7E+ZYBt2qfGSoot9xI8w=", + "hash": "sha256-LBMFszTXxiK1ZvqP6VjSCWk06/IVbJV9yEGkn6olM6k=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.0.0", + "rev": "v4.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-jIQcgGknigQFUkLjLoxUjq+Mqjb085v6Zqgd49Dxivo=" + "vendorHash": "sha256-ofuLOrJSztgwtohDoZdgd9DMJSK77z93L2NlqO5bmCM=" }, "cloudfoundry": { "hash": "sha256-Js/UBblHkCkfaBVOpYFGyrleOjpNE1mo+Sf3OpXLkfM=", @@ -382,11 +382,11 @@ "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg=" }, "fastly": { - "hash": "sha256-OODPVNHFW8hnpofWLvzn7qukngB8okZADYI5t9muHpQ=", + "hash": "sha256-XvDsL2N/S7DE+9ks8Y6ZY3hcogzUsiF7VymNK7NnmaI=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v3.2.0", + "rev": "v4.0.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -420,11 +420,11 @@ "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk=" }, "github": { - "hash": "sha256-GieysqBcXSgHuT13FqDtPPklFPRBREwMrTZZ7QH14pY=", + "hash": "sha256-5HOGOISVozkwJU1/CRpzBOqChWEG3TTNrE5tssgWtH8=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.18.0", + "rev": "v5.18.3", "spdx": "MIT", "vendorHash": null }, @@ -438,22 +438,22 @@ "vendorHash": "sha256-yK2M07+FmMEE9YuCJk86qLncHr2ToeZQAzWRQz1lLNM=" }, "google": { - "hash": "sha256-FdchvDE8aTGKZADeN1peeWMz2jVN4VL1pUf1Tf3e/3E=", + "hash": "sha256-tdsMjgGR9Tmk5wonihYlFqy8wzx60jEfnIh4dujvabY=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.56.0", + "rev": "v4.57.0", "spdx": "MPL-2.0", "vendorHash": "sha256-2dJAoDisGQOE21NBTjbFPM0hAYjHqo6QH/ONiHQU6hk=" }, "google-beta": { - "hash": "sha256-u7tGES1uiKpn47msir3rn118eWJsD9bnUAM+HHNZUyA=", + "hash": "sha256-e0Qnlu1O6h9s9+vo9yELifl5AmNNqhQc3Y6XorNCRQ8=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.56.0", + "rev": "v4.57.0", "spdx": "MPL-2.0", "vendorHash": "sha256-2dJAoDisGQOE21NBTjbFPM0hAYjHqo6QH/ONiHQU6hk=" }, @@ -467,13 +467,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-4K0Pk7tgnOjFdHpe6SZNSt/wU8OBzdB/y99nibW5bAY=", + "hash": "sha256-2Ig0ZwU9ZzsfAq5XCFMvL1NCmfnhVjoIrgl74hQypGE=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v1.35.0", + "rev": "v1.36.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-oSpAq2834Nt+E8l64YhvuXdfUsoTU5rBr2I8+Yz9tkc=" + "vendorHash": "sha256-zPO+TbJsFrgfjSaSrX5YRop/0LDDw/grNNntaIGiBU0=" }, "gridscale": { "hash": "sha256-ahYCrjrJPEItGyqbHYtgkIH/RzMyxBQkebSAyd8gwYo=", @@ -540,11 +540,11 @@ "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=" }, "huaweicloud": { - "hash": "sha256-x/5jt31yPTJRHSHRZqSrrjNdERWho6l71jvS7x6dR0c=", + "hash": "sha256-5Yw1b7tuGg8tDL1rQhqgFMTgtvc2k0n45dR5xvr7Dmo=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.45.0", + "rev": "v1.45.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -621,11 +621,11 @@ "vendorHash": "sha256-UnWHUD9T4nTT6Y2UrvBIdIk9eA8l0vWJ/IpEY3PIzDU=" }, "ksyun": { - "hash": "sha256-mq0wE9jkn67HFyg0MgtD9lY7lk0+4/rnPLJ4mXX0xwY=", + "hash": "sha256-1P4iv9UbSUepsKP+xKvy+YTHAIemMkwQruTrHyAsxsI=", "homepage": "https://registry.terraform.io/providers/kingsoftcloud/ksyun", "owner": "kingsoftcloud", "repo": "terraform-provider-ksyun", - "rev": "v1.3.66", + "rev": "v1.3.67", "spdx": "MPL-2.0", "vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ=" }, @@ -648,13 +648,13 @@ "vendorHash": null }, "launchdarkly": { - "hash": "sha256-7m5+Fu9UjmGWL4PgYCpI9vMStfmU4oQ1cx+7wAirEbQ=", + "hash": "sha256-zi4GzbQmvvfxQ5vL4FbVkqUcwm7Y4ET8GFeIc/LipTY=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.11.0", + "rev": "v2.12.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-j8Lit22aWeLvYrq5ao0nIdcVZDSxaAKaW+bxQ/JCSgE=" + "vendorHash": "sha256-Fb2k493XTePXgpCY9ZoMWaCZqq3fx3A2dBRsOp1MDBc=" }, "libvirt": { "hash": "sha256-VO9fbRLz7mDYT8WORodnN4l3II2j+TdpV8cZ9M+NjTM=", @@ -684,13 +684,13 @@ "vendorHash": "sha256-Jlg3a91pOhMC5SALzL9onajZUZ2H9mXfU5CKvotbCbw=" }, "local": { - "hash": "sha256-7P6p23lQ/2Ko/RKETVe7oSZUDwKeGdznUSvbxPWds+Y=", + "hash": "sha256-LN9mYtFNPPlG3Wdz0ggS57zYMO2chf6JipRmn+OKCnw=", "homepage": "https://registry.terraform.io/providers/hashicorp/local", "owner": "hashicorp", "repo": "terraform-provider-local", - "rev": "v2.3.0", + "rev": "v2.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-NXSquRqBaENxWX+ZukDJie/EU+wdEQSxvZQEZqjL+ug=" + "vendorHash": "sha256-ZjS40Xc8y2UBPn4rX3EgRoSapRvMEeVMGZE6z9tpsAQ=" }, "lxd": { "hash": "sha256-4BDpVWfdSYTKPTCgKIHOqgNaxgdIGjW5yRh9Ezs/0zY=", @@ -765,13 +765,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-ReVP0droWSP+NWV0kQznfCllL/jx0uQKmaGr+CyR8iQ=", + "hash": "sha256-bf4t4xcA/K4atLyDVzkeLw5zm9sBz/dUBiivVaz4hNU=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.15.0", + "rev": "v3.16.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-aFjsUhdGboN8Hfu2ky6djG0hC/Z9MU2tOWDFXekOGNQ=" + "vendorHash": "sha256-yF2yk85RLbvmULakODOV2V0Z9dzKfLClUSZTnECdO3o=" }, "nomad": { "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=", @@ -783,13 +783,13 @@ "vendorHash": "sha256-3t8pUAwuVeZN5cYGs72YsdRvJunudSmKSldFWEFVA/4=" }, "ns1": { - "hash": "sha256-fPeWs1VMsCY+OywHdwP9EUyjpoTYquBqP8W08Z/0DAA=", + "hash": "sha256-F7nKtDlVnW7jDPTeszYv9aYMAnHo2/k+MxsXdjghS88=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v2.0.0", + "rev": "v2.0.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-R4q9ASqTdKv4BG4zNktKsLxa6UU42UzWTLYHuRnJ4Zg=" + "vendorHash": "sha256-dGHT3mq5a+3KhNZQkYZ+HYrqxR9YT7Yn64UkmE0vz6M=" }, "null": { "hash": "sha256-ExXDbAXMVCTZBlYmi4kD/7JFB1fCFAoPL637+1N6rEI=", @@ -811,22 +811,22 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-PsTlJY9Y4o7qmA2h+jbIARB9N7+Qku8CaOAYkQ2CKBU=", + "hash": "sha256-ZERJIZ1nsvvMhZe9hjcZt5F1lFNFV4TP0ifNin+MC5M=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v4.110.0", + "rev": "v4.111.0", "spdx": "MPL-2.0", "vendorHash": null }, "okta": { - "hash": "sha256-3Ym2Q3Y2f26ioiB3N2HZiPsrgVe4zszJDR7e0gzxOHU=", + "hash": "sha256-O4ZTGYM9r3XFzr2Nx/Tt2Fs7WOqQuQWfo+ZMmZyg+mo=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v3.43.0", + "rev": "v3.44.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-7jA44ZcBGCeLrr+On8F9er+ch2qf6vbijTRtu+aHrB4=" + "vendorHash": "sha256-KYOzbbBjE2C7+1St62rs9mlJFhpIlWQJ0reh5V5tQsk=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -856,11 +856,11 @@ "vendorHash": "sha256-aoJDRzackPjWxkrsQclweUFH3Bqdcj1aTJuTHZ7Dh7g=" }, "opentelekomcloud": { - "hash": "sha256-UIpzv5Tas5jxpaqg1n0KRoJhYj6vRE6DBQ2u701xgzU=", + "hash": "sha256-fkEQ4VWGJiPFTA6Wz8AxAiL4DOW+Kewl8T9ywy/yPME=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.33.1", + "rev": "v1.33.2", "spdx": "MPL-2.0", "vendorHash": "sha256-EbUHKM6fKEZk1ey4qTgAd/20OKJu0DoBF0MAOxB7y64=" }, @@ -883,11 +883,11 @@ "vendorHash": null }, "pagerduty": { - "hash": "sha256-uicfk05Y8p4jQLG+Z8Cd2kI8rToI++13lsg0JUsm7Ew=", + "hash": "sha256-FHGoaWJQ3HRtY/LNCTX+L+jgYMPKkefjpbtfzMVbPQw=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v2.11.0", + "rev": "v2.11.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -964,11 +964,11 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-gscuuaohIOIdDAAUWKg82fm9iY51ZxoN4EeAxAzTvjI=", + "hash": "sha256-aWn/w7k+gxCodN7W9GBM9Ontkg6Ir2LNLYkY34ORxzI=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.12.1", + "rev": "v2.13.1", "spdx": "MPL-2.0", "vendorHash": "sha256-kh1wv7cuWCC1rP0WBQW95pFg53gZTakqGoMIDMDSmt0=" }, @@ -1045,13 +1045,13 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-bUFX6Ok7cYyaoYHElUIcEwl6DRGK8q+opKBCABo8CVM=", + "hash": "sha256-mbqnFKxHSh4IF+zPpT2wIz1/dJKpuM7TUHS0Cvt/srg=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.103.0", + "rev": "v1.106.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-IlztpEAI/Z7DUQ5pMaGSQnXWPedAIJlS773nxsRMCYg=" + "vendorHash": "sha256-TxTw+13HJDHDdLhGjM3SXOL87RJdRFs0Y+t/oK81DfI=" }, "stackpath": { "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=", @@ -1090,20 +1090,20 @@ "vendorHash": "sha256-2wPmLpjhG6QgG+BUCO0oIzHjBOWIOYuptgdtSIm9TZw=" }, "talos": { - "hash": "sha256-Uj4UlxPvI80og/wJPtQgyrejXLcfc6R4IJfsXiVNm+Y=", + "hash": "sha256-/Ml+Vsh50U5CoVdnls69iTPoSPpgAtOpO2hWlcmbyKw=", "homepage": "https://registry.terraform.io/providers/siderolabs/talos", "owner": "siderolabs", "repo": "terraform-provider-talos", - "rev": "v0.1.1", + "rev": "v0.1.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-tltQNtTsPoT5CTrKM7vLDVkmmW2FTd6MBubfXZveGxI=" + "vendorHash": "sha256-GkmUKSnqkabwGCl22/90529BWb0oJaIJHYHlS/h3KNY=" }, "tencentcloud": { - "hash": "sha256-91efifPY9ErjqtNPzm3+XSy1Jy+eQs2znxYzez74J/0=", + "hash": "sha256-iQHueKyp1bYj5/hRDmUFENSc5V7Q3+eq3mmYGIvPOG8=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.79.13", + "rev": "v1.79.15", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1254,12 +1254,12 @@ "vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ=" }, "yandex": { - "hash": "sha256-0P8R0L5PGrDKWGd92OkKi9WCfMK5IrdYJyoINaZWZjc=", + "hash": "sha256-XT31rLurZAvjE08cAGIkd7pcS1LMdOIU6e60qLrLsXI=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "proxyVendor": true, "repo": "terraform-provider-yandex", - "rev": "v0.86.0", + "rev": "v0.87.0", "spdx": "MPL-2.0", "vendorHash": "sha256-r2+ARKvTghscGBhmZpz84vdBudiy2OsmQR03oDz5gbs=" } 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 6a722b80b8..bc7a2545bd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -168,9 +168,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.3.9"; - hash = "sha256-gwuUdO9m4Q2tFRLSVTbcsclOq9jcbQU4JV9nIElTkQ4="; - vendorHash = "sha256-CE6jNBvM0980+R0e5brK5lMrkad+91qTt9mp2h3NZyY="; + version = "1.4.0"; + hash = "sha256-jt+axusOYbJmGJpim8i76Yfb/QgWduUmZMIiIs0CJoA="; + vendorHash = "sha256-M22VONnPs0vv2L3q/2RjE0+Jna/Kv95xubVNthp5bMc="; 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 23df7ddd9a..1c116d5ec2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.44.4"; + version = "0.44.5"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Y+7Q9b6c6oetlFUgSQXUcOuGywgrQGK9Lb6oiwiyp7M="; + hash = "sha256-1wuK3rdc17fCAZjqJNReYYPy284BHyB3gp+xUt09oIY="; }; vendorHash = "sha256-eY9YwXSIOrXbVWUIfVrUIRso1F5weBGKbPFv43k8t2Y="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix index dcb4dd9eb0..3934bc2240 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "velero"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-jN45chUeoGJGJWD6Rj6duNE36/QCzPqci8V3h1OHtw4="; + sha256 = "sha256-VrzDCRZR2Sh4yk0451016zTPKzV19MSgXXeg8tXWd8o="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" ]; - vendorHash = "sha256-mvVwf4w/65L+F6aiTNf2jmJtaT1EpWCQJ6r9NHUUUqQ="; + vendorHash = "sha256-zpJ2X4+Yo5BSmlnB2f5Af36jXu8oc5saRfPupstQWC4="; excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; 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 a25fad9312..e594e7d4ec 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.204"; + version = "1.2.207"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-/AMOnoED7MKvX/UTRWVGyXw8xuAHQWCnBnA6aQujXiE="; + hash = "sha256-qAptDffM4ZufEPmrhxlGgMyNoih7JYptUVnPfyXy7ok="; }; - vendorHash = "sha256-SzqGcbfDtBfgnu6CRPyk2tPdwNDhM1RfteKTXVvivw4="; + vendorHash = "sha256-QQ0CjyBz1gY6o2I45DA9iD7rrJGVTvWvl4u8ZHuHNeg="; proxyVendor = true; @@ -64,7 +64,7 @@ buildGoModule rec { integration/suites \ pkg/true_git/*test.go \ test/e2e - '' + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) '' + # Remove failing tests. rm -rf \ cmd/werf/docs/replacers/kubectl/kubectl_test.go diff --git a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix index e9c1d3dde5..ef6d723f3b 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.27.1"; + version = "3.27.2"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WXYmV4QE0OPv1reYX+YrmqGdnRUDHXBt60NIUDLTDLk="; + sha256 = "sha256-2U5DlXnW+mCxGfdjikeMm+k+KyxDwjXmjGrH3uq4lJo="; }; - vendorHash = "sha256-FxKmFDx5ckLm8uJB9ouYSwjX+Pu20In6ertGzhhlEwA="; + vendorHash = "sha256-h0n0dR1iqeVEFvcDeMlfBu7mlrSNloAih2ZhT3ML1FI="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix index f80be45ebd..7563e8c22d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix @@ -66,9 +66,6 @@ python3.pkgs.buildPythonApplication rec { requests ]; - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - dontWrapGApps = true; preFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix index fbb73dbd96..4edf146b33 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.5.27"; + version = "3.5.31"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-EeQs7WcNpnz2KrgUel9OF9pwW7WzKJrv5pvsZkV4RVg="; + hash = "sha256-v6N1isaTVPwV/LC/a2lzrboLI6V/4W586RE5esfR500="; }; postPatch = '' @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ # See https://github.com/Flexget/Flexget/blob/master/requirements.txt - APScheduler + apscheduler beautifulsoup4 click colorama @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec { packaging psutil pynzb - PyRSS2Gen + pyrss2gen python-dateutil pyyaml rebulk @@ -70,6 +70,10 @@ python3Packages.buildPythonApplication rec { transmission-rpc ]; + pythonImportsCheck = [ + "flexget" + ]; + meta = with lib; { homepage = "https://flexget.com/"; changelog = "https://github.com/Flexget/Flexget/releases/tag/v${version}"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix index 60c928e0b9..ee114446ac 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix @@ -12,7 +12,7 @@ , sqlite , tinyxml , wrapGAppsHook -, wxGTK30 +, wxGTK32 , gtk3 , xdg-utils }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { pugixml sqlite tinyxml - wxGTK30 + wxGTK32 gtk3 xdg-utils ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/geph/default.nix b/third_party/nixpkgs/pkgs/applications/networking/geph/default.nix new file mode 100644 index 0000000000..2b7987fa1e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/geph/default.nix @@ -0,0 +1,122 @@ +{ lib +, stdenvNoCC +, rustPlatform +, fetchFromGitHub +, buildNpmPackage +, perl +, pkg-config +, glib +, webkitgtk +, libappindicator-gtk3 +, libayatana-appindicator +, cairo +, openssl +}: + +let + version = "4.7.8"; + geph-meta = with lib; { + description = "A modular Internet censorship circumvention system designed specifically to deal with national filtering."; + homepage = "https://geph.io"; + platforms = platforms.linux; + maintainers = with maintainers; [ penalty1083 ]; + }; +in +{ + cli = rustPlatform.buildRustPackage rec { + pname = "geph4-client"; + inherit version; + + src = fetchFromGitHub { + owner = "geph-official"; + repo = pname; + rev = "v${version}"; + hash = "sha256-DVGbLyFgraQMSIUAqDehF8DqbnvcaeWbuLVgiSQY3KE="; + }; + + cargoHash = "sha256-uBq6rjUnKEscwhu60HEZffLvuXcArz+AiR52org+qKw="; + + nativeBuildInputs = [ perl ]; + + meta = geph-meta // { + license = with lib.licenses; [ gpl3Only ]; + }; + }; + + gui = stdenvNoCC.mkDerivation rec { + pname = "geph-gui"; + inherit version; + + src = fetchFromGitHub { + owner = "geph-official"; + repo = "gephgui-pkg"; + rev = "85a55bfc2f4314d9c49608f252080696b1f8e2a9"; + hash = "sha256-id/sfaQsF480kUXg//O5rBIciuuhDuXY19FQe1E3OQs="; + fetchSubmodules = true; + }; + + gephgui = buildNpmPackage { + pname = "gephgui"; + inherit version src; + + sourceRoot = "source/gephgui-wry/gephgui"; + + postPatch = "ln -s ${./package-lock.json} ./package-lock.json"; + + npmDepsHash = "sha256-5y6zpMF4M56DiWVhMvjJGsYpVdlJSoWoWyPgLc7hJoo="; + + installPhase = '' + runHook preInstall + + mkdir -p $out + mv dist $out + + runHook postInstall + ''; + }; + + gephgui-wry = rustPlatform.buildRustPackage rec { + pname = "gephgui-wry"; + inherit version src; + + sourceRoot = "source/gephgui-wry"; + + cargoHash = "sha256-lidlUUfHXKPUlICdaVv/SFlyyWsZ7cYHyTJ3kkMn3L4="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + glib + webkitgtk + libappindicator-gtk3 + libayatana-appindicator + cairo + openssl + ]; + + preBuild = '' + ln -s ${gephgui}/dist ./gephgui + ''; + }; + + dontBuild = true; + + installPhase = '' + install -Dt $out/bin ${gephgui-wry}/bin/gephgui-wry + install -d $out/share/icons/hicolor + for i in '16' '32' '64' '128' '256' + do + name=''${i}x''${i} + dir=$out/share/icons/hicolor + mkdir -p $dir + mv flatpak/icons/$name $dir + done + install -Dt $out/share/applications flatpak/icons/io.geph.GephGui.desktop + sed -i -e '/StartupWMClass/s/=.*/=gephgui-wry/' $out/share/applications/io.geph.GephGui.desktop + ''; + + meta = geph-meta // { + license = with lib.licenses; [ unfree ]; + }; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/geph/package-lock.json b/third_party/nixpkgs/pkgs/applications/networking/geph/package-lock.json new file mode 100644 index 0000000000..1523705c18 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/geph/package-lock.json @@ -0,0 +1,3658 @@ +{ + "name": "gephgui-html", + "version": "0.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "gephgui-html", + "version": "0.0.0", + "dependencies": { + "@extractus/feed-extractor": "^6.2.1", + "@smui/chips": "7.0.0-beta.0", + "@smui/form-field": "7.0.0-beta.0", + "@vitejs/plugin-legacy": "^2.3.0", + "country-code-emoji": "^2.3.0", + "country-flag-icons": "^1.5.5", + "darkreader": "^4.9.58", + "detect-nearest-browser-locale": "^19.0.0", + "knuth-shuffle": "^1.0.8", + "knuth-shuffle-seeded": "^1.0.6", + "openmoji": "^14.0.0", + "stream-browserify": "^3.0.0", + "svelte-material-icons": "^2.0.4", + "svelte-material-ui": "^6.2.0", + "terser": "^5.15.1", + "tinyld": "=1.3.1", + "twemoji": "^14.0.2", + "uplot": "^1.6.22" + }, + "devDependencies": { + "@rollup/plugin-dsv": "^2.0.3", + "@smui/button": "^6.1.4", + "@smui/checkbox": "^6.1.4", + "@smui/circular-progress": "^6.1.4", + "@smui/data-table": "^6.2.0", + "@smui/dialog": "^6.1.4", + "@smui/icon-button": "^6.1.4", + "@smui/linear-progress": "^6.1.4", + "@smui/ripple": "^6.1.4", + "@smui/select": "^6.2.0", + "@smui/snackbar": "^6.1.4", + "@smui/switch": "^6.1.4", + "@smui/tab": "^6.1.4", + "@smui/tab-bar": "^6.1.4", + "@smui/textfield": "^6.1.4", + "@sveltejs/vite-plugin-svelte": "^1.0.2", + "@tsconfig/svelte": "^3.0.0", + "rollup": "^2.79.1", + "svelte": "^3.50.1", + "svelte-check": "^2.8.1", + "svelte-preprocess": "^4.10.7", + "tslib": "^2.4.0", + "typescript": "^4.6.4", + "vite": "^3.1.0" + } + }, + "node_modules/@babel/standalone": { + "version": "7.21.2", + "resolved": "https://registry.npmmirror.com/@babel/standalone/-/standalone-7.21.2.tgz", + "integrity": "sha512-ySP/TJcyqMJVg1M/lmnPVi6L+F+IJpQ4+0lqtf723LERbk1N8/0JgLgm346cRAzfHaoXkLq/M/mJBd2uo25RBA==", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.15.18.tgz", + "integrity": "sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz", + "integrity": "sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==", + "cpu": [ + "loong64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@extractus/feed-extractor": { + "version": "6.2.1", + "resolved": "https://registry.npmmirror.com/@extractus/feed-extractor/-/feed-extractor-6.2.1.tgz", + "integrity": "sha512-zCIcvp4CDhgqdX17MJenBCXXm4NMVFJyKmvVMzl3LwOyFUEmpO4WGjtzXhxw1XN1Mjj5gvPclJNPgRBGlom2zA==", + "dependencies": { + "bellajs": "^11.1.1", + "cross-fetch": "^3.1.5", + "fast-xml-parser": "^4.0.13", + "html-entities": "^2.3.3" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.2", + "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", + "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "dependencies": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.0", + "resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", + "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.1.2", + "resolved": "https://registry.npmmirror.com/@jridgewell/set-array/-/set-array-1.1.2.tgz", + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/source-map": { + "version": "0.3.2", + "resolved": "https://registry.npmmirror.com/@jridgewell/source-map/-/source-map-0.3.2.tgz", + "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.14", + "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", + "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.17", + "resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", + "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", + "dependencies": { + "@jridgewell/resolve-uri": "3.1.0", + "@jridgewell/sourcemap-codec": "1.4.14" + } + }, + "node_modules/@material/animation": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/animation/-/animation-13.0.0.tgz", + "integrity": "sha512-YR0/u4u56qXDjKYolQ7F+IvlPkaSBhMl/dZv8DK0FbD6PH4ckOPd3bEXNRndXtprsxwknQQP2pttjPImylkl0g==", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@material/banner": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/banner/-/banner-13.0.0.tgz", + "integrity": "sha512-59M85ezhwRaa+BqguYCCaRS57fV5KQe3Ff2cU6LcQNw0UPMFW1ap0dZ+iZBv/sj+7/QcqBBShL9uu8dWKtI4Gg==", + "dependencies": { + "@material/base": "^13.0.0", + "@material/button": "^13.0.0", + "@material/dom": "^13.0.0", + "@material/elevation": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/shape": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/tokens": "^13.0.0", + "@material/typography": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/base": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/base/-/base-13.0.0.tgz", + "integrity": "sha512-vFx0JryRfcvUNX3cZ2u32wUMvxzd+c/YW0LFOXNgqCDWlubHcMm0Y6Wz371LhfQo80/NE69u+/4Joo99yKnVeg==", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@material/button": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/button/-/button-13.0.0.tgz", + "integrity": "sha512-lYorht6fcEd4P+dsLVp2BGtaY5cGYNp71LMajuDe71GZX3dZPoKeVvb+Ie1S7vcB+o+WLTeaisMk9/vA4gfi8A==", + "dependencies": { + "@material/density": "^13.0.0", + "@material/dom": "^13.0.0", + "@material/elevation": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/shape": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/tokens": "^13.0.0", + "@material/touch-target": "^13.0.0", + "@material/typography": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/card": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/card/-/card-13.0.0.tgz", + "integrity": "sha512-ooJUOt1Viv99Dyz4rhz9ZZbfa996eHh3RUuXkPRkT66Btd5TzpdqsQWKwOVc5bgbgWqzhDWQ6A/aQdYqH97ccg==", + "dependencies": { + "@material/dom": "^13.0.0", + "@material/elevation": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/shape": "^13.0.0", + "@material/theme": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/checkbox": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/checkbox/-/checkbox-13.0.0.tgz", + "integrity": "sha512-tRC6n9Jq7GgdU0d1F8NOvUy6WiRZR58tUgL1QqoiQK9PGKSt0dAF3Aa48uubO7/Lt9K4NqgwV6/OeHv8pHaM/w==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/density": "^13.0.0", + "@material/dom": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/touch-target": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/chips": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/chips/-/chips-14.0.0.tgz", + "integrity": "sha512-SfZX/Ovdq4NgjdtIr/N1O3fEHisZC+t8G8629OV/NrniSS6rKOa+q1mImzna8R4pfuYO+7nT5nZewQpL/JSYaQ==", + "dependencies": { + "@material/animation": "^14.0.0", + "@material/base": "^14.0.0", + "@material/checkbox": "^14.0.0", + "@material/density": "^14.0.0", + "@material/dom": "^14.0.0", + "@material/elevation": "^14.0.0", + "@material/feature-targeting": "^14.0.0", + "@material/focus-ring": "^14.0.0", + "@material/ripple": "^14.0.0", + "@material/rtl": "^14.0.0", + "@material/shape": "^14.0.0", + "@material/theme": "^14.0.0", + "@material/tokens": "^14.0.0", + "@material/touch-target": "^14.0.0", + "@material/typography": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/chips/node_modules/@material/animation": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/animation/-/animation-14.0.0.tgz", + "integrity": "sha512-VlYSfUaIj/BBVtRZI8Gv0VvzikFf+XgK0Zdgsok5c1v5DDnNz5tpB8mnGrveWz0rHbp1X4+CWLKrTwNmjrw3Xw==", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@material/chips/node_modules/@material/base": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/base/-/base-14.0.0.tgz", + "integrity": "sha512-Ou7vS7n1H4Y10MUZyYAbt6H0t67c6urxoCgeVT7M38aQlaNUwFMODp7KT/myjYz2YULfhu3PtfSV3Sltgac9mA==", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@material/chips/node_modules/@material/checkbox": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/checkbox/-/checkbox-14.0.0.tgz", + "integrity": "sha512-OoqwysCqvj1d0cRmEwVWPvg5OqYAiCFpE6Wng6me/Cahfe4xgRxSPa37WWqsClw20W7PG/5RrYRCBtc6bUUUZA==", + "dependencies": { + "@material/animation": "^14.0.0", + "@material/base": "^14.0.0", + "@material/density": "^14.0.0", + "@material/dom": "^14.0.0", + "@material/feature-targeting": "^14.0.0", + "@material/focus-ring": "^14.0.0", + "@material/ripple": "^14.0.0", + "@material/theme": "^14.0.0", + "@material/touch-target": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/chips/node_modules/@material/density": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/density/-/density-14.0.0.tgz", + "integrity": "sha512-NlxXBV5XjNsKd8UXF4K/+fOXLxoFNecKbsaQO6O2u+iG8QBfFreKRmkhEBb2hPPwC3w8nrODwXX0lHV+toICQw==", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@material/chips/node_modules/@material/dom": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/dom/-/dom-14.0.0.tgz", + "integrity": "sha512-8t88XyacclTj8qsIw9q0vEj4PI2KVncLoIsIMzwuMx49P2FZg6TsLjor262MI3Qs00UWAifuLMrhnOnfyrbe7Q==", + "dependencies": { + "@material/feature-targeting": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/chips/node_modules/@material/elevation": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/elevation/-/elevation-14.0.0.tgz", + "integrity": "sha512-Di3tkxTpXwvf1GJUmaC8rd+zVh5dB2SWMBGagL4+kT8UmjSISif/OPRGuGnXs3QhF6nmEjkdC0ijdZLcYQkepw==", + "dependencies": { + "@material/animation": "^14.0.0", + "@material/base": "^14.0.0", + "@material/feature-targeting": "^14.0.0", + "@material/rtl": "^14.0.0", + "@material/theme": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/chips/node_modules/@material/feature-targeting": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/feature-targeting/-/feature-targeting-14.0.0.tgz", + "integrity": "sha512-a5WGgHEq5lJeeNL5yevtgoZjBjXWy6+klfVWQEh8oyix/rMJygGgO7gEc52uv8fB8uAIoYEB3iBMOv8jRq8FeA==", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@material/chips/node_modules/@material/ripple": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/ripple/-/ripple-14.0.0.tgz", + "integrity": "sha512-9XoGBFd5JhFgELgW7pqtiLy+CnCIcV2s9cQ2BWbOQeA8faX9UZIDUx/g76nHLZ7UzKFtsULJxZTwORmsEt2zvw==", + "dependencies": { + "@material/animation": "^14.0.0", + "@material/base": "^14.0.0", + "@material/dom": "^14.0.0", + "@material/feature-targeting": "^14.0.0", + "@material/rtl": "^14.0.0", + "@material/theme": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/chips/node_modules/@material/rtl": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/rtl/-/rtl-14.0.0.tgz", + "integrity": "sha512-xl6OZYyRjuiW2hmbjV2omMV8sQtfmKAjeWnD1RMiAPLCTyOW9Lh/PYYnXjxUrNa0cRwIIbOn5J7OYXokja8puA==", + "dependencies": { + "@material/theme": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/chips/node_modules/@material/shape": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/shape/-/shape-14.0.0.tgz", + "integrity": "sha512-o0mJB0+feOv473KckI8gFnUo8IQAaEA6ynXzw3VIYFjPi48pJwrxa0mZcJP/OoTXrCbDzDeFJfDPXEmRioBb9A==", + "dependencies": { + "@material/feature-targeting": "^14.0.0", + "@material/rtl": "^14.0.0", + "@material/theme": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/chips/node_modules/@material/theme": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/theme/-/theme-14.0.0.tgz", + "integrity": "sha512-6/SENWNIFuXzeHMPHrYwbsXKgkvCtWuzzQ3cUu4UEt3KcQ5YpViazIM6h8ByYKZP8A9d8QpkJ0WGX5btGDcVoA==", + "dependencies": { + "@material/feature-targeting": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/chips/node_modules/@material/tokens": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/tokens/-/tokens-14.0.0.tgz", + "integrity": "sha512-SXgB9VwsKW4DFkHmJfDIS0x0cGdMWC1D06m6z/WQQ5P5j6/m0pKrbHVlrLzXcRjau+mFhXGvj/KyPo9Pp/Rc8Q==", + "dependencies": { + "@material/elevation": "^14.0.0" + } + }, + "node_modules/@material/chips/node_modules/@material/touch-target": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/touch-target/-/touch-target-14.0.0.tgz", + "integrity": "sha512-o3kvxmS4HkmZoQTvtzLJrqSG+ezYXkyINm3Uiwio1PTg67pDgK5FRwInkz0VNaWPcw9+5jqjUQGjuZMtjQMq8w==", + "dependencies": { + "@material/base": "^14.0.0", + "@material/feature-targeting": "^14.0.0", + "@material/rtl": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/chips/node_modules/@material/typography": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/typography/-/typography-14.0.0.tgz", + "integrity": "sha512-/QtHBYiTR+TPMryM/CT386B2WlAQf/Ae32V324Z7P40gHLKY/YBXx7FDutAWZFeOerq/two4Nd2aAHBcMM2wMw==", + "dependencies": { + "@material/feature-targeting": "^14.0.0", + "@material/theme": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/circular-progress": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/circular-progress/-/circular-progress-13.0.0.tgz", + "integrity": "sha512-jSbr0ywY2N6s05tyqTXl/cG339C+qU3ck3FwXUq5SJup8CWT0AoJ8EG/CD10CEhNH8nH9Iwstve95oNgIt8G4g==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/progress-indicator": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/theme": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/data-table": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/data-table/-/data-table-13.0.0.tgz", + "integrity": "sha512-Z3yEq1T6Om/A3ntPw0bd40dqtOR4H3++pvchgW35kq+V9xDLL0hfzmuiy0QH4plA2ZsFYJxjt02k/SRvnkjKPQ==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/checkbox": "^13.0.0", + "@material/density": "^13.0.0", + "@material/dom": "^13.0.0", + "@material/elevation": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/icon-button": "^13.0.0", + "@material/linear-progress": "^13.0.0", + "@material/list": "^13.0.0", + "@material/menu": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/select": "^13.0.0", + "@material/shape": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/touch-target": "^13.0.0", + "@material/typography": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/density": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/density/-/density-13.0.0.tgz", + "integrity": "sha512-ppJTzOsuhjQam5GvHaq/XZocZNUr+41XQ2sd5nONAmQ0wwzXgqG0FaxtF1EXqK3uZFadz+vAu6enagre9DXhTA==", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@material/dialog": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/dialog/-/dialog-13.0.0.tgz", + "integrity": "sha512-1Ggo9Bid94F1ttZJKSjIcgMvkVQtKsqwbqLs5cWlleaiwtAcwUE12XA2B1MNj8xM9ajU3BJm4GigupBOK1jGHQ==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/button": "^13.0.0", + "@material/dom": "^13.0.0", + "@material/elevation": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/icon-button": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/shape": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/tokens": "^13.0.0", + "@material/touch-target": "^13.0.0", + "@material/typography": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/dom": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/dom/-/dom-13.0.0.tgz", + "integrity": "sha512-M9HLAYBZtkTUvf66FL+jAEvUOdhji1HkGA1mV6oyE+HY9gkCkmso+mngvzlLd5+uaAVE9I3WQFhSb9gp0cpXnw==", + "dependencies": { + "@material/feature-targeting": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/drawer": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/drawer/-/drawer-13.0.0.tgz", + "integrity": "sha512-TIV/K9MED3ymngmKrdLwOMhUF44BzoR6HuTVsZAM4bgy0sfSv+jzgaGUqJsvjEhTXk+Q9OTEge+TsU/ETzQCbg==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/dom": "^13.0.0", + "@material/elevation": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/list": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/shape": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/typography": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/elevation": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/elevation/-/elevation-13.0.0.tgz", + "integrity": "sha512-hzdblgamVRbC0UwKafcvUVDvKzMiOSveDiwGgFk+EAg/tZRdwMlQPyf/9I6Lr8Cw/pNGnEOPhmCDOYPOHimr0w==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/theme": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/fab": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/fab/-/fab-13.0.0.tgz", + "integrity": "sha512-qOi+XWEZWUR5T961UjSorgqm5VaanuZtRN3nsrKqHH1p0L8fYRc3qkGIChlaY9p7BcOYMCynXJzT+MfELVrcwA==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/dom": "^13.0.0", + "@material/elevation": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/shape": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/tokens": "^13.0.0", + "@material/touch-target": "^13.0.0", + "@material/typography": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/feature-targeting": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/feature-targeting/-/feature-targeting-13.0.0.tgz", + "integrity": "sha512-QJClfeaA4EMyAxKJy9WR0Nx+/VwSZCkhGLUVBG9NhxqYGfl/LtaeaidrNm32vYEoNZAofN92VD2RwQTRwp/dMQ==", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@material/floating-label": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/floating-label/-/floating-label-13.0.0.tgz", + "integrity": "sha512-imAPamD97QrizVCOpxjr3UfQJyDBpEEhDBSbEbKLrCpqG3jQx4/My5rNKKVGWjxUiBYgBA1dhkn98RRX5tGBtQ==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/dom": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/typography": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/focus-ring": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/focus-ring/-/focus-ring-14.0.0.tgz", + "integrity": "sha512-fqqka6iSfQGJG3Le48RxPCtnOiaLGPDPikhktGbxlyW9srBVMgeCiONfHM7IT/1eu80O0Y67Lh/4ohu5+C+VAQ==", + "dependencies": { + "@material/dom": "^14.0.0", + "@material/feature-targeting": "^14.0.0", + "@material/rtl": "^14.0.0" + } + }, + "node_modules/@material/focus-ring/node_modules/@material/dom": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/dom/-/dom-14.0.0.tgz", + "integrity": "sha512-8t88XyacclTj8qsIw9q0vEj4PI2KVncLoIsIMzwuMx49P2FZg6TsLjor262MI3Qs00UWAifuLMrhnOnfyrbe7Q==", + "dependencies": { + "@material/feature-targeting": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/focus-ring/node_modules/@material/feature-targeting": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/feature-targeting/-/feature-targeting-14.0.0.tgz", + "integrity": "sha512-a5WGgHEq5lJeeNL5yevtgoZjBjXWy6+klfVWQEh8oyix/rMJygGgO7gEc52uv8fB8uAIoYEB3iBMOv8jRq8FeA==", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@material/focus-ring/node_modules/@material/rtl": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/rtl/-/rtl-14.0.0.tgz", + "integrity": "sha512-xl6OZYyRjuiW2hmbjV2omMV8sQtfmKAjeWnD1RMiAPLCTyOW9Lh/PYYnXjxUrNa0cRwIIbOn5J7OYXokja8puA==", + "dependencies": { + "@material/theme": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/focus-ring/node_modules/@material/theme": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/theme/-/theme-14.0.0.tgz", + "integrity": "sha512-6/SENWNIFuXzeHMPHrYwbsXKgkvCtWuzzQ3cUu4UEt3KcQ5YpViazIM6h8ByYKZP8A9d8QpkJ0WGX5btGDcVoA==", + "dependencies": { + "@material/feature-targeting": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/form-field": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/form-field/-/form-field-14.0.0.tgz", + "integrity": "sha512-k1GNBj6Sp8A7Xsn5lTMp5DkUkg60HX7YkQIRyFz1qCDCKJRWh/ou7Z45GMMgKmG3aF6LfjIavc7SjyCl8e5yVg==", + "dependencies": { + "@material/base": "^14.0.0", + "@material/feature-targeting": "^14.0.0", + "@material/ripple": "^14.0.0", + "@material/rtl": "^14.0.0", + "@material/theme": "^14.0.0", + "@material/typography": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/form-field/node_modules/@material/animation": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/animation/-/animation-14.0.0.tgz", + "integrity": "sha512-VlYSfUaIj/BBVtRZI8Gv0VvzikFf+XgK0Zdgsok5c1v5DDnNz5tpB8mnGrveWz0rHbp1X4+CWLKrTwNmjrw3Xw==", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@material/form-field/node_modules/@material/base": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/base/-/base-14.0.0.tgz", + "integrity": "sha512-Ou7vS7n1H4Y10MUZyYAbt6H0t67c6urxoCgeVT7M38aQlaNUwFMODp7KT/myjYz2YULfhu3PtfSV3Sltgac9mA==", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@material/form-field/node_modules/@material/dom": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/dom/-/dom-14.0.0.tgz", + "integrity": "sha512-8t88XyacclTj8qsIw9q0vEj4PI2KVncLoIsIMzwuMx49P2FZg6TsLjor262MI3Qs00UWAifuLMrhnOnfyrbe7Q==", + "dependencies": { + "@material/feature-targeting": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/form-field/node_modules/@material/feature-targeting": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/feature-targeting/-/feature-targeting-14.0.0.tgz", + "integrity": "sha512-a5WGgHEq5lJeeNL5yevtgoZjBjXWy6+klfVWQEh8oyix/rMJygGgO7gEc52uv8fB8uAIoYEB3iBMOv8jRq8FeA==", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@material/form-field/node_modules/@material/ripple": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/ripple/-/ripple-14.0.0.tgz", + "integrity": "sha512-9XoGBFd5JhFgELgW7pqtiLy+CnCIcV2s9cQ2BWbOQeA8faX9UZIDUx/g76nHLZ7UzKFtsULJxZTwORmsEt2zvw==", + "dependencies": { + "@material/animation": "^14.0.0", + "@material/base": "^14.0.0", + "@material/dom": "^14.0.0", + "@material/feature-targeting": "^14.0.0", + "@material/rtl": "^14.0.0", + "@material/theme": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/form-field/node_modules/@material/rtl": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/rtl/-/rtl-14.0.0.tgz", + "integrity": "sha512-xl6OZYyRjuiW2hmbjV2omMV8sQtfmKAjeWnD1RMiAPLCTyOW9Lh/PYYnXjxUrNa0cRwIIbOn5J7OYXokja8puA==", + "dependencies": { + "@material/theme": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/form-field/node_modules/@material/theme": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/theme/-/theme-14.0.0.tgz", + "integrity": "sha512-6/SENWNIFuXzeHMPHrYwbsXKgkvCtWuzzQ3cUu4UEt3KcQ5YpViazIM6h8ByYKZP8A9d8QpkJ0WGX5btGDcVoA==", + "dependencies": { + "@material/feature-targeting": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/form-field/node_modules/@material/typography": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/typography/-/typography-14.0.0.tgz", + "integrity": "sha512-/QtHBYiTR+TPMryM/CT386B2WlAQf/Ae32V324Z7P40gHLKY/YBXx7FDutAWZFeOerq/two4Nd2aAHBcMM2wMw==", + "dependencies": { + "@material/feature-targeting": "^14.0.0", + "@material/theme": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/icon-button": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/icon-button/-/icon-button-13.0.0.tgz", + "integrity": "sha512-SdxFytWvbfN0fj7jHFq3DqK5/Zoms+Ipuv6fI8AzwgDFe7mXJ2euPahN+3XcmJ3BaSMyfYsdbcYdCWs8bgHW1w==", + "dependencies": { + "@material/base": "^13.0.0", + "@material/density": "^13.0.0", + "@material/elevation": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/touch-target": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/image-list": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/image-list/-/image-list-13.0.0.tgz", + "integrity": "sha512-D78QKpK5JmO6zrbsSYt1YfRlkqzzduDTe6BstS0efUFS1CA11hrqwQFoMaR1L1dw2U3CQ/CP22bBMSZVV9aU6A==", + "dependencies": { + "@material/feature-targeting": "^13.0.0", + "@material/shape": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/typography": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/layout-grid": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/layout-grid/-/layout-grid-13.0.0.tgz", + "integrity": "sha512-9L1BVLRIyetm/AOC+59+yca6R0OO2AJKHiUMdZrxgUVjqVblqWXEMeONZqslFRGHBiSIaYdrDIhn4ZTYY6tKUA==", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@material/line-ripple": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/line-ripple/-/line-ripple-13.0.0.tgz", + "integrity": "sha512-5djBRXrd1+SiMVUTWr4rD6xv+/qTaGGmgUS5GytBE5mczvnEwcPmM4PzF+HNj2TS+wvNvIfRjRmUzWO2Z6w2lA==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/theme": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/linear-progress": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/linear-progress/-/linear-progress-13.0.0.tgz", + "integrity": "sha512-FJpP6flSME5QRPfkB616uA5bk9aMKJBqkklrHk6dSMZaTKbiHRmc6faxMIZ4w9W49JFMXaSwzC39y96tQTiRQg==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/progress-indicator": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/theme": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/list": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/list/-/list-13.0.0.tgz", + "integrity": "sha512-poq4WNDEfW6Z3YPAn3wdBX4RSkj3A83Pht6984MmG8YJZMlq34ftHECw37VcdmFJIyRPdpZqywJo/i7CxsSAgQ==", + "dependencies": { + "@material/base": "^13.0.0", + "@material/density": "^13.0.0", + "@material/dom": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/shape": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/typography": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/menu": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/menu/-/menu-13.0.0.tgz", + "integrity": "sha512-RY9R2ubYU6a7WRJW3nWr/AoSzdrxwUGqkfJSx0U9M/wK1vbXYYcJ7eCXFzSpa5VrstE7of7PbyYtQ8V61tILEQ==", + "dependencies": { + "@material/base": "^13.0.0", + "@material/dom": "^13.0.0", + "@material/elevation": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/list": "^13.0.0", + "@material/menu-surface": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/theme": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/menu-surface": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/menu-surface/-/menu-surface-13.0.0.tgz", + "integrity": "sha512-Irfnk0l8AO7z8ucilbBzZI8izbFV/aK1GbiPpT1SmZuKkL1z+04rB2HpB+OqwaBixdLTDq70AyawcnQ0MACeXQ==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/elevation": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/shape": "^13.0.0", + "@material/theme": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/notched-outline": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/notched-outline/-/notched-outline-13.0.0.tgz", + "integrity": "sha512-BHdxr1x2AN4oqycTNg0FGisG3rMHf50z3MuyUoQsJJ3WGjxBMWKd0yK/xl4m38nFKPg1vQnzyHIYTJdRpCaE7A==", + "dependencies": { + "@material/base": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/floating-label": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/shape": "^13.0.0", + "@material/theme": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/progress-indicator": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/progress-indicator/-/progress-indicator-13.0.0.tgz", + "integrity": "sha512-IfhAMn03gWg/Rl0Bg26Q1g+DrMnaULllz+ZJeIY7BXZC5qFYq1fLq4+RiQmfPGlJfURUjrWNLcI1VDVyXUHHzg==", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@material/radio": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/radio/-/radio-13.0.0.tgz", + "integrity": "sha512-6jeZ+dKSzBB/j2IZ7RjFl5mrB+EWnpv/x+U9w6ENLCdueM4+LKUqBAc2fC2WMycsqgoFnlB0xsO/sG+kN0J6fw==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/density": "^13.0.0", + "@material/dom": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/touch-target": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/ripple": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/ripple/-/ripple-13.0.0.tgz", + "integrity": "sha512-hx4B40hB2rRfsGwf1jwo2GGlYDq0yUQjcMcMmXfQipPJNpQhy8ylmXKc1DBjmWf7EQ/MgbfCSYwPrYXrbGP31w==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/dom": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/theme": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/rtl": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/rtl/-/rtl-13.0.0.tgz", + "integrity": "sha512-nFGy3iQg7k+xLs67eb86mRFVLwa0yi7MusqRK4OM8DXcLO5yoVfUTPKpdSykcbRryp9imVHsxutox2tZawR4og==", + "dependencies": { + "@material/theme": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/segmented-button": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/segmented-button/-/segmented-button-13.0.0.tgz", + "integrity": "sha512-cbjSzkGms+MB6e7ZF6Toc0kpIor4qFm3ueY8KGRIbpvPoJuHfDy6wqIUhwpfAibSpcaDSnCKg1m+hEtyplZPkQ==", + "dependencies": { + "@material/base": "^13.0.0", + "@material/elevation": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/touch-target": "^13.0.0", + "@material/typography": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/select": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/select/-/select-13.0.0.tgz", + "integrity": "sha512-wVprsSMicU/l+LAqXdOU+qdzzdHupLXpWWQo2Rsk8G6AxL1Zna+/+ETnRlDdr2wHHK/KNDXSBdmuCcoEIRshcA==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/density": "^13.0.0", + "@material/dom": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/floating-label": "^13.0.0", + "@material/line-ripple": "^13.0.0", + "@material/list": "^13.0.0", + "@material/menu": "^13.0.0", + "@material/menu-surface": "^13.0.0", + "@material/notched-outline": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/shape": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/typography": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/shape": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/shape/-/shape-13.0.0.tgz", + "integrity": "sha512-exk96+iCjzCujk3aSrvIMhmW773s1Tc0h+MbQKbt6Iv3nHJCyLSiRbxclCHXWHrVwG/9KZRkrt/g2qk7P3VRBg==", + "dependencies": { + "@material/feature-targeting": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/theme": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/slider": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/slider/-/slider-13.0.0.tgz", + "integrity": "sha512-PW+3X9MiOoWmXhirYo/Mk2UYW00Tnsihrx5YJQ4+IxwbrUI75/8yUsO8kVr7YC+Eqhldz8oXzhIXglQFtbpolQ==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/dom": "^13.0.0", + "@material/elevation": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/typography": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/snackbar": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/snackbar/-/snackbar-13.0.0.tgz", + "integrity": "sha512-z59aYCeMWWEbsUU04QDZN4CxzCCOp3OIc5tzrdqnY3qRq4wwApxncf7RKKKSU2K6WTEWfdHHOc7aNX8kqlDmUg==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/button": "^13.0.0", + "@material/dom": "^13.0.0", + "@material/elevation": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/icon-button": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/shape": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/typography": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/switch": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/switch/-/switch-13.0.0.tgz", + "integrity": "sha512-zbdo6nKEOAx24ILCBobZlQqU2WZ+KuPgdAc1VTI1q1BCKN3rDIfm9RnsCuYiZa9iaq4UUgdYuhH8KVEYGP7Lrw==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/density": "^13.0.0", + "@material/dom": "^13.0.0", + "@material/elevation": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/shape": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/tokens": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/tab": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/tab/-/tab-13.0.0.tgz", + "integrity": "sha512-7tziMFiyiFZner39h6ue6A6rfJhz8LDyeVPYfdAMe8ZO8GT+PczDr5yuectamR8fNBE7Fk9Bj/KvIOx+LjKgDg==", + "dependencies": { + "@material/base": "^13.0.0", + "@material/elevation": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/tab-indicator": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/typography": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/tab-bar": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/tab-bar/-/tab-bar-13.0.0.tgz", + "integrity": "sha512-GLODDvwKiN867weT+WiSR/4Oum2hw0Ipl1vcJxtZeE6C3PmGWBE316j8a5DLYvf9bjIPLYLNLUzLU3QnJB6T5w==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/density": "^13.0.0", + "@material/elevation": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/tab": "^13.0.0", + "@material/tab-indicator": "^13.0.0", + "@material/tab-scroller": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/typography": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/tab-indicator": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/tab-indicator/-/tab-indicator-13.0.0.tgz", + "integrity": "sha512-T6Q4zCdl374rQgNLrAIc8+sy8ax6fbNTZRb+oJgShzjVz4wH9OLk6LX1RREHEeWiZt69nTqeR4yU6/6xFX+Kjw==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/theme": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/tab-scroller": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/tab-scroller/-/tab-scroller-13.0.0.tgz", + "integrity": "sha512-SHdNXTLrNA47RbTNOQa67DbQjw0qrf1h0OuoESXHMU/B7QQvhAOqnHpU32/LdCP+gvc7EdZjolVQgk3WphDcQA==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/dom": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/tab": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/textfield": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/textfield/-/textfield-13.0.0.tgz", + "integrity": "sha512-CzodrOqx8wzj2AQngMpISURJID4jVOHf4CtiPoj32LG8bWLn5ZfAAX2aA2rO6NPyDYsFm0aEnlfMhnDwQyPoYw==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/density": "^13.0.0", + "@material/dom": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/floating-label": "^13.0.0", + "@material/line-ripple": "^13.0.0", + "@material/notched-outline": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/shape": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/typography": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/theme": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/theme/-/theme-13.0.0.tgz", + "integrity": "sha512-KAe1s0MvvfCGAwJliDVTvgAKuD3ESwhl7F7br4Iam4IPdqME2rWl8NPhKHFfaWqTG7PyCgMMngYEYuA8cLNTsA==", + "dependencies": { + "@material/feature-targeting": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/tokens": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/tokens/-/tokens-13.0.0.tgz", + "integrity": "sha512-t55CKVeAjABdSQCKjsvYvqrA6Z4f5varLpLloai8ZQU0giSl7qbUczV1i8y2pSOzpRTswD5JKM7a19qfsl/TCA==", + "dependencies": { + "@material/elevation": "^13.0.0" + } + }, + "node_modules/@material/tooltip": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/tooltip/-/tooltip-13.0.0.tgz", + "integrity": "sha512-/QinwEM0sYtRUthgOy7R+V4iwLMZ8SCd8A3PyGyTr27BUGWykwAUFdXyzT4rxLhDNcnDOYH14N+Z3Bom+UwO9Q==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/dom": "^13.0.0", + "@material/elevation": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/shape": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/typography": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/top-app-bar": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/top-app-bar/-/top-app-bar-13.0.0.tgz", + "integrity": "sha512-NTbIbBmoo4wfbBwW+9XMmjYQJ3e7NJ9P/ahTszYuzYDyWNcc3m8G/A0zM+1LBmoze3rP/QTxcaJUH/A5/3ufXA==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/elevation": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/shape": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/typography": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/touch-target": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/touch-target/-/touch-target-13.0.0.tgz", + "integrity": "sha512-2BMjj+nwKIYG7cZZGcNuRSKo53knqDu9ksv9wLidxjLgzqXBd1v9gdXsqMRQXepoOqftWGmYMaRYI0xMnxt6lA==", + "dependencies": { + "@material/base": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/rtl": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@material/typography": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/typography/-/typography-13.0.0.tgz", + "integrity": "sha512-UfaK4vT3LmGiiySf2RVIrf7fJZa6EJadFwo4YUMJx9bvUMRlBm1oI8Vo9fYpKdLfuSTeA+2BlgbwYVObj3laFw==", + "dependencies": { + "@material/feature-targeting": "^13.0.0", + "@material/theme": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmmirror.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@rollup/plugin-dsv": { + "version": "2.0.3", + "resolved": "https://registry.npmmirror.com/@rollup/plugin-dsv/-/plugin-dsv-2.0.3.tgz", + "integrity": "sha512-x2lqNepgPZUwRgNzEK8oTpoN6Y7NEQQl1PHp4gltXuxeJGlu3oyxVuw5gY5+T/LMUyQ9Nvlw6xu/rOC7v9kxPg==", + "dev": true, + "dependencies": { + "@rollup/pluginutils": "^3.1.0", + "@types/d3-dsv": "~1.2.0", + "d3-dsv": "1.2.0", + "tosource": "^1.0.0" + } + }, + "node_modules/@rollup/pluginutils": { + "version": "3.1.0", + "resolved": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", + "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "dev": true, + "dependencies": { + "@types/estree": "0.0.39", + "estree-walker": "^1.0.1", + "picomatch": "^2.2.2" + }, + "engines": { + "node": ">= 8.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0" + } + }, + "node_modules/@smui-extra/accordion": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui-extra/accordion/-/accordion-6.1.4.tgz", + "integrity": "sha512-2yaGn8Jmqr+EGF+Xk5GkvNGu9jUH+RxuhUybfpZ0LHlGJhmXAAGUthgf44EJ0XLlR7upPaAmd3lI1+fYfmrRDQ==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/elevation": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/typography": "^13.0.0", + "@smui/common": "^6.1.4", + "@smui/paper": "^6.1.4", + "@smui/ripple": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui-extra/autocomplete": { + "version": "6.2.0", + "resolved": "https://registry.npmmirror.com/@smui-extra/autocomplete/-/autocomplete-6.2.0.tgz", + "integrity": "sha512-JCZOQO6rnDdCq8/q9gB4ElM04AIaQAcNLiNkPsgzUT6v8klYzerqPnfT3JBvm+p+ZUqocmRAIrdsF5QVvAgacg==", + "dependencies": { + "@smui/common": "^6.1.4", + "@smui/list": "^6.1.4", + "@smui/menu": "^6.2.0", + "@smui/menu-surface": "^6.1.4", + "@smui/textfield": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui-extra/badge": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui-extra/badge/-/badge-6.1.4.tgz", + "integrity": "sha512-AudM5fswJlggtIy7JKywCBuWOPAT776OGwNXJlEUsCXCvqIqQC7HoCwn0Es15Y0rSZcPdRLJm9e2JjzC/SKTbw==", + "dependencies": { + "@material/feature-targeting": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/shape": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/typography": "^13.0.0", + "@smui/common": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/banner": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/banner/-/banner-6.1.4.tgz", + "integrity": "sha512-nv5/lHUFIIhEGmPBJfmj3Ube5LumCNJSlg+BnApk4obeBYET/ANz85zVU3kEEgn5FS8Z8V49/B59X5F0gY4eog==", + "dependencies": { + "@material/banner": "^13.0.0", + "@smui/common": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/button": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/button/-/button-6.1.4.tgz", + "integrity": "sha512-4CD6uPNkvZzoQyr6b3+PC49wieMkZW6xzxf+r/vq5pcv2X/PM+caySjzfAZamWN2m4nZMrmJjyEw1iCITWoQyg==", + "dependencies": { + "@material/button": "^13.0.0", + "@material/elevation": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/theme": "^13.0.0", + "@smui/common": "^6.1.4", + "@smui/ripple": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/card": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/card/-/card-6.1.4.tgz", + "integrity": "sha512-B8t2+w4Y9/3bz80yZeEFJH3Y2aFVZzHsUyBF2aC59rxa5qARihLE7PbCVEyqr6T5oQFr8A7QcHKLC+Ylsxj6HQ==", + "dependencies": { + "@material/card": "^13.0.0", + "@smui/button": "^6.1.4", + "@smui/common": "^6.1.4", + "@smui/icon-button": "^6.1.4", + "@smui/ripple": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/checkbox": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/checkbox/-/checkbox-6.1.4.tgz", + "integrity": "sha512-yWARPjnOaQFVi4iQxUINDLAd0V78mtKhAEuc+F91cjpfDvSzaPWPD3dfynYN7g3yf7uW/bocHM1yUxqtmQ3+7Q==", + "dependencies": { + "@material/checkbox": "^13.0.0", + "@smui/common": "^6.1.4", + "@smui/ripple": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/chips": { + "version": "7.0.0-beta.0", + "resolved": "https://registry.npmmirror.com/@smui/chips/-/chips-7.0.0-beta.0.tgz", + "integrity": "sha512-xL9bEJp0syGfHjGHtFAxBASCtDmbvlCLT/WV3k4PV1xzzCuEWFRQ+C15V8HxeKMPW/CPEi1rKelFkl1vzCchSQ==", + "dependencies": { + "@material/chips": "^14.0.0", + "@material/dom": "^14.0.0", + "@material/rtl": "^14.0.0", + "@smui/common": "^7.0.0-beta.0", + "@smui/ripple": "^7.0.0-beta.0", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/chips/node_modules/@material/animation": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/animation/-/animation-14.0.0.tgz", + "integrity": "sha512-VlYSfUaIj/BBVtRZI8Gv0VvzikFf+XgK0Zdgsok5c1v5DDnNz5tpB8mnGrveWz0rHbp1X4+CWLKrTwNmjrw3Xw==", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@smui/chips/node_modules/@material/base": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/base/-/base-14.0.0.tgz", + "integrity": "sha512-Ou7vS7n1H4Y10MUZyYAbt6H0t67c6urxoCgeVT7M38aQlaNUwFMODp7KT/myjYz2YULfhu3PtfSV3Sltgac9mA==", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@smui/chips/node_modules/@material/dom": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/dom/-/dom-14.0.0.tgz", + "integrity": "sha512-8t88XyacclTj8qsIw9q0vEj4PI2KVncLoIsIMzwuMx49P2FZg6TsLjor262MI3Qs00UWAifuLMrhnOnfyrbe7Q==", + "dependencies": { + "@material/feature-targeting": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@smui/chips/node_modules/@material/feature-targeting": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/feature-targeting/-/feature-targeting-14.0.0.tgz", + "integrity": "sha512-a5WGgHEq5lJeeNL5yevtgoZjBjXWy6+klfVWQEh8oyix/rMJygGgO7gEc52uv8fB8uAIoYEB3iBMOv8jRq8FeA==", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@smui/chips/node_modules/@material/ripple": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/ripple/-/ripple-14.0.0.tgz", + "integrity": "sha512-9XoGBFd5JhFgELgW7pqtiLy+CnCIcV2s9cQ2BWbOQeA8faX9UZIDUx/g76nHLZ7UzKFtsULJxZTwORmsEt2zvw==", + "dependencies": { + "@material/animation": "^14.0.0", + "@material/base": "^14.0.0", + "@material/dom": "^14.0.0", + "@material/feature-targeting": "^14.0.0", + "@material/rtl": "^14.0.0", + "@material/theme": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@smui/chips/node_modules/@material/rtl": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/rtl/-/rtl-14.0.0.tgz", + "integrity": "sha512-xl6OZYyRjuiW2hmbjV2omMV8sQtfmKAjeWnD1RMiAPLCTyOW9Lh/PYYnXjxUrNa0cRwIIbOn5J7OYXokja8puA==", + "dependencies": { + "@material/theme": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@smui/chips/node_modules/@material/theme": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/theme/-/theme-14.0.0.tgz", + "integrity": "sha512-6/SENWNIFuXzeHMPHrYwbsXKgkvCtWuzzQ3cUu4UEt3KcQ5YpViazIM6h8ByYKZP8A9d8QpkJ0WGX5btGDcVoA==", + "dependencies": { + "@material/feature-targeting": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@smui/chips/node_modules/@smui/common": { + "version": "7.0.0-beta.0", + "resolved": "https://registry.npmmirror.com/@smui/common/-/common-7.0.0-beta.0.tgz", + "integrity": "sha512-JFbmbXR/j3NdUPC1Nn28LDH62WVv6AaKQVr4VVmutgBYAkMy+QIQhG/kvFBP4Shr2gG8DLQyXGSK0wHHgiONlw==", + "dependencies": { + "@material/dom": "^14.0.0", + "@tsconfig/svelte": "^3.0.0", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/chips/node_modules/@smui/ripple": { + "version": "7.0.0-beta.0", + "resolved": "https://registry.npmmirror.com/@smui/ripple/-/ripple-7.0.0-beta.0.tgz", + "integrity": "sha512-2G9ILzcNAWeL8NgqW4tuBJXuh0gfGj01CtlGeRUSUNG5AxM3zLECrTEEqKdX25wtJf+QxBqV1Zi3ZqFDm3lzDg==", + "dependencies": { + "@material/dom": "^14.0.0", + "@material/ripple": "^14.0.0", + "@smui/common": "^7.0.0-beta.0", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/circular-progress": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/circular-progress/-/circular-progress-6.1.4.tgz", + "integrity": "sha512-79SOd1XpQsSA4P1JpuWgvMVRmGIXFnsTqDkbe8bqF5U8TuK8vPbTNeBO/ANlkOJr2Mqt4j/lJ8Vma02tqjamMA==", + "dependencies": { + "@material/circular-progress": "^13.0.0", + "@smui/common": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/common": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/common/-/common-6.1.4.tgz", + "integrity": "sha512-l6c4gJH+qP9HdM9RhTP07Gl8eewVbYWT7QfVSAF+wwji32ndjgZLlP5P2Jl/GmsQOOlDoNB3VPy/o4Z/kab31g==", + "dependencies": { + "@material/dom": "^13.0.0", + "@tsconfig/svelte": "^3.0.0", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/data-table": { + "version": "6.2.0", + "resolved": "https://registry.npmmirror.com/@smui/data-table/-/data-table-6.2.0.tgz", + "integrity": "sha512-fFfGRr6vwg343wdGhwHrHZbKI/eYQC8rcT7cDaQc8MOL6ULVW29h0Qt6KwyLMeArC/LV2SBsXQJqOIt+Z90qSQ==", + "dependencies": { + "@material/data-table": "^13.0.0", + "@material/dom": "^13.0.0", + "@smui/checkbox": "^6.1.4", + "@smui/common": "^6.1.4", + "@smui/icon-button": "^6.1.4", + "@smui/ripple": "^6.1.4", + "@smui/select": "^6.2.0", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/dialog": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/dialog/-/dialog-6.1.4.tgz", + "integrity": "sha512-ouCROTmIHutDxmSI3DYX4vlGeFaq0VHRtdhD3vCdd/7u9qBukXunKaCfTOvqozdoaa0pG3Cc66bYsa25m9RP4w==", + "dependencies": { + "@material/button": "^13.0.0", + "@material/dialog": "^13.0.0", + "@material/dom": "^13.0.0", + "@smui/common": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/drawer": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/drawer/-/drawer-6.1.4.tgz", + "integrity": "sha512-Y13Fvf9ue/yfeuV99I8doRYEN/viWMQpWPTmz3bvh+0ztyPvjK4kpP0AlCu1QxX7UCgb390DLmfT1lDrCl/QrA==", + "dependencies": { + "@material/dom": "^13.0.0", + "@material/drawer": "^13.0.0", + "@smui/common": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/fab": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/fab/-/fab-6.1.4.tgz", + "integrity": "sha512-uwjh2moyu8bDoZBKLYbQXgDkX/FRlK/xseVYJ8jG/qTSxx/juVd9hG8sK7ERB/ru9odexTSobDXdQT6dPwaXDA==", + "dependencies": { + "@material/fab": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@smui/common": "^6.1.4", + "@smui/ripple": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/floating-label": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/floating-label/-/floating-label-6.1.4.tgz", + "integrity": "sha512-7crwK7WsU7ELS+uJj5J8XnbCGoJrCDijs7DN57ok3LemWTsmn0vhhnsmDC3FYZARcAQ1KsX936+ahJGfiP/oAg==", + "dependencies": { + "@material/floating-label": "^13.0.0", + "@smui/common": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/form-field": { + "version": "7.0.0-beta.0", + "resolved": "https://registry.npmmirror.com/@smui/form-field/-/form-field-7.0.0-beta.0.tgz", + "integrity": "sha512-YWHg8bH1+sc8j5wmdbGdZJNtireCro7fBNp8RZCceChHXQPvaxhUwRU6zV/HepcVLT14SVSO3px5jRNnpCuM8Q==", + "dependencies": { + "@material/feature-targeting": "^14.0.0", + "@material/form-field": "^14.0.0", + "@material/rtl": "^14.0.0", + "@smui/common": "^7.0.0-beta.0", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/form-field/node_modules/@material/dom": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/dom/-/dom-14.0.0.tgz", + "integrity": "sha512-8t88XyacclTj8qsIw9q0vEj4PI2KVncLoIsIMzwuMx49P2FZg6TsLjor262MI3Qs00UWAifuLMrhnOnfyrbe7Q==", + "dependencies": { + "@material/feature-targeting": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@smui/form-field/node_modules/@material/feature-targeting": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/feature-targeting/-/feature-targeting-14.0.0.tgz", + "integrity": "sha512-a5WGgHEq5lJeeNL5yevtgoZjBjXWy6+klfVWQEh8oyix/rMJygGgO7gEc52uv8fB8uAIoYEB3iBMOv8jRq8FeA==", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@smui/form-field/node_modules/@material/rtl": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/rtl/-/rtl-14.0.0.tgz", + "integrity": "sha512-xl6OZYyRjuiW2hmbjV2omMV8sQtfmKAjeWnD1RMiAPLCTyOW9Lh/PYYnXjxUrNa0cRwIIbOn5J7OYXokja8puA==", + "dependencies": { + "@material/theme": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@smui/form-field/node_modules/@material/theme": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/@material/theme/-/theme-14.0.0.tgz", + "integrity": "sha512-6/SENWNIFuXzeHMPHrYwbsXKgkvCtWuzzQ3cUu4UEt3KcQ5YpViazIM6h8ByYKZP8A9d8QpkJ0WGX5btGDcVoA==", + "dependencies": { + "@material/feature-targeting": "^14.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@smui/form-field/node_modules/@smui/common": { + "version": "7.0.0-beta.0", + "resolved": "https://registry.npmmirror.com/@smui/common/-/common-7.0.0-beta.0.tgz", + "integrity": "sha512-JFbmbXR/j3NdUPC1Nn28LDH62WVv6AaKQVr4VVmutgBYAkMy+QIQhG/kvFBP4Shr2gG8DLQyXGSK0wHHgiONlw==", + "dependencies": { + "@material/dom": "^14.0.0", + "@tsconfig/svelte": "^3.0.0", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/icon-button": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/icon-button/-/icon-button-6.1.4.tgz", + "integrity": "sha512-8eUow8d+vztGJBzHTuXGP0UszXq5RUN4syxW7Ur742D4zNSrF6dzccjteF5S51a7Pcf7AHeEDkAqHbA6ioIGLw==", + "dependencies": { + "@material/density": "^13.0.0", + "@material/icon-button": "^13.0.0", + "@smui/common": "^6.1.4", + "@smui/ripple": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/image-list": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/image-list/-/image-list-6.1.4.tgz", + "integrity": "sha512-v52fqVzwqeOvwuJNnk16vHK3QTeS62EZoycSyUMpdf0AeG3DLzIOVo5+CkQ7xuvIFpWve59i5pmOsn29fteMsg==", + "dependencies": { + "@material/image-list": "^13.0.0", + "@smui/common": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/layout-grid": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/layout-grid/-/layout-grid-6.1.4.tgz", + "integrity": "sha512-i8t/PxQsWXfXG1ESv3uiHHIsLTHU/T+FN33HncnXDYkG7IITMFeKXMN76VWpRjDfTl0f7p4EHazBjeXJ1dFziQ==", + "dependencies": { + "@material/layout-grid": "^13.0.0", + "@smui/common": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/line-ripple": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/line-ripple/-/line-ripple-6.1.4.tgz", + "integrity": "sha512-IUbapkBPyrybkUEEZVLpBs6HXXHN3v1aHewFPI7KvHU4a+Ho7EIqWpAHn8wc8SSX2knC2/HeGtpNycAAW127Tw==", + "dependencies": { + "@material/line-ripple": "^13.0.0", + "@smui/common": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/linear-progress": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/linear-progress/-/linear-progress-6.1.4.tgz", + "integrity": "sha512-ta1syavpt9yIAmqV98DKzf0JEy32us4oIxThgj9Ze+4Xi6l4NnuUAx3L9XiW37qE7xrNJcoFMAlErht2yYDUIw==", + "dependencies": { + "@material/linear-progress": "^13.0.0", + "@smui/common": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/list": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/list/-/list-6.1.4.tgz", + "integrity": "sha512-YPecf8ib/EETUVlt+TZMclzm5S+usMVpFsIgidMR75+HFUpXVlHsaOqGdQuQYJ75YRf3HZcYwUNn4t2B3ayhTg==", + "dependencies": { + "@material/dom": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/list": "^13.0.0", + "@smui/common": "^6.1.4", + "@smui/ripple": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/menu": { + "version": "6.2.0", + "resolved": "https://registry.npmmirror.com/@smui/menu/-/menu-6.2.0.tgz", + "integrity": "sha512-zYb3U5DPyrHWKwH2Q6KLSotrQ+6r223PnLbYGRcOCF7sEVNL+P7N8n8EfJTxX+/NF9Dbs48Z1a0QBvkN51klbQ==", + "dependencies": { + "@material/dom": "^13.0.0", + "@material/menu": "^13.0.0", + "@smui/common": "^6.1.4", + "@smui/list": "^6.1.4", + "@smui/menu-surface": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/menu-surface": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/menu-surface/-/menu-surface-6.1.4.tgz", + "integrity": "sha512-rZDHRLiAUCYrunhYAuZUSqtBO2r80rMu5/aeNuBNcemwBw/z/6opNTC8XEcAfN6kbbABewKDD/aW/MIZJgjHsA==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/menu-surface": "^13.0.0", + "@smui/common": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/notched-outline": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/notched-outline/-/notched-outline-6.1.4.tgz", + "integrity": "sha512-wUWnF5qzCbM6UXioq1CHeYMHXfnd/2A2dXnl7ziQTEqPit9qCNc0XM9VcoxLJTy7IyEFmmTI7GcH0fOjggqg8A==", + "dependencies": { + "@material/notched-outline": "^13.0.0", + "@smui/common": "^6.1.4", + "@smui/floating-label": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/paper": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/paper/-/paper-6.1.4.tgz", + "integrity": "sha512-mKfbF5Hr5yUsUL8tGmKHfkV6bxkE50EJwZmCw0t1+CSOfHTD/96klVNDVKh4Tgr7tfK8g0yJ14Ra8fJwV/V6jA==", + "dependencies": { + "@material/elevation": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/shape": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/typography": "^13.0.0", + "@smui/common": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/radio": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/radio/-/radio-6.1.4.tgz", + "integrity": "sha512-G9/bhNX5X8GmWjzddRRmDxwcg4PqreCAoBXiQVcJdv4pinrkfgrtGVzGVzRzD0WEHlB4X9J2aYn6BkFn41xC+Q==", + "dependencies": { + "@material/radio": "^13.0.0", + "@smui/common": "^6.1.4", + "@smui/ripple": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/ripple": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/ripple/-/ripple-6.1.4.tgz", + "integrity": "sha512-bMyjVE13Mpy8iygQTtxFTPfxJcefAD/4JBDTm3EORhyO16CcSHhHmMuUjP8YxWTPmn+mnWaeNORZ31aJt4tlYw==", + "dependencies": { + "@material/dom": "^13.0.0", + "@material/ripple": "^13.0.0", + "@smui/common": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/segmented-button": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/segmented-button/-/segmented-button-6.1.4.tgz", + "integrity": "sha512-71k+vUfBYynvof1YNeElSoM2GFMZenU7yTKhL40yyACZJ33HAa/Xc+Tcy2uyrUyvCNd1dyrr49Cs4s/OX/nrdQ==", + "dependencies": { + "@material/segmented-button": "^13.0.0", + "@smui/common": "^6.1.4", + "@smui/ripple": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/select": { + "version": "6.2.0", + "resolved": "https://registry.npmmirror.com/@smui/select/-/select-6.2.0.tgz", + "integrity": "sha512-Cr9lKbEiGF9E+AzQOaSbUc1WyHbbft7CoeLNHblEiRijffSMY/Pgsn0qjqOBh3jeDUu6Nb5BW/3icL1As3SS4Q==", + "dependencies": { + "@material/feature-targeting": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/select": "^13.0.0", + "@material/theme": "^13.0.0", + "@smui/common": "^6.1.4", + "@smui/floating-label": "^6.1.4", + "@smui/line-ripple": "^6.1.4", + "@smui/list": "^6.1.4", + "@smui/menu": "^6.2.0", + "@smui/menu-surface": "^6.1.4", + "@smui/notched-outline": "^6.1.4", + "@smui/ripple": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/slider": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/slider/-/slider-6.1.4.tgz", + "integrity": "sha512-Q+U8Q3XYOw6m8LOCfrXapFPsgIwnxqgn4Cy2MSnew1CtaPwEnul8gNP4OKxvZz24g2XPJa+ohAHVIVH149stQw==", + "dependencies": { + "@material/dom": "^13.0.0", + "@material/slider": "^13.0.0", + "@smui/common": "^6.1.4", + "@smui/ripple": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/snackbar": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/snackbar/-/snackbar-6.1.4.tgz", + "integrity": "sha512-RkKqm9/uXRxcOTQfgkL3HvwRkRVzhmEjUWaRj6hr3MPUHvTI2nihv86BUNobRCt32ROKvnSATCjXsCfqTfceqg==", + "dependencies": { + "@material/dom": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/snackbar": "^13.0.0", + "@smui/button": "^6.1.4", + "@smui/common": "^6.1.4", + "@smui/icon-button": "^6.1.4", + "@smui/ripple": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/switch": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/switch/-/switch-6.1.4.tgz", + "integrity": "sha512-UluXjA4RD9f/EjrpmQwdhZB5Zk6d9FhGdzMIEEc7JEIoYnQ0TmOCSUDoV+IJpwdFSxYIlKgX37PInqPB62Eg3Q==", + "dependencies": { + "@material/feature-targeting": "^13.0.0", + "@material/switch": "^13.0.0", + "@material/theme": "^13.0.0", + "@smui/common": "^6.1.4", + "@smui/ripple": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/tab": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/tab/-/tab-6.1.4.tgz", + "integrity": "sha512-vxxJ31XDArQPhGEq4M4CNeQH9i09xJxBEX3cTr34lP3IXih3RQ1TTw1a8xzC137FsJERGm3ii72CKHpPpnyFkA==", + "dependencies": { + "@material/tab": "^13.0.0", + "@smui/common": "^6.1.4", + "@smui/ripple": "^6.1.4", + "@smui/tab-indicator": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/tab-bar": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/tab-bar/-/tab-bar-6.1.4.tgz", + "integrity": "sha512-bY2hzuYrdzvqWY34cYzez1YK5l4aF5gUFnaiu6l83wmhX5fzl5AqqKCbWgxoAVqNC4ErKAvthFzSaeiDdzOaNQ==", + "dependencies": { + "@material/tab-bar": "^13.0.0", + "@smui/common": "^6.1.4", + "@smui/tab": "^6.1.4", + "@smui/tab-scroller": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/tab-indicator": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/tab-indicator/-/tab-indicator-6.1.4.tgz", + "integrity": "sha512-yb79eJe/5X7X9rzcO9vZG+QDUsyvXSGWaonpsD4n9PUtWYG56pmar1LAwsVTYJw3nAqZZuGyLDC8/O6qCrd2Tg==", + "dependencies": { + "@material/tab-indicator": "^13.0.0", + "@smui/common": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/tab-scroller": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/tab-scroller/-/tab-scroller-6.1.4.tgz", + "integrity": "sha512-ViD6yuxYEkxfUeYq/EDpdRoeJCG+geYTWhXlQBKaLQ0IwN8qI5NRH+YcQozzJXNYlbW77lCn2X1piUWuMKEGSg==", + "dependencies": { + "@material/dom": "^13.0.0", + "@material/tab-scroller": "^13.0.0", + "@smui/common": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/textfield": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/textfield/-/textfield-6.1.4.tgz", + "integrity": "sha512-Y873i6KCAeh3fa3Kp7EuVKR5BU5CtfVEJXP30uVM5PdNIVeAGV5xTCjOyq/rpiGALILxQFVMfE6NKKCyTCCenA==", + "dependencies": { + "@material/dom": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/textfield": "^13.0.0", + "@smui/common": "^6.1.4", + "@smui/floating-label": "^6.1.4", + "@smui/line-ripple": "^6.1.4", + "@smui/notched-outline": "^6.1.4", + "@smui/ripple": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/tooltip": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/tooltip/-/tooltip-6.1.4.tgz", + "integrity": "sha512-KBSoaRJ+9GX5HCxRt66zUOJ4++w9P9LPbBjOXIfyAvV3Qfm4VOBAm5mD2GWi1fJw96gci+lnTFq4pCMMN9L/2A==", + "dependencies": { + "@material/tooltip": "^13.0.0", + "@smui/common": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/top-app-bar": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/top-app-bar/-/top-app-bar-6.1.4.tgz", + "integrity": "sha512-r7ychtYYtysTnVhTlNx+KZeReuUacbP9Cv3nmgQeiY8Qs3bSae/+AVNzEA3nB1QCXKKWwNPy81E0rjV4XKFLPg==", + "dependencies": { + "@material/feature-targeting": "^13.0.0", + "@material/top-app-bar": "^13.0.0", + "@smui/common": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@smui/touch-target": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/touch-target/-/touch-target-6.1.4.tgz", + "integrity": "sha512-ZQ1yYBOMIFaGiKylFWbmK9SEwCopZ/et2Pppvy3ssdQeSH8xDPcpa5/EdRYudxCYTPW/scZCUSww6ysTaFOuAw==", + "dependencies": { + "@material/touch-target": "^13.0.0", + "@smui/common": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/@sveltejs/vite-plugin-svelte": { + "version": "1.4.0", + "resolved": "https://registry.npmmirror.com/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-1.4.0.tgz", + "integrity": "sha512-6QupI/jemMfK+yI2pMtJcu5iO2gtgTfcBdGwMZZt+lgbFELhszbDl6Qjh000HgAV8+XUA+8EY8DusOFk8WhOIg==", + "dev": true, + "dependencies": { + "debug": "^4.3.4", + "deepmerge": "^4.2.2", + "kleur": "^4.1.5", + "magic-string": "^0.26.7", + "svelte-hmr": "^0.15.1", + "vitefu": "^0.2.2" + }, + "engines": { + "node": "^14.18.0 || >= 16" + }, + "peerDependencies": { + "svelte": "^3.44.0", + "vite": "^3.0.0" + } + }, + "node_modules/@tsconfig/svelte": { + "version": "3.0.0", + "resolved": "https://registry.npmmirror.com/@tsconfig/svelte/-/svelte-3.0.0.tgz", + "integrity": "sha512-pYrtLtOwku/7r1i9AMONsJMVYAtk3hzOfiGNekhtq5tYBGA7unMve8RvUclKLMT3PrihvJqUmzsRGh0RP84hKg==" + }, + "node_modules/@types/d3-dsv": { + "version": "1.2.2", + "resolved": "https://registry.npmmirror.com/@types/d3-dsv/-/d3-dsv-1.2.2.tgz", + "integrity": "sha512-GRnz9z8ypqb7OsQ/xw/BmFAp0/k3pgM1s19FTZZSlCMY0EvyVTkU8xzZKKDXzytGXPpTNC4R5pGl9oxEvVSnHQ==", + "dev": true + }, + "node_modules/@types/estree": { + "version": "0.0.39", + "resolved": "https://registry.npmmirror.com/@types/estree/-/estree-0.0.39.tgz", + "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", + "dev": true + }, + "node_modules/@types/pug": { + "version": "2.0.6", + "resolved": "https://registry.npmmirror.com/@types/pug/-/pug-2.0.6.tgz", + "integrity": "sha512-SnHmG9wN1UVmagJOnyo/qkk0Z7gejYxOYYmaAwr5u2yFYfsupN3sg10kyzN8Hep/2zbHxCnsumxOoRIRMBwKCg==", + "dev": true + }, + "node_modules/@types/sass": { + "version": "1.45.0", + "resolved": "https://registry.npmmirror.com/@types/sass/-/sass-1.45.0.tgz", + "integrity": "sha512-jn7qwGFmJHwUSphV8zZneO3GmtlgLsmhs/LQyVvQbIIa+fzGMUiHI4HXJZL3FT8MJmgXWbLGiVVY7ElvHq6vDA==", + "deprecated": "This is a stub types definition. sass provides its own type definitions, so you do not need this installed.", + "dev": true, + "dependencies": { + "sass": "*" + } + }, + "node_modules/@vitejs/plugin-legacy": { + "version": "2.3.1", + "resolved": "https://registry.npmmirror.com/@vitejs/plugin-legacy/-/plugin-legacy-2.3.1.tgz", + "integrity": "sha512-J5KaGBlSt2tEYPVjM/C8dA6DkRzkFkbPe+Xb4IX5G+XOV5OGbVAfkMjKywdrkO3gGynO8S98i71Lmsff4cWkCQ==", + "dependencies": { + "@babel/standalone": "^7.20.0", + "core-js": "^3.26.0", + "magic-string": "^0.26.7", + "regenerator-runtime": "^0.13.10", + "systemjs": "^6.13.0" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "peerDependencies": { + "terser": "^5.4.0", + "vite": "^3.0.0" + } + }, + "node_modules/acorn": { + "version": "8.8.2", + "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.8.2.tgz", + "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "devOptional": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "node_modules/bellajs": { + "version": "11.1.2", + "resolved": "https://registry.npmmirror.com/bellajs/-/bellajs-11.1.2.tgz", + "integrity": "sha512-2Fy3Km5JKyIy/KunW3oica2gZtkjD2qSqti2Q3xPhHvXXdMbc+32pEMOPG+xrSat0BXVhRjHIx++lzxIPK0GqQ==", + "engines": { + "node": ">= 14" + } + }, + "node_modules/binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "devOptional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "devOptional": true, + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmmirror.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "devOptional": true, + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, + "node_modules/core-js": { + "version": "3.29.0", + "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.29.0.tgz", + "integrity": "sha512-VG23vuEisJNkGl6XQmFJd3rEG/so/CNatqeE+7uZAwTSwFeB/qaO0be8xZYUNWprJ/GIwL8aMt9cj1kvbpTZhg==", + "hasInstallScript": true + }, + "node_modules/country-code-emoji": { + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/country-code-emoji/-/country-code-emoji-2.3.0.tgz", + "integrity": "sha512-MqmIWr3aucoU/3XZU44e0sz6izAlErqaUYp9/NFzdnzb9TrwwornyW3ws2da5TSnpTUr2qP2840oJW9oNKXCoQ==" + }, + "node_modules/country-flag-icons": { + "version": "1.5.5", + "resolved": "https://registry.npmmirror.com/country-flag-icons/-/country-flag-icons-1.5.5.tgz", + "integrity": "sha512-k4WXZ/WvWOSiYXRG1n8EYHNr1m/IX0GffKqAidaet5DrJsDOmJ8Q/8JvvONhZNnKYg24s4lvsm+9og1HcuIU/g==" + }, + "node_modules/cross-fetch": { + "version": "3.1.5", + "resolved": "https://registry.npmmirror.com/cross-fetch/-/cross-fetch-3.1.5.tgz", + "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==", + "dependencies": { + "node-fetch": "2.6.7" + } + }, + "node_modules/d3-dsv": { + "version": "1.2.0", + "resolved": "https://registry.npmmirror.com/d3-dsv/-/d3-dsv-1.2.0.tgz", + "integrity": "sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==", + "dev": true, + "dependencies": { + "commander": "2", + "iconv-lite": "0.4", + "rw": "1" + }, + "bin": { + "csv2json": "bin/dsv2json", + "csv2tsv": "bin/dsv2dsv", + "dsv2dsv": "bin/dsv2dsv", + "dsv2json": "bin/dsv2json", + "json2csv": "bin/json2dsv", + "json2dsv": "bin/json2dsv", + "json2tsv": "bin/json2dsv", + "tsv2csv": "bin/dsv2dsv", + "tsv2json": "bin/dsv2json" + } + }, + "node_modules/darkreader": { + "version": "4.9.58", + "resolved": "https://registry.npmmirror.com/darkreader/-/darkreader-4.9.58.tgz", + "integrity": "sha512-D/JGoJqW3m2AWBLhO+Pev+eThfs+CwRT4bcLb/1zKjql2yVwG0lx8C2XRDdSVGHw4y11n26W7syWoBpUfuhMqQ==" + }, + "node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/dedent-js": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/dedent-js/-/dedent-js-1.0.1.tgz", + "integrity": "sha512-OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ==" + }, + "node_modules/deepmerge": { + "version": "4.3.0", + "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.3.0.tgz", + "integrity": "sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/detect-indent": { + "version": "6.1.0", + "resolved": "https://registry.npmmirror.com/detect-indent/-/detect-indent-6.1.0.tgz", + "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/detect-nearest-browser-locale": { + "version": "19.0.0", + "resolved": "https://registry.npmmirror.com/detect-nearest-browser-locale/-/detect-nearest-browser-locale-19.0.0.tgz", + "integrity": "sha512-nprsk4sjhtvQThzsc4M1ZbMw0YZce+D8XTr1mxl4VZIeORKTgnHsdIzftRSGdkQ9SZpkZAZEd+ixYka0AKqi5g==", + "dependencies": { + "detect-nearest-locale": "^1.0.1" + } + }, + "node_modules/detect-nearest-locale": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/detect-nearest-locale/-/detect-nearest-locale-1.0.1.tgz", + "integrity": "sha512-f4BbmpbH5AA4MsW55rnPxAC9b1Ev+6XY3JzlifZiaBAC95jfstbszEq70BM+79vXUw8HAq77TiAz1xcBO1Em2A==" + }, + "node_modules/es6-promise": { + "version": "3.3.1", + "resolved": "https://registry.npmmirror.com/es6-promise/-/es6-promise-3.3.1.tgz", + "integrity": "sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==", + "dev": true + }, + "node_modules/esbuild": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/esbuild/-/esbuild-0.15.18.tgz", + "integrity": "sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==", + "hasInstallScript": true, + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=12" + }, + "optionalDependencies": { + "@esbuild/android-arm": "0.15.18", + "@esbuild/linux-loong64": "0.15.18", + "esbuild-android-64": "0.15.18", + "esbuild-android-arm64": "0.15.18", + "esbuild-darwin-64": "0.15.18", + "esbuild-darwin-arm64": "0.15.18", + "esbuild-freebsd-64": "0.15.18", + "esbuild-freebsd-arm64": "0.15.18", + "esbuild-linux-32": "0.15.18", + "esbuild-linux-64": "0.15.18", + "esbuild-linux-arm": "0.15.18", + "esbuild-linux-arm64": "0.15.18", + "esbuild-linux-mips64le": "0.15.18", + "esbuild-linux-ppc64le": "0.15.18", + "esbuild-linux-riscv64": "0.15.18", + "esbuild-linux-s390x": "0.15.18", + "esbuild-netbsd-64": "0.15.18", + "esbuild-openbsd-64": "0.15.18", + "esbuild-sunos-64": "0.15.18", + "esbuild-windows-32": "0.15.18", + "esbuild-windows-64": "0.15.18", + "esbuild-windows-arm64": "0.15.18" + } + }, + "node_modules/esbuild-android-64": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz", + "integrity": "sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-android-arm64": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz", + "integrity": "sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-darwin-64": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz", + "integrity": "sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-darwin-arm64": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz", + "integrity": "sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-freebsd-64": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz", + "integrity": "sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-freebsd-arm64": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz", + "integrity": "sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-32": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz", + "integrity": "sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-64": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz", + "integrity": "sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-arm": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz", + "integrity": "sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-arm64": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz", + "integrity": "sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-mips64le": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz", + "integrity": "sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==", + "cpu": [ + "mips64el" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-ppc64le": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz", + "integrity": "sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==", + "cpu": [ + "ppc64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-riscv64": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz", + "integrity": "sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==", + "cpu": [ + "riscv64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-s390x": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz", + "integrity": "sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==", + "cpu": [ + "s390x" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-netbsd-64": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz", + "integrity": "sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-openbsd-64": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz", + "integrity": "sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-sunos-64": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz", + "integrity": "sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-windows-32": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz", + "integrity": "sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-windows-64": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz", + "integrity": "sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-windows-arm64": { + "version": "0.15.18", + "resolved": "https://registry.npmmirror.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz", + "integrity": "sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/estree-walker": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-1.0.1.tgz", + "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", + "dev": true + }, + "node_modules/fast-glob": { + "version": "3.2.12", + "resolved": "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.2.12.tgz", + "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-xml-parser": { + "version": "4.1.3", + "resolved": "https://registry.npmmirror.com/fast-xml-parser/-/fast-xml-parser-4.1.3.tgz", + "integrity": "sha512-LsNDahCiCcJPe8NO7HijcnukHB24tKbfDDA5IILx9dmW3Frb52lhbeX6MPNUSvyGNfav2VTYpJ/OqkRoVLrh2Q==", + "dependencies": { + "strnum": "^1.0.5" + }, + "bin": { + "fxparser": "src/cli/cli.js" + } + }, + "node_modules/fastq": { + "version": "1.15.0", + "resolved": "https://registry.npmmirror.com/fastq/-/fastq-1.15.0.tgz", + "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", + "dev": true, + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "devOptional": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + }, + "engines": { + "node": ">=6 <7 || >=8" + } + }, + "node_modules/fs-extra/node_modules/jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "devOptional": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.10", + "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" + }, + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/html-entities": { + "version": "2.3.3", + "resolved": "https://registry.npmmirror.com/html-entities/-/html-entities-2.3.3.tgz", + "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==" + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/immutable": { + "version": "4.2.4", + "resolved": "https://registry.npmmirror.com/immutable/-/immutable-4.2.4.tgz", + "integrity": "sha512-WDxL3Hheb1JkRN3sQkyujNlL/xRjAo3rJtaU5xeufUauG66JdMr32bLj4gF+vWl84DIA3Zxw7tiAjneYzRRw+w==", + "devOptional": true + }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmmirror.com/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmmirror.com/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "devOptional": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-core-module": { + "version": "2.11.0", + "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.11.0.tgz", + "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", + "dependencies": { + "has": "^1.0.3" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "devOptional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "devOptional": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "devOptional": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/jsonfile": { + "version": "5.0.0", + "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-5.0.0.tgz", + "integrity": "sha512-NQRZ5CRo74MhMMC3/3r5g2k4fjodJ/wh8MxjFbCViWKFjxrnudWSY5vomh+23ZaXzAS7J3fBZIR2dV6WbmfM0w==", + "dependencies": { + "universalify": "^0.1.2" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/kleur": { + "version": "4.1.5", + "resolved": "https://registry.npmmirror.com/kleur/-/kleur-4.1.5.tgz", + "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/knuth-shuffle": { + "version": "1.0.8", + "resolved": "https://registry.npmmirror.com/knuth-shuffle/-/knuth-shuffle-1.0.8.tgz", + "integrity": "sha512-IdC4Hpp+mx53zTt6VAGsAtbGM0g4BV9fP8tTcviCosSwocHcRDw9uG5Rnv6wLWckF4r72qeXFoK9NkvV1gUJCQ==" + }, + "node_modules/knuth-shuffle-seeded": { + "version": "1.0.6", + "resolved": "https://registry.npmmirror.com/knuth-shuffle-seeded/-/knuth-shuffle-seeded-1.0.6.tgz", + "integrity": "sha512-9pFH0SplrfyKyojCLxZfMcvkhf5hH0d+UwR9nTVJ/DDQJGuzcXjTwB7TP7sDfehSudlGGaOLblmEWqv04ERVWg==", + "dependencies": { + "seed-random": "~2.2.0" + } + }, + "node_modules/lower-case": { + "version": "2.0.2", + "resolved": "https://registry.npmmirror.com/lower-case/-/lower-case-2.0.2.tgz", + "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", + "dependencies": { + "tslib": "^2.0.3" + } + }, + "node_modules/magic-string": { + "version": "0.26.7", + "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.26.7.tgz", + "integrity": "sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==", + "dependencies": { + "sourcemap-codec": "^1.4.8" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.5", + "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dev": true, + "dependencies": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/min-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/min-indent/-/min-indent-1.0.1.tgz", + "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmmirror.com/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true + }, + "node_modules/mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "dev": true, + "dependencies": { + "minimist": "^1.2.6" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/mri": { + "version": "1.2.0", + "resolved": "https://registry.npmmirror.com/mri/-/mri-1.2.0.tgz", + "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/nanoid": { + "version": "3.3.4", + "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.4.tgz", + "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/no-case": { + "version": "3.0.4", + "resolved": "https://registry.npmmirror.com/no-case/-/no-case-3.0.4.tgz", + "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", + "dependencies": { + "lower-case": "^2.0.2", + "tslib": "^2.0.3" + } + }, + "node_modules/node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmmirror.com/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "devOptional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmmirror.com/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/openmoji": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/openmoji/-/openmoji-14.0.0.tgz", + "integrity": "sha512-MGF9GbXfpULuRtUM1srEv2OP3sg/e8hAw0UCTiP+N3+CX38RCo8/kjyFYm0eO+OENnbbri9Vx4m5pU0Vbc7LGw==" + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pascal-case": { + "version": "3.1.2", + "resolved": "https://registry.npmmirror.com/pascal-case/-/pascal-case-3.1.2.tgz", + "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", + "dependencies": { + "no-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmmirror.com/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" + }, + "node_modules/picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "devOptional": true, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/postcss": { + "version": "8.4.21", + "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.21.tgz", + "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", + "dependencies": { + "nanoid": "^3.3.4", + "picocolors": "^1.0.0", + "source-map-js": "^1.0.2" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true + }, + "node_modules/readable-stream": { + "version": "3.6.1", + "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.1.tgz", + "integrity": "sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "devOptional": true, + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/regenerator-runtime": { + "version": "0.13.11", + "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" + }, + "node_modules/resolve": { + "version": "1.22.1", + "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.1.tgz", + "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "dependencies": { + "is-core-module": "^2.9.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmmirror.com/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmmirror.com/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "node_modules/rollup": { + "version": "2.79.1", + "resolved": "https://registry.npmmirror.com/rollup/-/rollup-2.79.1.tgz", + "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==", + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=10.0.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/rw": { + "version": "1.3.3", + "resolved": "https://registry.npmmirror.com/rw/-/rw-1.3.3.tgz", + "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==", + "dev": true + }, + "node_modules/sade": { + "version": "1.8.1", + "resolved": "https://registry.npmmirror.com/sade/-/sade-1.8.1.tgz", + "integrity": "sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==", + "dev": true, + "dependencies": { + "mri": "^1.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true + }, + "node_modules/sander": { + "version": "0.5.1", + "resolved": "https://registry.npmmirror.com/sander/-/sander-0.5.1.tgz", + "integrity": "sha512-3lVqBir7WuKDHGrKRDn/1Ye3kwpXaDOMsiRP1wd6wpZW56gJhsbp5RqQpA6JG/P+pkXizygnr1dKR8vzWaVsfA==", + "dev": true, + "dependencies": { + "es6-promise": "^3.1.2", + "graceful-fs": "^4.1.3", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.2" + } + }, + "node_modules/sass": { + "version": "1.58.3", + "resolved": "https://registry.npmmirror.com/sass/-/sass-1.58.3.tgz", + "integrity": "sha512-Q7RaEtYf6BflYrQ+buPudKR26/lH+10EmO9bBqbmPh/KeLqv8bjpTNqxe71ocONqXq+jYiCbpPUmQMS+JJPk4A==", + "devOptional": true, + "dependencies": { + "chokidar": ">=3.0.0 <4.0.0", + "immutable": "^4.0.0", + "source-map-js": ">=0.6.2 <2.0.0" + }, + "bin": { + "sass": "sass.js" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/seed-random": { + "version": "2.2.0", + "resolved": "https://registry.npmmirror.com/seed-random/-/seed-random-2.2.0.tgz", + "integrity": "sha512-34EQV6AAHQGhoc0tn/96a9Fsi6v2xdqe/dMUwljGRaFOzR3EgRmECvD0O8vi8X+/uQ50LGHfkNu/Eue5TPKZkQ==" + }, + "node_modules/sorcery": { + "version": "0.10.0", + "resolved": "https://registry.npmmirror.com/sorcery/-/sorcery-0.10.0.tgz", + "integrity": "sha512-R5ocFmKZQFfSTstfOtHjJuAwbpGyf9qjQa1egyhvXSbM7emjrtLXtGdZsDJDABC85YBfVvrOiGWKSYXPKdvP1g==", + "dev": true, + "dependencies": { + "buffer-crc32": "^0.2.5", + "minimist": "^1.2.0", + "sander": "^0.5.0", + "sourcemap-codec": "^1.3.0" + }, + "bin": { + "sorcery": "bin/index.js" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-js": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz", + "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmmirror.com/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/sourcemap-codec": { + "version": "1.4.8", + "resolved": "https://registry.npmmirror.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", + "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", + "deprecated": "Please use @jridgewell/sourcemap-codec instead" + }, + "node_modules/stream-browserify": { + "version": "3.0.0", + "resolved": "https://registry.npmmirror.com/stream-browserify/-/stream-browserify-3.0.0.tgz", + "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==", + "dependencies": { + "inherits": "~2.0.4", + "readable-stream": "^3.5.0" + } + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/strip-indent": { + "version": "3.0.0", + "resolved": "https://registry.npmmirror.com/strip-indent/-/strip-indent-3.0.0.tgz", + "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", + "dev": true, + "dependencies": { + "min-indent": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strnum": { + "version": "1.0.5", + "resolved": "https://registry.npmmirror.com/strnum/-/strnum-1.0.5.tgz", + "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==" + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/svelte": { + "version": "3.55.1", + "resolved": "https://registry.npmmirror.com/svelte/-/svelte-3.55.1.tgz", + "integrity": "sha512-S+87/P0Ve67HxKkEV23iCdAh/SX1xiSfjF1HOglno/YTbSTW7RniICMCofWGdJJbdjw3S+0PfFb1JtGfTXE0oQ==", + "engines": { + "node": ">= 8" + } + }, + "node_modules/svelte-check": { + "version": "2.10.3", + "resolved": "https://registry.npmmirror.com/svelte-check/-/svelte-check-2.10.3.tgz", + "integrity": "sha512-Nt1aWHTOKFReBpmJ1vPug0aGysqPwJh2seM1OvICfM2oeyaA62mOiy5EvkXhltGfhCcIQcq2LoE0l1CwcWPjlw==", + "dev": true, + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.9", + "chokidar": "^3.4.1", + "fast-glob": "^3.2.7", + "import-fresh": "^3.2.1", + "picocolors": "^1.0.0", + "sade": "^1.7.4", + "svelte-preprocess": "^4.0.0", + "typescript": "*" + }, + "bin": { + "svelte-check": "bin/svelte-check" + }, + "peerDependencies": { + "svelte": "^3.24.0" + } + }, + "node_modules/svelte-hmr": { + "version": "0.15.1", + "resolved": "https://registry.npmmirror.com/svelte-hmr/-/svelte-hmr-0.15.1.tgz", + "integrity": "sha512-BiKB4RZ8YSwRKCNVdNxK/GfY+r4Kjgp9jCLEy0DuqAKfmQtpL38cQK3afdpjw4sqSs4PLi3jIPJIFp259NkZtA==", + "dev": true, + "engines": { + "node": "^12.20 || ^14.13.1 || >= 16" + }, + "peerDependencies": { + "svelte": ">=3.19.0" + } + }, + "node_modules/svelte-material-icons": { + "version": "2.1.0", + "resolved": "https://registry.npmmirror.com/svelte-material-icons/-/svelte-material-icons-2.1.0.tgz", + "integrity": "sha512-UaZngbPcWtS6gEoZx/8bpv0ompsm5SOZs66NkuEQIX+p8UblrUoknjy7kKRlFEpRdFQ232IB8jswkGaFTreB6g==", + "peerDependencies": { + "svelte": "^3.0.0" + } + }, + "node_modules/svelte-material-ui": { + "version": "6.2.0", + "resolved": "https://registry.npmmirror.com/svelte-material-ui/-/svelte-material-ui-6.2.0.tgz", + "integrity": "sha512-/iS1gJr2Y4N+jDyt8AQZYaOTp9hAisWd5BXo20CIVUQbp2PX583S6w1JP5SpztjQnyGONpIa+qAg3Ntbj51c7Q==", + "dependencies": { + "@smui-extra/accordion": "^6.1.4", + "@smui-extra/autocomplete": "^6.2.0", + "@smui-extra/badge": "^6.1.4", + "@smui/banner": "^6.1.4", + "@smui/button": "^6.1.4", + "@smui/card": "^6.1.4", + "@smui/checkbox": "^6.1.4", + "@smui/chips": "^6.1.4", + "@smui/circular-progress": "^6.1.4", + "@smui/common": "^6.1.4", + "@smui/data-table": "^6.2.0", + "@smui/dialog": "^6.1.4", + "@smui/drawer": "^6.1.4", + "@smui/fab": "^6.1.4", + "@smui/floating-label": "^6.1.4", + "@smui/form-field": "^6.1.4", + "@smui/icon-button": "^6.1.4", + "@smui/image-list": "^6.1.4", + "@smui/layout-grid": "^6.1.4", + "@smui/line-ripple": "^6.1.4", + "@smui/linear-progress": "^6.1.4", + "@smui/list": "^6.1.4", + "@smui/menu": "^6.2.0", + "@smui/menu-surface": "^6.1.4", + "@smui/notched-outline": "^6.1.4", + "@smui/paper": "^6.1.4", + "@smui/radio": "^6.1.4", + "@smui/ripple": "^6.1.4", + "@smui/segmented-button": "^6.1.4", + "@smui/select": "^6.2.0", + "@smui/slider": "^6.1.4", + "@smui/snackbar": "^6.1.4", + "@smui/switch": "^6.1.4", + "@smui/tab": "^6.1.4", + "@smui/tab-bar": "^6.1.4", + "@smui/tab-indicator": "^6.1.4", + "@smui/tab-scroller": "^6.1.4", + "@smui/textfield": "^6.1.4", + "@smui/tooltip": "^6.1.4", + "@smui/top-app-bar": "^6.1.4", + "@smui/touch-target": "^6.1.4" + } + }, + "node_modules/svelte-material-ui/node_modules/@material/chips": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/chips/-/chips-13.0.0.tgz", + "integrity": "sha512-Ov4runDbrROUpMqKyCi3lpknfrLzGwtV+/rfYIgTYUkEVpCHXHddxXxcjP4zqh3QLXnE6ma92PLGcxCb/zzogQ==", + "dependencies": { + "@material/animation": "^13.0.0", + "@material/base": "^13.0.0", + "@material/checkbox": "^13.0.0", + "@material/density": "^13.0.0", + "@material/dom": "^13.0.0", + "@material/elevation": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/shape": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/tokens": "^13.0.0", + "@material/touch-target": "^13.0.0", + "@material/typography": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/svelte-material-ui/node_modules/@material/form-field": { + "version": "13.0.0", + "resolved": "https://registry.npmmirror.com/@material/form-field/-/form-field-13.0.0.tgz", + "integrity": "sha512-cXs5uYA89KgrXrU1UYkl52JizeIK3Mx9LjBw4ZYiyQJzFaBTPYsYWGSJMad1HZhWlRiigGTyN1M9ePIxtBpi0Q==", + "dependencies": { + "@material/base": "^13.0.0", + "@material/feature-targeting": "^13.0.0", + "@material/ripple": "^13.0.0", + "@material/rtl": "^13.0.0", + "@material/theme": "^13.0.0", + "@material/typography": "^13.0.0", + "tslib": "^2.1.0" + } + }, + "node_modules/svelte-material-ui/node_modules/@smui/chips": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/chips/-/chips-6.1.4.tgz", + "integrity": "sha512-zNYQeYkaeqatT8K4DI0J1sWnNAUpUMyGIGijBEW0QZkQFf9+v4eGFemulE/feY3MrYRgGDCFydgziK6G4+ezNg==", + "dependencies": { + "@material/chips": "^13.0.0", + "@material/dom": "^13.0.0", + "@material/rtl": "^13.0.0", + "@smui/common": "^6.1.4", + "@smui/ripple": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/svelte-material-ui/node_modules/@smui/form-field": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@smui/form-field/-/form-field-6.1.4.tgz", + "integrity": "sha512-MytvYxHO/+zTzReWGNZ4UXZ2jeDShyopHFfQUCfwPszHX8ckiYTx/Ld+wFBs6GSq9bGJw49gHnYkkZUfVIbm3A==", + "dependencies": { + "@material/feature-targeting": "^13.0.0", + "@material/form-field": "^13.0.0", + "@material/rtl": "^13.0.0", + "@smui/common": "^6.1.4", + "svelte2tsx": "^0.5.12" + } + }, + "node_modules/svelte-preprocess": { + "version": "4.10.7", + "resolved": "https://registry.npmmirror.com/svelte-preprocess/-/svelte-preprocess-4.10.7.tgz", + "integrity": "sha512-sNPBnqYD6FnmdBrUmBCaqS00RyCsCpj2BG58A1JBswNF7b0OKviwxqVrOL/CKyJrLSClrSeqQv5BXNg2RUbPOw==", + "dev": true, + "hasInstallScript": true, + "dependencies": { + "@types/pug": "^2.0.4", + "@types/sass": "^1.16.0", + "detect-indent": "^6.0.0", + "magic-string": "^0.25.7", + "sorcery": "^0.10.0", + "strip-indent": "^3.0.0" + }, + "engines": { + "node": ">= 9.11.2" + }, + "peerDependencies": { + "@babel/core": "^7.10.2", + "coffeescript": "^2.5.1", + "less": "^3.11.3 || ^4.0.0", + "postcss": "^7 || ^8", + "postcss-load-config": "^2.1.0 || ^3.0.0 || ^4.0.0", + "pug": "^3.0.0", + "sass": "^1.26.8", + "stylus": "^0.55.0", + "sugarss": "^2.0.0", + "svelte": "^3.23.0", + "typescript": "^3.9.5 || ^4.0.0" + }, + "peerDependenciesMeta": { + "@babel/core": { + "optional": true + }, + "coffeescript": { + "optional": true + }, + "less": { + "optional": true + }, + "node-sass": { + "optional": true + }, + "postcss": { + "optional": true + }, + "postcss-load-config": { + "optional": true + }, + "pug": { + "optional": true + }, + "sass": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "typescript": { + "optional": true + } + } + }, + "node_modules/svelte-preprocess/node_modules/magic-string": { + "version": "0.25.9", + "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.25.9.tgz", + "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", + "dev": true, + "dependencies": { + "sourcemap-codec": "^1.4.8" + } + }, + "node_modules/svelte2tsx": { + "version": "0.5.23", + "resolved": "https://registry.npmmirror.com/svelte2tsx/-/svelte2tsx-0.5.23.tgz", + "integrity": "sha512-jYFnugTQRFmUpvLXPQrKzVYcW5ErT+0QCxg027Zx9BuvYefMZFuoBSTDYe7viPEFGrPPiLgT2m7f5n9khE7f7Q==", + "dependencies": { + "dedent-js": "^1.0.1", + "pascal-case": "^3.1.1" + }, + "peerDependencies": { + "svelte": "^3.24", + "typescript": "^4.1.2" + } + }, + "node_modules/systemjs": { + "version": "6.14.0", + "resolved": "https://registry.npmmirror.com/systemjs/-/systemjs-6.14.0.tgz", + "integrity": "sha512-OMf+kFCYG9fLQerUyw/QVIPfZ+lo579R+usrDzSrZAkvMl6B0tHtc4rUP7DFaPCr7Sy6p5DYD4V9OCF1Sp6+vA==" + }, + "node_modules/terser": { + "version": "5.16.5", + "resolved": "https://registry.npmmirror.com/terser/-/terser-5.16.5.tgz", + "integrity": "sha512-qcwfg4+RZa3YvlFh0qjifnzBHjKGNbtDo9yivMqMFDy9Q6FSaQWSB/j1xKhsoUFJIqDOM3TsN6D5xbrMrFcHbg==", + "dependencies": { + "@jridgewell/source-map": "^0.3.2", + "acorn": "^8.5.0", + "commander": "^2.20.0", + "source-map-support": "~0.5.20" + }, + "bin": { + "terser": "bin/terser" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/tinyld": { + "version": "1.3.1", + "resolved": "https://registry.npmmirror.com/tinyld/-/tinyld-1.3.1.tgz", + "integrity": "sha512-INB2is03ygze5dUeAp5wCYBUf/+FsXcElCmfewe1ujirCUTe4nGUNDN229Ay/C2W+f15qD7uhclstNHY+a6fgg==", + "bin": { + "tinyld": "bin/tinyld.js" + }, + "engines": { + "node": ">= 12.10.0", + "npm": ">= 6.12.0", + "yarn": ">= 1.20.0" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "devOptional": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/tosource": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/tosource/-/tosource-1.0.0.tgz", + "integrity": "sha512-N6g8eQ1eerw6Y1pBhdgkubWIiPFwXa2POSUrlL8jth5CyyEWNWzoGKRkO3CaO7Jx27hlJP54muB3btIAbx4MPg==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmmirror.com/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, + "node_modules/tslib": { + "version": "2.5.0", + "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.5.0.tgz", + "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" + }, + "node_modules/twemoji": { + "version": "14.0.2", + "resolved": "https://registry.npmmirror.com/twemoji/-/twemoji-14.0.2.tgz", + "integrity": "sha512-BzOoXIe1QVdmsUmZ54xbEH+8AgtOKUiG53zO5vVP2iUu6h5u9lN15NcuS6te4OY96qx0H7JK9vjjl9WQbkTRuA==", + "dependencies": { + "fs-extra": "^8.0.1", + "jsonfile": "^5.0.0", + "twemoji-parser": "14.0.0", + "universalify": "^0.1.2" + } + }, + "node_modules/twemoji-parser": { + "version": "14.0.0", + "resolved": "https://registry.npmmirror.com/twemoji-parser/-/twemoji-parser-14.0.0.tgz", + "integrity": "sha512-9DUOTGLOWs0pFWnh1p6NF+C3CkQ96PWmEFwhOVmT3WbecRC+68AIqpsnJXygfkFcp4aXbOp8Dwbhh/HQgvoRxA==" + }, + "node_modules/typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmmirror.com/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmmirror.com/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/uplot": { + "version": "1.6.24", + "resolved": "https://registry.npmmirror.com/uplot/-/uplot-1.6.24.tgz", + "integrity": "sha512-WpH2BsrFrqxkMu+4XBvc0eCDsRBhzoq9crttYeSI0bfxpzR5YoSVzZXOKFVWcVC7sp/aDXrdDPbDZGCtck2PVg==" + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + }, + "node_modules/vite": { + "version": "3.2.5", + "resolved": "https://registry.npmmirror.com/vite/-/vite-3.2.5.tgz", + "integrity": "sha512-4mVEpXpSOgrssFZAOmGIr85wPHKvaDAcXqxVxVRZhljkJOMZi1ibLibzjLHzJvcok8BMguLc7g1W6W/GqZbLdQ==", + "dependencies": { + "esbuild": "^0.15.9", + "postcss": "^8.4.18", + "resolve": "^1.22.1", + "rollup": "^2.79.1" + }, + "bin": { + "vite": "bin/vite.js" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + }, + "peerDependencies": { + "@types/node": ">= 14", + "less": "*", + "sass": "*", + "stylus": "*", + "sugarss": "*", + "terser": "^5.4.0" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "less": { + "optional": true + }, + "sass": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "terser": { + "optional": true + } + } + }, + "node_modules/vitefu": { + "version": "0.2.4", + "resolved": "https://registry.npmmirror.com/vitefu/-/vitefu-0.2.4.tgz", + "integrity": "sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==", + "dev": true, + "peerDependencies": { + "vite": "^3.0.0 || ^4.0.0" + }, + "peerDependenciesMeta": { + "vite": { + "optional": true + } + } + }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmmirror.com/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true + } + } +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/giara/default.nix b/third_party/nixpkgs/pkgs/applications/networking/giara/default.nix index 60c2ad8262..3e10a61a63 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/giara/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/giara/default.nix @@ -64,9 +64,6 @@ python3.pkgs.buildPythonApplication rec { --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; - # Fix setup-hooks https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - meta = with lib; { description = "A Reddit app, built with Python, GTK and Handy; Created with mobile Linux in mind"; maintainers = with maintainers; [ dasj19 ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/gossa/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gossa/default.nix index 4a14571b23..4e77b387a8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gossa/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gossa/default.nix @@ -5,7 +5,7 @@ }: buildGoModule rec { - name = "gossa"; + pname = "gossa"; version = "0.2.2"; src = fetchFromGitHub { 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 477ff10de3..e1bc3b3b56 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.31.0.83"; + version = "2.32.1.3"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm"; - sha256 = "sha256-dzT6S6124l70uYqkB6fGgCpqZBXS2irgwOfkmupN8HU="; + sha256 = "sha256-lsUS7JymCMOa5wlWJOwLFm4KRnAYixi9Kk5CYHB17Ac="; }; nativeBuildInputs = [ rpmextract makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix index 142bd5e382..b31accd286 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation rec { - name = "cinny-desktop"; + pname = "cinny-desktop"; version = "2.2.4"; src = fetchurl { 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 8777bd2495..48ba7275fe 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 @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.25"; ptb = "0.0.39"; - canary = "0.0.148"; + canary = "0.0.149"; } else { stable = "0.0.264"; ptb = "0.0.59"; @@ -22,7 +22,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-2ZrSDyPj3AHriCWZ/bb303H3J97TTun//WjmInNEmwk="; + sha256 = "sha256-8DHr7adczIv9FXaxPxSfZPn+8ogWLWHRp9l0JpKhoiY="; }; }; x86_64-darwin = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix index 72a9d2d3eb..10fb303fdd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -5,6 +5,7 @@ , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes , libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss , pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand +, libunity , wayland , branch , common-updater-scripts, withOpenASAR ? false }: @@ -69,6 +70,7 @@ stdenv.mkDerivation rec { libnotify libX11 libXcomposite + libunity libuuid libXcursor libXdamage diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 55d8227f57..f30850d258 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -19,25 +19,25 @@ }: let - pinData = lib.importJSON ./pin.json; + pinData = import ./pin.nix; + inherit (pinData.hashes) desktopSrcHash desktopYarnHash; executableName = "element-desktop"; keytar = callPackage ./keytar { inherit Security AppKit; }; seshat = callPackage ./seshat { inherit CoreServices; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { pname = "element-desktop"; - inherit (pinData) version; - name = "${pname}-${version}"; + name = "${finalAttrs.pname}-${finalAttrs.version}"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; - rev = "v${version}"; - sha256 = pinData.desktopSrcHash; + rev = "v${finalAttrs.version}"; + sha256 = desktopSrcHash; }; offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; - sha256 = pinData.desktopYarnHash; + yarnLock = finalAttrs.src + "/yarn.lock"; + sha256 = desktopYarnHash; }; nativeBuildInputs = [ yarn fixup_yarn_lock nodejs makeWrapper ] @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { # desktop item mkdir -p "$out/share" - ln -s "${desktopItem}/share/applications" "$out/share/applications" + ln -s "${finalAttrs.desktopItem}/share/applications" "$out/share/applications" # executable wrapper # LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102 @@ -117,7 +117,7 @@ stdenv.mkDerivation rec { icon = "element"; desktopName = "Element"; genericName = "Matrix Client"; - comment = meta.description; + comment = finalAttrs.meta.description; categories = [ "Network" "InstantMessaging" "Chat" ]; startupWMClass = "element"; mimeTypes = [ "x-scheme-handler/element" ]; @@ -141,9 +141,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A feature-rich client for Matrix.org"; homepage = "https://element.io/"; - changelog = "https://github.com/vector-im/element-desktop/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/vector-im/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.asl20; maintainers = teams.matrix.members; inherit (electron.meta) platforms; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix index b73fda7217..e6b73d2983 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,25 +12,25 @@ }: let - pinData = lib.importJSON ./pin.json; + pinData = import ./pin.nix; + inherit (pinData.hashes) webSrcHash webYarnHash; noPhoningHome = { disable_guests = true; # disable automatic guest account registration at matrix.org }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { pname = "element-web"; - inherit (pinData) version; src = fetchFromGitHub { owner = "vector-im"; - repo = pname; - rev = "v${version}"; - sha256 = pinData.webSrcHash; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + sha256 = webSrcHash; }; offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; - sha256 = pinData.webYarnHash; + yarnLock = finalAttrs.src + "/yarn.lock"; + sha256 = webYarnHash; }; nativeBuildInputs = [ yarn fixup_yarn_lock jq nodejs ]; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - export VERSION=${version} + export VERSION=${finalAttrs.version} yarn build:res --offline yarn build:module_system --offline yarn build:bundle --offline @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { cp -R webapp $out cp ${jitsi-meet}/libs/external_api.min.js $out/jitsi_external_api.min.js - echo "${version}" > "$out/version" + echo "${finalAttrs.version}" > "$out/version" jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json" runHook postInstall @@ -79,9 +79,9 @@ stdenv.mkDerivation rec { meta = { description = "A glossy Matrix collaboration client for the web"; homepage = "https://element.io/"; - changelog = "https://github.com/vector-im/element-web/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/vector-im/element-web/blob/v${finalAttrs.version}/CHANGELOG.md"; maintainers = lib.teams.matrix.members; license = lib.licenses.asl20; platforms = lib.platforms.all; }; -} +}) 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 deleted file mode 100644 index 05cfe1d87b..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "version": "1.11.24", - "desktopSrcHash": "eAcJwoifIg0yCcYyeueVOL6CeGVMwmHpbr58MOUpK9I=", - "desktopYarnHash": "175ln40xp4djzc9wrx2vfg6did4rxy7nyxm6vs95pcbpv1i84g97", - "webSrcHash": "45xyfflTGA9LQxKi2WghYdDN0+R4ntjIPONnm+CJ5Dk=", - "webYarnHash": "1rwlx73chgq7x4zki9w4y3br8ypvk37vi6agqhk2dvq6y4znr93y" -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix new file mode 100644 index 0000000000..b1c29d0b61 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -0,0 +1,9 @@ +{ + "version" = "1.11.24"; + "hashes" = { + "desktopSrcHash" = "eAcJwoifIg0yCcYyeueVOL6CeGVMwmHpbr58MOUpK9I="; + "desktopYarnHash" = "175ln40xp4djzc9wrx2vfg6did4rxy7nyxm6vs95pcbpv1i84g97"; + "webSrcHash" = "45xyfflTGA9LQxKi2WghYdDN0+R4ntjIPONnm+CJ5Dk="; + "webYarnHash" = "1rwlx73chgq7x4zki9w4y3br8ypvk37vi6agqhk2dvq6y4znr93y"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update.sh index 976b6cb0ba..50051d7b1a 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update.sh @@ -42,12 +42,14 @@ wget "$desktop_src/yarn.lock" desktop_yarn_hash=$(prefetch-yarn-deps yarn.lock) popd -cat > pin.json << EOF +cat > pin.nix << EOF { - "version": "$version", - "desktopSrcHash": "$desktop_src_hash", - "desktopYarnHash": "$desktop_yarn_hash", - "webSrcHash": "$web_src_hash", - "webYarnHash": "$web_yarn_hash" + "version" = "$version"; + "hashes" = { + "desktopSrcHash" = "$desktop_src_hash"; + "desktopYarnHash" = "$desktop_yarn_hash"; + "webSrcHash" = "$web_src_hash"; + "webYarnHash" = "$web_yarn_hash"; + }; } EOF diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix index 5bf231ec92..9178c73a46 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -4,7 +4,7 @@ with ocamlPackages; buildDunePackage rec { pname = "jackline"; - version = "unstable-2022-05-27"; + version = "unstable-2023-02-24"; minimalOCamlVersion = "4.08"; @@ -13,8 +13,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "d8f7c504027a0dd51966b2b7304d6daad155a05b"; - hash = "sha256-6SWYl2mB0g8JNVHBeTnZEbzOaTmVbsRMMEs+3j/ewwk="; + rev = "846be4e7fcddf45e66e0ff5b29fb5a212d6ee8c3"; + hash = "sha256-/j3VJRx/w9HQUnfoq/4gMWV5oVdRiPGddrgbCDk5y8c="; }; nativeBuildInpts = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix index 1c9f581d46..d2896b82f4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -64,14 +64,14 @@ let in stdenv.mkDerivation rec { pname = "jami"; - version = "20230206.0"; + version = "20230306.0"; src = fetchFromGitLab { domain = "git.jami.net"; owner = "savoirfairelinux"; repo = "jami-client-qt"; rev = "stable/${version}"; - hash = "sha256-MQ28UJUvgJoPk65neUgMrG+SxOcfnUl803urEFQ7468="; + hash = "sha256-OQo5raXl2OIAF/iLMCNT32b4xRZ/jCN0EkgH9rJXbFE="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix index 6a1b5086bc..d80d2b2f4d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix @@ -51,7 +51,7 @@ buildPythonApplication rec { dbus-python pyxdg python-olm - ]; + ] ++ matrix-nio.optional-dependencies.e2e; meta = with lib; { description = "Simple but convenient CLI-based Matrix client app for sending and receiving"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix index bfe11b2721..b6c9f61f82 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -66,7 +66,7 @@ mkDerivation rec { watchgod dbus-python matrix-nio - ]; + ] ++ matrix-nio.optional-dependencies.e2e; qmakeFlags = [ "PREFIX=${placeholder "out"}" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nchat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nchat/default.nix index 43d2d7e374..4fe0cc054b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nchat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nchat/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { readline sqlite zlib - ] ++ lib.optional stdenv.isDarwin [ AppKit Cocoa Foundation ]; + ] ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa Foundation ]; cmakeFlags = [ "-DHAS_WHATSAPP=OFF" # go module build required diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix index bbabfedc69..0b37b6999e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -83,9 +83,6 @@ stdenv.mkDerivation rec { "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389 ]; - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; - preFixup = lib.optionalString voipSupport '' # add gstreamer plugins path to the wrapper qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 10d2cb87f8..dbe944d189 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder, - attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus, + attrs, aiohttp, appdirs, click, keyring, logbook, peewee, janus, prompt-toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3, setuptools, installShellFiles, nixosTests, @@ -29,12 +29,14 @@ buildPythonApplication rec { click janus keyring - Logbook + logbook matrix-nio peewee prompt-toolkit setuptools - ] ++ lib.optionals enableDbusUi [ + ] + ++ matrix-nio.optional-dependencies.e2e + ++ lib.optionals enableDbusUi [ dbus-python notify2 pygobject3 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 d8f3fcb179..9fda9d0ec4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.5.1"; - hash = "sha256-At4ILl6nHltP1TMI5cjK7gE4NENAccS4MPMHXJoGveM="; + version = "6.9.0"; + hash = "sha256-VgEGFt8LvVpIWiqFyYiTXUavYY0YmnJ+CxrNhPP0hCg="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.6.0-beta.1"; - hash = "sha256-txSvMg7Q+r9UWJMC9Rj2XQ8y1WN3xphMruvOZok/VPk="; + version = "6.10.0-beta.1"; + hash = "sha256-A8jpYDWiCCBadRDzmNVxzucKPomgXlqdyeGiYp+1Byo="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 5bd11cff90..8938c05a24 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -48,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.13.7.15481"; - versions.x86_64-darwin = "5.13.7.15481"; - versions.x86_64-linux = "5.13.10.1208"; + versions.aarch64-darwin = "5.13.11.16405"; + versions.x86_64-darwin = "5.13.11.16405"; + versions.x86_64-linux = "5.13.11.1288"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-lCg8xCEuZSWnd4fieug9xjudE9q6pNICRsbvA4ATVK8="; + hash = "sha256-YjERJ6B06/uloHRQVyZDLyf/2Gae0P7xdk4Db9aqROs="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-jmMpkqUga/KQJfXFbGURcWQudnCKlIi5NGY6LuekjKw="; + hash = "sha256-g6n4SKdord7gRwBaYUle3+yi1eB0T36ilScTaCcU8us="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-GmDWb7HRpf5khA5DAGOD5lx5zSzOdDfTvmcOU/LwN+A="; + hash = "sha256-BdI3HEQVe9A3D6KJ45wHWsrfb+dhTZAp/xlcr9X92EU="; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix index 996677f8a1..689cef0db0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "1.0.5"; + version = "1.0.6"; - vendorHash = "sha256-sLCgPXyOiGaigcVuwUU4+Lmb7SjopWKhCReBzrZyuRs="; + vendorHash = "sha256-IRR10wC05dv4d170Iweuxdy/JEnYjvdW0h5nS1ht9cg="; src = fetchFromGitHub { owner = "ipfs-cluster"; repo = "ipfs-cluster"; rev = "v${version}"; - hash = "sha256-c0COSf4ktFxkPJwzq/0RyG1JvNUvhdWpeRlrbAirGec="; + hash = "sha256-2En7morOodWvtNZGAZhl1EZJCCHdrYSUA1WBYGkjnYI="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index 1342e0f7e9..da599367af 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -8,7 +8,7 @@ , future , atomicwrites , attrs -, Logbook +, logbook , pygments , matrix-nio , aiohttp @@ -45,12 +45,12 @@ in buildPythonPackage { future atomicwrites attrs - Logbook + logbook pygments matrix-nio aiohttp requests - ]; + ] ++ matrix-nio.optional-dependencies.e2e; passthru.scripts = [ "matrix.py" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/localsend/default.nix b/third_party/nixpkgs/pkgs/applications/networking/localsend/default.nix new file mode 100644 index 0000000000..58bc5b3fdc --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/localsend/default.nix @@ -0,0 +1,64 @@ +{ lib, stdenv, appimageTools, fetchurl, undmg }: + +let + pname = "localsend"; + version = "1.8.0"; + + srcs = { + x86_64-linux = fetchurl { + url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.AppImage"; + hash = "sha256-Setxw0urfJCiHI+Ms+Igroi1CLCgB0H5BsV6RkxyBME="; + }; + x86_64-darwin = fetchurl { + url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg"; + hash = "sha256-uVZ/ULhr8CiV/wL9Yaw6q2IYAHNqld606ADKab/EVlU="; + }; + }; + src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + appimageContents = appimageTools.extract { inherit pname version src; }; + + linux = appimageTools.wrapType2 rec { + inherit pname version src meta; + + extraPkgs = p: [ p.libepoxy ]; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/org.localsend.localsend_app.desktop \ + $out/share/applications/${pname}.desktop + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Icon=application-vnd.appimage' 'Icon=${pname}' \ + --replace 'Exec=localsend_app' 'Exec=$out/bin/localsend' + + install -m 444 -D ${appimageContents}/application-vnd.appimage.svg \ + $out/share/icons/hicolor/scalable/apps/${pname}.svg + ''; + }; + + darwin = stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/Applications + cp -r *.app $out/Applications + ''; + }; + + meta = with lib; { + description = "An open source cross-platform alternative to AirDrop"; + homepage = "https://localsend.org/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + platforms = builtins.attrNames srcs; + }; +in +if stdenv.isDarwin +then darwin +else linux diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/bubblemail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/bubblemail/default.nix index 6127622075..bd5783a5c6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/bubblemail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/bubblemail/default.nix @@ -13,6 +13,7 @@ , glib , gobject-introspection , folks +, bash }: python3Packages.buildPythonApplication rec { @@ -39,6 +40,7 @@ python3Packages.buildPythonApplication rec { libsecret gnome-online-accounts folks + bash ]; nativeBuildInputs = [ @@ -59,9 +61,6 @@ python3Packages.buildPythonApplication rec { # See https://nixos.org/nixpkgs/manual/#ssec-gnome-common-issues-double-wrapped dontWrapGApps = true; - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mkchromecast/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mkchromecast/default.nix index 58f381f7a4..de08620cf8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mkchromecast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mkchromecast/default.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; ([ - PyChromecast + pychromecast psutil mutagen flask diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad/mullvad.nix b/third_party/nixpkgs/pkgs/applications/networking/mullvad/mullvad.nix index 0d62c3c7ce..cb6b8a19ed 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mullvad/mullvad.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad/mullvad.nix @@ -15,19 +15,20 @@ , enableOpenvpn ? true , openvpn-mullvad , shadowsocks-rust +, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "mullvad"; - version = "2023.1"; + version = "2023.2"; src = fetchFromGitHub { owner = "mullvad"; repo = "mullvadvpn-app"; rev = version; - hash = "sha256-BoduliiDOpzEPYHAjr636e7DbrhFnC/v9au6Mp9T/Qs="; + hash = "sha256-UozgUsew6MRplahTW/y688R2VetO50UGQevmVo8/QNs="; }; - cargoHash = "sha256-5kK2IA0Z1dQbHlnGXNZHD+BycurshfpqrwcIEveWKT0="; + cargoHash = "sha256-/DYEG/8FlDbyWsvnxM+0tbKG4/DbwEnNX2KiC3ryyGI="; patches = [ # https://github.com/mullvad/mullvadvpn-app/pull/4389 @@ -44,6 +45,7 @@ rustPlatform.buildRustPackage rec { protobuf makeWrapper git + installShellFiles ]; buildInputs = [ @@ -59,6 +61,17 @@ rustPlatform.buildRustPackage rec { ln -s ${libwg}/lib/libwg.a $dest ''; + postInstall = '' + compdir=$(mktemp -d) + for shell in bash zsh fish; do + $out/bin/mullvad shell-completions $shell $compdir + done + installShellCompletion --cmd mullvad \ + --bash $compdir/mullvad.bash \ + --zsh $compdir/_mullvad \ + --fish $compdir/mullvad.fish + ''; + postFixup = # Place all binaries in the 'mullvad-' namespace, even though these # specific binaries aren't used in the lifetime of the program. diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix index 2450042382..8a4323acf0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "uC3ksJ4nNXBjQYqNOS4qK6aCK6/Wzf27YXHbM73TpdU="; + sha256 = "5g74oN+NiKm/hnBLZvDxnAcBuP6B4y1Nsvb6nShZBnw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix index 6355f2418b..f121847e9a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.7.3"; + version = "3.7.4"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-SzQdT2BJ0iIMTScJ7ft47oKd+na5MlOx5xRB1SQ7CBc="; + sha256 = "sha256-K9P9avZdW+QR+K+GSp4kqWVZX5J7mHpu4gyuR4smmcU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix b/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix index 3ba4f6ac57..4398c771e5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonPackage rec { aiohttp matrix-api-async aioredis aiosqlite arrow pyyaml motor regex mattermostdriver setuptools voluptuous ibm-watson tailer multidict watchgod get-video-properties appdirs bitstring matrix-nio - ]; + ] ++ matrix-nio.optional-dependencies.e2e; passthru.python = python3Packages.python; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix index 507d2a282e..dee7cde6fd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix @@ -27,7 +27,7 @@ let propagatedBuildInputs = with pypkgs; [ twisted - Mako + mako chardet pyxdg pyopenssl diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/fragments/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/fragments/default.nix index ebeba4c010..932cfbbbe3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/fragments/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/fragments/default.nix @@ -13,7 +13,6 @@ , ninja , openssl , pkg-config -, python3 , rustPlatform , sqlite , transmission @@ -31,24 +30,22 @@ let }); in stdenv.mkDerivation rec { pname = "fragments"; - version = "2.0.2"; + version = "2.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Fragments"; rev = version; - sha256 = "sha256-CMa1yka0kOxMhxSuazlJxTk4fzxuuwKYLBpEMwHbBUE="; + sha256 = "sha256-/KtUcj41s9WeHzIgGWhYQv6oD/Df7WOnJAPuS6yGLHk="; }; - postPatch = '' - patchShebangs build-aux/meson/postinstall.py - ''; - + # https://github.com/gtk-rs/gtk4-rs/issues/1201 + patches = [ ./gtk4-rs.patch ]; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; + inherit src patches; name = "${pname}-${version}"; - hash = "sha256-/rFZcbpITYkpSCEZp9XH253u90RGmuVLEBGIRNBgI/o="; + hash = "sha256-bhQHXx7kZFL+qb+k0gN1NZZ6LYjBUHuNqU528f0QAg0="; }; nativeBuildInputs = [ @@ -58,7 +55,6 @@ in stdenv.mkDerivation rec { meson ninja pkg-config - python3 wrapGAppsHook4 ] ++ (with rustPlatform; [ cargoSetupHook diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/fragments/gtk4-rs.patch b/third_party/nixpkgs/pkgs/applications/networking/p2p/fragments/gtk4-rs.patch new file mode 100644 index 0000000000..4e2a735543 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/fragments/gtk4-rs.patch @@ -0,0 +1,28 @@ +diff --git a/Cargo.lock b/Cargo.lock +index c0dfa2a..2decf88 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1158,9 +1158,9 @@ checksum = "da5bf7748fd4cd0b2490df8debcc911809dbcbee4ece9531b96c29a9c729de5a" + + [[package]] + name = "gtk4" +-version = "0.4.8" ++version = "0.4.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c64f0c2a3d80e899dc3febddad5bac193ffcf74a0fd7e31037f30dd34d6f7396" ++checksum = "4e8ae5aef2793bc3551b5e5e3fa062a5de54bb1eccf10dfa4effe9e4384fbbbc" + dependencies = [ + "bitflags", + "cairo-rs", +@@ -1181,9 +1181,9 @@ dependencies = [ + + [[package]] + name = "gtk4-macros" +-version = "0.4.8" ++version = "0.4.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fafbcc920af4eb677d7d164853e7040b9de5a22379c596f570190c675d45f7a7" ++checksum = "d9a4a8077b3a392dd7d637924529e1213d2e0c8e4d531177bc3355e86c257a54" + dependencies = [ + "anyhow", + "proc-macro-crate 1.2.1", diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix index a4b78e250d..016ff2aa5e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { ipy pyperclip ] ++ - lib.optional useGeoIP GeoIP; + lib.optional useGeoIP geoip; dontBuild = true; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix b/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix index 98f7ac541a..14844161d1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix @@ -41,8 +41,6 @@ buildPythonApplication rec { ]; buildInputs = [ - # To avoid enabling strictDeps = false (#56943) - gobject-introspection librsvg pango webkitgtk diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix index ec94d504b9..8aa0e38fcf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "waypipe"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "waypipe"; rev = "v${version}"; - sha256 = "sha256-ee3RKlcZQf8o8cQfz1ckiLDFNzdFJesBJKJTTrUmcpU="; + sha256 = "sha256-uf2+PSqgZ+RShuVYlR42xMV38tuYbGV+bW1tdXgiZYU="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix index 8d404d4ebd..7b90807590 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix @@ -1,5 +1,5 @@ { lib -, buildGoModule +, buildGo120Module , fetchFromGitHub , gitUpdater , makeWrapper @@ -7,20 +7,20 @@ , libxcrypt }: -buildGoModule rec { +buildGo120Module rec { pname = "shellhub-agent"; - version = "0.10.8"; + version = "0.11.6"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "BtD22Ss5PuVx2RVLQIsUeGBJBl5lh1XHJ0vcM2bOEwk="; + sha256 = "eZLQzy3lWwGM6VWFbsJ6JuGC+/dZnoymZgNtM8CPBM4="; }; modRoot = "./agent"; - vendorSha256 = "sha256-tvKiTQioj999oIUDHUSXTMXOh/LKoykzu8JEUnrelws="; + vendorSha256 = "sha256-7kDPo24I58Nh7OiHj6Zy40jAEaXSOmbcczkgJPXBItU="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix new file mode 100644 index 0000000000..701172cbd2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix @@ -0,0 +1,114 @@ +{ lib +, stdenv +, rust +, rustPlatform +, fetchFromGitHub +, substituteAll +, fetchpatch +, pkg-config +, wrapGAppsHook4 +, cairo +, gdk-pixbuf +, glib +, graphene +, gtk3 +, gtk4 +, libadwaita +, libappindicator-gtk3 +, librclone +, pango +, rclone +}: + +let + # https://github.com/trevyn/librclone/pull/8 + librclone-mismatched-types-patch = fetchpatch { + name = "use-c_char-to-be-platform-independent.patch"; + url = "https://github.com/trevyn/librclone/commit/91fdf3fa5f5eea0dfd06981ba72e09034974fdad.patch"; + hash = "sha256-8YDyUNP/ISP5jCliT6UCxZ89fdRFud+6u6P29XdPy58="; + }; +in rustPlatform.buildRustPackage rec { + pname = "celeste"; + version = "0.4.6"; + + src = fetchFromGitHub { + owner = "hwittenborn"; + repo = "celeste"; + rev = "v${version}"; + hash = "sha256-VEyQlycpqsGKqtV/QvqBfVHqQhl/H6HsWPRDBtQO3qM="; + }; + + cargoHash = "sha256-fqt0XklJJAXi2jO7eo0tIwRo2Y3oM56qYwoaelKY8iU="; + + patches = [ + (substituteAll { + src = ./target-dir.patch; + rustTarget = rust.toRustTarget stdenv.hostPlatform; + }) + ]; + + postPatch = '' + pushd $cargoDepsCopy/librclone-sys + oldHash=$(sha256sum build.rs | cut -d " " -f 1) + patch -p2 < ${./librclone-path.patch} + substituteInPlace build.rs \ + --subst-var-by librclone ${librclone} + substituteInPlace .cargo-checksum.json \ + --replace $oldHash $(sha256sum build.rs | cut -d " " -f 1) + popd + pushd $cargoDepsCopy/librclone + oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1) + patch -p1 < ${librclone-mismatched-types-patch} + substituteInPlace .cargo-checksum.json \ + --replace $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1) + popd + ''; + + # Cargo.lock is outdated + preConfigure = '' + cargo update --offline + ''; + + # We need to build celeste-tray first because celeste/src/launch.rs reads that file at build time. + # Upstream does the same: https://github.com/hwittenborn/celeste/blob/765dfa2/justfile#L1-L3 + cargoBuildFlags = [ "--bin" "celeste-tray" ]; + postConfigure = '' + cargoBuildHook + cargoBuildFlags= + ''; + + RUSTC_BOOTSTRAP = 1; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + wrapGAppsHook4 + ]; + + buildInputs = [ + cairo + gdk-pixbuf + glib + graphene + gtk3 + gtk4 + libadwaita + librclone + pango + ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libappindicator-gtk3 ]}" + --prefix PATH : "${lib.makeBinPath [ rclone ]}" + ) + ''; + + meta = { + changelog = "https://github.com/hwittenborn/celeste/blob/${src.rev}/CHANGELOG.md"; + description = "GUI file synchronization client that can sync with any cloud provider"; + homepage = "https://github.com/hwittenborn/celeste"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/librclone-path.patch b/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/librclone-path.patch new file mode 100644 index 0000000000..21af74dfde --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/librclone-path.patch @@ -0,0 +1,31 @@ +diff --git a/librclone-sys/build.rs b/librclone-sys/build.rs +index 10e45bc..7d04c08 100644 +--- a/librclone-sys/build.rs ++++ b/librclone-sys/build.rs +@@ -16,15 +16,8 @@ fn main() { + println!("cargo:rerun-if-changed=go.mod"); + println!("cargo:rerun-if-changed=go.sum"); + +- Command::new("go") +- .args(["build", "--buildmode=c-archive", "-o"]) +- .arg(&format!("{}/librclone.a", out_dir)) +- .arg("github.com/rclone/rclone/librclone") +- .status() +- .expect("`go build` failed. Is `go` installed and latest version?"); +- +- println!("cargo:rustc-link-search=native={}", out_dir); +- println!("cargo:rustc-link-lib=static=rclone"); ++ println!("cargo:rustc-link-search=native={}", "@librclone@/lib"); ++ println!("cargo:rustc-link-lib=dylib=rclone"); + + if target_triple.ends_with("darwin") { + println!("cargo:rustc-link-lib=framework=CoreFoundation"); +@@ -32,7 +25,7 @@ fn main() { + } + + let bindings = bindgen::Builder::default() +- .header(format!("{}/librclone.h", out_dir)) ++ .header(format!("{}/librclone.h", "@librclone@/include")) + .allowlist_function("RcloneRPC") + .allowlist_function("RcloneInitialize") + .allowlist_function("RcloneFinalize") diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/target-dir.patch b/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/target-dir.patch new file mode 100644 index 0000000000..a8da72e77f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/target-dir.patch @@ -0,0 +1,16 @@ +diff --git a/celeste/src/launch.rs b/celeste/src/launch.rs +index 5227170..e3cf189 100644 +--- a/celeste/src/launch.rs ++++ b/celeste/src/launch.rs +@@ -172,10 +172,7 @@ impl TrayApp { + perms.set_mode(0o755); + file.set_permissions(perms).unwrap(); + +- #[cfg(debug_assertions)] +- let tray_file = include_bytes!("../../target/debug/celeste-tray"); +- #[cfg(not(debug_assertions))] +- let tray_file = include_bytes!("../../target/release/celeste-tray"); ++ let tray_file = include_bytes!(concat!("../../target/@rustTarget@/", env!("cargoBuildType"), "/celeste-tray")); + + file.write_all(tray_file).unwrap(); + drop(file); diff --git a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix index d221324b20..952851b08d 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.23.1"; + version = "1.23.2"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-Jbg56Nn+5ZjIv1KZrThkqWY+P13MglLE78E6jc0rbY0="; + hash = "sha256-EowUQYfSznTuAHV7OIesFPM99zRmeKkzYNp7VANtR2U="; }; - vendorHash = "sha256-q63iaRxJRvPY0Np20O6JmdMEjSg/kxRneBfs8fRTwXk="; + vendorHash = "sha256-5NgflkRXkbWiIkASmxIgWliE8sF89HtlMtlIF+5u6Ic="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/office/gtg/default.nix b/third_party/nixpkgs/pkgs/applications/office/gtg/default.nix index 8165cc381c..44aaa6c714 100644 --- a/third_party/nixpkgs/pkgs/applications/office/gtg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/gtg/default.nix @@ -67,7 +67,6 @@ python3Packages.buildPythonApplication rec { ''; format = "other"; - strictDeps = false; # gobject-introspection does not run with strictDeps (https://github.com/NixOS/nixpkgs/issues/56943) checkPhase = "xvfb-run pytest ../tests/"; diff --git a/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix b/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix index 4f6ef33cae..786fa2f462 100644 --- a/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix @@ -12,15 +12,27 @@ , perl }: +let + versionReplace = { + easybind = { + snapshot = "2.2.1-SNAPSHOT"; + pin = "2.2.1-20230117.075740-16"; + }; + afterburner = { + snapshot = "testmoduleinfo-SNAPSHOT"; + pin = "0e337d8773"; + }; + }; +in stdenv.mkDerivation rec { - version = "5.7"; + version = "5.9"; pname = "jabref"; src = fetchFromGitHub { owner = "JabRef"; repo = "jabref"; rev = "v${version}"; - hash = "sha256-wzBaAaxGsMPh64uW+bBOiycYfVCW9H5FCn06r6XdxeE="; + hash = "sha256-uACmXas5L1NcxLwllkcbgCCt9bRicpQkiJkhkkVWDDY="; }; desktopItems = [ @@ -39,28 +51,37 @@ stdenv.mkDerivation rec { deps = stdenv.mkDerivation { pname = "${pname}-deps"; - inherit src version; + inherit src version postPatch; nativeBuildInputs = [ gradle perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon downloadDependencies + gradle --no-daemon downloadDependencies -Dos.arch=amd64 + gradle --no-daemon downloadDependencies -Dos.arch=aarch64 ''; # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) installPhase = '' find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \ | sh + mv $out/com/tobiasdiez/easybind/${versionReplace.easybind.pin} \ + $out/com/tobiasdiez/easybind/${versionReplace.easybind.snapshot} ''; # Don't move info to share/ forceShare = [ "dummy" ]; outputHashMode = "recursive"; - outputHash = { - x86_64-linux = "sha256-OicHJVFxHGPE76bEDoLhkEhVcAJmplqjoh2I3nnVaLA="; - aarch64-linux = "sha256-8QWmweptL/+pSO6DhfBLaLcBrfKd4TDsDoXs4TgXvew="; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system}"); + outputHash = "sha256-s6GA8iT3UEVuELBgpBvzPJlVX+9DpfOQrEd3KIth8eA="; }; + postPatch = '' + # Pin the version + substituteInPlace build.gradle \ + --replace 'com.github.JabRef:afterburner.fx:${versionReplace.afterburner.snapshot}' \ + 'com.github.JabRef:afterburner.fx:${versionReplace.afterburner.pin}' \ + --replace 'com.tobiasdiez:easybind:${versionReplace.easybind.snapshot}' \ + 'com.tobiasdiez:easybind:${versionReplace.easybind.pin}' + ''; + preBuild = '' # Include CSL styles and locales in our build cp -r buildres/csl/* src/main/resources/ @@ -114,9 +135,13 @@ stdenv.mkDerivation rec { # Resources in the jar can't be found, workaround copied from AUR cp -r build/resources $out/share/java/jabref - # workaround for https://github.com/NixOS/nixpkgs/issues/162064 tar xf build/distributions/JabRef-${version}.tar -C $out --strip-components=1 - unzip $out/lib/javafx-web-*-linux${lib.optionalString stdenv.isAarch64 "-aarch64"}.jar libjfxwebkit.so -d $out/lib/ + + # remove openjfx libs for other platforms + rm $out/lib/javafx-*-win.jar ${lib.optionalString stdenv.isAarch64 "$out/lib/javafx-*-linux.jar"} + + # workaround for https://github.com/NixOS/nixpkgs/issues/162064 + unzip $out/lib/javafx-web-*.jar libjfxwebkit.so -d $out/lib/ DEFAULT_JVM_OPTS=$(sed -n -E "s/^DEFAULT_JVM_OPTS='(.*)'$/\1/p" $out/bin/JabRef | sed -e "s|\$APP_HOME|$out|g" -e 's/"//g') rm $out/bin/* diff --git a/third_party/nixpkgs/pkgs/applications/office/karlender/default.nix b/third_party/nixpkgs/pkgs/applications/office/karlender/default.nix index ebbb0bbd9f..84777373d2 100644 --- a/third_party/nixpkgs/pkgs/applications/office/karlender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/karlender/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "karlender"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitLab { owner = "floers"; repo = pname; rev = "v${version}"; - hash = "sha256-lmNG9B2uO/zitOY/cNjnLRjCn6mSJ3CIpXIXpChDi9A="; + hash = "sha256-mtkVdVxO796hZZJrGohNTeZfC43rdvEUgUZvBG92f8c="; }; - cargoHash = "sha256-foxl8pqRqEbVwUWUGHmaTGazrwLQxcDJ/RvJE9wIszg="; + cargoHash = "sha256-jbdQ1dwTRJuA4F89YfxsO2PaHVef8bvxAj13veDteNM="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix index 8fa7d6d78a..a8a6fb8bf9 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix @@ -1,6 +1,7 @@ { stdenv , fetchurl , lib +, substituteAll , pam , python3 , libxslt @@ -88,7 +89,6 @@ , gdb , commonsLogging , librdf_rasqal -, wrapGAppsHook , gnome , glib , ncurses @@ -102,15 +102,32 @@ , mkDerivation ? null , qtbase ? null , qtx11extras ? null +, qtwayland ? null , ki18n ? null , kconfig ? null , kcoreaddons ? null , kio ? null , kwindowsystem ? null -, wrapQtAppsHook ? null , variant ? "fresh" , symlinkJoin , postgresql +# The rest are used only in passthru, for the wrapper +, kauth ? null +, kcompletion ? null +, kconfigwidgets ? null +, kglobalaccel ? null +, kitemviews ? null +, knotifications ? null +, ktextwidgets ? null +, kwidgetsaddons ? null +, kxmlgui ? null +, phonon ? null +, qtdeclarative ? null +, qtquickcontrols ? null +, qtsvg ? null +, qttools ? null +, solid ? null +, sonnet ? null } @ args: assert builtins.elem variant [ "fresh" "still" ]; @@ -137,6 +154,7 @@ let mkDrv = if kdeIntegration then mkDerivation else stdenv.mkDerivation; srcs = { + primary = primary-src; third_party = map (x: ((fetchurl { inherit (x) url sha256 name; }) // { inherit (x) md5name md5; })) (importVariant "download.nix" ++ [ @@ -176,10 +194,12 @@ in outputs = [ "out" "dev" ]; - env.NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString ([ "-I${librdf_rasqal}/include/rasqal" # librdf_redland refers to rasqal.h instead of rasqal/rasqal.h "-fno-visibility-inlines-hidden" # https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10 - ]; + ] ++ optionals (stdenv.isLinux && stdenv.isAarch64 && variant == "still") [ + "-O2" # https://bugs.gentoo.org/727188 + ]); tarballPath = "external/tarballs"; @@ -354,33 +374,24 @@ in # It installs only things to $out/lib/libreoffice postInstall = '' - mkdir -p $out/bin $out/share/desktop - - mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/" - - for a in sbase scalc sdraw smath swriter simpress soffice unopkg; do - ln -s $out/lib/libreoffice/program/$a $out/bin/$a - done - - ln -s $out/bin/soffice $out/bin/libreoffice + mkdir -p $out/share ln -s $out/lib/libreoffice/share/xdg $out/share/applications - for f in $out/share/applications/*.desktop; do - substituteInPlace "$f" \ - --replace "Exec=libreoffice${major}.${minor}" "Exec=libreoffice" - done - cp -r sysui/desktop/icons "$out/share" sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop + # Install dolphin templates, like debian does + install -D extras/source/shellnew/soffice.* --target-directory="$out/share/templates/.source" + cp ${substituteAll {src = ./soffice-template.desktop; app="Writer"; ext="odt"; type="text"; }} $out/share/templates/soffice.odt.desktop + cp ${substituteAll {src = ./soffice-template.desktop; app="Calc"; ext="ods"; type="spreadsheet"; }} $out/share/templates/soffice.ods.desktop + cp ${substituteAll {src = ./soffice-template.desktop; app="Impress"; ext="odp"; type="presentation";}} $out/share/templates/soffice.odp.desktop + cp ${substituteAll {src = ./soffice-template.desktop; app="Draw"; ext="odg"; type="drawing"; }} $out/share/templates/soffice.odg.desktop + mkdir -p $dev cp -r include $dev - '' + optionalString kdeIntegration '' - for prog in $out/bin/*; do - wrapQtApp $prog - done ''; + # Wrapping is done in ./wrapper.nix dontWrapQtApps = true; configureFlags = [ @@ -464,8 +475,7 @@ in jdk17 libtool pkg-config - ] - ++ [ (if kdeIntegration then wrapQtAppsHook else wrapGAppsHook) ]; + ]; buildInputs = with xorg; [ ArchiveZip @@ -557,20 +567,56 @@ in zip zlib ] - ++ (with gst_all_1; [ - gst-libav - gst-plugins-bad - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gstreamer - ]) + ++ passthru.gst_packages ++ optionals kdeIntegration [ qtbase qtx11extras kcoreaddons kio ] ++ optionals (lib.versionAtLeast (lib.versions.majorMinor version) "7.4") [ libwebp ]; passthru = { inherit srcs; jdk = jre'; + inherit kdeIntegration; + # For the wrapper.nix + inherit gtk3; + # Although present in qtPackages, we need qtbase.qtPluginPrefix and + # qtbase.qtQmlPrefix + inherit qtbase; + gst_packages = with gst_all_1; [ + gst-libav + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gstreamer + ]; + qmlPackages = [ + ki18n + knotifications + qtdeclarative + qtquickcontrols + qtwayland + solid + sonnet + ]; + qtPackages = [ + kauth + kcompletion + kconfigwidgets + kglobalaccel + ki18n + kio + kitemviews + ktextwidgets + kwidgetsaddons + kwindowsystem + kxmlgui + phonon + qtbase + qtdeclarative + qtsvg + qttools + qtwayland + sonnet + ]; }; requiredSystemFeatures = [ "big-parallel" ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.nix index 95206ee6a8..13819a0fb5 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.nix @@ -1,33 +1,117 @@ -{ lib, runCommand -, libreoffice, dbus, bash, substituteAll -, coreutils, gnugrep -, dolphinTemplates ? true +{ lib +, stdenv +# The unwrapped libreoffice derivation +, unwrapped +, makeWrapper +, runCommand +, substituteAll +# For Emulating wrapGAppsHook +, gsettings-desktop-schemas +, hicolor-icon-theme +, dconf +, librsvg +, gdk-pixbuf +# Configuration options for the wrapper +, extraMakeWrapperArgs ? [] +, dbusVerify ? stdenv.isLinux +, dbus }: -runCommand libreoffice.name { - inherit (libreoffice) jdk meta; - inherit coreutils dbus gnugrep libreoffice bash; + +let + inherit (unwrapped.srcs.primary) major minor; + + makeWrapperArgs = builtins.concatStringsSep " " ([ + "--set" "GDK_PIXBUF_MODULE_FILE" "${librsvg}/${gdk-pixbuf.moduleDir}.cache" + "--prefix" "GIO_EXTRA_MODULES" ":" "${lib.getLib dconf}/lib/gio/modules" + "--prefix" "XDG_DATA_DIRS" ":" "${unwrapped.gtk3}/share/gsettings-schemas/${unwrapped.gtk3.name}" + "--prefix" "XDG_DATA_DIRS" ":" "$out/share" + "--prefix" "XDG_DATA_DIRS" ":" "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" + "--prefix" "XDG_DATA_DIRS" ":" "${hicolor-icon-theme}/share" + "--prefix" "GST_PLUGIN_SYSTEM_PATH_1_0" ":" + "${lib.makeSearchPath "lib/girepository-1.0" unwrapped.gst_packages}" + ] ++ lib.optionals unwrapped.kdeIntegration [ + "--prefix" "QT_PLUGIN_PATH" ":" "${ + lib.makeSearchPath + unwrapped.qtbase.qtPluginPrefix + (builtins.map lib.getBin unwrapped.qtPackages) + }" + "--prefix" "QML2_IMPORT_PATH" ":" "${ + lib.makeSearchPath unwrapped.qtbase.qtQmlPrefix + (builtins.map lib.getBin unwrapped.qmlPackages) + }" + ] ++ [ + # Add dictionaries from all NIX_PROFILES + "--run" (lib.escapeShellArg '' + for PROFILE in $NIX_PROFILES; do + HDIR="$PROFILE/share/hunspell" + if [ -d "$HDIR" ]; then + export DICPATH=$DICPATH''${DICPATH:+:}$HDIR + fi + done + '') + ] ++ lib.optionals dbusVerify [ + # If no dbus is running, start a dedicated dbus daemon + "--run" (lib.escapeShellArg '' + if ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then + dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus" + if ! test -d "$dbus_tmp_dir" && test -d "/run"; then + mkdir -p "$dbus_tmp_dir" + fi + if ! test -d "$dbus_tmp_dir"; then + dbus_tmp_dir="/tmp/libreoffice-$(id -u)/libreoffice-dbus" + mkdir -p "$dbus_tmp_dir" + fi + dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")" + "${dbus}"/bin/dbus-daemon \ + --nopidfile \ + --nofork \ + --config-file "${dbus}"/share/dbus-1/session.conf \ + --address "unix:path=$dbus_socket_dir/session" &> /dev/null & + dbus_pid=$! + export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session" + fi + '') + ] ++ [ + "--chdir" "${unwrapped}/lib/libreoffice/program" + "--inherit-argv0" + ] ++ extraMakeWrapperArgs + ); +in runCommand "${unwrapped.name}-wrapped" { + inherit (unwrapped) meta; + paths = [ unwrapped ]; + nativeBuildInputs = [ makeWrapper ]; + passthru = { + inherit unwrapped; + # For backwards compatibility: + libreoffice = lib.warn "libreoffice: Use the unwrapped attributed, using libreoffice.libreoffice is deprecated." unwrapped; + inherit (unwrapped) kdeIntegration; + }; } ('' mkdir -p "$out/bin" - substituteAll "${./wrapper.sh}" "$out/bin/soffice" - chmod a+x "$out/bin/soffice" - - for i in $(ls "${libreoffice}/bin/"); do - test "$i" = "soffice" || ln -s soffice "$out/bin/$(basename "$i")" + mkdir -p "$out/share" + for dir in ${unwrapped}/share/*; do + dirname="''${dir##*/}" + if [[ $dirname == "applications" ]]; then + cp -r $dir/ $out/share/ + else + ln -s $dir $out/share/ + fi done - mkdir -p "$out/share" - ln -s "${libreoffice}/share"/* $out/share -'' + lib.optionalString dolphinTemplates '' - # Add templates to dolphin "Create new" menu - taken from debian + ln -s ${unwrapped}/lib $out/lib + for f in $out/share/applications/*.desktop; do + substituteInPlace "$f" \ + --replace "Exec=libreoffice${major}.${minor}" "Exec=soffice" + done - # We need to unpack the core source since the necessary files aren't available in the libreoffice output - unpackFile "${libreoffice.src}" - - install -D "${libreoffice.name}"/extras/source/shellnew/soffice.* --target-directory="$out/share/templates/.source" - - cp ${substituteAll {src = ./soffice-template.desktop; app="Writer"; ext="odt"; type="text"; }} $out/share/templates/soffice.odt.desktop - cp ${substituteAll {src = ./soffice-template.desktop; app="Calc"; ext="ods"; type="spreadsheet"; }} $out/share/templates/soffice.ods.desktop - cp ${substituteAll {src = ./soffice-template.desktop; app="Impress"; ext="odp"; type="presentation";}} $out/share/templates/soffice.odp.desktop - cp ${substituteAll {src = ./soffice-template.desktop; app="Draw"; ext="odg"; type="drawing"; }} $out/share/templates/soffice.odg.desktop + for i in sbase scalc sdraw smath swriter simpress soffice unopkg; do + makeWrapper ${unwrapped}/lib/libreoffice/program/$i $out/bin/$i ${makeWrapperArgs} +'' + lib.optionalString dbusVerify '' + # Delete the dbus socket directory after libreoffice quits + sed -i 's/^exec -a "$0" //g' $out/bin/"$i" + echo 'code="$?"' >> $out/bin/$i + echo 'test -n "$dbus_socket_dir" && { rm -rf "$dbus_socket_dir"; kill $dbus_pid; }' >> $out/bin/$i + echo 'exit "$code"' >> $out/bin/$i +'' + '' + done '') - diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.sh b/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.sh deleted file mode 100644 index 162bede3ec..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!@bash@/bin/bash -export JAVA_HOME="${JAVA_HOME:-@jdk@}" -#export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}" - -if "@coreutils@"/bin/uname | "@gnugrep@"/bin/grep Linux > /dev/null && - ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then - dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus" - if ! test -d "$dbus_tmp_dir" && test -d "/run"; then - mkdir -p "$dbus_tmp_dir" - fi - if ! test -d "$dbus_tmp_dir"; then - dbus_tmp_dir="/tmp/libreoffice-$(id -u)/libreoffice-dbus" - mkdir -p "$dbus_tmp_dir" - fi - dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")" - "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" &> /dev/null & - dbus_pid=$! - export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session" -fi - -for PROFILE in $NIX_PROFILES; do - HDIR="$PROFILE/share/hunspell" - if [ -d "$HDIR" ]; then - export DICPATH=$DICPATH''${DICPATH:+:}$HDIR - fi -done - -"@libreoffice@/bin/$("@coreutils@"/bin/basename "$0")" "$@" -code="$?" - -test -n "$dbus_socket_dir" && { rm -rf "$dbus_socket_dir"; kill $dbus_pid; } -exit "$code" diff --git a/third_party/nixpkgs/pkgs/applications/office/pdfmixtool/default.nix b/third_party/nixpkgs/pkgs/applications/office/pdfmixtool/default.nix index c8f6ce6de1..f7b58acf22 100644 --- a/third_party/nixpkgs/pkgs/applications/office/pdfmixtool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/pdfmixtool/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "pdfmixtool"; - version = "1.1"; + version = "1.1.1"; src = fetchFromGitLab { owner = "scarpetta"; repo = pname; rev = "v${version}"; - hash = "sha256-S8hhWZ6nHyIWPwsfl+o9XnljLD3aE/vthCLuWEbm5nc="; + hash = "sha256-fgtRKUG6J/CM6cXUTHWAPemqL8loWZT3wZmGdRHldq8="; }; nativeBuildInputs = [ @@ -36,12 +36,11 @@ mkDerivation rec { ]; patches = [ - # fix incompatibility with qpdf11 + # fix incompatibility with qpdf11.3.0 usage of c++17 - delete this patch when we reach pdfmixtool version > v1.1.1 (fetchpatch { - url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/81f7e96f6e68dfeba3cd4e00d8553dfdd2d7f2fa.diff"; - hash = "sha256-uBchYjUIqL7dJR7U/TSxhSGu1qY742cFUIv0XKU6L2g="; + url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/bd5f78c3a4d977d9b0c74302ce2521c737189b43.diff"; + hash = "sha256-h2g5toFqgEEnObd2TYQms1a1WFTgN7VsIHyy0Uyq4/I="; }) - ]; meta = with lib; { 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 9b7c58ef5c..869b72fb8f 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.12.2"; + version = "7.13.1"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-iWKe4l3n5e0CWd2h+tUtbPfmTznJb+UuKo3shAUDs1E="; + sha256 = "sha256-ZZnyPdwzIX0WNywcD2uYxaDG/cbgU8nyiwe0r3YIrs0="; name = "${pname}-${version}.AppImage"; }; diff --git a/third_party/nixpkgs/pkgs/applications/office/zim/default.nix b/third_party/nixpkgs/pkgs/applications/office/zim/default.nix index 73c94f7339..c20c9449ae 100644 --- a/third_party/nixpkgs/pkgs/applications/office/zim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/zim/default.nix @@ -14,9 +14,8 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-iOF11/fhQYlvnpWJidJS1yJVavF7xLxvBl59VCh9A4U="; }; - buildInputs = [ gtk3 gobject-introspection gnome.adwaita-icon-theme ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ]; - # see https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-1131643663 nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix b/third_party/nixpkgs/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix index 3a1359ca57..6ce255675b 100644 --- a/third_party/nixpkgs/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, xen_4_10 +, xen }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "sha256:02l1vs5c2jfw22gxvl2fb66m0d99n8ya1i7rphsb5cxsljvxary0"; }; - buildInputs = [ xen_4_10 ]; + buildInputs = [ xen ]; buildPhase = '' make all PREFIX=/ LIBDIR="$out/lib" INCLUDEDIR="$out/include" diff --git a/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix b/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix index 641bda8fb8..76c18839bf 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix @@ -6,7 +6,7 @@ , php}: stdenvNoCC.mkDerivation rec { - name = "cloudlog"; + pname = "cloudlog"; version = "2.4"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix index e6461c9244..725f531dd0 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix @@ -41,7 +41,7 @@ gnuradio.pkgs.mkDerivation rec { cmake pkg-config gnuradio.unwrapped.python - gnuradio.unwrapped.python.pkgs.Mako + gnuradio.unwrapped.python.pkgs.mako gnuradio.unwrapped.python.pkgs.six ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix index 1dbdbaa722..6220d36980 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix @@ -67,7 +67,7 @@ let # building with boost 1.7x fails ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ]; pythonNative = with python.pkgs; [ - Mako + mako six ]; }; @@ -118,7 +118,7 @@ let gnuradio-companion = { pythonRuntime = with python.pkgs; [ pyyaml - Mako + mako numpy pygobject3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.9.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.9.nix index baf86ca434..12b8ef003d 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.9.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.9.nix @@ -71,7 +71,7 @@ let # building with boost 1.7x fails ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ]; pythonNative = with python.pkgs; [ - Mako + mako six ]; }; @@ -118,7 +118,7 @@ let gnuradio-companion = { pythonRuntime = with python.pkgs; [ pyyaml - Mako + mako numpy pygobject3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix index e06e343728..80d534a351 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix @@ -73,7 +73,7 @@ let # building with boost 1.7x fails ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ]; pythonNative = with python.pkgs; [ - Mako + mako six ]; }; @@ -120,7 +120,7 @@ let gnuradio-companion = { pythonRuntime = with python.pkgs; [ pyyaml - Mako + mako numpy pygobject3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/uhd/3.5.nix b/third_party/nixpkgs/pkgs/applications/radio/uhd/3.5.nix index c0cb7b62aa..5f34597ea2 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/uhd/3.5.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/uhd/3.5.nix @@ -85,8 +85,8 @@ stdenv.mkDerivation rec { ++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] ; - # Python + Mako are always required for the build itself but not necessary for runtime. - pythonEnv = python3.withPackages (ps: with ps; [ Mako ] + # Python + mako are always required for the build itself but not necessary for runtime. + pythonEnv = python3.withPackages (ps: with ps; [ mako ] ++ optionals (enableLibuhd_Python_api) [ numpy setuptools ] ++ optionals (enableUtils) [ requests six ] ); diff --git a/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix b/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix index 3eb5b9a679..812b9cf6a9 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix @@ -83,8 +83,8 @@ stdenv.mkDerivation rec { ++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] ; - # Python + Mako are always required for the build itself but not necessary for runtime. - pythonEnv = python3.withPackages (ps: with ps; [ Mako ] + # Python + mako are always required for the build itself but not necessary for runtime. + pythonEnv = python3.withPackages (ps: with ps; [ mako ] ++ optionals (enablePythonApi) [ numpy setuptools ] ++ optionals (enableUtils) [ requests six ] ); diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/diamond/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/diamond/default.nix index 2b34f61ab2..c81cc35ff0 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/diamond/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/diamond/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diamond"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "bbuchfink"; repo = "diamond"; rev = "v${version}"; - sha256 = "sha256-Og1cxEMJ24cncNDD2dXwy58OZ/nJmGdqrMRr5Y6YmHo="; + sha256 = "sha256-ud11GNuDL1HDNaAzkNB/ebuPJR4wgWYy49zBr93BtSo="; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix index c555a30b15..05c445b6cd 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec { ] ++ (with python3Packages; [ biopython psutil - XlsxWriter + xlsxwriter ]); # Tests rely on some of the databases being available, which is not bundled diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/muscle/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/muscle/default.nix index 99d13d1ab8..86219f35f9 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/muscle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/muscle/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "muscle"; + pname = "muscle"; version = "5.1.0"; src = fetchFromGitHub { owner = "rcedgar"; - repo = "${name}"; + repo = pname; rev = "${version}"; hash = "sha256-NpnJziZXga/T5OavUt3nQ5np8kJ9CFcSmwyg4m6IJsk="; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/neuron/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/neuron/default.nix index 115def63a3..5b08fbfd67 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/neuron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/neuron/default.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { bison flex git - ] ++ lib.optional useCore [ perl gsl ] - ++ lib.optional stdenv.isDarwin [ xcbuild ]; + ] ++ lib.optionals useCore [ perl gsl ] + ++ lib.optionals stdenv.isDarwin [ xcbuild ]; - buildInputs = lib.optional useIv [ + buildInputs = lib.optionals useIv [ xorg.libX11.dev xorg.libXcomposite.dev xorg.libXext.dev @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { python3.pkgs.setuptools python3.pkgs.scikit-build python3.pkgs.matplotlib - ] ++ lib.optional useMpi [ + ] ++ lib.optionals useMpi [ mpi - ] ++ lib.optional useMpi [ + ] ++ lib.optionals useMpi [ python3.pkgs.mpi4py - ] ++ lib.optional useRx3d [ + ] ++ lib.optionals useRx3d [ python3.pkgs.cython python3.pkgs.numpy ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/veryfasttree/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/veryfasttree/default.nix index d5d4c6231e..f85f930552 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/veryfasttree/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/veryfasttree/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "veryfasttree"; + pname = "veryfasttree"; version = "3.1.1"; src = fetchFromGitHub { owner = "citiususc"; - repo = "${name}"; + repo = pname; rev = "v${version}"; hash = "sha256-AOzbxUnrn1qgscjdOKf4dordnSKtIg3nSVaYWK1jbuc="; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix index 25efbd754b..02b2d2d61a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix @@ -46,7 +46,7 @@ in python.pkgs.buildPythonApplication rec { numpy packaging pyqt4 - Rtree + rtree scipy setuptools shapely diff --git a/third_party/nixpkgs/pkgs/applications/science/engineering/strictdoc/default.nix b/third_party/nixpkgs/pkgs/applications/science/engineering/strictdoc/default.nix index c81652c5ae..aaf944fdd0 100644 --- a/third_party/nixpkgs/pkgs/applications/science/engineering/strictdoc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/engineering/strictdoc/default.nix @@ -19,7 +19,7 @@ , setuptools , textx , xlrd -, XlsxWriter +, xlsxwriter , pytestCheckHook }: @@ -70,7 +70,7 @@ buildPythonApplication rec { setuptools textx xlrd - XlsxWriter + xlsxwriter ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/abc/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/abc/default.nix index 6ac9dd6498..bea9381132 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/abc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/abc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "abc-verifier"; - version = "unstable-2023-02-04"; + version = "unstable-2023-02-23"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "a8f0ef2368aa56b3ad20a52298a02e63b2a93e2d"; - hash = "sha256-48i6AKQhMG5hcnkS0vejOy1PqFbeb6FpU7Yx0rEvHDI="; + rev = "2c1c83f75b8078ced51f92c697da3e712feb3ac3"; + hash = "sha256-THcyEifIp9v1bOofFVm9NFPqgI6NfKKys+Ea2KyNpv8="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix index 143d118524..50824ab3c0 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -1,6 +1,6 @@ -{ haskellPackages, mkDerivation, fetchFromGitHub, lib +{ haskellPackages, mkDerivation, fetchFromGitHub, lib, stdenv # the following are non-haskell dependencies -, makeWrapper, which, maude, graphviz +, makeWrapper, which, maude, graphviz, glibcLocales }: let @@ -76,6 +76,9 @@ mkDerivation (common "tamarin-prover" src // { executableToolDepends = [ makeWrapper which maude graphviz ]; postInstall = '' wrapProgram $out/bin/tamarin-prover \ + '' + lib.optionalString stdenv.isLinux '' + --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \ + '' + '' --prefix PATH : ${lib.makeBinPath [ which maude graphviz ]} # so that the package can be used as a vim plugin to install syntax coloration install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/syntax/spthy.vim diff --git a/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix index 75dbccced1..43b53e56c0 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "calc"; - version = "2.14.1.3"; + version = "2.14.1.5"; src = fetchurl { urls = [ "https://github.com/lcn2/calc/releases/download/v${version}/${pname}-${version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-5aAvYzjAkpLZGf9UE+Ta18Io9EwP769yYlVykiH4qd0="; + sha256 = "sha256-bPacYnEJBdQsIP+Z8D/ODskyEcvhgAy3ra4wasYMo6A="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/math/maxima/5.45.nix b/third_party/nixpkgs/pkgs/applications/science/math/maxima/5.45.nix new file mode 100644 index 0000000000..cdf5421ce1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/math/maxima/5.45.nix @@ -0,0 +1,126 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, texinfo +, perl +, python3 +, makeWrapper +, autoreconfHook +, rlwrap ? null +, tk ? null +, gnuplot ? null +, lisp-compiler +}: + +let + # Allow to remove some executables from the $PATH of the wrapped binary + searchPath = lib.makeBinPath + (lib.filter (x: x != null) [ lisp-compiler rlwrap tk gnuplot ]); +in +stdenv.mkDerivation rec { + pname = "maxima"; + # old version temporarily kept for sage due to + # https://github.com/sagemath/sage/issues/33718 + version = "5.45.1"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "sha256-/pAWJ2lwvvIUoaJENIVYZEUU1/36pPyLnQ6Hr8u059w="; + }; + + nativeBuildInputs = [ + autoreconfHook + lisp-compiler + makeWrapper + python3 + texinfo + ]; + + strictDeps = true; + + nativeCheckInputs = [ + gnuplot + ]; + + postPatch = '' + substituteInPlace doc/info/Makefile.am --replace "/usr/bin/env perl" "${perl}/bin/perl" + ''; + + postInstall = '' + # Make sure that maxima can find its runtime dependencies. + for prog in "$out/bin/"*; do + wrapProgram "$prog" --prefix PATH ":" "$out/bin:${searchPath}" + done + # Move emacs modules and documentation into the right place. + mkdir -p $out/share/emacs $out/share/doc + ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp + ln -s ../maxima/${version}/doc $out/share/doc/maxima + '' + + (lib.optionalString (lisp-compiler.pname == "ecl") '' + cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${version}/binary-ecl/" + '') + ; + + patches = [ + # fix path to info dir (see https://trac.sagemath.org/ticket/11348) + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/infodir.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "09v64n60f7i6frzryrj0zd056lvdpms3ajky4f9p6kankhbiv21x"; + }) + + # fix https://sourceforge.net/p/maxima/bugs/2596/ + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/matrixexp.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "06961hn66rhjijfvyym21h39wk98sfxhp051da6gz0n9byhwc6zg"; + }) + + # undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca + # see https://trac.sagemath.org/ticket/13364#comment:93 + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx"; + }) + ] ++ lib.optionals (lisp-compiler.pname == "ecl") [ + # build fasl, needed for ECL support + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "18zafig8vflhkr80jq2ivk46k92dkszqlyq8cfmj0b2vcfjwwbar"; + }) + ]; + + # The test suite is disabled since 5.42.2 because of the following issues: + # + # Error(s) found: + # /build/maxima-5.44.0/share/linearalgebra/rtest_matrixexp.mac problems: + # (20 21 22) + # Tests that were expected to fail but passed: + # /build/maxima-5.44.0/share/vector/rtest_vect.mac problem: + # (19) + # 3 tests failed out of 16,184 total tests. + # + # These failures don't look serious. It would be nice to fix them, but I + # don't know how and probably won't have the time to find out. + doCheck = false; # try to re-enable after next version update + + enableParallelBuilding = true; + + passthru = { + inherit lisp-compiler; + }; + + meta = with lib; { + description = "Computer algebra system"; + homepage = "http://maxima.sourceforge.net"; + license = licenses.gpl2Plus; + + longDescription = '' + Maxima is a fairly complete computer algebra system written in + lisp with an emphasis on symbolic computation. It is based on + DOE-MACSYMA and licensed under the GPL. Its abilities include + symbolic integration, 3D plotting, and an ODE solver. + ''; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix index b42587596f..9d1b5c09b8 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix @@ -79,12 +79,6 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx"; }) - ] ++ lib.optionals (lisp-compiler.pname == "ecl") [ - # build fasl, needed for ECL support - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "18zafig8vflhkr80jq2ivk46k92dkszqlyq8cfmj0b2vcfjwwbar"; - }) ]; # The test suite is disabled since 5.42.2 because of the following issues: diff --git a/third_party/nixpkgs/pkgs/applications/science/math/readstat/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/readstat/default.nix index e58674f344..efbf80ba16 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/readstat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/readstat/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libiconv }: stdenv.mkDerivation rec { - name = "readstat"; + pname = "readstat"; version = "1.1.9"; src = fetchFromGitHub { 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 eced57706d..fa65ce0f36 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/default.nix @@ -128,7 +128,7 @@ let singular = pkgs.singular.override { inherit flint; }; - maxima = pkgs.maxima.override { + maxima = pkgs.maxima-ecl-5_45.override { lisp-compiler = pkgs.ecl.override { # "echo syntax error | ecl > /dev/full 2>&1" segfaults in # ECL. We apply a patch to fix it (write_error.patch), but it 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 index 76495f5cae..7ad542402b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/bada-bib/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/bada-bib/default.nix @@ -22,7 +22,6 @@ python3Packages.buildPythonApplication rec { pname = "bada-bib"; version = "0.8.0"; format = "other"; - strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchFromGitHub { owner = "RogerCrocker"; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix index a33af57951..037b8dfa09 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix @@ -157,6 +157,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Drpath=ON" + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" "-Dbuiltin_llvm=OFF" "-Dbuiltin_nlohmannjson=OFF" "-Dbuiltin_openui5=OFF" @@ -207,9 +210,6 @@ stdenv.mkDerivation rec { "-Druntime_cxxmodules=OFF" ]; - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; - # Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}. # TODO: Remove the [DY]LDLIBRARY_PATH prefix for xrootd when #200830 get merged. postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix b/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix index 56d68fcd47..cccb568004 100644 --- a/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix +++ b/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix @@ -79,9 +79,9 @@ mkDerivation rec { python3Packages.mutagen xapian zlib - ] ++ lib.optional withGui [ + ] ++ lib.optionals withGui [ qtbase - ] ++ lib.optional stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/guake/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/guake/default.nix index ee28a25047..d030c7add9 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/guake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/guake/default.nix @@ -26,11 +26,6 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-BW13fBH26UqMPMjV8JC4QkpgzyoPfCpAfSkJD68uOZU="; }; - # Strict deps breaks guake - # See https://github.com/NixOS/nixpkgs/issues/59930 - # and https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - nativeBuildInputs = [ gobject-introspection wrapGAppsHook diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/themes.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/themes.nix new file mode 100644 index 0000000000..e4be8b5efe --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/themes.nix @@ -0,0 +1,36 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "kitty-themes"; + version = "unstable-2023-03-08"; + + src = fetchFromGitHub { + owner = "kovidgoyal"; + repo = "kitty-themes"; + rev = "c01fcbd694353507c3cc7f657179bad1f32140a7"; + hash = "sha256-heJayOz/2Bey/zAwL2PR1OsfGyCPqMyxT1XzwHLhQ0w="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -Dm644 -t $out/share/kitty-themes/ themes.json + mv themes $out/share/kitty-themes + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/kovidgoyal/kitty-themes"; + description = "Themes for the kitty terminal emulator"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ AndersonTorres nelsonjeppesen ]; + platforms = lib.platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix index a5c98cb7df..5eb565227a 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "378"; + version = "379"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-ZJ37/V7dDtnkfPjk2VO0sNPDC8KAFm38T/0Ulz/sPpI="; + hash = "sha256-p93ydO6EuX+xKDZ1AJ1Tyi0CoP/VzlpRGNr8NiPrsxA="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/bumpver/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/bumpver/default.nix index d32e0154c8..fb5e0c8322 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/bumpver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/bumpver/default.nix @@ -20,6 +20,11 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = [ python3.pkgs.pytestCheckHook git mercurial]; + disabledTests = [ + # fails due to more aggressive setuptools version specifier validation + "test_parse_default_pattern" + ]; + meta = with lib; { description = "Bump version numbers in project files"; homepage = "https://pypi.org/project/bumpver/"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix index 927bd7acaa..ab15b09a4d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix @@ -1,4 +1,5 @@ { buildPythonApplication +, charset-normalizer , colorama , commitizen , decli @@ -41,10 +42,12 @@ buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'charset-normalizer = "^2.1.0"' 'charset-normalizer = "*"' + --replace 'charset-normalizer = "^2.1.0"' 'charset-normalizer = "*"' \ + --replace 'argcomplete = ">=1.12.1,<2.1"' 'argcomplete = ">=1.12.1"' ''; propagatedBuildInputs = [ + charset-normalizer termcolor questionary colorama diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gfold/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gfold/default.nix index 0df0669c41..831315a577 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gfold/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gfold/default.nix @@ -12,7 +12,7 @@ let pname = "gfold"; - version = "4.3.1"; + version = "4.3.2"; in rustPlatform.buildRustPackage { inherit pname version; @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage { owner = "nickgerace"; repo = pname; rev = version; - sha256 = "sha256-jlUGtTtoJ3DQbs4VEDUbYyl+s9S+bLTQ+GM6OQg6MNo="; + sha256 = "sha256-wZokY1KhhO3aztLIeZU/saGibzTYB9loGe003arFWEs="; }; - cargoHash = "sha256-Mrqg0wOG3JHDdGMZMcFsifpazOukZeoMPrQh4vIfQyU="; + cargoHash = "sha256-yII5lm0zbP46gUsLrr3/828Tolwg5meRP5TVvEMy8Dg="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix index 3f154f0350..8c3e6ea42b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.23.0"; + version = "2.24.3"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-91TmPIjFOCeZmbobn3mIJis5qofJFmNGuX19+Cyo8Ck="; + hash = "sha256-Z0Z8mMTk1uAgegL4swJswCJ3D5Zi7DMTai9oQXH+2WM="; }; - vendorHash = "sha256-NiXC0ooUkAqFCLp3eRBpryazQU94gSnw0gYFwQNeCo4="; + vendorHash = "sha256-nn2DzjcXHiuSaiEuWNZTAZ3+OKrEpRzUPzqmH+gZ9sY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix index 455b7497aa..aa58c16b2d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.16.0"; + version = "3.16.1"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-94qYCyWqVwMMptlJIe4o4/mEHnhcMubcupd+Qs2SYH0="; + hash = "sha256-Js32YKzQcrQfVt7RWXFPA7guR8Tpd1jCTuwboV1zyw0="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix index 6ccfafeb70..e225d5b55c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rCy6+cjjFgcMqYn48Gfw+tTIMmsTD9lz8h14EfXWatI="; + sha256 = "sha256-Ppb42u31/iJd743vKX+5RdI7aITsWg9Jg0Aheguep5s="; }; - cargoSha256 = "sha256-aO9DYD20KQL2cLWy3uIQLJ1oR4PHNbgZLYi/Y8O6UHk="; + cargoSha256 = "sha256-O0wyNdgY1meEBJh/tEHxwzjNQdzxbKn5Ji+gdd146vQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch index 968e618f31..46d2c31714 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch @@ -8,13 +8,13 @@ Subject: [PATCH] Remove geo from database.yml 1 file changed, 28 deletions(-) diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql -index 5329a8e9fd7..a4daab1fd0c 100644 +index c1b1247b5b08..a81437d1e1b5 100644 --- a/config/database.yml.postgresql +++ b/config/database.yml.postgresql -@@ -18,13 +18,6 @@ production: - # port: 8600 - # record: secondary.postgresql.service.consul - # interval: 300 +@@ -26,13 +26,6 @@ production: + # username: git + # password: "secure password" + # host: localhost - geo: - adapter: postgresql - encoding: unicode @@ -25,10 +25,10 @@ index 5329a8e9fd7..a4daab1fd0c 100644 # # Development specific -@@ -39,13 +32,6 @@ development: - host: localhost - variables: - statement_timeout: 15s +@@ -57,13 +50,6 @@ development: + # host: localhost + # variables: + # statement_timeout: 15s - geo: - adapter: postgresql - encoding: unicode @@ -39,10 +39,10 @@ index 5329a8e9fd7..a4daab1fd0c 100644 # # Staging specific -@@ -58,13 +44,6 @@ staging: - username: git - password: "secure password" - host: localhost +@@ -84,13 +70,6 @@ staging: + # username: git + # password: "secure password" + # host: localhost - geo: - adapter: postgresql - encoding: unicode @@ -53,10 +53,10 @@ index 5329a8e9fd7..a4daab1fd0c 100644 # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". -@@ -80,10 +59,3 @@ test: &test - prepared_statements: false - variables: - statement_timeout: 15s +@@ -117,10 +96,3 @@ test: &test + # prepared_statements: false + # variables: + # statement_timeout: 15s - geo: - adapter: postgresql - encoding: unicode 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 f068e7618d..77d930b071 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": "15.8.4", - "repo_hash": "sha256-8R2a934nC6n482Am7EruV3yHgxFSICuGcKgRBCy7GGI=", - "yarn_hash": "1famdjvsbhvnkg5sp2vnc3jzaixww41833pb0427s3qpig0fc7az", + "version": "15.9.3", + "repo_hash": "sha256-WYzhKknxx3NwCsXsQCPNQNdoya010YbVh9uTpcHgSl4=", + "yarn_hash": "0msrbzqz5hgyl0c6dcxyzi6qnf2k3fmg44d201pa578p08xb0lld", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.8.4-ee", + "rev": "v15.9.3-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.8.4", - "GITLAB_PAGES_VERSION": "15.8.4", - "GITLAB_SHELL_VERSION": "14.15.0", - "GITLAB_WORKHORSE_VERSION": "15.8.4" + "GITALY_SERVER_VERSION": "15.9.3", + "GITLAB_PAGES_VERSION": "15.9.3", + "GITLAB_SHELL_VERSION": "14.17.0", + "GITLAB_WORKHORSE_VERSION": "15.9.3" } } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix index e6cd605a51..c83478f05a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix @@ -166,6 +166,7 @@ stdenv.mkDerivation { # path, not their relative state directory path. This gets rid of # warnings and means we don't have to link back to lib from the # state directory. + ${replace}/bin/replace-literal -f -r -e '../../lib' "$out/share/gitlab/lib" config ${replace}/bin/replace-literal -f -r -e '../lib' "$out/share/gitlab/lib" config ${replace}/bin/replace-literal -f -r -e "require_relative 'application'" "require_relative '$out/share/gitlab/config/application'" config ''; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 9c561119f1..2b7fa73d91 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -1,10 +1,10 @@ source 'https://rubygems.org' -gem 'rugged', '~> 1.2' -gem 'gitlab-markup', '~> 1.7.1' -gem 'activesupport', '~> 6.1.6.1' -gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools -gem 'sentry-raven', '~> 3.0', require: false +gem 'rugged', '~> 1.5.1' +gem 'gitlab-markup', '~> 1.8.0' +gem 'activesupport', '~> 6.1.7.2' +gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools in ../tools/protogem +gem 'sentry-raven', '~> 3.1', require: false gem 'rbtrace', require: false # The Gitaly Gem contains the Protobuf and gRPC definitions required by the @@ -12,13 +12,14 @@ gem 'rbtrace', require: false gem 'gitaly', '~> 15.5.0' # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.29' +gem 'gitlab-labkit', '~> 0.31' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 9.15' gem 'google-protobuf', '~> 3.21.12' +gem 'nokogiri', '~> 1.14' # Rails is currently blocked on the upgrade to the new major version for Redis, # so we don't upgrade either until the issue is resolved. This is an indirect @@ -26,12 +27,11 @@ gem 'google-protobuf', '~> 3.21.12' gem 'redis', '~> 4.8.0' group :development, :test do - gem 'rubocop', '~> 0.69', require: false - gem 'rspec', require: false + gem 'rubocop', '~> 1.38', require: false + gem 'rspec', '~> 3.12.0', require: false gem 'rspec-parameterized', require: false - gem 'timecop', require: false gem 'factory_bot', require: false - gem 'pry', '~> 0.12.2', require: false + gem 'pry', '~> 0.13.1', require: false end # Gems required in omnibus-gitlab pipeline diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 2b90a2e0cd..93b568efe8 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -1,52 +1,46 @@ GEM remote: https://rubygems.org/ specs: - abstract_type (0.0.7) - actionpack (6.1.6.1) - actionview (= 6.1.6.1) - activesupport (= 6.1.6.1) + actionpack (6.1.7.2) + actionview (= 6.1.7.2) + activesupport (= 6.1.7.2) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.6.1) - activesupport (= 6.1.6.1) + actionview (6.1.7.2) + activesupport (= 6.1.7.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.1.6.1) + activesupport (6.1.7.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - adamantium (0.2.0) - ice_nine (~> 0.11.0) - memoizable (~> 0.4.0) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) - binding_ninja (0.2.3) + binding_of_caller (1.0.0) + debug_inspector (>= 0.0.1) builder (3.2.4) coderay (1.1.2) - concord (0.1.5) - adamantium (~> 0.2.0) - equalizer (~> 0.0.9) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.0) crass (1.0.6) + debug_inspector (1.1.0) diff-lcs (1.3) dotenv (2.7.6) - equalizer (0.0.11) - erubi (1.11.0) - factory_bot (5.0.2) - activesupport (>= 4.2.0) + erubi (1.12.0) + factory_bot (6.2.1) + activesupport (>= 5.0.0) faraday (1.0.1) multipart-post (>= 1.2, < 3) ffi (1.15.5) gitaly (15.5.0) grpc (~> 1.0) - gitlab-labkit (0.29.0) + gitlab-labkit (0.31.0) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) @@ -61,7 +55,7 @@ GEM tomlrb (>= 1.3, < 2.1) with_env (= 1.1.0) xml-simple (~> 1.1.5) - gitlab-markup (1.7.1) + gitlab-markup (1.8.1) google-protobuf (3.21.12) googleapis-common-protos-types (1.4.0) google-protobuf (~> 3.14) @@ -70,10 +64,10 @@ GEM googleapis-common-protos-types (~> 1.0) i18n (1.12.0) concurrent-ruby (~> 1.0) - ice_nine (0.11.2) jaeger-client (1.1.0) opentracing (~> 0.3) thrift + json (2.6.3) licensee (9.15.2) dotenv (~> 2.0) octokit (~> 4.20) @@ -83,14 +77,12 @@ GEM loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - memoizable (0.4.2) - thread_safe (~> 0.3, >= 0.3.1) - method_source (0.9.2) - mini_portile2 (2.8.0) - minitest (5.16.3) + method_source (1.0.0) + mini_portile2 (2.8.1) + minitest (5.17.0) msgpack (1.3.3) multipart-post (2.1.1) - nokogiri (1.13.10) + nokogiri (1.14.1) mini_portile2 (~> 2.8.0) racc (~> 1.4) octokit (4.20.0) @@ -98,120 +90,118 @@ GEM sawyer (~> 0.8.0, >= 0.5.3) opentracing (0.5.0) optimist (3.0.1) - parallel (1.19.2) - parser (3.0.3.2) + parallel (1.22.1) + parser (3.2.0.0) ast (~> 2.4.1) - pg_query (2.2.0) + pg_query (2.2.1) google-protobuf (>= 3.19.2) proc_to_ast (0.1.0) coderay parser unparser - procto (0.0.3) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) public_suffix (4.0.7) - racc (1.6.1) - rack (2.2.4) + racc (1.6.2) + rack (2.2.6.2) rack-test (2.0.2) rack (>= 1.3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) + rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) - rainbow (3.0.0) + rainbow (3.1.1) rbtrace (0.4.14) ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) redis (4.8.0) - regexp_parser (1.8.1) + regexp_parser (2.6.2) reverse_markdown (1.4.0) nokogiri rexml (3.2.5) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.0) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-parameterized (0.4.2) - binding_ninja (>= 0.2.3) + rspec-support (~> 3.12.0) + rspec-parameterized (1.0.0) + rspec-parameterized-core (< 2) + rspec-parameterized-table_syntax (< 2) + rspec-parameterized-core (1.0.0) parser proc_to_ast rspec (>= 2.13, < 4) unparser - rspec-support (3.8.0) - rubocop (0.86.0) + rspec-parameterized-table_syntax (1.0.0) + binding_of_caller + rspec-parameterized-core (< 2) + rspec-support (3.12.0) + rubocop (1.44.0) + json (~> 2.3) parallel (~> 1.10) - parser (>= 2.7.0.1) + parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.7) - rexml - rubocop-ast (>= 0.0.3, < 1.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.24.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.2.0) - parser (>= 2.7.0.1) - ruby-progressbar (1.10.1) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.24.1) + parser (>= 3.1.1.0) + ruby-progressbar (1.11.0) rubyzip (2.3.2) - rugged (1.2.0) + rugged (1.5.1) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) - sentry-raven (3.0.4) + sentry-raven (3.1.2) faraday (>= 1.0) thor (1.1.0) - thread_safe (0.3.6) thrift (0.17.0) - timecop (0.9.1) tomlrb (2.0.1) tzinfo (2.0.5) concurrent-ruby (~> 1.0) - unicode-display_width (1.7.0) - unparser (0.4.7) - abstract_type (~> 0.0.7) - adamantium (~> 0.2.0) - concord (~> 0.1.5) + unicode-display_width (2.4.2) + unparser (0.6.7) diff-lcs (~> 1.3) - equalizer (~> 0.0.9) - parser (>= 2.6.5) - procto (~> 0.0.2) + parser (>= 3.2.0) with_env (1.1.0) xml-simple (1.1.9) rexml - zeitwerk (2.6.0) + zeitwerk (2.6.6) PLATFORMS ruby DEPENDENCIES - activesupport (~> 6.1.6.1) + activesupport (~> 6.1.7.2) factory_bot gitaly (~> 15.5.0) - gitlab-labkit (~> 0.29) + gitlab-labkit (~> 0.31) gitlab-license_finder - gitlab-markup (~> 1.7.1) + gitlab-markup (~> 1.8.0) google-protobuf (~> 3.21.12) grpc (~> 1.42.0) licensee (~> 9.15) - pry (~> 0.12.2) + nokogiri (~> 1.14) + pry (~> 0.13.1) rbtrace redis (~> 4.8.0) - rspec + rspec (~> 3.12.0) rspec-parameterized - rubocop (~> 0.69) - rugged (~> 1.2) - sentry-raven (~> 3.0) - timecop + rubocop (~> 1.38) + rugged (~> 1.5.1) + sentry-raven (~> 3.1) BUNDLED WITH - 2.3.26 + 2.4.6 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 53b290066b..38f56ff772 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 @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.8.4"; + version = "15.9.3"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,10 +22,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-att8MR94uINKOTYlj2sZLezMXZag11qP2p9T9a3Eklc="; + sha256 = "sha256-WBg1fo8tG0tfrsu8QtIo0SY1ZbktVHfcTf77Ny29DSM="; }; - vendorSha256 = "sha256-8P5X/bqeI1hY45IGsvEWOg3GuetEQF/XtZzUMdX22pA="; + vendorSha256 = "sha256-IIvvI7CKLWB2W4fi/HLFtfZdovehxDmtQ8GUEw24fbY="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index f3a4a082f2..d31f4c3d78 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -1,22 +1,14 @@ { - abstract_type = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09330cmhrc2wmfhdj9zzg82sv6cdhm3qgdkva5ni5xfjril2pf14"; - type = "gem"; - }; - version = "0.0.7"; - }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m5x42s72mik9xkrgbway4ra139k71p2dfxcvg5gwdmac8maiq7k"; + sha256 = "0c2y6sqpan68lrx78pvhbxb2917m75s808r6cg1kyygwvg31niza"; type = "gem"; }; - version = "6.1.6.1"; + version = "6.1.7.2"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -24,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0syh8jwih5qvv87zfyzl37rz6sc1prhy6gia95bn76zyqk9cfzx8"; + sha256 = "10g5gk8h4mfhvgqylzbf591fqf5p78ca35cb97p9bclpv9jfy0za"; type = "gem"; }; - version = "6.1.6.1"; + version = "6.1.7.2"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -35,19 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vb0xi7yvgfqky9h4clyncb886mr1wvz9amk7d9ffmgpwrpzvjaz"; + sha256 = "14pjq2k761qaywaznpqq8ziivjk2ks1ma2cjwdflkxqgndxjmsr2"; type = "gem"; }; - version = "6.1.6.1"; - }; - adamantium = { - dependencies = ["ice_nine" "memoizable"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0165r2ikgfwv2rm8dzyijkp74fvg0ni72hpdx8ay2v7cj08dqyak"; - type = "gem"; - }; - version = "0.2.0"; + version = "6.1.7.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -70,15 +53,16 @@ }; version = "2.4.2"; }; - binding_ninja = { + binding_of_caller = { + dependencies = ["debug_inspector"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17fa3sv6p2fw9g8fxpwx1kjhhs28aw41akkba0hlgvk60055b1aa"; + sha256 = "078n2dkpgsivcf0pr50981w95nfc2bsrp3wpf9wnxz1qsp8jbb9s"; type = "gem"; }; - version = "0.2.3"; + version = "1.0.0"; }; builder = { groups = ["default"]; @@ -98,24 +82,15 @@ }; version = "1.1.2"; }; - concord = { - dependencies = ["adamantium" "equalizer"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1b6cdn0fg4n9gzbdr7zyf4jq40y6h0c0g9cra7wk9hhmsylk91bg"; - type = "gem"; - }; - version = "0.1.5"; - }; concurrent-ruby = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; + sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5"; type = "gem"; }; - version = "1.1.10"; + version = "1.2.0"; }; crass = { groups = ["default"]; @@ -127,6 +102,16 @@ }; version = "1.0.6"; }; + debug_inspector = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01l678ng12rby6660pmwagmyg8nccvjfgs3487xna7ay378a59ga"; + type = "gem"; + }; + version = "1.1.0"; + }; diff-lcs = { source = { remotes = ["https://rubygems.org"]; @@ -145,23 +130,15 @@ }; version = "2.7.6"; }; - equalizer = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4"; - type = "gem"; - }; - version = "0.0.11"; - }; erubi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; + sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; factory_bot = { dependencies = ["activesupport"]; @@ -169,10 +146,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02ijqa3g6lb8l8mvi40z1zgh9bb3gr08p2r2ym159ghhfbcrmbwk"; + sha256 = "1pfk942d6qwhw151hxaz7n4knk6whyxqvvywdx2cdw9yhykyaqzq"; type = "gem"; }; - version = "5.0.2"; + version = "6.2.1"; }; faraday = { dependencies = ["multipart-post"]; @@ -212,10 +189,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09xlv72nbys9a5iqvhxfzdr7vy3s3m2a6ixqb9vq71k925faq6gb"; + sha256 = "07zd8r189qcqr3xp6dinlw94sylxbyn56nnas7k0aw6xvr74q12v"; type = "gem"; }; - version = "0.29.0"; + version = "0.31.0"; }; gitlab-license_finder = { dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"]; @@ -233,10 +210,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnlra517pfj3hx07kasbqlcw51ix4xajr6bsd3mwg8bc92dlwy7"; + sha256 = "0yvh8vv9kgd06hc8c1pl2hq56w56vr0n7dr5mz19fx4p2v89y7xb"; type = "gem"; }; - version = "1.7.1"; + version = "1.8.1"; }; google-protobuf = { groups = ["default"]; @@ -281,14 +258,6 @@ }; version = "1.12.0"; }; - ice_nine = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x"; - type = "gem"; - }; - version = "0.11.2"; - }; jaeger-client = { dependencies = ["opentracing" "thrift"]; groups = ["default"]; @@ -300,6 +269,16 @@ }; version = "1.1.0"; }; + json = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; + type = "gem"; + }; + version = "2.6.3"; + }; licensee = { dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"]; groups = ["default"]; @@ -322,42 +301,35 @@ }; version = "2.19.1"; }; - memoizable = { - dependencies = ["thread_safe"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c"; - type = "gem"; - }; - version = "0.4.2"; - }; method_source = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; + sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; type = "gem"; }; - version = "0.9.2"; + version = "1.0.0"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; minitest = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; + sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0"; type = "gem"; }; - version = "5.16.3"; + version = "5.17.0"; }; msgpack = { groups = ["default"]; @@ -385,10 +357,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk"; + sha256 = "0qr6psd9qgv83pklpw7cpmshkcasnv8d777ksmvwsacwfvvkmnxj"; type = "gem"; }; - version = "1.13.10"; + version = "1.14.1"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -426,10 +398,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l"; + sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; type = "gem"; }; - version = "1.19.2"; + version = "1.22.1"; }; parser = { dependencies = ["ast"]; @@ -437,10 +409,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sszdl9mpzqzn9kxrp28sqmg47mjxcwypr4d60vbajqba4v885di"; + sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623"; type = "gem"; }; - version = "3.0.3.2"; + version = "3.2.0.0"; }; pg_query = { dependencies = ["google-protobuf"]; @@ -448,10 +420,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l79y41nwwacabj61jkbh4r7haajaf8y4bn5pihh0m1g8547b8w4"; + sha256 = "1slcbzzqdv6104l5h8ql6kj43zmnm16g2dav8bc8dasfpwmrg1k0"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.1"; }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; @@ -462,22 +434,16 @@ }; version = "0.1.0"; }; - procto = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13imvg1x50rz3r0yyfbhxwv72lbf7q28qx9l9nfbb91h2n9ch58c"; - type = "gem"; - }; - version = "0.0.3"; - }; pry = { dependencies = ["coderay" "method_source"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69"; + sha256 = "0iyw4q4an2wmk8v5rn2ghfy2jaz9vmw2nk8415nnpx2s866934qk"; type = "gem"; }; - version = "0.12.2"; + version = "0.13.1"; }; public_suffix = { groups = ["default"]; @@ -494,20 +460,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p685i23lr8pl7l09g9l2mcj615fr7g33w3mkcr472lcg34nq8n8"; + sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; rack = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa"; + sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb"; type = "gem"; }; - version = "2.2.4"; + version = "2.2.6.2"; }; rack-test = { dependencies = ["rack"]; @@ -537,18 +503,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mcb75qvldfz6zsr4inrfx7dmb0ngxy507awx28khqmnla3hqpc9"; + sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz"; type = "gem"; }; - version = "1.4.4"; + version = "1.5.0"; }; rainbow = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; + sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; type = "gem"; }; - version = "3.0.0"; + version = "3.1.1"; }; rbtrace = { dependencies = ["ffi" "msgpack" "optimist"]; @@ -576,10 +544,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n9d14ppshnx71i3mi1pnm3hwhcbb6m6vsc0b0dqgsab8r2rs96n"; + sha256 = "0zjg29w5zvar7by1kqck3zilbdzm5iz3jp5d1zn3970krskfazh2"; type = "gem"; }; - version = "1.8.1"; + version = "2.6.2"; }; reverse_markdown = { dependencies = ["nokogiri"]; @@ -608,10 +576,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3"; + sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c"; type = "gem"; }; - version = "3.8.0"; + version = "3.12.0"; }; rspec-core = { dependencies = ["rspec-support"]; @@ -619,10 +587,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p1s5bnbqp3sxk67y0fh0x884jjym527r0vgmhbm81w7aq6b7l4p"; + sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4"; type = "gem"; }; - version = "3.8.0"; + version = "3.12.0"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -630,10 +598,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c4gs5ybf7km0qshdm92p38zvg32n1j2kr5fgs2icacz7xf2y6fy"; + sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6"; type = "gem"; }; - version = "3.8.3"; + version = "3.12.2"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -641,42 +609,64 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06y508cjqycb4yfhxmb3nxn0v9xqf17qbd46l1dh4xhncinr4fyp"; + sha256 = "0sq2cc9pm5gq411y7iwfvzbmgv3g91lyf7y7cqn1lr3yf1v122nc"; type = "gem"; }; - version = "3.8.0"; + version = "3.12.3"; }; rspec-parameterized = { - dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"]; + dependencies = ["rspec-parameterized-core" "rspec-parameterized-table_syntax"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c0892jbaznnldk1wi24qxm70g4zhw2idqx516rhgdzgd7yh5j31"; + sha256 = "11mk52x34j957rqccxfqlsqjzg26dz04ipd1v4yx5yraqx1v01ww"; type = "gem"; }; - version = "0.4.2"; + version = "1.0.0"; + }; + rspec-parameterized-core = { + dependencies = ["parser" "proc_to_ast" "rspec" "unparser"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hfc2q7g8f5s6kdh1chwlalvz3fvj57vlfpn18b23677hm4ljyr8"; + type = "gem"; + }; + version = "1.0.0"; + }; + rspec-parameterized-table_syntax = { + dependencies = ["binding_of_caller" "rspec-parameterized-core"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "134q0hki279np9dv7mgr85wspdrvhpj9lpvxr9kx6pcwzwg9bpyp"; + type = "gem"; + }; + version = "1.0.0"; }; rspec-support = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p3m7drixrlhvj2zpc38b11x145bvm311x6f33jjcxmvcm0wq609"; + sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx"; type = "gem"; }; - version = "3.8.0"; + version = "3.12.0"; }; rubocop = { - dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jl3ghxw1bpj272s5s3gl07l2rbd1vwr9z9jmlxxaa2faldn9gms"; + sha256 = "0a2j57r6pvngqlzkmww031gs5isax3nsr9n7cbfpqnh34ljh2lk1"; type = "gem"; }; - version = "0.86.0"; + version = "1.44.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -684,20 +674,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w5rjkwxaxkr2jr1sl5wz0nffal27ik6b1qfzx5skl43vfk2jz97"; + sha256 = "1pdzabz95hv3z5sfbkfqa8bdybsfl13gv7rjb32v3ss8klq99lbd"; type = "gem"; }; - version = "0.2.0"; + version = "1.24.1"; }; ruby-progressbar = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; + sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; type = "gem"; }; - version = "1.10.1"; + version = "1.11.0"; }; rubyzip = { groups = ["default" "development" "omnibus" "test"]; @@ -714,10 +704,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v846qs2pa3wnzgz95jzbcdrgl9vyjl65qiscw4q4dvm5sb7j68i"; + sha256 = "0wnfgxx59nq2wpvi8ll7bqw9x99x5hps6i38xdjrwbb5a3896d58"; type = "gem"; }; - version = "1.2.0"; + version = "1.5.1"; }; sawyer = { dependencies = ["addressable" "faraday"]; @@ -736,10 +726,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17j4br2lpnd8066d50mkg9kwk9v70hn3zfiqkvysd8p9nffmqnm0"; + sha256 = "0jin9x4f43lplglhr9smv2wxsjgmph2ygqlci4s0v0aq5493ng8h"; type = "gem"; }; - version = "3.0.4"; + version = "3.1.2"; }; thor = { groups = ["default"]; @@ -751,14 +741,6 @@ }; version = "1.1.0"; }; - thread_safe = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; - type = "gem"; - }; - version = "0.3.6"; - }; thrift = { groups = ["default"]; platforms = []; @@ -769,14 +751,6 @@ }; version = "0.17.0"; }; - timecop = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0d7mm786180v4kzvn1f77rhfppsg5n0sq2bdx63x9nv114zm8jrp"; - type = "gem"; - }; - version = "0.9.1"; - }; tomlrb = { groups = ["default" "development" "omnibus" "test"]; platforms = []; @@ -803,21 +777,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; type = "gem"; }; - version = "1.7.0"; + version = "2.4.2"; }; unparser = { - dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"]; + dependencies = ["diff-lcs" "parser"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qg1apxlnf4kxfj9jpm6hhv73jsncbs4zpsgyan32p5r331q1gmx"; + sha256 = "1j6ym6cn43ry4lvcal7cv0n9g9awny7kcrn1crp7cwx2vwzffhmf"; type = "gem"; }; - version = "0.4.7"; + version = "0.6.7"; }; with_env = { groups = ["default" "development" "omnibus" "test"]; @@ -845,9 +819,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc"; + sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv"; type = "gem"; }; - version = "2.6.0"; + version = "2.6.6"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix rename to third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 25e2a06424..cfc79c9f26 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -1,20 +1,20 @@ -{ lib, fetchFromGitLab, buildGoModule, ruby }: +{ lib, fetchFromGitLab, buildGoModule, ruby, libkrb5 }: buildGoModule rec { pname = "gitlab-shell"; - version = "14.15.0"; + version = "14.17.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-GDhYBL5LT3r6UIjDDY3LV5VgcBch190hYLPb6uMWETs="; + sha256 = "sha256-GTy+1O6Z7i+L8SSSQpYnN6SRfqDutkJYrj66tpX4f5M="; }; - buildInputs = [ ruby ]; + buildInputs = [ ruby libkrb5 ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-2DpQNJw67ipIW3ctHDJthuDrKNZCYvjXGlDxzBEMGWs="; + vendorSha256 = "sha256-mFGkT5lyQfcaGz503vgqx/kP5S0V2Ks5HDmjx+BxZzg="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index a01d8aa221..25064f22f4 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 = "15.8.4"; + version = "15.9.3"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-0FWR6cIV/0R2OrOAKhvuVnIY3Hkw4CIjyBUeF/paumw="; + vendorSha256 = "sha256-wvoMBzRGp8RX2kHKKz3REDq8YLTsHbDayEMYi7hSzTE="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 96517b56ff..ed0c5127f7 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -13,9 +13,9 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir # NOTE: When incrementing the major or minor version here, also increment activerecord_version # in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve # https://gitlab.com/gitlab-org/gitlab/-/issues/375713 -gem 'rails', '~> 6.1.6.1' +gem 'rails', '~> 6.1.7.2' -gem 'bootsnap', '~> 1.15.0', require: false +gem 'bootsnap', '~> 1.16.0', require: false # Pin openssl to match the version bundled with our supported Rubies. # See https://stdgems.org/openssl/#gem-version. @@ -39,7 +39,7 @@ gem 'default_value_for', '~> 3.4.0' # Supported DBs gem 'pg', '~> 1.4.5' -gem 'rugged', '~> 1.2' +gem 'rugged', '~> 1.5' gem 'grape-path-helpers', '~> 1.7.1' gem 'faraday', '~> 1.0' @@ -62,25 +62,26 @@ gem 'omniauth-azure-activedirectory-v2', '~> 2.0' gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md gem 'omniauth-cas3', '~> 1.1.4', path: 'vendor/gems/omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md gem 'omniauth-dingtalk-oauth2', '~> 1.0' -gem 'omniauth-alicloud', '~> 2.0.0' +gem 'omniauth-alicloud', '~> 2.0.1' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '2.0.1' gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md gem 'omniauth-google-oauth2', '~> 1.1' gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-saml', '~> 2.0.0' -gem 'omniauth-shibboleth', '~> 1.3.0' gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md -gem 'omniauth-authentiq', '~> 0.3.3' -gem 'gitlab-omniauth-openid-connect', '~> 0.10.0', require: 'omniauth_openid_connect' +gem 'omniauth_openid_connect', '~> 0.6.1' +# Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem. +# See https://docs.gitlab.com/ee/development/emails.html#rationale. +gem 'openid_connect', '= 1.3.0' gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md gem 'omniauth-atlassian-oauth2', '~> 0.2.0' gem 'rack-oauth2', '~> 1.21.3' gem 'jwt', '~> 2.1.0' # Kerberos authentication. EE-only -gem 'gssapi', group: :kerberos +gem 'gssapi', '~> 1.3.1', group: :kerberos gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos # Spam and anti-bot protection @@ -150,11 +151,26 @@ gem 'fog-google', '~> 1.19', require: 'fog/google' gem 'fog-local', '~> 0.8' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' -gem 'fog-aliyun', '~> 0.3' -gem 'gitlab-fog-azure-rm', '~> 1.4.0', require: 'fog/azurerm' +# NOTE: +# the fog-aliyun gem since v0.4 pulls in aliyun-sdk transitively, which monkey-patches +# the rest-client gem to drop the Content-Length header field for chunked transfers, +# which may have knock-on effects on other features using `RestClient`. +# We may want to update this dependency if this is ever addressed upstream, e.g. via +# https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93 +gem 'fog-aliyun', '~> 0.4' +gem 'gitlab-fog-azure-rm', '~> 1.7.0', require: 'fog/azurerm' # for Google storage -gem 'google-api-client', '~> 0.33' +gem 'google-cloud-storage', '~> 1.44.0' +gem 'google-apis-core', '~> 0.10.0' +gem 'google-apis-compute_v1', '~> 0.57.0' +gem 'google-apis-container_v1', '~> 0.43.0' +gem 'google-apis-container_v1beta1', '~> 0.43.0' +gem 'google-apis-cloudbilling_v1', '~> 0.21.0' +gem 'google-apis-cloudresourcemanager_v1', '~> 0.31.0' +gem 'google-apis-iam_v1', '~> 0.36.0' +gem 'google-apis-serviceusage_v1', '~> 0.28.0' +gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0' # for aws storage gem 'unf', '~> 0.1.4' @@ -166,16 +182,16 @@ gem 'seed-fu', '~> 2.3.7' gem 'elasticsearch-model', '~> 7.2' gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' gem 'elasticsearch-api', '7.13.3' -gem 'aws-sdk-core', '~> 3.168.4' +gem 'aws-sdk-core', '~> 3.170.0' gem 'aws-sdk-cloudformation', '~> 1' -gem 'aws-sdk-s3', '~> 1.117.2' +gem 'aws-sdk-s3', '~> 1.119.1' gem 'faraday_middleware-aws-sigv4', '~>0.3.0' gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # Markdown and HTML processing gem 'html-pipeline', '~> 2.14.3' gem 'deckar01-task_list', '2.3.2' -gem 'gitlab-markup', '~> 1.8.0', require: 'github/markup' +gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup' gem 'commonmarker', '~> 0.23.6' gem 'kramdown', '~> 2.3.1' gem 'RedCloth', '~> 4.3.2' @@ -189,8 +205,7 @@ gem 'asciidoctor-plantuml', '~> 0.0.16' gem 'asciidoctor-kroki', '~> 0.7.0', require: false gem 'rouge', '~> 3.30.0' gem 'truncato', '~> 0.7.12' -gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.13.10' +gem 'nokogiri', '~> 1.14.1' # Calendar rendering gem 'icalendar' @@ -223,7 +238,7 @@ gem 'redis-namespace', '~> 1.9.0' gem 'gitlab-sidekiq-fetcher', '0.9.0', require: 'sidekiq-reliable-fetch' # Cron Parser -gem 'fugit', '~> 1.2.1' +gem 'fugit', '~> 1.8.1' # HTTP requests gem 'httparty', '~> 0.20.0' @@ -329,15 +344,15 @@ gem 'sentry-sidekiq', '~> 5.1.1' # PostgreSQL query parsing # -gem 'pg_query', '~> 2.2' +gem 'pg_query', '~> 2.2', '>= 2.2.1' gem 'premailer-rails', '~> 1.10.3' -gem 'gitlab-labkit', '~> 0.29.0' +gem 'gitlab-labkit', '~> 0.30.1' gem 'thrift', '>= 0.16.0' # I18n -gem 'ruby_parser', '~> 3.15', require: false +gem 'ruby_parser', '~> 3.19', require: false gem 'rails-i18n', '~> 7.0' gem 'gettext_i18n_rails', '~> 1.8.0' gem 'gettext_i18n_rails_js', '~> 1.3' @@ -358,12 +373,12 @@ gem 'prometheus-client-mmap', '~> 0.17', require: 'prometheus/client' gem 'warning', '~> 1.3.0' group :development do - gem 'lefthook', '~> 1.2.7', require: false + gem 'lefthook', '~> 1.2.9', require: false gem 'rubocop' gem 'solargraph', '~> 0.47.2', require: false gem 'letter_opener_web', '~> 2.0.0' - gem 'lookbook', '~> 1.4', '>= 1.4.5' + gem 'lookbook', '~> 1.5', '>= 1.5.3' # Better errors handler gem 'better_errors', '~> 2.9.1' @@ -378,13 +393,13 @@ group :development, :test do gem 'bullet', '~> 7.0.2' gem 'pry-byebug' gem 'pry-rails', '~> 0.3.9' - gem 'pry-shell', '~> 0.5.1' + gem 'pry-shell', '~> 0.6.1' gem 'awesome_print', require: false gem 'database_cleaner', '~> 1.7.0' gem 'factory_bot_rails', '~> 6.2.0' - gem 'rspec-rails', '~> 5.0.1' + gem 'rspec-rails', '~> 6.0.1' # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.11.0' @@ -395,7 +410,7 @@ group :development, :test do gem 'spring', '~> 4.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 9.2.0', require: false + gem 'gitlab-styles', '~> 10.0.0', require: false gem 'haml_lint', '~> 0.40.0', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -421,7 +436,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.6.4', require: false + gem 'gitlab-dangerfiles', '~> 3.7.0', require: false end group :development, :test, :coverage do @@ -496,7 +511,7 @@ gem 'ssh_data', '~> 1.3' gem 'spamcheck', '~> 1.0.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 15.5.2' +gem 'gitaly', '~> 15.9.0-rc3' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' @@ -544,7 +559,7 @@ gem 'lockbox', '~> 1.1.1' gem 'valid_email', '~> 0.1' # JSON -gem 'json', '~> 2.5.1' +gem 'json', '~> 2.6.3' gem 'json_schemer', '~> 0.2.18' gem 'oj', '~> 3.13.21' gem 'oj-introspect', '~> 0.7' 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 ea1771e5af..c988145616 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 @@ -100,63 +100,63 @@ GEM acme-client (2.0.11) faraday (>= 1.0, < 3.0.0) faraday-retry (~> 1.0) - actioncable (6.1.6.1) - actionpack (= 6.1.6.1) - activesupport (= 6.1.6.1) + actioncable (6.1.7.2) + actionpack (= 6.1.7.2) + activesupport (= 6.1.7.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.6.1) - actionpack (= 6.1.6.1) - activejob (= 6.1.6.1) - activerecord (= 6.1.6.1) - activestorage (= 6.1.6.1) - activesupport (= 6.1.6.1) + actionmailbox (6.1.7.2) + actionpack (= 6.1.7.2) + activejob (= 6.1.7.2) + activerecord (= 6.1.7.2) + activestorage (= 6.1.7.2) + activesupport (= 6.1.7.2) mail (>= 2.7.1) - actionmailer (6.1.6.1) - actionpack (= 6.1.6.1) - actionview (= 6.1.6.1) - activejob (= 6.1.6.1) - activesupport (= 6.1.6.1) + actionmailer (6.1.7.2) + actionpack (= 6.1.7.2) + actionview (= 6.1.7.2) + activejob (= 6.1.7.2) + activesupport (= 6.1.7.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.6.1) - actionview (= 6.1.6.1) - activesupport (= 6.1.6.1) + actionpack (6.1.7.2) + actionview (= 6.1.7.2) + activesupport (= 6.1.7.2) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.6.1) - actionpack (= 6.1.6.1) - activerecord (= 6.1.6.1) - activestorage (= 6.1.6.1) - activesupport (= 6.1.6.1) + actiontext (6.1.7.2) + actionpack (= 6.1.7.2) + activerecord (= 6.1.7.2) + activestorage (= 6.1.7.2) + activesupport (= 6.1.7.2) nokogiri (>= 1.8.5) - actionview (6.1.6.1) - activesupport (= 6.1.6.1) + actionview (6.1.7.2) + activesupport (= 6.1.7.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.6.1) - activesupport (= 6.1.6.1) + activejob (6.1.7.2) + activesupport (= 6.1.7.2) globalid (>= 0.3.6) - activemodel (6.1.6.1) - activesupport (= 6.1.6.1) - activerecord (6.1.6.1) - activemodel (= 6.1.6.1) - activesupport (= 6.1.6.1) + activemodel (6.1.7.2) + activesupport (= 6.1.7.2) + activerecord (6.1.7.2) + activemodel (= 6.1.7.2) + activesupport (= 6.1.7.2) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (6.1.6.1) - actionpack (= 6.1.6.1) - activejob (= 6.1.6.1) - activerecord (= 6.1.6.1) - activesupport (= 6.1.6.1) + activestorage (6.1.7.2) + actionpack (= 6.1.7.2) + activejob (= 6.1.7.2) + activerecord (= 6.1.7.2) + activesupport (= 6.1.7.2) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.6.1) + activesupport (6.1.7.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -168,6 +168,9 @@ GEM public_suffix (>= 2.0.2, < 6.0) aes_key_wrap (1.1.0) akismet (3.0.0) + aliyun-sdk (0.8.0) + nokogiri (~> 1.6) + rest-client (~> 2.0) android_key_attestation (0.3.0) apollo_upload_server (2.1.0) actionpack (>= 4.2) @@ -197,19 +200,19 @@ GEM awesome_print (1.9.2) awrence (1.1.1) aws-eventstream (1.2.0) - aws-partitions (1.674.0) + aws-partitions (1.703.0) aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.168.4) + aws-sdk-core (3.170.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.61.0) + aws-sdk-kms (1.62.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.117.2) + aws-sdk-s3 (1.119.1) aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -241,11 +244,8 @@ GEM rack (>= 0.9.0) bindata (2.4.11) binding_ninja (0.2.3) - bootsnap (1.15.0) + bootsnap (1.16.0) msgpack (~> 1.2) - bootstrap_form (4.2.0) - actionpack (>= 5.0) - activemodel (>= 5.0) browser (5.3.1) builder (3.2.4) bullet (7.0.2) @@ -266,11 +266,11 @@ GEM capybara-screenshot (1.0.22) capybara (>= 1.0, < 4) launchy - carrierwave (1.3.2) + carrierwave (1.3.3) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - ssrf_filter (~> 1.0) + ssrf_filter (~> 1.0, < 1.1.0) cbor (0.5.9.6) character_set (1.4.1) sorted_set (~> 1.0) @@ -294,7 +294,7 @@ GEM coderay (1.1.3) colored2 (3.1.2) commonmarker (0.23.6) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.0) connection_pool (2.3.0) cork (0.3.0) colored2 (~> 3.1) @@ -334,7 +334,6 @@ GEM deckar01-task_list (2.3.2) html-pipeline declarative (0.0.20) - declarative-option (0.1.0) declarative_policy (1.1.0) default_value_for (3.4.0) activerecord (>= 3.2.0, < 7.0) @@ -368,6 +367,8 @@ GEM diff-lcs (1.5.0) diff_match_patch (0.1.0) diffy (3.4.2) + digest-crc (0.6.4) + rake (>= 12.0.0, < 14.0.0) discordrb-webhooks (3.4.2) rest-client (>= 2.0.0) docile (1.4.0) @@ -422,7 +423,7 @@ GEM launchy (~> 2.1) mail (~> 2.7) encryptor (3.0.0) - erubi (1.11.0) + erubi (1.12.0) escape_utils (1.2.1) et-orbi (1.2.7) tzinfo @@ -477,7 +478,7 @@ GEM faraday_middleware multi_json fast_blank (1.0.0) - fast_gettext (2.1.0) + fast_gettext (2.3.0) ffaker (2.10.0) ffi (1.15.5) ffi-compiler (1.0.1) @@ -494,7 +495,9 @@ GEM flipper-active_support_cache_store (0.25.0) activesupport (>= 4.2, < 8) flipper (~> 0.25.0) - fog-aliyun (0.3.3) + fog-aliyun (0.4.0) + addressable (~> 2.8.0) + aliyun-sdk (~> 0.8.0) fog-core fog-json ipaddress (~> 0.8) @@ -538,15 +541,14 @@ GEM fog-core nokogiri (>= 1.5.11, < 2.0.0) formatador (0.2.5) - fugit (1.2.3) - et-orbi (~> 1.1, >= 1.1.8) - raabro (~> 1.1) + fugit (1.8.1) + et-orbi (~> 1, >= 1.2.7) + raabro (~> 1.4) fuubar (2.2.0) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) fuzzyurl (0.9.0) gemoji (3.0.1) - gems (1.2.0) get_process_mem (0.2.7) ffi (~> 1.0) gettext (3.3.6) @@ -561,28 +563,28 @@ GEM rails (>= 3.2.0) git (1.11.0) rchardet (~> 1.8) - gitaly (15.5.2) + gitaly (15.9.0.pre.rc3) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) terminal-table (>= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (3.6.4) + gitlab-dangerfiles (3.7.0) danger (>= 8.4.5) danger-gitlab (>= 8.0.0) rake gitlab-experiment (0.7.1) activesupport (>= 3.0) request_store (>= 1.0) - gitlab-fog-azure-rm (1.4.0) + gitlab-fog-azure-rm (1.7.0) azure-storage-blob (~> 2.0) azure-storage-common (~> 2.0) fog-core (= 2.1.0) fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.29.0) + gitlab-labkit (0.30.1) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) @@ -592,22 +594,17 @@ GEM redis (> 3.0.0, < 6.0.0) gitlab-license (2.2.1) gitlab-mail_room (0.0.9) - gitlab-markup (1.8.1) + gitlab-markup (1.9.0) gitlab-net-dns (0.9.1) - gitlab-omniauth-openid-connect (0.10.0) - addressable (~> 2.7) - omniauth (>= 1.9, < 3) - openid_connect (~> 1.2) gitlab-sidekiq-fetcher (0.9.0) json (>= 2.5) sidekiq (~> 6.1) - gitlab-styles (9.2.0) - rubocop (~> 1.38.0) - rubocop-gitlab-security (~> 0.1.1) - rubocop-graphql (~> 0.14) - rubocop-performance (~> 1.14) - rubocop-rails (~> 2.15) - rubocop-rspec (~> 2.15) + gitlab-styles (10.0.0) + rubocop (~> 1.43.0) + rubocop-graphql (~> 0.18) + rubocop-performance (~> 1.15) + rubocop-rails (~> 2.17) + rubocop-rspec (~> 2.18) gitlab_chronic_duration (0.10.6.2) numerizer (~> 0.2) gitlab_omniauth-ldap (2.2.0) @@ -622,12 +619,17 @@ GEM i18n (>= 0.7) multi_json request_store (>= 1.0) - google-api-client (0.53.0) - google-apis-core (~> 0.1) - google-apis-generator (~> 0.1) - google-apis-compute_v1 (0.53.0) - google-apis-core (>= 0.9.0, < 2.a) - google-apis-core (0.9.1) + google-apis-cloudbilling_v1 (0.21.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-cloudresourcemanager_v1 (0.31.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-compute_v1 (0.57.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-container_v1 (0.43.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-container_v1beta1 (0.43.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-core (0.10.0) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -636,28 +638,36 @@ GEM retriable (>= 2.0, < 4.a) rexml webrick - google-apis-discovery_v1 (0.12.0) - google-apis-core (>= 0.9.0, < 2.a) google-apis-dns_v1 (0.28.0) google-apis-core (>= 0.9.0, < 2.a) - google-apis-generator (0.11.0) - activesupport (>= 5.0) - gems (~> 1.2) + google-apis-iam_v1 (0.36.0) google-apis-core (>= 0.9.1, < 2.a) - google-apis-discovery_v1 (~> 0.5) - thor (>= 0.20, < 2.a) google-apis-iamcredentials_v1 (0.15.0) google-apis-core (>= 0.9.0, < 2.a) google-apis-monitoring_v3 (0.37.0) google-apis-core (>= 0.9.1, < 2.a) google-apis-pubsub_v1 (0.30.0) google-apis-core (>= 0.9.1, < 2.a) - google-apis-sqladmin_v1beta4 (0.38.0) - google-apis-core (>= 0.9.0, < 2.a) - google-apis-storage_v1 (0.20.0) + google-apis-serviceusage_v1 (0.28.0) google-apis-core (>= 0.9.1, < 2.a) + google-apis-sqladmin_v1beta4 (0.41.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-storage_v1 (0.19.0) + google-apis-core (>= 0.9.0, < 2.a) + google-cloud-core (1.6.0) + google-cloud-env (~> 1.0) + google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.3.0) + google-cloud-storage (1.44.0) + addressable (~> 2.8) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.19.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) google-protobuf (3.21.12) googleapis-common-protos-types (1.3.0) google-protobuf (~> 3.14) @@ -716,7 +726,7 @@ GEM grpc (1.42.0) google-protobuf (~> 3.18) googleapis-common-protos-types (~> 1.0) - gssapi (1.2.0) + gssapi (1.3.1) ffi (>= 1.0.1) guard (2.16.2) formatador (>= 0.2.4) @@ -799,7 +809,7 @@ GEM character_set (~> 1.4) regexp_parser (~> 2.5) regexp_property_values (~> 1.0) - json (2.5.1) + json (2.6.3) json-jwt (1.15.3) activesupport (>= 4.2) aes_key_wrap @@ -835,7 +845,7 @@ GEM kramdown (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.2.7) + lefthook (1.2.9) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -873,7 +883,7 @@ GEM loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - lookbook (1.4.5) + lookbook (1.5.3) actioncable activemodel css_parser @@ -883,7 +893,7 @@ GEM railties (>= 5.0) redcarpet (~> 3.5) rouge (>= 3.26, < 5.0) - view_component (~> 2.0) + view_component (> 2.0, < 4) yard (~> 0.9.25) zeitwerk (~> 2.5) lru_redux (1.1.0) @@ -903,7 +913,7 @@ GEM mini_histogram (0.3.1) mini_magick (4.10.1) mini_mime (1.1.2) - mini_portile2 (2.8.0) + mini_portile2 (2.8.1) minitest (5.11.3) mixlib-cli (2.1.8) mixlib-config (3.0.9) @@ -924,7 +934,7 @@ GEM multi_json (1.14.1) multi_xml (0.6.0) multipart-post (2.2.3) - murmurhash3 (0.1.6) + murmurhash3 (0.1.7) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) mustermann-grape (1.0.1) @@ -941,7 +951,7 @@ GEM netrc (0.11.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.13.10) + nokogiri (1.14.1) mini_portile2 (~> 2.8.0) racc (~> 1.4) notiffany (0.1.3) @@ -973,22 +983,19 @@ GEM train-core wmi-lite (~> 1.0) oj (3.13.23) - oj-introspect (0.7.1) + oj-introspect (0.7.2) oj (>= 3.13.23) omniauth (2.1.0) hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection - omniauth-alicloud (2.0.0) + omniauth-alicloud (2.0.1) omniauth-oauth2 (~> 1.8) omniauth-atlassian-oauth2 (0.2.0) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.5) omniauth-auth0 (2.0.0) omniauth-oauth2 (~> 1.4) - omniauth-authentiq (0.3.3) - jwt (>= 1.5) - omniauth-oauth2 (>= 1.5) omniauth-azure-activedirectory-v2 (2.0.0) omniauth-oauth2 (~> 1.8) omniauth-dingtalk-oauth2 (1.0.1) @@ -1015,11 +1022,12 @@ GEM omniauth-saml (2.0.0) omniauth (~> 2.0) ruby-saml (~> 1.9) - omniauth-shibboleth (1.3.0) - omniauth (>= 1.0.0) omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack + omniauth_openid_connect (0.6.1) + omniauth (>= 1.9, < 3) + openid_connect (~> 1.1) open4 (1.3.4) openid_connect (1.3.0) activemodel @@ -1039,7 +1047,7 @@ GEM org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) - os (1.1.1) + os (1.1.4) pact (1.63.0) pact-mock_service (~> 3.0, >= 3.3.1) pact-support (~> 1.16, >= 1.16.9) @@ -1064,7 +1072,7 @@ GEM expgen (~> 0.1) rainbow (~> 3.1.1) parallel (1.22.1) - parser (3.1.3.0) + parser (3.2.0.0) ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) @@ -1072,7 +1080,7 @@ GEM peek (1.1.0) railties (>= 4.0.0) pg (1.4.5) - pg_query (2.2.0) + pg_query (2.2.1) google-protobuf (>= 3.19.2) plist (3.6.0) png_quantizator (0.2.1) @@ -1090,16 +1098,16 @@ GEM parser unparser prometheus-client-mmap (0.17.0) - pry (0.13.1) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - pry-byebug (3.9.0) + pry-byebug (3.10.1) byebug (~> 11.0) - pry (~> 0.13.0) + pry (>= 0.13, < 0.15) pry-rails (0.3.9) pry (>= 0.10.4) - pry-shell (0.5.1) - pry (~> 0.13.0) + pry-shell (0.6.1) + pry (>= 0.13.0) tty-markdown tty-prompt public_suffix (5.0.0) @@ -1110,7 +1118,7 @@ GEM puma (>= 2.7) pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) - racc (1.6.1) + racc (1.6.2) rack (2.2.6.2) rack-accept (0.4.5) rack (>= 0.4) @@ -1131,20 +1139,20 @@ GEM rack-test (2.0.2) rack (>= 1.3) rack-timeout (0.6.3) - rails (6.1.6.1) - actioncable (= 6.1.6.1) - actionmailbox (= 6.1.6.1) - actionmailer (= 6.1.6.1) - actionpack (= 6.1.6.1) - actiontext (= 6.1.6.1) - actionview (= 6.1.6.1) - activejob (= 6.1.6.1) - activemodel (= 6.1.6.1) - activerecord (= 6.1.6.1) - activestorage (= 6.1.6.1) - activesupport (= 6.1.6.1) + rails (6.1.7.2) + actioncable (= 6.1.7.2) + actionmailbox (= 6.1.7.2) + actionmailer (= 6.1.7.2) + actionpack (= 6.1.7.2) + actiontext (= 6.1.7.2) + actionview (= 6.1.7.2) + activejob (= 6.1.7.2) + activemodel (= 6.1.7.2) + activerecord (= 6.1.7.2) + activestorage (= 6.1.7.2) + activesupport (= 6.1.7.2) bundler (>= 1.15.0) - railties (= 6.1.6.1) + railties (= 6.1.7.2) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -1153,14 +1161,14 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) + rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) rails-i18n (7.0.3) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (6.1.6.1) - actionpack (= 6.1.6.1) - activesupport (= 6.1.6.1) + railties (6.1.7.2) + actionpack (= 6.1.7.2) + activesupport (= 6.1.7.2) method_source rake (>= 12.2) thor (~> 1.0) @@ -1173,14 +1181,14 @@ GEM ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) - rbtree (0.4.4) + rbtree (0.4.6) rchardet (1.8.0) rdoc (6.3.2) re2 (1.6.0) recaptcha (5.12.3) json recursive-open-struct (1.1.3) - redcarpet (3.5.1) + redcarpet (3.6.0) redis (4.8.0) redis-actionpack (5.3.0) actionpack (>= 5, < 8) @@ -1195,9 +1203,9 @@ GEM redis (>= 4, < 5) regexp_parser (2.6.0) regexp_property_values (1.0.0) - representable (3.0.4) + representable (3.2.0) declarative (< 0.1.0) - declarative-option (< 0.2.0) + trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) request_store (1.5.1) rack (>= 1.4) @@ -1220,40 +1228,40 @@ GEM chunky_png rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-benchmark (0.6.0) benchmark-malloc (~> 0.2) benchmark-perf (~> 0.6) benchmark-trend (~> 0.4) rspec (>= 3.0) - rspec-core (3.10.2) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rspec-core (3.12.0) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.3) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) + rspec-support (~> 3.12.0) rspec-parameterized (0.5.0) binding_ninja (>= 0.2.3) parser proc_to_ast rspec (>= 2.13, < 4) unparser - rspec-rails (5.0.1) - actionpack (>= 5.2) - activesupport (>= 5.2) - railties (>= 5.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) + rspec-rails (6.0.1) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.11) + rspec-expectations (~> 3.11) + rspec-mocks (~> 3.11) + rspec-support (~> 3.11) rspec-retry (0.6.1) rspec-core (> 3.3) - rspec-support (3.10.3) + rspec-support (3.12.0) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) rspec_profiling (0.0.6) @@ -1261,31 +1269,32 @@ GEM pg rails sqlite3 - rubocop (1.38.0) + rubocop (1.43.0) json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.2.1) + parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.23.0, < 2.0) + rubocop-ast (>= 1.24.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.23.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.24.1) parser (>= 3.1.1.0) - rubocop-gitlab-security (0.1.1) - rubocop (>= 0.51) - rubocop-graphql (0.18.0) + rubocop-capybara (2.17.0) + rubocop (~> 1.41) + rubocop-graphql (0.19.0) rubocop (>= 0.87, < 2) - rubocop-performance (1.15.1) + rubocop-performance (1.16.0) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.17.3) + rubocop-rails (2.17.4) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-rspec (2.16.0) + rubocop-rspec (2.18.1) rubocop (~> 1.33) + rubocop-capybara (~> 2.17) ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) @@ -1297,12 +1306,12 @@ GEM rexml ruby-statistics (3.0.0) ruby2_keywords (0.0.5) - ruby_parser (3.15.0) - sexp_processor (~> 4.9) + ruby_parser (3.19.2) + sexp_processor (~> 4.16) rubyntlm (0.6.3) rubypants (0.2.0) rubyzip (2.3.2) - rugged (1.2.0) + rugged (1.5.1) safe_yaml (1.0.4) safety_net_attestation (0.4.0) jwt (~> 2.0) @@ -1348,7 +1357,7 @@ GEM sidekiq (>= 3.0) set (1.0.1) settingslogic (2.0.9) - sexp_processor (4.15.1) + sexp_processor (4.16.1) shellany (0.0.1) shoulda-matchers (5.1.0) activesupport (>= 5.2.0) @@ -1412,9 +1421,10 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.4.2) + sqlite3 (1.6.0) + mini_portile2 (~> 2.8.0) ssh_data (1.3.0) - ssrf_filter (1.0.7) + ssrf_filter (1.0.8) stackprof (0.2.21) state_machines (0.5.0) state_machines-activemodel (0.8.0) @@ -1465,6 +1475,7 @@ GEM tpm-key_attestation (0.9.0) bindata (~> 2.4) openssl-signature_algorithm (~> 0.4.0) + trailblazer-option (0.1.2) train-core (3.4.9) addressable (~> 2.5) ffi (!= 1.13.0) @@ -1477,7 +1488,7 @@ GEM nokogiri (>= 1.7.0, <= 2.0) tty-color (0.6.0) tty-cursor (0.7.1) - tty-markdown (0.7.0) + tty-markdown (0.7.1) kramdown (>= 1.16.2, < 3.0) pastel (~> 0.8) rouge (~> 3.14) @@ -1494,18 +1505,18 @@ GEM tty-screen (0.8.1) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) u2f (0.2.1) uber (0.1.0) - undercover (0.4.4) + undercover (0.4.5) imagen (>= 0.1.8) rainbow (>= 2.1, < 4.0) - rugged (>= 0.27, < 1.3) + rugged (>= 0.27, < 1.6) unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (1.8.0) + unicode-display_width (2.4.2) unicode_utils (1.4.0) uniform_notifier (1.16.0) unleash (3.2.2) @@ -1596,8 +1607,8 @@ DEPENDENCIES autoprefixer-rails (= 10.2.5.1) awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.168.4) - aws-sdk-s3 (~> 1.117.2) + aws-sdk-core (~> 3.170.0) + aws-sdk-s3 (~> 1.119.1) babosa (~> 1.0.4) base32 (~> 0.3.0) batch-loader (~> 2.0.1) @@ -1605,8 +1616,7 @@ DEPENDENCIES benchmark-ips (~> 2.3.0) benchmark-memory (~> 0.1) better_errors (~> 2.9.1) - bootsnap (~> 1.15.0) - bootstrap_form (~> 4.2.0) + bootsnap (~> 1.16.0) browser (~> 5.3.1) bullet (~> 7.0.2) bundler-audit (~> 0.7.0.1) @@ -1652,35 +1662,43 @@ DEPENDENCIES flipper (~> 0.25.0) flipper-active_record (~> 0.25.0) flipper-active_support_cache_store (~> 0.25.0) - fog-aliyun (~> 0.3) + fog-aliyun (~> 0.4) fog-aws (~> 3.15) fog-core (= 2.1.0) fog-google (~> 1.19) fog-local (~> 0.8) fog-openstack (~> 1.0) fog-rackspace (~> 0.1.1) - fugit (~> 1.2.1) + fugit (~> 1.8.1) fuubar (~> 2.2.0) gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 15.5.2) + gitaly (~> 15.9.0.pre.rc3) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 3.6.4) + gitlab-dangerfiles (~> 3.7.0) gitlab-experiment (~> 0.7.1) - gitlab-fog-azure-rm (~> 1.4.0) - gitlab-labkit (~> 0.29.0) + gitlab-fog-azure-rm (~> 1.7.0) + gitlab-labkit (~> 0.30.1) gitlab-license (~> 2.2.1) gitlab-mail_room (~> 0.0.9) - gitlab-markup (~> 1.8.0) + gitlab-markup (~> 1.9.0) gitlab-net-dns (~> 0.9.1) - gitlab-omniauth-openid-connect (~> 0.10.0) gitlab-sidekiq-fetcher (= 0.9.0) - gitlab-styles (~> 9.2.0) + gitlab-styles (~> 10.0.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.2.0) gon (~> 6.4.0) - google-api-client (~> 0.33) + google-apis-cloudbilling_v1 (~> 0.21.0) + google-apis-cloudresourcemanager_v1 (~> 0.31.0) + google-apis-compute_v1 (~> 0.57.0) + google-apis-container_v1 (~> 0.43.0) + google-apis-container_v1beta1 (~> 0.43.0) + google-apis-core (~> 0.10.0) + google-apis-iam_v1 (~> 0.36.0) + google-apis-serviceusage_v1 (~> 0.28.0) + google-apis-sqladmin_v1beta4 (~> 0.41.0) + google-cloud-storage (~> 1.44.0) google-protobuf (~> 3.21, >= 3.21.12) gpgme (~> 2.0.22) grape (~> 1.5.2) @@ -1695,7 +1713,7 @@ DEPENDENCIES graphql (~> 1.13.12) graphql-docs (~> 2.1.0) grpc (~> 1.42.0) - gssapi + gssapi (~> 1.3.1) guard-rspec haml_lint (~> 0.40.0) hamlit (~> 2.15.0) @@ -1712,7 +1730,7 @@ DEPENDENCIES ipynbdiff! jira-ruby (~> 2.1.4) js_regex (~> 3.8) - json (~> 2.5.1) + json (~> 2.6.3) json_schemer (~> 0.2.18) jwt (~> 2.1.0) kaminari (~> 1.2.2) @@ -1720,7 +1738,7 @@ DEPENDENCIES knapsack (~> 1.21.1) kramdown (~> 2.3.1) kubeclient (~> 4.9.3)! - lefthook (~> 1.2.7) + lefthook (~> 1.2.9) letter_opener_web (~> 2.0.0) license_finder (~> 7.0) licensee (~> 9.15) @@ -1728,7 +1746,7 @@ DEPENDENCIES lockbox (~> 1.1.1) lograge (~> 0.5) loofah (~> 2.19.1) - lookbook (~> 1.4, >= 1.4.5) + lookbook (~> 1.5, >= 1.5.3) lru_redux mail (= 2.7.1) mail-smtp_pool (~> 0.1.0)! @@ -1740,17 +1758,16 @@ DEPENDENCIES multi_json (~> 1.14.1) net-ldap (~> 0.17.1) net-ntp - nokogiri (~> 1.13.10) + nokogiri (~> 1.14.1) oauth2 (~> 2.0) octokit (~> 4.15) ohai (~> 16.10) oj (~> 3.13.21) oj-introspect (~> 0.7) omniauth (~> 2.1.0) - omniauth-alicloud (~> 2.0.0) + omniauth-alicloud (~> 2.0.1) omniauth-atlassian-oauth2 (~> 0.2.0) omniauth-auth0 (~> 2.0.0) - omniauth-authentiq (~> 0.3.3) omniauth-azure-activedirectory-v2 (~> 2.0) omniauth-azure-oauth2 (~> 0.0.9)! omniauth-cas3 (~> 1.1.4)! @@ -1762,9 +1779,10 @@ DEPENDENCIES omniauth-oauth2-generic (~> 0.2.2) omniauth-salesforce (~> 1.0.5)! omniauth-saml (~> 2.0.0) - omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.4.0)! + omniauth_openid_connect (~> 0.6.1) + openid_connect (= 1.3.0) openssl (= 2.2.2) org-ruby (~> 0.9.12) pact (~> 1.63) @@ -1772,13 +1790,13 @@ DEPENDENCIES parslet (~> 1.8) peek (~> 1.1) pg (~> 1.4.5) - pg_query (~> 2.2) + pg_query (~> 2.2, >= 2.2.1) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.17) pry-byebug pry-rails (~> 0.3.9) - pry-shell (~> 0.5.1) + pry-shell (~> 0.6.1) puma (~> 5.6.5) puma_worker_killer (~> 0.3.1) rack (~> 2.2.6, >= 2.2.6.2) @@ -1787,7 +1805,7 @@ DEPENDENCIES rack-oauth2 (~> 1.21.3) rack-proxy (~> 0.7.6) rack-timeout (~> 0.6.3) - rails (~> 6.1.6.1) + rails (~> 6.1.7.2) rails-controller-testing rails-i18n (~> 7.0) rainbow (~> 3.0) @@ -1806,7 +1824,7 @@ DEPENDENCIES rqrcode-rails3 (~> 0.1.7) rspec-benchmark (~> 0.6.0) rspec-parameterized - rspec-rails (~> 5.0.1) + rspec-rails (~> 6.0.1) rspec-retry (~> 0.6.1) rspec_junit_formatter rspec_profiling (~> 0.0.6) @@ -1815,9 +1833,9 @@ DEPENDENCIES ruby-magic (~> 0.5) ruby-progressbar (~> 1.10) ruby-saml (~> 1.13.0) - ruby_parser (~> 3.15) + ruby_parser (~> 3.19) rubyzip (~> 2.3.2) - rugged (~> 1.2) + rugged (~> 1.5) sanitize (~> 6.0) sassc-rails (~> 2.1.0) sd_notify (~> 0.1.0) @@ -1875,4 +1893,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.3.26 + 2.4.6 diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 269318a096..3e3e5d0d32 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -17,10 +17,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06wn3yiada1hxnhnq6ww118k6xckrkh9m9z4h5l04cph3ha7kw0i"; + sha256 = "1y9lj7ra9xf4q4mryydmd498grsndqmz1zwasb4ai9gv62igvw3s"; type = "gem"; }; - version = "6.1.6.1"; + version = "6.1.7.2"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -28,10 +28,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lh3dmr84jw0ihqdgqy7758gd12v1pr4pz394vif97accgz1dk54"; + sha256 = "0bzacsr93sxv90nljv3ajw54nmyz1v9k2v2wx1pxsi0jasqg5fvn"; type = "gem"; }; - version = "6.1.6.1"; + version = "6.1.7.2"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; @@ -39,10 +39,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19qjvs621hrvgyv08wsc80fv39402fvsxdsc602xgvvm9bzlp5hk"; + sha256 = "1rjddp1a5l4amsbibhnf7g2rb69qvq0nc0a2dvr6r57bpkf82hj4"; type = "gem"; }; - version = "6.1.6.1"; + version = "6.1.7.2"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -50,10 +50,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m5x42s72mik9xkrgbway4ra139k71p2dfxcvg5gwdmac8maiq7k"; + sha256 = "0c2y6sqpan68lrx78pvhbxb2917m75s808r6cg1kyygwvg31niza"; type = "gem"; }; - version = "6.1.6.1"; + version = "6.1.7.2"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -61,10 +61,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h7s384cvzd4rz4k653gwjvxlb1b4cxn2kz7q3rvvx5nd5kvj9pz"; + sha256 = "1jx8wi961i34v7x0j3h4wjw3qbyx9bkzb598vg42kidzk2f90dyj"; type = "gem"; }; - version = "6.1.6.1"; + version = "6.1.7.2"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -72,10 +72,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0syh8jwih5qvv87zfyzl37rz6sc1prhy6gia95bn76zyqk9cfzx8"; + sha256 = "10g5gk8h4mfhvgqylzbf591fqf5p78ca35cb97p9bclpv9jfy0za"; type = "gem"; }; - version = "6.1.6.1"; + version = "6.1.7.2"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -83,21 +83,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rfvn1m7c21fm5hq6262a76snaja9mb0jfl47fvsmaiikm4y9zly"; + sha256 = "0ililjwy4x52a6x5fidh1iyllf6vx49nz93fd2hxypc5bpryx9mz"; type = "gem"; }; - version = "6.1.6.1"; + version = "6.1.7.2"; }; activemodel = { dependencies = ["activesupport"]; - groups = ["default" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qm3whcaiv5kkgp6plyxi6xa6n3sap18m6w1lfwvr93xb8v57693"; + sha256 = "0nn17y72fhsynwn11bqg75bazqp6r1g8mpwwyv64harwvh3fh5qj"; type = "gem"; }; - version = "6.1.6.1"; + version = "6.1.7.2"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -105,10 +105,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c6hcy2affwkkggd49v1g1j6ahijikbcxrcksngm9silmc24ixw2"; + sha256 = "1k69m3b0lb4jx20jx8vsvdqm1ki1r6riq9haabyddkcpvmgz1wh7"; type = "gem"; }; - version = "6.1.6.1"; + version = "6.1.7.2"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -127,10 +127,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1idgd8r1hlkih8kyfn38z7kxqnr40s7as130cwa6x939b8slrgrz"; + sha256 = "0c3cvc01azfkccg5hsl96wafsxb5hf1nva3cn8rif2mlwx17p8n3"; type = "gem"; }; - version = "6.1.6.1"; + version = "6.1.7.2"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -138,10 +138,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vb0xi7yvgfqky9h4clyncb886mr1wvz9amk7d9ffmgpwrpzvjaz"; + sha256 = "14pjq2k761qaywaznpqq8ziivjk2ks1ma2cjwdflkxqgndxjmsr2"; type = "gem"; }; - version = "6.1.6.1"; + version = "6.1.7.2"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -185,6 +185,17 @@ src: }; version = "3.0.0"; }; + aliyun-sdk = { + dependencies = ["nokogiri" "rest-client"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17avsza5r4f6d0f2ajgy6clmasrxs7jd16hz7ljq502jkczmv4b5"; + type = "gem"; + }; + version = "0.8.0"; + }; android_key_attestation = { groups = ["default"]; platforms = []; @@ -368,10 +379,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a4inr58vqzqb6g4j09pch55xyhj4kbbl4drsk1apfwhakc70vpr"; + sha256 = "0j579s8y4ppgcxvvsxwbmisplgbi6l09jc4v593y17vrnbfgqcix"; type = "gem"; }; - version = "1.674.0"; + version = "1.703.0"; }; aws-sdk-cloudformation = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -390,10 +401,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "131acgw2hi893n0dfbczs42bkc41afhyrmd9w8zx5y8r1k5zd6rc"; + sha256 = "0zc4zhv2wq7s5p8c9iaplama1lpg2kwldg81j83c8w4xydf1wd2r"; type = "gem"; }; - version = "3.168.4"; + version = "3.170.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -401,10 +412,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ajp7yvnf95d60xmg618xznfwsy8h1vrkzj33r1bsf2gsfp50vzy"; + sha256 = "070s86pxrbq98iddq6shdq7g0lrzgsdqnsnc5l4kygvqimliq4dr"; type = "gem"; }; - version = "1.61.0"; + version = "1.62.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -412,10 +423,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xpb8c8zw1c0grbw1rcc0ynlys1301vm9kkqy4ls3i2zqk5v6n91"; + sha256 = "1rpnlzsl52znhcki13jkwdshgwf51pn26267481f4fa842gr7xgp"; type = "gem"; }; - version = "1.117.2"; + version = "1.119.1"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -598,21 +609,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ln89f9ypzincd5hqgmzd5vvfgf7fgir56v1spsri40ma88vnipj"; + sha256 = "1vcg52gwl64xhhal6kwk1pc01y1klzdlnv1awyk89kb91z010x7q"; type = "gem"; }; - version = "1.15.0"; - }; - bootstrap_form = { - dependencies = ["actionpack" "activemodel"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "044pi097jwh3z68g1zfmbcl9xchqfcsls1j1nvx1bkyj034v6y7m"; - type = "gem"; - }; - version = "4.2.0"; + version = "1.16.0"; }; browser = { groups = ["default"]; @@ -708,10 +708,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "055i3ybjv9n9hqaazxn3d9ibqhlwh93d4hdlwbpjjfy8qbrz6hiw"; + sha256 = "1w8k7bbwknqmq64mygl2a137vx3cs8xrjmdp8l3whm6f5vg480hg"; type = "gem"; }; - version = "1.3.2"; + version = "1.3.3"; }; cbor = { groups = ["default"]; @@ -866,10 +866,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; + sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5"; type = "gem"; }; - version = "1.1.10"; + version = "1.2.0"; }; connection_pool = { groups = ["default"]; @@ -1040,16 +1040,6 @@ src: }; version = "0.0.20"; }; - declarative-option = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p"; - type = "gem"; - }; - version = "0.1.0"; - }; declarative_policy = { groups = ["default"]; platforms = []; @@ -1165,6 +1155,17 @@ src: }; version = "3.4.2"; }; + digest-crc = { + dependencies = ["rake"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1czaak53w8n13y1fr0q23gp0fhklvxjac5n562qj3xk6sh5ad0x2"; + type = "gem"; + }; + version = "0.6.4"; + }; discordrb-webhooks = { dependencies = ["rest-client"]; groups = ["default"]; @@ -1435,10 +1436,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; + sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; escape_utils = { groups = ["default" "development" "test"]; @@ -1728,10 +1729,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05df0w58w748n3bwcb5cbbh6l203hwl6k59vl6p3qfq0bay5s28d"; + sha256 = "112gsrqah2w03kgi9mjsn6hl74mrwckphf223h36iayc4djf4lq2"; type = "gem"; }; - version = "2.1.0"; + version = "2.3.0"; }; ffaker = { groups = ["development" "test"]; @@ -1828,15 +1829,15 @@ src: version = "0.25.0"; }; fog-aliyun = { - dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"]; + dependencies = ["addressable" "aliyun-sdk" "fog-core" "fog-json" "ipaddress" "xml-simple"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vl5zf9wr6qwm1awxscyifvrrfqnyacidxgzhkba2wqlgizk3anh"; + sha256 = "0f6cwnq4vq628lgv1wn7fzmwgcpv840zbmcwpfpiwy7b9dh388wg"; type = "gem"; }; - version = "0.3.3"; + version = "0.4.0"; }; fog-aws = { dependencies = ["fog-core" "fog-json" "fog-xml"]; @@ -1942,10 +1943,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0idp3hcg50rd7nh8lywyk39s40wgq7axc9nc64si0saf3whmifm0"; + sha256 = "1cm2lrvhrpqq19hbdsxf4lq2nkb2qdldbdxh3gvi15l62dlb5zqq"; type = "gem"; }; - version = "1.2.3"; + version = "1.8.1"; }; fuubar = { dependencies = ["rspec-core" "ruby-progressbar"]; @@ -1978,16 +1979,6 @@ src: }; version = "3.0.1"; }; - gems = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1w26k4db8yj6x1gpxvh1rma4p36hz61xkk7kjf0z61nrajyp8g9l"; - type = "gem"; - }; - version = "1.2.0"; - }; get_process_mem = { dependencies = ["ffi"]; groups = ["default" "puma" "test"]; @@ -2049,10 +2040,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10bq1l9445b9ff921kyayrn5w1b0f7qm1sjia3wmnl54jq2vxfk2"; + sha256 = "1gja1b2zirv1clavlg6c0c3xc0z2si2xvxcp9cd165q4lwh47ika"; type = "gem"; }; - version = "15.5.2"; + version = "15.9.0.pre.rc3"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -2082,10 +2073,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v3m056hpds46byqsacvf4y4xgikgm9ngmz0xlrz57il812a4kl6"; + sha256 = "0kg5nyp1lfqlksrh4dlnq8a4nhdbhhiwm4hif2smlmqcwr1bri9m"; type = "gem"; }; - version = "3.6.4"; + version = "3.7.0"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2104,10 +2095,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zpbw2i1igv6ywqikip64w2xa5sqb9vg98qli0hab2h25g1n6hdg"; + sha256 = "1hix4q2ibrq0r97bn492vzxj4fgijc209kbak8jlrbal7ja6g74n"; type = "gem"; }; - version = "1.4.0"; + version = "1.7.0"; }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; @@ -2115,10 +2106,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09xlv72nbys9a5iqvhxfzdr7vy3s3m2a6ixqb9vq71k925faq6gb"; + sha256 = "04xi2b9wna2z7qw6cdlypfibp5wnf30xn80dlpbdz0sc063bvvdx"; type = "gem"; }; - version = "0.29.0"; + version = "0.30.1"; }; gitlab-license = { groups = ["default"]; @@ -2145,10 +2136,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yvh8vv9kgd06hc8c1pl2hq56w56vr0n7dr5mz19fx4p2v89y7xb"; + sha256 = "1m3ypny84jyvlxf060p3q3d8pb4yihxa2br5hh012bgc11d09nky"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.0"; }; gitlab-net-dns = { groups = ["default"]; @@ -2160,17 +2151,6 @@ src: }; version = "0.9.1"; }; - gitlab-omniauth-openid-connect = { - dependencies = ["addressable" "omniauth" "openid_connect"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lqizfap12ica5c6q74ldarzmbpmhgl156bap9xhamrlm4za4i7a"; - type = "gem"; - }; - version = "0.10.0"; - }; gitlab-sidekiq-fetcher = { dependencies = ["json" "sidekiq"]; groups = ["default"]; @@ -2183,15 +2163,15 @@ src: version = "0.9.0"; }; gitlab-styles = { - dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-graphql" "rubocop-performance" "rubocop-rails" "rubocop-rspec"]; + dependencies = ["rubocop" "rubocop-graphql" "rubocop-performance" "rubocop-rails" "rubocop-rspec"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "196fhlbhhanpbn5iriccp7m04xgkq7swyk07im50q7z05pxyf1ki"; + sha256 = "1w0kd66l92ckv5z3gqfifhkny8ipxx4cckpdyign0lgknpvj06wa"; type = "gem"; }; - version = "9.2.0"; + version = "10.0.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -2237,16 +2217,27 @@ src: }; version = "6.4.0"; }; - google-api-client = { - dependencies = ["google-apis-core" "google-apis-generator"]; + google-apis-cloudbilling_v1 = { + dependencies = ["google-apis-core"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zypv7qz37ql5fqnlmk39krbazzshjzsw44syg7p0ap03zr6w021"; + sha256 = "00hy54g38rwz71l5gh41zm7v9gywrz7mh6m1z3bwrqh98ixq8bga"; type = "gem"; }; - version = "0.53.0"; + version = "0.21.0"; + }; + google-apis-cloudresourcemanager_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gzv5svbj62qcdw5ljva0sh8wifjx9wwx00kfj9bbff052i7597h"; + type = "gem"; + }; + version = "0.31.0"; }; google-apis-compute_v1 = { dependencies = ["google-apis-core"]; @@ -2254,10 +2245,32 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jsz21m0mkjhn6yik2rshgg8i17sdwm8rmq0pfhfs6pwkv7kg5b2"; + sha256 = "0s40lzp1nvnpda45lvybira8gll8snkdd4v3x7sl8fmwi9a18ia0"; type = "gem"; }; - version = "0.53.0"; + version = "0.57.0"; + }; + google-apis-container_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0914hq1wcnvg68vcdwpq5kxnm5h38ay7rrdsrzlqn9i7rca2a7bq"; + type = "gem"; + }; + version = "0.43.0"; + }; + google-apis-container_v1beta1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l0k0davbaaqx76jy9vb6vk6j0l9hl68jmkgn7m6r4nvi37qzi38"; + type = "gem"; + }; + version = "0.43.0"; }; google-apis-core = { dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"]; @@ -2265,21 +2278,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d5h7sm8asxg252dnkk91sq51ynk1m06i15an6s04ihsi5ja64n0"; + sha256 = "02fqn9505q3d3m6lpa5ic2j3pa81k2x440qyw2fairsidrms5jk8"; type = "gem"; }; - version = "0.9.1"; - }; - google-apis-discovery_v1 = { - dependencies = ["google-apis-core"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05as93y4c613dg70xpyzs18a18vqm0bkl2slv3myb1382bzcqnif"; - type = "gem"; - }; - version = "0.12.0"; + version = "0.10.0"; }; google-apis-dns_v1 = { dependencies = ["google-apis-core"]; @@ -2292,16 +2294,16 @@ src: }; version = "0.28.0"; }; - google-apis-generator = { - dependencies = ["activesupport" "gems" "google-apis-core" "google-apis-discovery_v1" "thor"]; + google-apis-iam_v1 = { + dependencies = ["google-apis-core"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y8j6bxgl1sxq2n3hslvld09xv6bcympk30if681xci1s6zgwmj6"; + sha256 = "0rhzka4h1zg83zdyalbic25xbp8wrywsdfi6hdp663axdf3y5dqd"; type = "gem"; }; - version = "0.11.0"; + version = "0.36.0"; }; google-apis-iamcredentials_v1 = { dependencies = ["google-apis-core"]; @@ -2336,16 +2338,27 @@ src: }; version = "0.30.0"; }; + google-apis-serviceusage_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qmh25nvf8f9p9fribm18nszvamilshavrmwyq3xmrs76q17w2sz"; + type = "gem"; + }; + version = "0.28.0"; + }; google-apis-sqladmin_v1beta4 = { dependencies = ["google-apis-core"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r8npqk6hsvj31dcfn8y0449gds2v75jkk209r7vyj2mrk6pj0nh"; + sha256 = "17bljsgmbp80d6wn3wjbzi537a9f5hmcr0zv776z2y8q92v565am"; type = "gem"; }; - version = "0.38.0"; + version = "0.41.0"; }; google-apis-storage_v1 = { dependencies = ["google-apis-core"]; @@ -2353,10 +2366,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l6qhspmpgafj7wgwad6j7fxv1kxvim7sxvfyzb6d6chzh3ww6la"; + sha256 = "17qamcjnf22zvw1g169g8a2gkzdsxx4ij3a4ganihyrcf9r62asj"; type = "gem"; }; - version = "0.20.0"; + version = "0.19.0"; + }; + google-cloud-core = { + dependencies = ["google-cloud-env" "google-cloud-errors"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0amp8vd16pzbdrfbp7k0k38rqxpwd88bkyp35l3x719hbb6l85za"; + type = "gem"; + }; + version = "1.6.0"; }; google-cloud-env = { dependencies = ["faraday"]; @@ -2369,6 +2393,27 @@ src: }; version = "1.6.0"; }; + google-cloud-errors = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jynh1s93nl8njm5l5wcy86pnjmv112cq6m0443s52f04hg6h2s5"; + type = "gem"; + }; + version = "1.3.0"; + }; + google-cloud-storage = { + dependencies = ["addressable" "digest-crc" "google-apis-iamcredentials_v1" "google-apis-storage_v1" "google-cloud-core" "googleauth" "mini_mime"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1skhlpcykxxzw3050cwngdyc3n746wfx443w1w9chxwjbh2ix6i9"; + type = "gem"; + }; + version = "1.44.0"; + }; google-protobuf = { groups = ["default"]; platforms = []; @@ -2559,10 +2604,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j93nsf9j57p7x4aafalvjg8hia2mmqv3aky7fmw2ck5yci343ix"; + sha256 = "1qdfhj12aq8v0y961v4xv96a1y2z80h3xhvzrs9vsfgf884g6765"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.1"; }; guard = { dependencies = ["formatador" "listen" "lumberjack" "nenv" "notiffany" "pry" "shellany" "thor"]; @@ -2944,14 +2989,14 @@ src: version = "3.8.0"; }; json = { - groups = ["default"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; + sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; type = "gem"; }; - version = "2.5.1"; + version = "2.6.3"; }; json-jwt = { dependencies = ["activesupport" "aes_key_wrap" "bindata" "httpclient"]; @@ -3109,10 +3154,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18vcakjkb5fhavq9s6j7zwjc14c652361qws5g1slqb300anfww2"; + sha256 = "07bh4ns9b58nrjjsfx2r69ki56f7nclcczsravkj9ilgw1lagm0z"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.9"; }; letter_opener = { dependencies = ["launchy"]; @@ -3238,10 +3283,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nww5h9frmbjfpfy2nb296vn78xnq1qg0lq3lsn52ky8s8rb65dw"; + sha256 = "0f4b0bp7y7bw57lfynd5d5kgdn0dqkxl2masyk6hvpl5mxsz83sa"; type = "gem"; }; - version = "1.4.5"; + version = "1.5.3"; }; lru_redux = { groups = ["default"]; @@ -3405,10 +3450,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; minitest = { groups = ["development" "test"]; @@ -3529,10 +3574,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1szwcm44z5jg1l4dq73zyjw4rjin23ihkhrw5cpcjrb6cg8hd3y7"; + sha256 = "0dh9xnjs98a2by2rd8jlcmx94miryssk1ral2pji21xbx7i2q2ip"; type = "gem"; }; - version = "0.1.6"; + version = "0.1.7"; }; mustermann = { dependencies = ["ruby2_keywords"]; @@ -3664,10 +3709,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk"; + sha256 = "0qr6psd9qgv83pklpw7cpmshkcasnv8d777ksmvwsacwfvvkmnxj"; type = "gem"; }; - version = "1.13.10"; + version = "1.14.1"; }; notiffany = { dependencies = ["nenv" "shellany"]; @@ -3749,10 +3794,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h2hw0cxs8z6g3bkrsrxmlixcmalnlmj9rzcd8sxaqjs95w4wn7a"; + sha256 = "0g9ksljmlkg56xz8ddzsjkhjh89jv4hr99k3x7c70a7dcx2s85f4"; type = "gem"; }; - version = "0.7.1"; + version = "0.7.2"; }; omniauth = { dependencies = ["hashie" "rack" "rack-protection"]; @@ -3771,10 +3816,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qsx4ri5rbr68djyqd5523rcyxhzi5v05f66wz0iflyda6fkdkwf"; + sha256 = "1ls87xxzhh1bbm4iqz221hz57y7iq1ifn33i7vvx1d02r9dl4k5i"; type = "gem"; }; - version = "2.0.0"; + version = "2.0.1"; }; omniauth-atlassian-oauth2 = { dependencies = ["omniauth" "omniauth-oauth2"]; @@ -3798,17 +3843,6 @@ src: }; version = "2.0.0"; }; - omniauth-authentiq = { - dependencies = ["jwt" "omniauth-oauth2"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0k7vajxwplsp188xfj4mi9iqbc7f7djqh02by4mphc51hl87kcqi"; - type = "gem"; - }; - version = "0.3.3"; - }; omniauth-azure-activedirectory-v2 = { dependencies = ["omniauth-oauth2"]; groups = ["default"]; @@ -3948,17 +3982,6 @@ src: }; version = "2.0.0"; }; - omniauth-shibboleth = { - dependencies = ["omniauth"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04yin7j8xpr8llvank3ivzahqkc6ss5bppc7q6znzdswxmf75fxh"; - type = "gem"; - }; - version = "1.3.0"; - }; omniauth-twitter = { dependencies = ["omniauth-oauth" "rack"]; groups = ["default"]; @@ -3980,6 +4003,17 @@ src: }; version = "2.4.0"; }; + omniauth_openid_connect = { + dependencies = ["omniauth" "openid_connect"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08yl0x203k6nrshc70zawfqh79ap1c3fyka9zwwy61cvn7sih4sz"; + type = "gem"; + }; + version = "0.6.1"; + }; open4 = { groups = ["default" "development"]; platforms = []; @@ -4068,10 +4102,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x"; + sha256 = "0gwd20smyhxbm687vdikfh1gpi96h8qb1x28s2pdcysf6dm6v0ap"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.4"; }; pact = { dependencies = ["pact-mock_service" "pact-support" "rack-test" "rspec" "term-ansicolor" "thor" "webrick"]; @@ -4122,10 +4156,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17qfhjvnr9q2gp1gfdl6kndy2mb6qdwsls3vnjhb1h8ddimdm4s5"; + sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623"; type = "gem"; }; - version = "3.1.3.0"; + version = "3.2.0.0"; }; parslet = { groups = ["default" "development" "test"]; @@ -4175,10 +4209,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l79y41nwwacabj61jkbh4r7haajaf8y4bn5pihh0m1g8547b8w4"; + sha256 = "1slcbzzqdv6104l5h8ql6kj43zmnm16g2dav8bc8dasfpwmrg1k0"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.1"; }; plist = { groups = ["default"]; @@ -4257,17 +4291,13 @@ src: pry = { dependencies = ["coderay" "method_source"]; groups = ["default" "development" "test"]; - platforms = [{ - engine = "maglev"; - } { - engine = "ruby"; - }]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iyw4q4an2wmk8v5rn2ghfy2jaz9vmw2nk8415nnpx2s866934qk"; + sha256 = "0k9kqkd9nps1w1r1rb7wjr31hqzkka2bhi8b518x78dcxppm9zn4"; type = "gem"; }; - version = "0.13.1"; + version = "0.14.2"; }; pry-byebug = { dependencies = ["byebug" "pry"]; @@ -4275,10 +4305,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "096y5vmzpyy4x9h4ky4cs4y7d19vdq9vbwwrqafbh5gagzwhifiv"; + sha256 = "1y41al94ks07166qbp2200yzyr5y60hm7xaiw4lxpgsm4b1pbyf8"; type = "gem"; }; - version = "3.9.0"; + version = "3.10.1"; }; pry-rails = { dependencies = ["pry"]; @@ -4297,10 +4327,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zb7mfj07vafp2h3ixz0v5lw1drl379m7yjmdzbgbb3p0vih141b"; + sha256 = "031nacdzds5821p384qzhliim1h6d60nc63ml572gpz4zwynp6m9"; type = "gem"; }; - version = "0.5.1"; + version = "0.6.1"; }; public_suffix = { groups = ["danger" "default" "development" "test"]; @@ -4359,10 +4389,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p685i23lr8pl7l09g9l2mcj615fr7g33w3mkcr472lcg34nq8n8"; + sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; rack = { groups = ["default" "development" "test"]; @@ -4467,10 +4497,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11injrn9khwkw3ydb4lbgabi5fznml32nm44ym0v6gwilchlj0hp"; + sha256 = "1b7ggchi3d7pwzmj8jn9fhbazr5fr4dy304f0hz7kqbg23s9c1ym"; type = "gem"; }; - version = "6.1.6.1"; + version = "6.1.7.2"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -4500,10 +4530,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mcb75qvldfz6zsr4inrfx7dmb0ngxy507awx28khqmnla3hqpc9"; + sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz"; type = "gem"; }; - version = "1.4.4"; + version = "1.5.0"; }; rails-i18n = { dependencies = ["i18n" "railties"]; @@ -4522,10 +4552,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cwpjj9inak65cvs9wyhpjdsx1xajzbiy25p397a8kmyvkrcvzms"; + sha256 = "0mm3nf3y715ln6v8k6g4351ggkr1bcwc5637vr979yw8vsmdi42k"; type = "gem"; }; - version = "6.1.6.1"; + version = "6.1.7.2"; }; rainbow = { groups = ["coverage" "default" "development" "test"]; @@ -4584,10 +4614,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p0x2sxm0ar4ywsxp94yh3glawf83bdikdkccpc8zzln5987l9y1"; + sha256 = "1z0h1x7fpkzxamnvbw1nry64qd6n0nqkwprfair29z94kd3a9vhl"; type = "gem"; }; - version = "0.4.4"; + version = "0.4.6"; }; rchardet = { groups = ["default" "development"]; @@ -4645,10 +4675,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi"; + sha256 = "1sg9sbf9pm91l7lac7fs4silabyn0vflxwaa2x3lrzsm0ff8ilca"; type = "gem"; }; - version = "3.5.1"; + version = "3.6.0"; }; RedCloth = { groups = ["default"]; @@ -4735,15 +4765,15 @@ src: version = "1.0.0"; }; representable = { - dependencies = ["declarative" "declarative-option" "uber"]; + dependencies = ["declarative" "trailblazer-option" "uber"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07"; + sha256 = "1kms3r6w6pnryysnaqqa9fsn0v73zx1ilds9d1c565n3xdzbyafc"; type = "gem"; }; - version = "3.0.4"; + version = "3.2.0"; }; request_store = { dependencies = ["rack"]; @@ -4863,14 +4893,14 @@ src: }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; - groups = ["default" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dwai7jnwmdmd7ajbi2q0k0lx1dh88knv5wl7c34wjmf94yv8w5q"; + sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c"; type = "gem"; }; - version = "3.10.0"; + version = "3.12.0"; }; rspec-benchmark = { dependencies = ["benchmark-malloc" "benchmark-perf" "benchmark-trend" "rspec"]; @@ -4889,10 +4919,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06wmcjsslx9vmw0bair46551ya8mb76csjyb59fxsmnkkp75jmh0"; + sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4"; type = "gem"; }; - version = "3.10.2"; + version = "3.12.0"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -4900,10 +4930,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sz9bj4ri28adsklnh257pnbq4r5ayziw02qf67wry0kvzazbb17"; + sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6"; type = "gem"; }; - version = "3.10.1"; + version = "3.12.2"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -4911,10 +4941,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02i64ihazgm2dp07y89q1m9pyk724g5n9l83cy21x6snnzcg7xnj"; + sha256 = "0sq2cc9pm5gq411y7iwfvzbmgv3g91lyf7y7cqn1lr3yf1v122nc"; type = "gem"; }; - version = "3.10.3"; + version = "3.12.3"; }; rspec-parameterized = { dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"]; @@ -4933,10 +4963,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pj2a9vrkp2xzlq0810q90sdc2zcqc7k92n57hxzhri2vcspy7n6"; + sha256 = "0d3fnabkaw8n0na2dpnlg2xygggj51djzpj9x6y5rkiqbfyqwv01"; type = "gem"; }; - version = "5.0.1"; + version = "6.0.1"; }; rspec-retry = { dependencies = ["rspec-core"]; @@ -4954,10 +4984,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pjckrh8q6sqxy38xw7f4ziylq1983k84xh927s6352pps68zj35"; + sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx"; type = "gem"; }; - version = "3.10.3"; + version = "3.12.0"; }; rspec_junit_formatter = { dependencies = ["rspec-core"]; @@ -4987,10 +5017,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fhyia6fw438ld83vz7vx37zynmzv042saf04ir43ga6sxk4m9k4"; + sha256 = "1imdfx3mx2p1k7bhc5qm35zvqw12hyz52yy2k9xj3dwrdpzjg0fh"; type = "gem"; }; - version = "1.38.0"; + version = "1.43.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -4998,21 +5028,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qiq3q66w57im0ryrvnd1yq0g2s2safhywpv94441kvc1amayjzy"; + sha256 = "1pdzabz95hv3z5sfbkfqa8bdybsfl13gv7rjb32v3ss8klq99lbd"; type = "gem"; }; - version = "1.23.0"; + version = "1.24.1"; }; - rubocop-gitlab-security = { + rubocop-capybara = { dependencies = ["rubocop"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v0040kpx46fxz3p7dsdjgvsx89qjhwy17n8vxnqg9a7g1rfvxln"; + sha256 = "1h4qcjkz0365qlhi7y1ni94qj14k397cad566zygm20p15ypbp5v"; type = "gem"; }; - version = "0.1.1"; + version = "2.17.0"; }; rubocop-graphql = { dependencies = ["rubocop"]; @@ -5020,10 +5050,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1669dfwhnfkmz7yz7fl5bhhsdwxivnh2zkp260my7w4yzfckki7i"; + sha256 = "0hryrjmcl04br06ibjzzrbb2am8ybbhnl2l7w13xl3wz3k4jyjxs"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -5031,10 +5061,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00ld0hfm2x5hzms9xhkyjfxs8afsmlg1kf0mklk68cq4wwwihkwd"; + sha256 = "1n7g0vg06ldjaq4f8c11c7yqy99zng1qdrkkk4kfziippy24yxnc"; type = "gem"; }; - version = "1.15.1"; + version = "1.16.0"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; @@ -5042,21 +5072,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bv51vwcg5m4v35n7653xclw9vv3ifvgbhvc2l79wz2p76ipm1bx"; + sha256 = "1nxyifly45y7dfiaf0ql8aq7xykrg0sh1l7dxmn3sb9p2jd18140"; type = "gem"; }; - version = "2.17.3"; + version = "2.17.4"; }; rubocop-rspec = { - dependencies = ["rubocop"]; + dependencies = ["rubocop" "rubocop-capybara"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rpcww107xq6aj5wkypzjj346jaxhqal33wmhlwb9gc2h425yg5k"; + sha256 = "1vmmin3ymgq7bhv2hl4pd0zpwawy709p816axc4vi67w61b4bij1"; type = "gem"; }; - version = "2.16.0"; + version = "2.18.1"; }; ruby-fogbugz = { dependencies = ["crack" "multipart-post"]; @@ -5127,10 +5157,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b6l5bxbamaplp904i7f088j806v0pqi0kvhb8xx81v4whl40y2k"; + sha256 = "15pqbxh15djxpcfkschkwdfhmb3xz7a10zv61qpc7rk3jbfwxbda"; type = "gem"; }; - version = "3.15.0"; + version = "3.19.2"; }; rubyntlm = { groups = ["default"]; @@ -5163,14 +5193,14 @@ src: version = "2.3.2"; }; rugged = { - groups = ["default"]; + groups = ["coverage" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v846qs2pa3wnzgz95jzbcdrgl9vyjl65qiscw4q4dvm5sb7j68i"; + sha256 = "0wnfgxx59nq2wpvi8ll7bqw9x99x5hps6i38xdjrwbb5a3896d58"; type = "gem"; }; - version = "1.2.0"; + version = "1.5.1"; }; safe_yaml = { groups = ["default" "test"]; @@ -5381,10 +5411,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p0jj2la8bhb7kgqmqbksaq7idnpgjv6asgfd18d2l3z4kra14cj"; + sha256 = "1p0r92dyffx6wkgazv3wi4m2yfm39kvvr9cjp2f57az5pgsdpajw"; type = "gem"; }; - version = "4.15.1"; + version = "4.16.1"; }; shellany = { groups = ["default" "test"]; @@ -5640,14 +5670,15 @@ src: version = "3.4.2"; }; sqlite3 = { + dependencies = ["mini_portile2"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"; + sha256 = "0f24qp50mc1qg8yvv7b3x73mh78d6mzd3b7rqib1ixfbsdiayx1x"; type = "gem"; }; - version = "1.4.2"; + version = "1.6.0"; }; ssh_data = { groups = ["default"]; @@ -5664,10 +5695,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0flmg6f444liaxjgdwdrwcfwyyhc54a7wp26kqih2cklwll5gp40"; + sha256 = "1nx0vap3mrh62v37lr45h77ipp4li8x77v4kxr1psh3yhda9zx03"; type = "gem"; }; - version = "1.0.7"; + version = "1.0.8"; }; stackprof = { groups = ["default"]; @@ -5973,6 +6004,16 @@ src: }; version = "0.9.0"; }; + trailblazer-option = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18s48fndi2kfvrfzmq6rxvjfwad347548yby0341ixz1lhpg3r10"; + type = "gem"; + }; + version = "0.1.2"; + }; train-core = { dependencies = ["addressable" "ffi" "json" "mixlib-shellout" "net-scp" "net-ssh"]; groups = ["default"]; @@ -6021,10 +6062,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hp6b6mcawg563098gs93wr49xmg871lkaj8m8gwk2va3zvqw7i5"; + sha256 = "14nwxdh5yr2xlpgxjqmdgjlrj1h9ddpc1r00sp1jxp1sc7jsqbq6"; type = "gem"; }; - version = "0.7.0"; + version = "0.7.1"; }; tty-prompt = { dependencies = ["pastel" "tty-reader"]; @@ -6075,10 +6116,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; type = "gem"; }; - version = "2.0.5"; + version = "2.0.6"; }; u2f = { groups = ["default"]; @@ -6106,10 +6147,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19gnc5sr41z3rqbw03k8v3sdpn7rccmgivnc0x5pdq4x7bhcpi31"; + sha256 = "1fgkhqg7npixc95h060ykbjz0a07ldl3dp9y7wd2qgi5irq5vfr7"; type = "gem"; }; - version = "0.4.4"; + version = "0.4.5"; }; unf = { dependencies = ["unf_ext"]; @@ -6137,10 +6178,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; + sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; type = "gem"; }; - version = "1.8.0"; + version = "2.4.2"; }; unicode_utils = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py index 266ca3e4ce..1965ce78b7 100755 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py @@ -177,6 +177,14 @@ def update_gitaly(): _call_nix_update('gitaly', gitaly_server_version) +@cli.command('update-gitlab-pages') +def update_gitlab_pages(): + """Update gitlab-shell""" + data = _get_data_json() + gitlab_pages_version = data['passthru']['GITLAB_PAGES_VERSION'] + _call_nix_update('gitlab-pages', gitlab_pages_version) + + @cli.command('update-gitlab-shell') def update_gitlab_shell(): """Update gitlab-shell""" @@ -201,6 +209,7 @@ def update_all(ctx, rev: str): ctx.invoke(update_data, rev=rev) ctx.invoke(update_rubyenv) ctx.invoke(update_gitaly) + ctx.invoke(update_gitlab_pages) ctx.invoke(update_gitlab_shell) ctx.invoke(update_gitlab_workhorse) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlint/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlint/default.nix index 6adb5bdc7a..f03de45890 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlint/default.nix @@ -7,19 +7,27 @@ python3.pkgs.buildPythonApplication rec { pname = "gitlint"; - version = "0.18.0"; + version = "0.19.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "jorisroovers"; repo = "gitlint"; - rev = "v${version}"; - sha256 = "sha256-MmXzrooN+C9MUaAz4+IEGkGJWHbgvPMSLHgssM0wyN8="; + rev = "refs/tags/v${version}"; + hash = "sha256-4SGkkC4LjZXTDXwK6jMOIKXR1qX76CasOwSqv8XUrjs="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + # Upstream splitted the project into gitlint and gitlint-core to # simplify the dependency handling sourceRoot = "source/gitlint-core"; + nativeBuildInputs = with python3.pkgs; [ + hatch-vcs + hatchling + ]; + propagatedBuildInputs = with python3.pkgs; [ arrow click @@ -31,12 +39,6 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]; - postPatch = '' - # We don't need gitlint-core - substituteInPlace setup.py \ - --replace "'gitlint-core[trusted-deps]==' + version," "" - ''; - pythonImportsCheck = [ "gitlint" ]; @@ -44,6 +46,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Linting for your git commit messages"; homepage = "https://jorisroovers.com/gitlint/"; + changelog = "https://github.com/jorisroovers/gitlint/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ethancedwards8 fab ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix index a789a35f7a..09e5525e22 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "glab"; - version = "1.25.3"; + version = "1.26.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-x/VH6cRrJZ2t2iftBPC86FcgIwjRNzV11MwLG2y+Paw="; + hash = "sha256-k0wkHw12MyVsAudaihoymGkP4y5y98cR7LKa+hEC1Mc="; }; vendorHash = "sha256-FZ1CiR8Rj/sMoCnQm6ArGQfRTlvmD14EZDmufnlTSTk="; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/lefthook/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/lefthook/default.nix index 261b309ebf..c69931bace 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/lefthook/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/lefthook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lefthook"; - version = "1.3.3"; + version = "1.3.5"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-9XmLQPkc8we5wRZe5+bhL1b9lxWX6JAQeF4DmRXBgew="; + sha256 = "sha256-v4ES3TbuDRUBK8xH/viP5QOZmp3eWjsy0YRaSxfTZV4="; }; vendorHash = "sha256-VeR/lyrQrjXWvHdxpG4H+XPlAud9rrlzX8GqhVzn1sg="; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix index 121a0cdf77..224efe8c1a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix @@ -52,10 +52,6 @@ python3.pkgs.buildPythonApplication rec { pycairo ]; - # gobject-introspection and some other similar setup hooks do not currently work with strictDeps. - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - postPatch = '' patchShebangs meson_shebang_normalisation.py ''; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock index 722205e17d..d2e9051caf 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock @@ -60,14 +60,14 @@ GEM xpath (~> 3.2) childprocess (3.0.0) chunky_png (1.4.0) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) crass (1.0.6) - css_parser (1.12.0) + css_parser (1.14.0) addressable csv (3.1.9) docile (1.4.0) - erubi (1.11.0) - globalid (1.0.0) + erubi (1.12.0) + globalid (1.1.0) activesupport (>= 5.0) htmlentities (4.3.4) i18n (1.8.11) @@ -81,11 +81,11 @@ GEM method_source (1.0.0) mini_magick (4.11.0) mini_mime (1.0.3) - mini_portile2 (2.8.0) - minitest (5.16.3) + mini_portile2 (2.8.1) + minitest (5.18.0) mocha (2.0.2) ruby2_keywords (>= 0.0.5) - mysql2 (0.5.4) + mysql2 (0.5.5) net-ldap (0.17.1) nio4r (2.5.8) nokogiri (1.13.10) @@ -94,14 +94,14 @@ GEM nokogiri (1.13.10-x86_64-linux) racc (~> 1.4) parallel (1.22.1) - parser (3.1.3.0) + parser (3.2.1.1) ast (~> 2.4.1) pg (1.2.3) public_suffix (5.0.1) puma (5.6.5) nio4r (~> 2.0) - racc (1.6.1) - rack (2.2.4) + racc (1.6.2) + rack (2.2.6.3) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) @@ -123,7 +123,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) + rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) railties (5.2.8.1) actionpack (= 5.2.8.1) @@ -163,8 +163,8 @@ GEM rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.24.0) - parser (>= 3.1.1.0) + rubocop-ast (1.27.0) + parser (>= 3.2.1.0) rubocop-performance (1.10.2) rubocop (>= 0.90.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -173,7 +173,7 @@ GEM rack (>= 1.1) rubocop (>= 0.90.0, < 2.0) ruby-openid (2.9.2) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) rubyzip (2.3.2) selenium-webdriver (3.142.7) @@ -183,18 +183,18 @@ GEM docile (~> 1.1) simplecov-html (~> 0.11) simplecov-html (0.12.3) - sprockets (4.1.1) + sprockets (4.2.0) concurrent-ruby (~> 1.0) - rack (> 1, < 3) + rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) thor (1.2.1) thread_safe (0.3.6) - tzinfo (1.2.10) + tzinfo (1.2.11) thread_safe (~> 0.1) - unicode-display_width (2.3.0) + unicode-display_width (2.4.2) webdrivers (4.7.0) nokogiri (~> 1.6) rubyzip (>= 1.3.0) @@ -251,7 +251,7 @@ DEPENDENCIES yard RUBY VERSION - ruby 2.7.6p219 + ruby 2.7.7p221 BUNDLED WITH 2.3.26 diff --git a/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix index d71b570b7d..969d7d945f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper, nixosTests }: let - version = "4.2.9"; + version = "4.2.10"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -16,7 +16,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-04dBNF9u/RDAeYmAk7JZ2NxNzY5B38T2RkloWueoyx4="; + sha256 = "sha256-byY4jCOJKWJVLKSR1e/tq9QtrIiGHdnYC8M0WPZb4ek="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix index fa34afaa4d..f7340dc1de 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix @@ -186,10 +186,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; + sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; type = "gem"; }; - version = "1.1.10"; + version = "1.2.2"; }; crass = { groups = ["default"]; @@ -207,10 +207,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1107j3frhmcd95wcsz0rypchynnzhnjiyyxxcl6dlmr2lfy08z4b"; + sha256 = "04q1vin8slr3k8mp76qz0wqgap6f9kdsbryvgfq9fljhrm463kpj"; type = "gem"; }; - version = "1.12.0"; + version = "1.14.0"; }; csv = { groups = ["default"]; @@ -237,10 +237,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; + sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; globalid = { dependencies = ["activesupport"]; @@ -248,10 +248,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n5yc058i8xhi1fwcp1w7mfi6xaxfmrifdb4r4hjfff33ldn8lqj"; + sha256 = "0kqm5ndzaybpnpxqiqkc41k4ksyxl41ln8qqr6kb130cdxsf2dxk"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; htmlentities = { groups = ["default"]; @@ -341,20 +341,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; minitest = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; + sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06"; type = "gem"; }; - version = "5.16.3"; + version = "5.18.0"; }; mocha = { dependencies = ["ruby2_keywords"]; @@ -380,10 +380,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xsy70mg4p854jska7ff7cy8fyn9nhlkrmfdvkkfmk8qxairbfq1"; + sha256 = "1gjvj215qdhwk3292sc7xsn6fmwnnaq2xs35hh5hc8d8j22izlbn"; type = "gem"; }; - version = "0.5.4"; + version = "0.5.5"; }; net-ldap = { groups = ["ldap"]; @@ -432,10 +432,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17qfhjvnr9q2gp1gfdl6kndy2mb6qdwsls3vnjhb1h8ddimdm4s5"; + sha256 = "1a2v5f8fw7nxm41xp422p1pbr41hafy62bp95m7vg42cqp5y4grc"; type = "gem"; }; - version = "3.1.3.0"; + version = "3.2.1.1"; }; pg = { groups = ["default"]; @@ -481,20 +481,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p685i23lr8pl7l09g9l2mcj615fr7g33w3mkcr472lcg34nq8n8"; + sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; rack = { groups = ["default" "openid" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa"; + sha256 = "17wg99w29hpiq9p4cmm8c6kdg4lcw0ll2c36qw7y50gy1cs4h5j2"; type = "gem"; }; - version = "2.2.4"; + version = "2.2.6.3"; }; rack-openid = { dependencies = ["rack" "ruby-openid"]; @@ -546,10 +546,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mcb75qvldfz6zsr4inrfx7dmb0ngxy507awx28khqmnla3hqpc9"; + sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz"; type = "gem"; }; - version = "1.4.4"; + version = "1.5.0"; }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; @@ -724,10 +724,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sqkg84npyq9z4d3z46w59zyr1r1rbd1mrrlglws9ksw04wdq5x9"; + sha256 = "16iabkwqhzqh3cd4pcrp0nqv4ks2whcz84csawi78ynfk12vd20a"; type = "gem"; }; - version = "1.24.0"; + version = "1.27.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -766,10 +766,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; + sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40"; type = "gem"; }; - version = "1.11.0"; + version = "1.13.0"; }; ruby2_keywords = { groups = ["default" "test"]; @@ -829,10 +829,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qj82dcfkk6c4zw357k5r05s5iwvyddh57bpwj0a1hjgaw70pcb8"; + sha256 = "0k0236g4h3ax7v6vp9k0l2fa0w6f1wqp7dn060zm4isw4n3k89sw"; type = "gem"; }; - version = "4.1.1"; + version = "4.2.0"; }; sprockets-rails = { dependencies = ["actionpack" "activesupport" "sprockets"]; @@ -871,20 +871,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rw89y3zj0wcybcyiazgcprg6hi42k8ipp1n2lbl95z1dmpgmly6"; + sha256 = "1dk1cfnhgl14l580b650qyp8m5xpqb3zg0wb251h5jkm46hzc0b5"; type = "gem"; }; - version = "1.2.10"; + version = "1.2.11"; }; unicode-display_width = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ra70s8prfacpqwj5v2mqn1rbfz6xds3n9nsr9cwzs3z2c0wm5j7"; + sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.2"; }; webdrivers = { dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"]; diff --git a/third_party/nixpkgs/pkgs/applications/video/catt/default.nix b/third_party/nixpkgs/pkgs/applications/video/catt/default.nix index 7e1157fc4a..88513fc50a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/catt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/catt/default.nix @@ -21,11 +21,11 @@ let version = "7.1.2"; src = oldAttrs.src.override { inherit version; - sha256 = "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj"; + hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; }; }); - PyChromecast = super.PyChromecast.overridePythonAttrs (oldAttrs: rec { + pychromecast = super.pychromecast.overridePythonAttrs (oldAttrs: rec { version = "9.2.0"; src = oldAttrs.src.override { inherit version; @@ -40,6 +40,7 @@ with py.pkgs; buildPythonApplication rec { pname = "catt"; version = "0.12.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -49,7 +50,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ click ifaddr - PyChromecast + pychromecast protobuf requests yt-dlp diff --git a/third_party/nixpkgs/pkgs/applications/video/devede/default.nix b/third_party/nixpkgs/pkgs/applications/video/devede/default.nix index e8fa11c914..800edd4792 100644 --- a/third_party/nixpkgs/pkgs/applications/video/devede/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/devede/default.nix @@ -15,17 +15,8 @@ in buildPythonApplication rec { sha256 = "1xb7acjphvn4ya8fgjsvag5gzi9a6c2famfl0ffr8nhb9y8ig9mg"; }; - # Temporary fix - # See https://github.com/NixOS/nixpkgs/issues/61578 - # and https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - nativeBuildInputs = [ gettext wrapGAppsHook - - # Temporary fix - # See https://github.com/NixOS/nixpkgs/issues/61578 - # and https://github.com/NixOS/nixpkgs/issues/56943 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix b/third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix index 335b8c1917..635d91ca54 100644 --- a/third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook ]; propagatedBuildInputs = [ - PyChromecast bottle pycaption paste html5lib pygobject3 dbus-python + pychromecast bottle pycaption paste html5lib pygobject3 dbus-python gtk3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix index 88cc0b899a..81bfbe4a39 100644 --- a/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -18,11 +18,11 @@ buildPythonApplication rec { pname = "jellyfin-mpv-shim"; - version = "2.5.0"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-B9orjQojiLwC90LZ4ynY7niw6fhJIaUn/DUXAYVMjfg="; + sha256 = "sha256-90Z2vgYT/9hBQZgfXeY7l6sGwT5KEY8X4rZMgrbTwrM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/kazam/default.nix b/third_party/nixpkgs/pkgs/applications/video/kazam/default.nix index 4ba0fe98df..e44949f54b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kazam/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kazam/default.nix @@ -40,9 +40,6 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ pygobject3 pyxdg pycairo dbus-python xlib ]; - # workaround https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - patches = [ # Fix paths (substituteAll { diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/add-KODI_WEBSERVER_EXTRA_WHITELIST.patch b/third_party/nixpkgs/pkgs/applications/video/kodi/add-KODI_WEBSERVER_EXTRA_WHITELIST.patch deleted file mode 100644 index ae221eff60..0000000000 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/add-KODI_WEBSERVER_EXTRA_WHITELIST.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 620c3eb38f0dbea6e877e37e97508513e87a0732 Mon Sep 17 00:00:00 2001 -From: Jeremy Fleischman -Date: Sun, 27 Mar 2022 00:44:52 -0700 -Subject: [PATCH] Add new KODI_WEBSERVER_EXTRA_WHITELIST cmake var to allow - access to more directories - -(This is a backport of -https://github.com/xbmc/xbmc/commit/a6dedce7ba1f03bdd83b019941d1e369a06f7888 -to Kodi 19.4 Matrix) - -This is useful for NixOS, which often ends up creating a `KODI_HOME` -with symlinks to other files (including the chorus2 interface). Kodi's -webserver cautiously refuses to follow these symlinks, and you end up -getting 404s rather than the web page. - -See https://forum.kodi.tv/showthread.php?tid=366338&pid=3079493 for a -discussion of this on the Kodi forum. ---- - CMakeLists.txt | 1 + - xbmc/CompileInfo.cpp.in | 5 +++++ - xbmc/CompileInfo.h | 1 + - xbmc/utils/FileUtils.cpp | 6 +++++- - 4 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2d5369798df23..d5ef6d9390ef0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -243,6 +243,7 @@ add_custom_command(OUTPUT ${CORE_BUILD_DIR}/xbmc/CompileInfo.cpp - -DAPP_BUILD_DATE=${APP_BUILD_DATE} - -DAPP_SHARED_LIBRARY_SUFFIX="${APP_SHARED_LIBRARY_SUFFIX}" - -Dprefix=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} -+ -DKODI_WEBSERVER_EXTRA_WHITELIST="${KODI_WEBSERVER_EXTRA_WHITELIST}" - -P ${CMAKE_SOURCE_DIR}/cmake/scripts/common/GenerateVersionedFiles.cmake - DEPENDS ${CMAKE_SOURCE_DIR}/version.txt - export-files -diff --git a/xbmc/CompileInfo.cpp.in b/xbmc/CompileInfo.cpp.in -index f81fe77902236..4f19203a89cde 100644 ---- a/xbmc/CompileInfo.cpp.in -+++ b/xbmc/CompileInfo.cpp.in -@@ -105,3 +105,8 @@ std::vector CCompileInfo::GetAvailableWindowSystems() - { - return StringUtils::Split("@CORE_PLATFORM_NAME_LC@", ' '); - } -+ -+const std::vector CCompileInfo::GetWebserverExtraWhitelist() -+{ -+ return StringUtils::Split("@KODI_WEBSERVER_EXTRA_WHITELIST@", ','); -+} -diff --git a/xbmc/CompileInfo.h b/xbmc/CompileInfo.h -index 553a0194ee77f..e2521324e6576 100644 ---- a/xbmc/CompileInfo.h -+++ b/xbmc/CompileInfo.h -@@ -32,4 +32,5 @@ class CCompileInfo - static const char* GetVersionCode(); - static std::vector GetAvailableWindowSystems(); - static std::vector LoadOfficialRepoInfos(); -+ static const std::vector GetWebserverExtraWhitelist(); - }; -diff --git a/xbmc/utils/FileUtils.cpp b/xbmc/utils/FileUtils.cpp -index e51f3d631c256..fc717c9608098 100644 ---- a/xbmc/utils/FileUtils.cpp -+++ b/xbmc/utils/FileUtils.cpp -@@ -6,6 +6,7 @@ - * See LICENSES/README.md for more information. - */ - -+#include "CompileInfo.h" - #include "FileUtils.h" - #include "ServiceBroker.h" - #include "guilib/GUIKeyboardFactory.h" -@@ -261,12 +262,15 @@ bool CFileUtils::CheckFileAccessAllowed(const std::string &filePath) - "/.ssh/", - }; - // ALLOW kodi paths -- const std::vector whitelist = { -+ std::vector whitelist = { - CSpecialProtocol::TranslatePath("special://home"), - CSpecialProtocol::TranslatePath("special://xbmc"), - CSpecialProtocol::TranslatePath("special://musicartistsinfo") - }; - -+ auto kodiExtraWhitelist = CCompileInfo::GetWebserverExtraWhitelist(); -+ whitelist.insert(whitelist.end(), kodiExtraWhitelist.begin(), kodiExtraWhitelist.end()); -+ - // image urls come in the form of image://... sometimes with a / appended at the end - // and can be embedded in a music or video file image://music@... - // strip this off to get the real file path diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/addon-update-script/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/addon-update-script/default.nix index 17c1d45783..abcdefaf02 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/addon-update-script/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/addon-update-script/default.nix @@ -9,7 +9,7 @@ { attrPath }: let - url = "http://mirrors.kodi.tv/addons/matrix/addons.xml.gz"; + url = "http://mirrors.kodi.tv/addons/nexus/addons.xml.gz"; updateScript = writeShellScript "update.sh" '' set -ex diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/arrow/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/arrow/default.nix index bca61e902e..931667d8a5 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/arrow/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/arrow/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "1.0.3.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "0xa16sb2hls59l4gsg1xwb1qbkhcvbykq02l05n5rcm0alg80l3l"; + url = "https://mirrors.kodi.tv/addons/nexus/script.module.arrow/script.module.arrow-${version}.zip"; + sha256 = "sha256-dFCAHlWgslxsAVQAPP3aDM6Fw+I9PP0ITUVTKJY2QXU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/arteplussept/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/arteplussept/default.nix index 1053ca11cb..7d58625d2d 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/arteplussept/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/arteplussept/default.nix @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "1.1.8"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; hash = "sha256-1f+oEHEhSsDMXH7WssSVjjuDjK3UNyMiNhaw7mh/xjI="; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/certifi/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/certifi/default.nix index 7becbd2252..0e0699752a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/certifi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/certifi/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "2022.9.24"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "kIPGEjmnHlgVb11W2RKBlrMy3/+kUOcQZiLCcnHCcno="; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-kIPGEjmnHlgVb11W2RKBlrMy3/+kUOcQZiLCcnHCcno="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/chardet/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/chardet/default.nix index fe482447cf..0d20853412 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/chardet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/chardet/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "4.0.0+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "1jsd165mb1b8jdan2jbjd3y3xa0xam2cxcccmwazkybpa0r6a7dj"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-sh1lMlB3+fkVr4yxzkRVHag+/GhySWFVk2iFVYsJTcs="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/dateutil/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/dateutil/default.nix index 94ca38dd08..9adcf3303b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/dateutil/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/dateutil/default.nix @@ -6,8 +6,8 @@ buildKodiAddon rec { version = "2.8.2"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "iQnyS0GjYcPbnBDUxmMrmDxHOA3K8RbTVke/HF4d5u4="; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-iQnyS0GjYcPbnBDUxmMrmDxHOA3K8RbTVke/HF4d5u4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/defusedxml/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/defusedxml/default.nix index 11738065ff..12a9f82e3f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/defusedxml/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/defusedxml/default.nix @@ -6,8 +6,8 @@ buildKodiAddon rec { version = "0.6.0+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "026i5rx9rmxcc18ixp6qhbryqdl4pn7cbwqicrishivan6apnacd"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-jSl7lbFqR6hjZhHzxY69hDbs84LY3B5RYKzXnHou0Qg="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/future/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/future/default.nix index 0f2815fe5f..30a1db9d6b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/future/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/future/default.nix @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "0.18.2+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-QBG7V70Dwmfq8ISILxGNvtmQT9fJp2e5gs2C9skRwIw="; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/idna/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/idna/default.nix index 44bda1278b..d752cb93b0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/idna/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/idna/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "3.4.0"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "wS1d1L18v4+RGwxDh7OpKRHB2A4qYwiq6b5mAz7l8Pk="; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-wS1d1L18v4+RGwxDh7OpKRHB2A4qYwiq6b5mAz7l8Pk="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index 684e73a632..6f5a8cc85b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -1,16 +1,29 @@ { stdenv, lib, rel, addonDir, buildKodiBinaryAddon, fetchFromGitHub, expat, glib, nspr, nss, gtest }: +let + bento4 = fetchFromGitHub { + owner = "xbmc"; + repo = "Bento4"; + rev = "1.6.0-639-5-${rel}"; + sha256 = "sha256-jjeBy3LmnN7hPjnbBSPcdtPD+MdbG+0kU8mekM2/ZFw="; + }; +in buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "19.0.7"; + version = "20.3.2"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "sha256-2bQVTSMznh7soeL1VJJpXrlZd4ONmP9wq9pYLnwPnZE="; + sha256 = "sha256-QG0qBRbUJJgsRLS2cQIDeTDYLjqVD0dRaZ7pCxpxNcs="; }; + extraCMakeFlags = [ + "-DENABLE_INTERNAL_BENTO4=ON" + "-DBENTO4_URL=${bento4}" + ]; + extraNativeBuildInputs = [ gtest ]; extraBuildInputs = [ expat ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix index 520dafff0b..92fc9dc553 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-ffmpegdirect"; namespace = "inputstream.ffmpegdirect"; - version = "19.0.3"; + version = "20.5.0"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.ffmpegdirect"; rev = "${version}-${rel}"; - sha256 = "sha256-G1+WhF0iEOhgQPXPv0LjpLSvDk3JpkryaGJYuG+5P40="; + sha256 = "sha256-2Xa5q+o/AYDwG+JYeXTUfMTJk/kln16J8KRcXILNE6c="; }; extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix index 0e3d06c3be..561ef2cc55 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-rtmp"; namespace = "inputstream.rtmp"; - version = "19.0.1"; + version = "20.3.0"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.rtmp"; rev = "${version}-${rel}"; - sha256 = "sha256-BNc9HJ4Yq1WTxTr7AUHBB9yDz8oefy2EtFRwVYVGcaY="; + sha256 = "sha256-VF2DpQXXU+rj76e/de5YB1T7dzeOjmO0dpsPVqEnMy4="; }; extraBuildInputs = [ openssl rtmpdump zlib ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix index 1319f72f4e..500a48532c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "0.5.10+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "FcOktwtOT7kDM+3y9qPDk3xU1qVeCduyAdUzebtJzv4="; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-FcOktwtOT7kDM+3y9qPDk3xU1qVeCduyAdUzebtJzv4="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/joystick/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/joystick/default.nix index 310cd4d083..506bbf5f0f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/joystick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/joystick/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = namespace; namespace = "peripheral.joystick"; - version = "19.0.1"; + version = "20.1.0"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - sha256 = "sha256-jSz0AgxhbCIbbZJxm4oq22y/hqew949UsqEAPoqEnHA="; + sha256 = "sha256-LdagiN0bVanmGkAy9APbP1TW68KES7BIy5PXgUzksJQ="; }; extraBuildInputs = [ tinyxml udev ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/keymap/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/keymap/default.nix index 6c42bd78f4..a98b8d2d76 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/keymap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/keymap/default.nix @@ -6,8 +6,8 @@ buildKodiAddon rec { version = "1.1.4"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "eWzMqsE8H0wUvPyd3wvjiaXEg4+sgkQ3CQYjE0VS+9g="; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-eWzMqsE8H0wUvPyd3wvjiaXEg4+sgkQ3CQYjE0VS+9g="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/kodi-six/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/kodi-six/default.nix index 24404ef349..638b7c3b50 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/kodi-six/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/kodi-six/default.nix @@ -6,8 +6,8 @@ buildKodiAddon rec { version = "0.1.3.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "14m232p9hx925pbk8knsg994m1nbpa5278zmcrnfblh4z84gjv4x"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-nWz5CPoE0uVsZvWjI4q6y4ZKUnraTjTXLSJ1mK4YopI="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix index 4e2a700101..3d58ddd643 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix @@ -1,4 +1,4 @@ -{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libretro, genesis-plus-gx }: +{ lib, buildKodiBinaryAddon, fetchFromGitHub, libretro, genesis-plus-gx }: buildKodiBinaryAddon rec { pname = "kodi-libretro-genplus"; @@ -8,7 +8,7 @@ buildKodiBinaryAddon rec { src = fetchFromGitHub { owner = "kodi-game"; repo = "game.libretro.genplus"; - rev = "${version}-${rel}"; + rev = "${version}-Matrix"; sha256 = "sha256-F3bt129lBZKlDtp7X0S0q10T9k9C2zNeHG+yIP3818Q="; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix index f669e24f8b..231c769fa7 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix @@ -1,4 +1,4 @@ -{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libretro, mgba }: +{ lib, buildKodiBinaryAddon, fetchFromGitHub, libretro, mgba }: buildKodiBinaryAddon rec { pname = "kodi-libretro-mgba"; @@ -8,7 +8,7 @@ buildKodiBinaryAddon rec { src = fetchFromGitHub { owner = "kodi-game"; repo = "game.libretro.mgba"; - rev = "${version}-${rel}"; + rev = "${version}-Matrix"; sha256 = "sha256-lxpj6Y34apYcE22q4W3Anhigp79r4RgiJ36DbES1kzU="; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix index 7994016b6c..7b52988e80 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix @@ -1,4 +1,4 @@ -{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libretro, snes9x }: +{ lib, buildKodiBinaryAddon, fetchFromGitHub, libretro, snes9x }: buildKodiBinaryAddon rec { pname = "kodi-libretro-snes9x"; @@ -8,7 +8,7 @@ buildKodiBinaryAddon rec { src = fetchFromGitHub { owner = "kodi-game"; repo = "game.libretro.snes9x"; - rev = "${version}-${rel}"; + rev = "${version}-Matrix"; sha256 = "sha256-LniZf8Gae4+4Rgc9OGhMCkOI3IA7CPjVrN/gbz9te38="; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/libretro/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/libretro/default.nix index d1fc3d4afd..208f832d69 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/libretro/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/libretro/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "libretro"; namespace = "game.libretro"; - version = "19.0.0"; + version = "20.1.0"; src = fetchFromGitHub { owner = "kodi-game"; repo = "game.libretro"; rev = "${version}-${rel}"; - sha256 = "1831wbbc4a545lr4mg1fm4sbx75k5lkrfqaa5fh308aar0nm974d"; + sha256 = "sha256-RwaLGAJt13PLKy45HU64TvQFyY532WWq2YX34Eyu+6o="; }; extraBuildInputs = [ tinyxml ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/myconnpy/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/myconnpy/default.nix index e39625545f..5a649b7041 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/myconnpy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/myconnpy/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "8.0.18+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "1cx3qdzw9lkkmbyvyrmc2i193is20fihn2sfl7kmv43f708vam0k"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-E1S1EThukF3noU4LC6MDQseRQhSsZr/9qnPSxH/Do7M="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix index 9c7041441f..6308a6470a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hdhomerun"; namespace = "pvr.hdhomerun"; - version = "19.1.0"; + version = "20.4.0"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hdhomerun"; rev = "${version}-${rel}"; - sha256 = "sha256-sYVb4nhUz2j19yv3/cyLyUAC+1K0c05+iAMEfpPifjs="; + sha256 = "sha256-FKxoPD8t5JbouhvQtMVMFjk3O5zB9kVgrn0eC2RPDvQ="; }; extraBuildInputs = [ jsoncpp libhdhomerun ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hts/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hts/default.nix index 4b13e4a617..fbace20ac6 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hts/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hts"; namespace = "pvr.hts"; - version = "19.0.6"; + version = "20.6.0"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hts"; rev = "${version}-${rel}"; - sha256 = "sha256-Lc3B1TdQ4oQIEIyKuQju+5cpInF5i2u4WFe3okFhe+I="; + sha256 = "sha256-D6t61/KUEQBMw5WrCfiWyFHnGbnpHWVKzzdgiRpviig="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix index 736ea03843..1758818b41 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix @@ -6,13 +6,13 @@ buildKodiBinaryAddon rec { pname = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "19.2.2"; + version = "20.6.1"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; rev = "${version}-${rel}"; - sha256 = "sha256-snW6sgbdyGqdZtd7HU5FTf4Kx5/Zjk2fLLi0MS+9tTU="; + sha256 = "sha256-fJDMxNDXDijPL0sg86LB6nYQwjTdInf3dyOr8Lkydmg="; }; extraBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/requests-cache/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/requests-cache/default.nix index de785ab9bb..6800ecde83 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/requests-cache/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/requests-cache/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "0.5.2+matrix.2"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "0fgl4jayq6hbhqxg16nfy9qizwf54c8nvg0icv93knaj13zfzkz8"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-6M/v/ghS2TnSZhG8bREjxfEfcfLOmvA6hgsa7JUk9Dk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/requests/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/requests/default.nix index 3361a03f5d..7f505f5532 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/requests/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/requests/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "2.27.1+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "QxxVT6XaEYQtAFkZde8EaTXzGO7cjG2pApQZcA32xA0="; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-QxxVT6XaEYQtAFkZde8EaTXzGO7cjG2pApQZcA32xA0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/routing/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/routing/default.nix index a75e786cf1..a96c16b862 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/routing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/routing/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "0.2.3+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "1qhp40xd8mbcvzwlamqw1j5l224ry086593948g24drpqiiyc8x6"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-piPmY8Q3NyIeImmkYhDwmQhBiwwcV0X532xV1DogF+I="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/signals/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/signals/default.nix index b66b1e99a8..4d84bcafee 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/signals/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/signals/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "0.0.6+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "1qcjbakch8hvx02wc01zv014nmzgn6ahc4n2bj5mzr114ppd3hjs"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-WsLR7iUh5F+LXMISBpWx71dLAtg/AMYF6BsiyKZakuE="; }; passthru= { diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/simplejson/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/simplejson/default.nix index e9293d6258..fad6efec15 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/simplejson/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/simplejson/default.nix @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "3.17.0+matrix.2"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-XLE4x0qr3CFwWqh1BfSg9q+w6pWgFBXG7TyVJWeGQIs="; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/six/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/six/default.nix index 1742d1f6f0..5933c54473 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/six/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/six/default.nix @@ -6,8 +6,8 @@ buildKodiAddon rec { version = "1.15.0+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "0c8vb0c4vhknkqqgvzj8l2ddgcm4iah0ca686slxbxbp800cydnf"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-zjbPAEB39dWpNsgoBqCKpLLXmqBI/v0wnnbCTRhYGzE="; }; passthru.updateScript = addonUpdateScript { diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/steam-controller/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/steam-controller/default.nix index d2b79029f7..20488d8a3f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/steam-controller/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/steam-controller/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = namespace; namespace = "peripheral.steamcontroller"; - version = "0.11.0"; + version = "20.0.2"; src = fetchFromGitHub { owner = "kodi-game"; repo = namespace; - rev = "f68140ca44f163a03d3a625d1f2005a6edef96cb"; - sha256 = "09lm8i119xlsxxk0c64rnp8iw0crr90v7m8iwi9r31qdmxrdxpmg"; + rev = "b3174673c6feb34325975b6c007581c39bf3e4a5"; + sha256 = "sha256-Q+eJfbD4NpAPANm9Mx9/pD29L5tdS4gxhQqNufufYdw="; }; extraBuildInputs = [ libusb1 ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/trakt-module/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/trakt-module/default.nix index ad7610e0f0..1c9680147c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/trakt-module/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/trakt-module/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "4.4.0+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "19kjhrykx92sy67cajxjckzdwgq47ipwml0bx9vmdr9d191h14p8"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-6JIAQwot5VZ36gvQym88BD/e/mSyS8WO8VqkPn2GcqY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/trakt/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/trakt/default.nix index f2a662616c..64113cb013 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/trakt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/trakt/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "3.5.0"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "07fb0wjcr8ggidswrjs1r1hzi6grykiyi855bgm7pjzzk95kl99v"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-OyU6S5r/y3vqW6Wg6OP0+Zn4YchBy8x1i++hzCQHyx0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/typing_extensions/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/typing_extensions/default.nix index 0fddddfb1b..f1c203a2b9 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/typing_extensions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/typing_extensions/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "3.7.4.3"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "0p28hchj05hmccs6b2836kh4vqdqnl169409f2845d0nw9y4wkqq"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-GE9OfOIWtEKQcAmQZAK1uOFN4DQDiWU0YxUWICGDSFw="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/urllib3/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/urllib3/default.nix index 90900f3060..02d7fde864 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/urllib3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/urllib3/default.nix @@ -6,8 +6,8 @@ buildKodiAddon rec { version = "1.26.13+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "pymhHS1TqRv9o/3zBtmP8QSLMXSgFYno0VaR+YqhJqY="; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-pymhHS1TqRv9o/3zBtmP8QSLMXSgFYno0VaR+YqhJqY="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix index 4288d4e039..674495f9d8 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = namespace; namespace = "vfs.libarchive"; - version = "19.0.1"; + version = "20.1.0"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - sha256 = "sha256-4sERFC/XBEE46n+iq6YJg/5Wz0+223tq4+O5cIf6X6E="; + sha256 = "sha256-D0eLH+G+qF5xLBBX/FdJC+gKNQpqSb7LjRmi/99rPNg="; }; extraBuildInputs = [ libarchive xz bzip2 zlib lz4 lzo openssl ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix index a9c37cc30a..b8e2213fec 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = namespace; namespace = "vfs.sftp"; - version = "19.0.1"; + version = "20.1.0"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - sha256 = "sha256-UXycPqPEn3W5X3SQs1fxgkdV5PSkzs3pjYyuhAVngt8="; + sha256 = "sha256-Dv/C8PHaSx13JoGp77rQPtp5G5EH5tqKqzjwZZA7+80="; }; extraBuildInputs = [ openssl libssh zlib ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix index a4036be735..20acfad234 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "visualization-waveform"; namespace = "visualization.waveform"; - version = "19.0.3"; + version = "20.2.1"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - hash = "sha256-3mTfL1UjPLDKardJy4IDNyzvHnkF//4nmWInOxP/XhQ="; + hash = "sha256-e1SIpMmfnS92X4f114MKch4o9Ke80aIzw6OQPrEb8d0="; }; extraBuildInputs = [ pkg-config libGL ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/websocket/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/websocket/default.nix index 423dfa73f3..9a15ab0a49 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/websocket/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/websocket/default.nix @@ -6,8 +6,8 @@ buildKodiAddon rec { version = "0.58.0+matrix.2"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "0j2fcrn3hc6207g0k0gx5ypj4j3ww9pd7rnlzq1fgdig00laa8y7"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-xyOlKAAvtucC/tTm027ifEgiry/9gQneAcIwOGxmTkg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/youtube/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/youtube/default.nix index 8dab69bb56..d256dad393 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -6,8 +6,8 @@ buildKodiAddon rec { version = "6.8.24+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "/yQML2iK5jcIhN6RJC+WJ8EnH640qFJFdaaVeGPEg9U="; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-/yQML2iK5jcIhN6RJC+WJ8EnH640qFJFdaaVeGPEg9U="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix index 05e594d80a..1a3b8135e0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, makeWrapper +{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper , pkg-config, cmake, yasm, python3Packages , libxcrypt, libgcrypt, libgpg-error, libunistring , boost, avahi, lame @@ -38,25 +38,27 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is assert gbmSupport || waylandSupport || x11Support; let - kodiReleaseDate = "20221204"; - kodiVersion = "19.5"; - rel = "Matrix"; + kodiReleaseDate = "20230115"; + kodiVersion = "20.0"; + rel = "Nexus"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "sha256-vprhEPxYpY3/AsUgvPNnhBlh0Dl73ekALAblHaUKzd0="; + sha256 = "sha256-0BkbA1iovouwjQVtiKFw3+64i7sMWZNiCUfOQ0EsslY="; }; + # see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ to get suggested versions for all dependencies + ffmpeg = stdenv.mkDerivation rec { pname = "kodi-ffmpeg"; - version = "4.3.2"; # see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ffmpeg/FFMPEG-VERSION + version = "4.4.1"; src = fetchFromGitHub { owner = "xbmc"; repo = "FFmpeg"; - rev = "${version}-${rel}-19.2"; - sha256 = "14s215sgc93ds1mrdbkgb7fvy94lpgv2ldricyxzis0gbzqfgs4f"; + rev = "${version}-${rel}-Alpha1"; + sha256 = "sha256-EQHmmWnDw+/udKYq7Nrf00nL7I5XWUtmzdauDryfTII="; }; preConfigure = '' cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . @@ -79,22 +81,22 @@ let libdvdcss = fetchFromGitHub { owner = "xbmc"; repo = "libdvdcss"; - rev = "1.4.2-Leia-Beta-5"; - sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl"; + rev = "1.4.3-Next-Nexus-Alpha2-2"; + sha256 = "sha256-CJMGH50mNAkovccNcol5ArF3zUnZKfbVB9EXyQgu5k4="; }; libdvdnav = fetchFromGitHub { owner = "xbmc"; repo = "libdvdnav"; - rev = "6.0.0-Leia-Alpha-3"; - sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb"; + rev = "6.1.1-Next-Nexus-Alpha2-2"; + sha256 = "sha256-m8SCjOokVbwJ7eVfYKHap1pQjVbI+BXaoxhGZQIg0+k="; }; libdvdread = fetchFromGitHub { owner = "xbmc"; repo = "libdvdread"; - rev = "6.0.0-Leia-Alpha-3"; - sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59"; + rev = "6.1.3-Next-Nexus-Alpha2-2"; + sha256 = "sha256-AphBQhXud+a6wm52zjzC5biz53NnqWdgpL2QDt2ZuXc="; }; kodi_platforms = lib.optional gbmSupport "gbm" @@ -107,22 +109,6 @@ in stdenv.mkDerivation { src = kodi_src; - patches = [ - # This is a backport of - # https://github.com/xbmc/xbmc/commit/a6dedce7ba1f03bdd83b019941d1e369a06f7888 - # to Kodi 19.4 Matrix. - # This can be removed once a new major release of Kodi comes out and we upgrade - # to it. - ./add-KODI_WEBSERVER_EXTRA_WHITELIST.patch - - # A patch to fix build until the next major release of Kodi comes out and we upgrade - # https://github.com/xbmc/xbmc/pull/22291 - (fetchpatch { - url = "https://github.com/xbmc/xbmc/commit/5449652abf0bb9dddd0d796de4120e60f19f89a5.patch"; - sha256 = "sha256-vqX08dTSPhIur4aVu2BzXEpAxMOjaadwRNI43GSV9Og="; - }) - ]; - buildInputs = [ gnutls libidn libtasn1 nasm p11-kit libxml2 python3Packages.python @@ -196,6 +182,7 @@ in stdenv.mkDerivation { "-DGIT_VERSION=${kodiReleaseDate}" "-DENABLE_EVENTCLIENTS=ON" "-DENABLE_INTERNAL_CROSSGUID=OFF" + "-DENABLE_INTERNAL_RapidJSON=OFF" "-DENABLE_OPTICAL=ON" "-DLIRC_DEVICE=/run/lirc/lircd" "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig" diff --git a/third_party/nixpkgs/pkgs/applications/video/media-downloader/default.nix b/third_party/nixpkgs/pkgs/applications/video/media-downloader/default.nix index 1b62c89c6a..ab7f9030fa 100644 --- a/third_party/nixpkgs/pkgs/applications/video/media-downloader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/media-downloader/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "media-downloader"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = pname; rev = "${version}"; - sha256 = "sha256-RMZG+rPbwJFL2AzEZlTrc8/bQCx8CWCWppEBjCj5hnU="; + sha256 = "sha256-3tVOyIwdGcSVnEJWQWh6HIsjY6uEzWkTs45qf81r/+0="; }; nativeBuildInputs = [ cmake qt5.wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/uosc.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/uosc.nix new file mode 100644 index 0000000000..1a486dbf55 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/uosc.nix @@ -0,0 +1,48 @@ +{ stdenvNoCC, lib, fetchFromGitHub, makeFontsConf }: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "uosc"; + version = "4.6.0"; + + src = fetchFromGitHub { + owner = "tomasklaen"; + repo = "uosc"; + rev = finalAttrs.version; + hash = "sha256-AxApKlSaRLPl6VsXsARfaT3kWDK6AB2AAEmIHYiuFaM="; + }; + + postPatch = '' + substituteInPlace scripts/uosc.lua \ + --replace "mp.find_config_file('scripts')" "\"$out/share/mpv/scripts\"" + ''; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/mpv/ + cp -r scripts $out/share/mpv + cp -r fonts $out/share + + runHook postInstall + ''; + + passthru.scriptName = "uosc.lua"; + # the script uses custom "texture" fonts as the background for ui elements. + # In order for mpv to find them, we need to adjust the fontconfig search path. + passthru.extraWrapperArgs = [ + "--set" + "FONTCONFIG_FILE" + (toString (makeFontsConf { + fontDirectories = [ "${finalAttrs.finalPackage}/share/fonts" ]; + })) + ]; + + meta = with lib; { + description = "Feature-rich minimalist proximity-based UI for MPV player"; + homepage = "https://github.com/tomasklaen/uosc"; + license = licenses.gpl3Only; + maintainers = with lib.maintainers; [ apfelkuchen6 ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix index e9be744ed0..0dd735071f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix @@ -18,6 +18,7 @@ let # expected to have a `scriptName` passthru attribute that points to the # name of the script that would reside in the script's derivation's # `$out/share/mpv/scripts/`. + # A script can optionally also provide an `extraWrapperArgs` passthru attribute. scripts ? [], extraUmpvWrapperArgs ? [] }: @@ -49,6 +50,8 @@ let # attribute of the script derivation from the `scripts` "--script=${script}/share/mpv/scripts/${script.scriptName}" ] + # scripts can also set the `extraWrapperArgs` passthru + ++ (script.extraWrapperArgs or []) ) scripts )) ++ extraMakeWrapperArgs) ; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix new file mode 100644 index 0000000000..ffd7cd600d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, asio +, cmake +, curl +, obs-studio +, opencv +, procps +, qtbase +, websocketpp +, xorg +}: + +stdenv.mkDerivation rec { + pname = "advanced-scene-switcher"; + version = "1.20.5"; + + src = fetchFromGitHub { + owner = "WarmUpTill"; + repo = "SceneSwitcher"; + rev = version; + sha256 = "04k7f7v756vdsan95g73cc29lrs61jis738v37a3ihi3ivps3ma3"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + asio + curl + obs-studio + opencv + procps + qtbase + websocketpp + xorg.libXScrnSaver + ]; + + dontWrapQtApps = true; + + postInstall = '' + mkdir $out/lib $out/share + mv $out/obs-plugins/64bit $out/lib/obs-plugins + mv $out/data $out/share/obs + ''; + + meta = { + description = "An automated scene switcher for OBS Studio"; + homepage = "https://github.com/WarmUpTill/SceneSwitcher"; + maintainers = with lib.maintainers; [ paveloom ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix index c796b2d84f..049636dd59 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix @@ -6,6 +6,8 @@ # - Add plugin to it's own directory (because of future patches). { + advanced-scene-switcher = qt6Packages.callPackage ./advanced-scene-switcher { }; + droidcam-obs = callPackage ./droidcam-obs { }; input-overlay = qt6Packages.callPackage ./input-overlay.nix { }; diff --git a/third_party/nixpkgs/pkgs/applications/video/peek/default.nix b/third_party/nixpkgs/pkgs/applications/video/peek/default.nix index f2b5f6c504..b8dff4f1af 100644 --- a/third_party/nixpkgs/pkgs/applications/video/peek/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/peek/default.nix @@ -17,7 +17,7 @@ , glib , cairo , keybinder3 -, ffmpeg +, ffmpeg-full , python3 , libxml2 , gst_all_1 @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ which ffmpeg gifski ]}) + gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ which ffmpeg-full gifski ]}) ''; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix b/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix index 5406b7dfa8..7e6f89855e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix @@ -44,10 +44,10 @@ python3.pkgs.buildPythonApplication rec { itstool python3 wrapGAppsHook + gobject-introspection ]; buildInputs = [ - gobject-introspection gtk3 libpeas librsvg @@ -78,12 +78,6 @@ python3.pkgs.buildPythonApplication rec { patchShebangs ./getenvvar.py ''; - # Fixes error - # Couldn’t recognize the image file format for file ".../share/pitivi/pixmaps/asset-proxied.svg" - # at startup, see https://github.com/NixOS/nixpkgs/issues/56943 - # and https://github.com/NixOS/nixpkgs/issues/89691#issuecomment-714398705. - strictDeps = false; - passthru = { updateScript = gnome.updateScript { packageName = "pitivi"; diff --git a/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix b/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix index 1e042461eb..82a09bbaca 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix @@ -15,28 +15,24 @@ , gst-plugins-good , gst-plugins-bad , gst-plugins-ugly +, wayland +, wrapQtAppsHook }: -mkDerivation rec { +mkDerivation rec { pname = "vokoscreen-ng"; - version = "3.0.8"; + version = "3.5.0"; src = fetchFromGitHub { owner = "vkohaupt"; repo = "vokoscreenNG"; rev = version; - sha256 = "1302663hyp2xxhaavhfky24a2p9gz23i3rykmrc6c1n23h24snri"; + sha256 = "sha256-4VEIQj9/rSzXM5EQFt2I+cKKOM1URKlblf+6vlWEuO0="; }; - patches = [ - # Adaptation of previously used https://github.com/City-busz/vokoscreenNG/commit/0a3784095ecca582f7eb09551ceb34c309d83637 patch - # used for 3.0.5 but incompatible at least since 3.0.8. The issue is addressed here https://github.com/vkohaupt/vokoscreenNG/issues/139 - ./linux-support-installation-target.patch - ]; - qmakeFlags = [ "src/vokoscreenNG.pro" ]; - nativeBuildInputs = [ qttools pkg-config qmake ]; + nativeBuildInputs = [ qttools pkg-config qmake wrapQtAppsHook ]; buildInputs = [ gstreamer libX11 @@ -44,7 +40,7 @@ mkDerivation rec { qtbase qtmultimedia qtx11extras - + wayland gst-plugins-base gst-plugins-good gst-plugins-bad @@ -57,7 +53,12 @@ mkDerivation rec { ''; postInstall = '' + mkdir -p $out/bin $out/share/applications $out/share/icons + cp ./vokoscreenNG $out/bin/ + cp ./src/applications/vokoscreenNG.desktop $out/share/applications/ + cp ./src/applications/vokoscreenNG.png $out/share/icons/ qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + wrapQtApp $out/bin/vokoscreenNG ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/linux-support-installation-target.patch b/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/linux-support-installation-target.patch deleted file mode 100644 index 4f1b63c342..0000000000 --- a/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/linux-support-installation-target.patch +++ /dev/null @@ -1,40 +0,0 @@ -Seulement dans b: patch.patch -Seulement dans b: ..rej -diff --color -ur a/src/vokoscreenNG.pro b/src/vokoscreenNG.pro ---- a/src/vokoscreenNG.pro 2021-02-03 15:00:57.377401016 +0100 -+++ b/src/vokoscreenNG.pro 2021-02-03 15:09:18.141905863 +0100 -@@ -160,7 +160,32 @@ - # systrayAlternative - include(systrayAlternative/systrayAlternative.pri) - -+unix:!macx { -+ isEmpty(PREFIX) { -+ PREFIX = /usr/local -+ } -+ isEmpty(BINDIR) { -+ BINDIR = $$PREFIX/bin -+ } -+ isEmpty(DATADIR) { -+ DATADIR = $$PREFIX/share -+ } -+ -+ target.path = $$BINDIR -+ -+ icon.files = applications/vokoscreenNG.png -+ icon.path = $$DATADIR/icons/hicolor/256x256/apps/ -+ -+ desktop.files = applications/vokoscreenNG.desktop -+ desktop.path = $$DATADIR/applications/ -+ -+ appdata.files = applications/vokoscreenNG.appdata.xml -+ appdata.path = $$DATADIR/metainfo/ -+ -+ INSTALLS += target icon desktop appdata -+} - # ciscoOpenh264 - win32:include(ciscoOpenh264/ciscoOpenh264.pri) - --unix:include(wayland/wayland.pri) -\ Pas de fin de ligne à la fin du fichier -+unix:include(wayland/wayland.pri) -+ diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix index 9e5372dce5..47da9a3c7b 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "colima"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uAstW+LzgT+xEJf4WNVSZsWtE50RU/rRpC7mkkFMIJU="; + sha256 = "sha256-oCYHQFajtZXVAVeJ8zvJABlmwmOUgisvVg9eLT7wd0M="; # We need the git revision leaveDotGit = true; postFetch = '' 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 9031f941ab..073237f421 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.26.1"; + version = "1.26.2"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-7tbnnERV+dYtEXzloHgWeSFpe8Dl18tiNWoAhIALWjE="; + sha256 = "sha256-Wo6COdbqRWuGP4qXjiCehDm8FlVjz1nZRouMOxlKocw="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose_1.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose_1.nix index 4e692eb51b..54e0d737bf 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose_1.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose_1.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-TIzZ0h0jdBJ5PRi9MxEASe6a+Nqz/iwhO70HM5WbCbc="; + hash = "sha256-TIzZ0h0jdBJ5PRi9MxEASe6a+Nqz/iwhO70HM5WbCbc="; }; # lots of networking and other fails diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/lima/bin.nix b/third_party/nixpkgs/pkgs/applications/virtualization/lima/bin.nix index 86b49c5a1e..3b6711a1f7 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/lima/bin.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/lima/bin.nix @@ -9,31 +9,31 @@ }: let - version = "0.14.2"; + version = "0.15.0"; dist = { aarch64-darwin = rec { archSuffix = "Darwin-arm64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "8334d83ca9555271b9843040066057dd8462a774f60dfaedbe97fae3834c3894"; + sha256 = "0da51d3c179e89bde404ea40be88b5c11aea8c7cf50cd030fd5b779e91462856"; }; x86_64-darwin = rec { archSuffix = "Darwin-x86_64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "3866113c92619f0041ff6fc68fef2bf16e751058b9237289b2bea8fb960bdab0"; + sha256 = "c535bc21923bc290ac56fe3a9ea87e8740c7c51e030f05cc32d51e726a59673e"; }; aarch64-linux = rec { archSuffix = "Linux-aarch64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "373be7ebcf5932570c384c6bfb159cd418011b98a18c26ba0467827dad302230"; + sha256 = "964c897f6dc2a6e203b0c109a7cd59102fe192837c792549b597d7ac301ecf54"; }; x86_64-linux = rec { archSuffix = "Linux-x86_64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "44cae71eae65673afcc22c557f6385aa98792aecbb43195de48217581ae39143"; + sha256 = "5ec308716abe8833ce36d6e77cac44d98d7cfc8add8dbcbe053a91af01cecfa1"; }; }; in diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/lkl/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/lkl/default.nix index 839022a8d5..f091aad6bf 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/lkl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/lkl/default.nix @@ -58,6 +58,10 @@ stdenv.mkDerivation rec { # crypto/jitterentropy.c:54:3: error: #error "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy.c." hardeningDisable = [ "format" "fortify" ]; + # Fixes the following error when using liblkl-hijack.so on aarch64-linux: + # symbol lookup error: liblkl-hijack.so: undefined symbol: __aarch64_ldadd4_sync + env.NIX_CFLAGS_LINK = "-lgcc_s"; + makeFlags = [ "-C tools/lkl" "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix index 695cd970b7..861d4877e4 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zxgNHzKXekZnk0OsHw30u4L9U2mIT/MryZuAQ2EBEYg="; + sha256 = "sha256-1IJboAy0GYgkysY84+wHHOulA/aiux7pgCtxfr0CFV8="; }; - cargoHash = "sha256-tsGyrU/5yp5PJ2d5HUoaw/jhGgYyDt6qBK+DvC79kmY="; + cargoHash = "sha256-kAou5pPOwbOZ9n8+fQJ4+Hh9x7wrY898R5XTuUEvF2o="; # skip test due FHS dependency doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix index 287fa02df7..120bd2670f 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -35,8 +35,7 @@ let # do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed - binPath = lib.makeBinPath ([ - ] ++ lib.optionals stdenv.isLinux [ + binPath = lib.makeBinPath (lib.optionals stdenv.isLinux [ runc crun conmon diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix index e5d5a1fbfe..1a9fe490af 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix @@ -26,7 +26,6 @@ python3.pkgs.buildPythonApplication rec { wrapGAppsHook libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi gsettings-desktop-schemas libosinfo gtksourceview4 - gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 ] ++ lib.optional spiceSupport spice-gtk; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/0000-fix-install-python.patch b/third_party/nixpkgs/pkgs/applications/virtualization/xen/0000-fix-install-python.4.15.patch similarity index 84% rename from third_party/nixpkgs/pkgs/applications/virtualization/xen/0000-fix-install-python.patch rename to third_party/nixpkgs/pkgs/applications/virtualization/xen/0000-fix-install-python.4.15.patch index 53821c0d9c..5fc5a6012e 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/xen/0000-fix-install-python.patch +++ b/third_party/nixpkgs/pkgs/applications/virtualization/xen/0000-fix-install-python.4.15.patch @@ -1,10 +1,10 @@ tools/python/install-wrap script brakes shebangs patching, disable diff --git a/tools/Rules.mk b/tools/Rules.mk -index 87a56dc..a7da869 100644 +index 444e5bacdd..c99ea959ff 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk -@@ -90,8 +90,7 @@ CFLAGS += $(CFLAGS-y) +@@ -135,8 +135,7 @@ CFLAGS += $(CFLAGS-y) CFLAGS += $(EXTRA_CFLAGS_XEN_TOOLS) diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.patch b/third_party/nixpkgs/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.4.15.patch similarity index 88% rename from third_party/nixpkgs/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.patch rename to third_party/nixpkgs/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.4.15.patch index 072338b87a..08e9aa5ad2 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.patch +++ b/third_party/nixpkgs/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.4.15.patch @@ -1,7 +1,7 @@ hack to make etherboot use prefetched ipxe diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile -index a0578d2..64428a0 100644 +index ed9e11305f..979a3acea8 100644 --- a/tools/firmware/etherboot/Makefile +++ b/tools/firmware/etherboot/Makefile @@ -16,6 +16,7 @@ IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz @@ -11,8 +11,8 @@ index a0578d2..64428a0 100644 +G=ipxe.git ROMS = $(addprefix $D/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS))) - -@@ -36,9 +37,9 @@ $T: + ROM = $D/src/bin/ipxe.bin +@@ -41,9 +42,9 @@ $T: fi mv _$T $T diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.4.15.patch b/third_party/nixpkgs/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.4.15.patch new file mode 100644 index 0000000000..c64ec52315 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.4.15.patch @@ -0,0 +1,42 @@ +diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile +index b6567c4127..83defeee95 100644 +--- a/xen/arch/x86/Makefile ++++ b/xen/arch/x86/Makefile +@@ -124,11 +124,11 @@ ifneq ($(efi-y),) + export XEN_BUILD_EFI := $(shell $(CC) $(XEN_CFLAGS) -c efi/check.c -o efi/check.o 2>/dev/null && echo y) + # Check if the linker supports PE. + EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10 --strip-debug +-XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(LD) $(EFI_LDFLAGS) -o efi/check.efi efi/check.o 2>/dev/null && echo y)) ++XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(EFI_LD) $(EFI_LDFLAGS) -o efi/check.efi efi/check.o 2>/dev/null && echo y)) + CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI + # Check if the linker produces fixups in PE by default (we need to disable it doing so for now). + XEN_NO_PE_FIXUPS := $(if $(XEN_BUILD_EFI), \ +- $(shell $(LD) $(EFI_LDFLAGS) --disable-reloc-section -o efi/check.efi efi/check.o 2>/dev/null && \ ++ $(shell $(EFI_LD) $(EFI_LDFLAGS) --disable-reloc-section -o efi/check.efi efi/check.o 2>/dev/null && \ + echo --disable-reloc-section)) + endif + +@@ -217,20 +217,20 @@ note_file_option ?= $(note_file) + ifeq ($(XEN_BUILD_PE),y) + $(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o efi/mkreloc + $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ +- $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \ ++ $(EFI_LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \ + $(BASEDIR)/common/symbols-dummy.o $(note_file_option) -o $(@D)/.$(@F).$(base).0 &&) : + efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S + $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \ + | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S + $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o + $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ +- $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \ ++ $(EFI_LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \ + $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file_option) -o $(@D)/.$(@F).$(base).1 &&) : + efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S + $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \ + | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S + $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o +- $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \ ++ $(EFI_LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \ + $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(note_file_option) -o $@ + $(NM) -pa --format=sysv $(@D)/$(@F) \ + | $(BASEDIR)/tools/symbols --all-symbols --xensyms --sysv --sort >$(@D)/$(@F).map diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.patch b/third_party/nixpkgs/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.patch deleted file mode 100644 index a103cb1617..0000000000 --- a/third_party/nixpkgs/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur xen-4.10.4-orig/xen/arch/x86/Makefile xen-4.10.4-patched/xen/arch/x86/Makefile ---- xen-4.10.4-orig/xen/arch/x86/Makefile 2019-07-04 01:28:50.000000000 +1000 -+++ xen-4.10.4-patched/xen/arch/x86/Makefile 2020-03-03 13:32:34.607951507 +1100 -@@ -166,7 +166,7 @@ - # Check if the compiler supports the MS ABI. - export XEN_BUILD_EFI := $(shell $(CC) $(filter-out $(CFLAGS-y) .%.d,$(CFLAGS)) -c efi/check.c -o efi/check.o 2>/dev/null && echo y) - # Check if the linker supports PE. --XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(LD) -mi386pep --subsystem=10 -o efi/check.efi efi/check.o 2>/dev/null && echo y)) -+XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(EFI_LD) -mi386pep --subsystem=10 -o efi/check.efi efi/check.o 2>/dev/null && echo y)) - CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI - - $(TARGET).efi: VIRT_BASE = 0x$(shell $(NM) efi/relocs-dummy.o | sed -n 's, A VIRT_START$$,,p') -@@ -188,20 +188,20 @@ - - $(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o $(BASEDIR)/common/symbols-dummy.o efi/mkreloc - $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ -- $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \ -+ $(guard) $(EFI_LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \ - $(BASEDIR)/common/symbols-dummy.o $(note_file) -o $(@D)/.$(@F).$(base).0 &&) : - $(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S - $(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \ - | $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S - $(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o - $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ -- $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \ -+ $(guard) $(EFI_LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \ - $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file) -o $(@D)/.$(@F).$(base).1 &&) : - $(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S - $(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \ - | $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S - $(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o -- $(guard) $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \ -+ $(guard) $(EFI_LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \ - $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(note_file) -o $@ - if $(guard) false; then rm -f $@; echo 'EFI support disabled'; \ - else $(NM) -pa --format=sysv $(@D)/$(@F) \ diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.patch b/third_party/nixpkgs/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.4.15.patch similarity index 82% rename from third_party/nixpkgs/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.patch rename to third_party/nixpkgs/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.4.15.patch index 11989e86c7..8f07c1a8e2 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.patch +++ b/third_party/nixpkgs/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.4.15.patch @@ -11,9 +11,11 @@ because I can't see why we have it 2) Ensures the said directory exists ---- a/xen/Makefile 2016-01-08 01:50:58.028045657 +0000 -+++ b/xen/Makefile 2016-01-08 01:51:33.560268718 +0000 -@@ -49,7 +49,9 @@ +diff --git a/xen/Makefile b/xen/Makefile +index acb2d28891..d0763fbbe7 100644 +--- a/xen/Makefile ++++ b/xen/Makefile +@@ -289,7 +289,9 @@ _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX) ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi; \ ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T).efi; \ if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \ @@ -24,8 +26,8 @@ because I can't see why we have it elif [ "$(D)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(D))" ]; then \ echo 'EFI installation only partially done (EFI_VENDOR not set)' >&2; \ fi; \ -@@ -69,7 +69,7 @@ - rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION).efi +@@ -319,7 +321,7 @@ _uninstall: + rm -f $(D)$(DEBUG_DIR)/$(T)-$(XEN_FULLVERSION).efi.map rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi rm -f $(D)$(EFI_DIR)/$(T).efi - rm -f $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/4.10.nix b/third_party/nixpkgs/pkgs/applications/virtualization/xen/4.15.nix similarity index 66% rename from third_party/nixpkgs/pkgs/applications/virtualization/xen/4.10.nix rename to third_party/nixpkgs/pkgs/applications/virtualization/xen/4.15.nix index 57fd033613..11f5900ee8 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/xen/4.10.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/xen/4.15.nix @@ -3,18 +3,22 @@ , withInternalQemu ? true , withInternalTraditionalQemu ? true , withInternalSeabios ? true -, withSeabios ? !withInternalSeabios, seabios ? null +, withSeabios ? !withInternalSeabios, seabios , withInternalOVMF ? false # FIXME: tricky to build , withOVMF ? false, OVMF -, withLibHVM ? true +, withLibHVM ? false + +# xen +, python3Packages # qemu , udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir -, alsa-lib, glib, python2 +, alsa-lib, glib, python3 , ... } @ args: assert withInternalSeabios -> !withSeabios; assert withInternalOVMF -> !withOVMF; +assert !withLibHVM; with lib; @@ -33,16 +37,16 @@ let qemuDeps = [ udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir - alsa-lib glib python2 + alsa-lib glib python3 ]; in callPackage (import ./generic.nix (rec { - version = "4.10.4"; + version = "4.15.1"; src = fetchurl { url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz"; - sha256 = "0ipkr7b3v3y183n6nfmz7q3gnzxa20011df4jpvxi6pmr8cpnkwh"; + sha256 = "1rmc7gb72xwhr3h9rc3bkac41s8kjjzz45miwdq6yalyq7j7vss5"; }; # Sources needed to build tools and firmwares. @@ -52,25 +56,26 @@ callPackage (import ./generic.nix (rec { url = "https://xenbits.xen.org/git-http/qemu-xen.git"; # rev = "refs/tags/qemu-xen-${version}"; # use revision hash - reproducible but must be updated with each new version - rev = "qemu-xen-${version}"; - sha256 = "0laxvhdjz1njxjvq3jzw2yqvdr9gdn188kqjf2gcrfzgih7xv2ym"; + rev = "e2af2d050338c99e8436e251ad67aafb3ebbd501"; + sha256 = "sha256-gVykPtzAA7tmpe6iVvnulaW+b0jD3gwL1JXC5yeIA7M="; }; buildInputs = qemuDeps; postPatch = '' # needed in build but /usr/bin/env is not available in sandbox substituteInPlace scripts/tracetool.py \ - --replace "/usr/bin/env python" "${python2}/bin/python" + --replace "/usr/bin/env python" "${python3}/bin/python" ''; meta.description = "Xen's fork of upstream Qemu"; }; } // optionalAttrs withInternalTraditionalQemu { + # TODO 4.15: something happened with traditional in this release? qemu-xen-traditional = { src = fetchgit { url = "https://xenbits.xen.org/git-http/qemu-xen-traditional.git"; # rev = "refs/tags/xen-${version}"; # use revision hash - reproducible but must be updated with each new version - rev = "c8ea0457495342c417c3dc033bba25148b279f60"; - sha256 = "0v5nl3c08kpjg57fb8l191h1y57ykp786kz6l525jgplif28vx13"; + rev = "3d273dd05e51e5a1ffba3d98c7437ee84e8f8764"; + sha256 = "1dc6dhjp4y2irmi9yiyw1kzmm1habyy8j1s2zkf6qyak850krqj7"; }; buildInputs = qemuDeps; patches = [ @@ -85,8 +90,8 @@ callPackage (import ./generic.nix (rec { "firmware/seabios-dir-remote" = { src = fetchgit { url = "https://xenbits.xen.org/git-http/seabios.git"; - rev = "f0cdc36d2f2424f6b40438f7ee7cc502c0eff4df"; - sha256 = "1wq5pjkjrfzqnq3wyr15mcn1l4c563m65gdyf8jm97kgb13pwwfm"; + rev = "155821a1990b6de78dde5f98fa5ab90e802021e0"; + sha256 = "sha256-F3lzr00CMAObJtpz0eZFT/rwjFx+bvlI37/JtHXP5Eo="; }; patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ]; meta.description = "Xen's fork of Seabios"; @@ -95,8 +100,8 @@ callPackage (import ./generic.nix (rec { "firmware/ovmf-dir-remote" = { src = fetchgit { url = "https://xenbits.xen.org/git-http/ovmf.git"; - rev = "173bf5c847e3ca8b42c11796ce048d8e2e916ff8"; - sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcr"; + rev = "a3741780fe3535e19e02efa869a7cac481891129"; + sha256 = "0000000000000000000000000000000000000000000000000000"; }; meta.description = "Xen's fork of OVMF"; }; @@ -105,36 +110,11 @@ callPackage (import ./generic.nix (rec { "firmware/etherboot/ipxe.git" = { src = fetchgit { url = "https://git.ipxe.org/ipxe.git"; - rev = "356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d"; - sha256 = "15n400vm3id5r8y3k6lrp9ab2911a9vh9856f5gvphkazfnmns09"; + rev = "988d2c13cdf0f0b4140685af35ced70ac5b3283c"; + sha256 = "1pkf1n1c0rdlzfls8fvjvi1sd9xjd9ijqlyz3wigr70ijcv6x8i9"; }; meta.description = "Xen's fork of iPXE"; }; - } // optionalAttrs withLibHVM { - xen-libhvm-dir-remote = { - src = fetchgit { - name = "xen-libhvm"; - url = "https://github.com/michalpalka/xen-libhvm"; - rev = "83065d36b36d6d527c2a4e0f5aaf0a09ee83122c"; - sha256 = "1jzv479wvgjkazprqdzcdjy199azmx2xl3pnxli39kc5mvjz3lzd"; - }; - buildPhase = '' - make - cd biospt - cc -Wall -g -D_LINUX -Wstrict-prototypes biospt.c -o biospt -I../libhvm -L../libhvm -lxenhvm - ''; - installPhase = '' - make install - cp biospt/biospt $out/bin/ - ''; - meta = { - description = '' - Helper library for reading ACPI and SMBIOS firmware values - from the host system for use with the HVM guest firmware - pass-through feature in Xen''; - license = licenses.bsd2; - }; - }; }; configureFlags = [] @@ -148,7 +128,8 @@ callPackage (import ./generic.nix (rec { ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" ++ optional (withInternalOVMF) "--enable-ovmf"; - env.NIX_CFLAGS_COMPILE = toString [ + NIX_CFLAGS_COMPILE = toString [ + # TODO 4.15: drop unneeded ones # Fix build on Glibc 2.24. "-Wno-error=deprecated-declarations" # Fix build with GCC 8 @@ -163,16 +144,32 @@ callPackage (import ./generic.nix (rec { # Fix build with GCC 10 "-Wno-error=enum-conversion" "-Wno-error=zero-length-bounds" + # Fix build with GCC 12 + # xentoollog_stubs.c:57: error: "Some_val" redefined [-Werror] + "-Wno-error" + ]; + + patches = with xsa; flatten [ + ./0000-fix-ipxe-src.4.15.patch + ./0000-fix-install-python.4.15.patch + ./0004-makefile-use-efi-ld.4.15.patch + ./0005-makefile-fix-efi-mountdir-use.4.15.patch + + XSA_386 ]; postPatch = '' # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror. sed 1i'#include ' \ - -i tools/blktap2/control/tap-ctl-allocate.c \ - -i tools/libxl/libxl_device.c - # Makefile didn't include previous PKG_CONFIG_PATH so glib wasn't found - substituteInPlace tools/Makefile \ - --replace 'PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-config' 'PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-config:$(PKG_CONFIG_PATH)' + -i tools/libs/light/libxl_device.c + + # Fix missing pkg-config dir + mkdir -p tools/pkg-config + ''; + + preBuild = '' + # PKG_CONFIG env var collides with variables used in tools Makefiles. + unset PKG_CONFIG ''; passthru = { @@ -181,4 +178,6 @@ callPackage (import ./generic.nix (rec { else throw "this xen has no qemu builtin"; }; -})) ({ ocamlPackages = ocaml-ng.ocamlPackages_4_05; } // args) +})) ({ + ocamlPackages = ocaml-ng.ocamlPackages_4_14; +} // args) diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic.nix b/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic.nix index 234d72e468..8a687d45e2 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic.nix @@ -4,9 +4,8 @@ config: # Xen , bison, bzip2, checkpolicy, dev86, figlet, flex, gettext, glib , acpica-tools, libaio, libiconv, libuuid, ncurses, openssl, perl -, python2Packages -# python2Packages.python , xz, yajl, zlib +, python3Packages # Xen Optional , ocamlPackages @@ -14,10 +13,10 @@ config: # Scripts , coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools , iproute2, inetutils, iptables, bridge-utils, openvswitch, nbd, drbd -, lvm2, util-linux, procps, systemd +, util-linux, procps, systemd # Documentation -# python2Packages.markdown +# python3Packages.markdown , fig2dev, ghostscript, texinfo, pandoc , binutils-unwrapped @@ -72,16 +71,16 @@ stdenv.mkDerivation (rec { # Xen bison bzip2 checkpolicy dev86 figlet flex gettext glib acpica-tools libaio - libiconv libuuid ncurses openssl perl python2Packages.python xz yajl zlib + libiconv libuuid ncurses openssl perl python3Packages.python xz yajl zlib # oxenstored ocamlPackages.findlib ocamlPackages.ocaml systemd # Python fixes - python2Packages.wrapPython + python3Packages.wrapPython # Documentation - python2Packages.markdown fig2dev ghostscript texinfo pandoc + python3Packages.markdown fig2dev ghostscript texinfo pandoc # Others ] ++ (concatMap (x: x.buildInputs or []) (attrValues config.xenfiles)) @@ -133,10 +132,6 @@ stdenv.mkDerivation (rec { ''; patches = [ - ./0000-fix-ipxe-src.patch - ./0000-fix-install-python.patch - ./0004-makefile-use-efi-ld.patch - ./0005-makefile-fix-efi-mountdir-use.patch ] ++ (config.patches or []); postPatch = '' @@ -156,10 +151,6 @@ stdenv.mkDerivation (rec { substituteInPlace tools/libfsimage/common/fsimage_plugin.c \ --replace /usr $out - substituteInPlace tools/blktap2/lvm/lvm-util.c \ - --replace /usr/sbin/vgs ${lvm2}/bin/vgs \ - --replace /usr/sbin/lvs ${lvm2}/bin/lvs - substituteInPlace tools/misc/xenpvnetboot \ --replace /usr/sbin/mount ${util-linux}/bin/mount \ --replace /usr/sbin/umount ${util-linux}/bin/umount @@ -167,9 +158,6 @@ stdenv.mkDerivation (rec { substituteInPlace tools/xenmon/xenmon.py \ --replace /usr/bin/pkill ${procps}/bin/pkill - substituteInPlace tools/xenstat/Makefile \ - --replace /usr/include/curses.h ${ncurses.dev}/include/curses.h - ${optionalString (builtins.compareVersions config.version "4.8" >= 0) '' substituteInPlace tools/hotplug/Linux/launch-xenstore.in \ --replace /bin/mkdir mkdir @@ -209,6 +197,10 @@ stdenv.mkDerivation (rec { makeFlags = [ "PREFIX=$(out) CONFIG_DIR=/etc" "XEN_SCRIPT_DIR=/etc/xen/scripts" ] ++ (config.makeFlags or []); + preBuild = '' + ${config.preBuild or ""} + ''; + buildFlags = [ "xen" "tools" ]; postBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/packages.nix b/third_party/nixpkgs/pkgs/applications/virtualization/xen/packages.nix index 5ff263dc8f..c55a719995 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/xen/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/xen/packages.nix @@ -6,7 +6,7 @@ # light] for each ./.nix. rec { - xen_4_10-vanilla = callPackage ./4.10.nix { + xen_4_15-vanilla = callPackage ./4.15.nix { meta = { description = "vanilla"; longDescription = '' @@ -19,7 +19,7 @@ rec { }; }; - xen_4_10-slim = xen_4_10-vanilla.override { + xen_4_15-slim = xen_4_15-vanilla.override { withInternalQemu = false; withInternalTraditionalQemu = true; withInternalSeabios = false; @@ -36,7 +36,7 @@ rec { }; }; - xen_4_10-light = xen_4_10-vanilla.override { + xen_4_15-light = xen_4_15-vanilla.override { withInternalQemu = false; withInternalTraditionalQemu = false; withInternalSeabios = false; @@ -52,8 +52,7 @@ rec { }; }; - xen-vanilla = xen_4_10-vanilla; - xen-slim = xen_4_10-slim; - xen-light = xen_4_10-light; - + xen-vanilla = xen_4_15-vanilla; + xen-slim = xen_4_15-slim; + xen-light = xen_4_15-light; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/xsa-patches.nix b/third_party/nixpkgs/pkgs/applications/virtualization/xen/xsa-patches.nix index b1d1d7783c..d789697a55 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/xen/xsa-patches.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/xen/xsa-patches.nix @@ -485,4 +485,9 @@ in { sha256 = "0lc94cx271z09r0mhxaypyd9d4740051p28idf5calx5228dqjgm"; }) ]; + + XSA_386 = (xsaPatch { + name = "386"; + sha256 = "sha256-pAuLgt3sDeL73NSDqZCWxRGZk1tWaYlDbh7cUcJ4s+w="; + }); } diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/gamescope/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/gamescope/default.nix index 7fdffc27f6..20a6a59e0c 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/gamescope/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/gamescope/default.nix @@ -1,11 +1,13 @@ { stdenv , fetchFromGitHub +, fetchpatch , meson , pkg-config , ninja , xorg , libdrm , vulkan-loader +, vulkan-headers , wayland , wayland-protocols , libxkbcommon @@ -18,15 +20,25 @@ , seatd , xwayland , glslang +, hwdata +, openvr , stb , wlroots , libliftoff +, libdisplay-info , lib , makeBinaryWrapper }: let pname = "gamescope"; - version = "3.11.49"; + version = "3.11.52-beta6"; + + vkroots = fetchFromGitHub { + owner = "Joshua-Ashton"; + repo = "vkroots"; + rev = "26757103dde8133bab432d172b8841df6bb48155"; + sha256 = "sha256-eet+FMRO2aBQJcCPOKNKGuQv5oDIrgdVPRO00c5gkL0="; + }; in stdenv.mkDerivation { inherit pname version; @@ -35,10 +47,37 @@ stdenv.mkDerivation { owner = "Plagman"; repo = "gamescope"; rev = "refs/tags/${version}"; - hash = "sha256-GRq/b013wFRHzFz2YCulJRtcwzX/dhJKd8dkATSLug0="; + hash = "sha256-2gn6VQfmwwl86mmnRh+J1uxSIpA5x/Papq578seJ3n8="; }; - patches = [ ./use-pkgconfig.patch ]; + patches = [ + ./use-pkgconfig.patch + + # https://github.com/Plagman/gamescope/pull/811 + (fetchpatch { + name = "fix-openvr-dependency-name.patch"; + url = "https://github.com/Plagman/gamescope/commit/557e56badec7d4c56263d3463ca9cdb195e368d7.patch"; + sha256 = "sha256-9Y1tJ24EsdtZEOCEA30+FJBrdzXX+Nj3nTb5kgcPfBE="; + }) + # https://github.com/Plagman/gamescope/pull/813 + (fetchpatch { + name = "fix-openvr-include.patch"; + url = "https://github.com/Plagman/gamescope/commit/1331b9f81ea4b3ae692a832ed85a464c3fd4c5e9.patch"; + sha256 = "sha256-wDtFpM/nMcqSbIpR7K5Tyf0845r3l4kQHfwll1VL4Mc="; + }) + # https://github.com/Plagman/gamescope/pull/812 + (fetchpatch { + name = "bump-libdisplay-info-maximum-version.patch"; + url = "https://github.com/Plagman/gamescope/commit/b430c5b9a05951755051fd4e41ce20496705fbbc.patch"; + sha256 = "sha256-YHtwudMUHiE8i3ZbiC9gkSjrlS0/7ydjmJsY1a8ZI2E="; + }) + # https://github.com/Plagman/gamescope/pull/824 + (fetchpatch { + name = "update-libdisplay-info-pkgconfig-filename.patch"; + url = "https://github.com/Plagman/gamescope/commit/5a672f09aa07c7c5d674789f3c685c8173e7a2cf.patch"; + sha256 = "sha256-7NX54WIsJDvZT3C58N2FQasV9PJyKkJrLGYS1r4f+kc="; + }) + ]; nativeBuildInputs = [ meson @@ -56,9 +95,11 @@ stdenv.mkDerivation { xorg.libXtst xorg.libXres xorg.libXi + xorg.libXmu libdrm libliftoff vulkan-loader + vulkan-headers glslang SDL2 wayland @@ -73,8 +114,17 @@ stdenv.mkDerivation { pipewire libcap stb + hwdata + openvr + vkroots + libdisplay-info ]; + postUnpack = '' + rm -rf source/subprojects/vkroots + ln -s ${vkroots} source/subprojects/vkroots + ''; + # --debug-layers flag expects these in the path postInstall = '' wrapProgram "$out/bin/gamescope" \ @@ -85,7 +135,7 @@ stdenv.mkDerivation { description = "SteamOS session compositing window manager"; homepage = "https://github.com/Plagman/gamescope"; license = licenses.bsd2; - maintainers = with maintainers; [ nrdxp zhaofengli ]; + maintainers = with maintainers; [ nrdxp pedrohlc Scrumplex zhaofengli ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix index f1d7c585c4..7bfe0f9927 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, libXrender, libXdmcp, libXfixes, freetype, asciidoc , xdotool, xorgserver, xsetroot, xterm, runtimeShell +, fetchpatch , nixosTests }: stdenv.mkDerivation rec { @@ -44,6 +45,12 @@ stdenv.mkDerivation rec { patches = [ ./test-path-environment.patch + # Adjust tests for compatibility with gcc 12 (https://github.com/herbstluftwm/herbstluftwm/issues/1512) + # Can be removed with the next release (>0.9.5). + (fetchpatch { + url = "https://github.com/herbstluftwm/herbstluftwm/commit/8678168c7a3307b1271e94974e062799e745ab40.patch"; + hash = "sha256-uI6ErfDitT2Tw0txx4lMSBn/jjiiyL4Qw6AJa/CTh1E="; + }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hypr/default.nix index 1450807c67..292894b47a 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hypr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hypr/default.nix @@ -20,28 +20,19 @@ , xmodmap }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (self: { pname = "hypr"; - version = "unstable-2022-05-25"; + version = "unstable-2023-01-26"; src = fetchFromGitHub { owner = "hyprwm"; repo = "Hypr"; - rev = "3e3d943c446ae77c289611a1a875c8dff8883c1e"; - hash = "sha256-lyaGGm53qxg7WVoFxZ7kerLe12P1N3JbN8nut6oZS50="; + rev = "af4641847b578b233a6f06806f575b3f320d74da"; + hash = "sha256-FUKR5nceEhm9GWa61hHO8+y4GBz7LYKXPB0OpQcQ674="; }; patches = [ ./000-dont-set-compiler.diff - # TODO: remove on next release - (fetchpatch { - url = "https://github.com/hyprwm/Hypr/commit/08d6af2caf882247943f0e8518ad782f35d1aba4.patch"; - sha256 = "sha256-WjR12ZH8CE+l9xSeQUAPYW5r5HzoPpod5YqDPJTdTY8="; - }) - (fetchpatch { - url = "https://github.com/hyprwm/Hypr/commit/7512a3ab91865b1e11b8c4a9dfdffb25c2b153de.patch"; - sha256 = "sha256-0Hq5n115z0U44op7A1FO9tUOeMEPV0QgD5E5zcmend0="; - }) ]; nativeBuildInputs = [ @@ -81,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - inherit (finalAttrs.src.meta) homepage; + inherit (self.src.meta) homepage; description = "A tiling X11 window manager written in modern C++"; license = licenses.bsd3; maintainers = with maintainers; [ AndersonTorres ]; 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 d36ac492f9..616045127d 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.22.0"; + version = "0.30.5"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-9Fp5k14QkV1CwLSL1nUUu6NYIpjfvI9vNJRYNqvyr3M="; + hash = "sha256-7Fjz6Q/f6jocMPAcgeodzdImILKuRmF6V0zo00ZPfjI="; }; - cargoSha256 = "sha256-MzosatZ4yPHAdANqOBPVW2wpjnojLo9B9N9o4DtU0Iw="; + cargoHash = "sha256-cHG3wUlk0AotfrQ8pYZNQDualhKSp6aNpY2mbjgnqzU="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/nimdow/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/nimdow/default.nix new file mode 100644 index 0000000000..0887a9b33d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/nimdow/default.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitHub, nimPackages, libX11, libXft, libXinerama }: +nimPackages.buildNimPackage rec { + pname = "nimdow"; + version = "0.7.36"; + + + src = fetchFromGitHub { + owner = "avahe-kellenberger"; + repo = pname; + rev = "v${version}"; + hash = "sha256-+36wxKgboOd3HvGnD555WySzJWGL39DaFXmIaFYtSN8="; + }; + + + buildInputs = with nimPackages; [ parsetoml x11 safeset libX11 libXft libXinerama ]; + + postInstall = '' + install -D config.default.toml $out/share/nimdow/config.default.toml + install -D nimdow.desktop $out/share/applications/nimdow.desktop + ''; + + postPatch = '' + substituteInPlace src/nimdowpkg/config/configloader.nim --replace "/usr/share/nimdow" "$out/share/nimdow" + ''; + + + + doCheck = true; + + meta = with lib; + src.meta // { + description = "Nim based tiling window manager"; + license = [ licenses.gpl2 ]; + maintainers = [ maintainers.marcusramberg ]; + }; +} 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 adb22269f0..a28c471332 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.23.0"; + version = "0.25.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-EMPqBKrtlwI9SJlqZjyAN5CtV4/BNwc5LapfeCEIYxc="; + sha256 = "sha256-ysAZdmkFEuqJDTPe246F2I4Qp+fjtomia42PS8BuMM8="; }; nativeBuildInputs = [ @@ -97,11 +97,6 @@ stdenv.mkDerivation rec { "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ]; - postPatch = '' - chmod +x build-aux/post_install.py - patchShebangs build-aux/post_install.py - ''; - checkPhase = '' runHook preCheck export NO_AT_BRIDGE=1 diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/waybox/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/waybox/default.nix index 4fab495441..cf85b9ea06 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/waybox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/waybox/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pkg-config , meson +, cmake , ninja , libxkbcommon , wayland @@ -12,29 +13,34 @@ , pixman , udev , libGL +, libxml2 , mesa }: stdenv.mkDerivation rec { pname = "waybox"; - version = "unstable-2021-04-07"; + version = "0.2.0"; src = fetchFromGitHub { owner = "wizbright"; repo = pname; - rev = "309ccd2faf08079e698104b19eff32b3a255b947"; - hash = "sha256-G32cGmOwmnuVlj1hCq9NRti6plJbkAktfzM4aYzQ+k8="; + rev = version; + hash = "sha256-G8dRa4hgev3x58uqp5To5OzF3zcPSuT3NL9MPnWf2M8="; }; nativeBuildInputs = [ pkg-config meson + cmake ninja wayland-scanner ]; + dontUseCmakeConfigure = true; + buildInputs = [ libxkbcommon + libxml2 wayland wayland-protocols wlroots @@ -44,6 +50,8 @@ stdenv.mkDerivation rec { mesa # for libEGL ]; + passthru.providedSessions = [ "waybox" ]; + meta = with lib; { homepage = "https://github.com/wizbright/waybox"; description = "An openbox clone on Wayland"; 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 9886fc97af..49a18187d7 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix @@ -6,6 +6,7 @@ , pipewire ? null, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null , libva ? null, libwebp ? null, xwayland ? null # beware of null defaults, as the parameters *are* supplied by callPackage by default +, buildDemo ? false }: stdenv.mkDerivation rec { @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { "-Dremoting=false" # TODO "-Dpipewire=${lib.boolToString (pipewire != null)}" "-Dimage-webp=${lib.boolToString (libwebp != null)}" - "-Ddemo-clients=false" + (lib.mesonBool "demo-clients" buildDemo) "-Dsimple-clients=" "-Dtest-junit-xml=false" # TODO: diff --git a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix index 6e33f6189a..00375db220 100644 --- a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix @@ -25,7 +25,9 @@ , nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" , propagateDoc ? bintools != null && bintools ? man , extraPackages ? [], extraBuildCommands ? "" -, isGNU ? bintools.isGNU or false, isLLVM ? bintools.isLLVM or false +, isGNU ? bintools.isGNU or false +, isLLVM ? bintools.isLLVM or false +, isCCTools ? bintools.isCCTools or false , buildPackages ? {} , targetPackages ? {} , useMacosReexportHack ? false @@ -139,6 +141,7 @@ stdenv.mkDerivation { local dst="$1" local wrapper="$2" export prog="$3" + export use_response_file_by_default=${if isCCTools then "1" else "0"} substituteAll "$wrapper" "$out/bin/$dst" chmod +x "$out/bin/$dst" } @@ -183,7 +186,9 @@ stdenv.mkDerivation { done '' + (if !useMacosReexportHack then '' - wrap ${targetPrefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${targetPrefix}ld} + if [ -e ''${ld:-$ldPath/${targetPrefix}ld} ]; then + wrap ${targetPrefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${targetPrefix}ld} + fi '' else '' ldInner="${targetPrefix}ld-reexport-delegate" wrap "$ldInner" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${targetPrefix}ld} @@ -191,10 +196,9 @@ stdenv.mkDerivation { unset ldInner '') + '' - for variant in ld.gold ld.bfd ld.lld; do - local underlying=$ldPath/${targetPrefix}$variant - [[ -e "$underlying" ]] || continue - wrap ${targetPrefix}$variant ${./ld-wrapper.sh} $underlying + for variant in $ldPath/${targetPrefix}ld.*; do + basename=$(basename "$variant") + wrap $basename ${./ld-wrapper.sh} $variant done ''; diff --git a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index 86a7416022..0d832bc4a6 100644 --- a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -232,8 +232,11 @@ fi # Only add --build-id if this is a final link. FIXME: should build gcc # with --enable-linker-build-id instead? +# +# Note: `lld` interprets `--build-id` to mean `--build-id=fast`; GNU ld defaults +# to SHA1. if [ "$NIX_SET_BUILD_ID_@suffixSalt@" = 1 ] && ! (( "$relocatable" )); then - extraAfter+=(--build-id) + extraAfter+=(--build-id="${NIX_BUILD_ID_STYLE:-sha1}") fi @@ -250,10 +253,18 @@ fi PATH="$path_backup" # Old bash workaround, see above. -@prog@ \ - ${extraBefore+"${extraBefore[@]}"} \ - ${params+"${params[@]}"} \ - ${extraAfter+"${extraAfter[@]}"} + +if (( "${NIX_LD_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then + @prog@ @<(printf "%q\n" \ + ${extraBefore+"${extraBefore[@]}"} \ + ${params+"${params[@]}"} \ + ${extraAfter+"${extraAfter[@]}"}) +else + @prog@ \ + ${extraBefore+"${extraBefore[@]}"} \ + ${params+"${params[@]}"} \ + ${extraAfter+"${extraAfter[@]}"} +fi if [ -e "@out@/nix-support/post-link-hook" ]; then source @out@/nix-support/post-link-hook diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/add-hardening.sh b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/add-hardening.sh index b23fda1fed..b1aa01355b 100644 --- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -12,8 +12,17 @@ done # Remove unsupported flags. for flag in @hardening_unsupported_flags@; do unset -v "hardeningEnableMap[$flag]" + # fortify being unsupported implies fortify3 is unsupported + if [[ "$flag" = 'fortify' ]] ; then + unset -v "hardeningEnableMap['fortify3']" + fi done +# make fortify and fortify3 mutually exclusive +if [[ -n "${hardeningEnableMap[fortify3]-}" ]]; then + unset -v "hardeningEnableMap['fortify']" +fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then declare -a allHardeningFlags=(fortify stackprotector pie pic strictoverflow format) declare -A hardeningDisableMap=() @@ -36,11 +45,23 @@ fi for flag in "${!hardeningEnableMap[@]}"; do case $flag in - fortify) - if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling fortify >&2; fi + fortify | fortify3) # Use -U_FORTIFY_SOURCE to avoid warnings on toolchains that explicitly # set -D_FORTIFY_SOURCE=0 (like 'clang -fsanitize=address'). - hardeningCFlags+=('-O2' '-U_FORTIFY_SOURCE' '-D_FORTIFY_SOURCE=2') + hardeningCFlags+=('-O2' '-U_FORTIFY_SOURCE') + case $flag in + fortify) + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling fortify >&2; fi + hardeningCFlags+=('-D_FORTIFY_SOURCE=2') + ;; + fortify3) + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling fortify3 >&2; fi + hardeningCFlags+=('-D_FORTIFY_SOURCE=3') + ;; + *) + # Ignore unsupported. + ;; + esac ;; stackprotector) if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackprotector >&2; fi diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix index 6520c04f5e..96fd8b66bb 100644 --- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix @@ -9,7 +9,6 @@ , lib , stdenvNoCC , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell -, gccForLibs ? null , zlib ? null , nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" , propagateDoc ? cc != null && cc ? man @@ -18,6 +17,9 @@ , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null , buildPackages ? {} , libcxx ? null +, gccForLibs ? if useCcForLibs then cc else null +# same as `gccForLibs`, but generalized beyond clang +, useCcForLibs ? isClang }: with lib; @@ -61,7 +63,7 @@ let expand-response-params = lib.optionalString ((buildPackages.stdenv.hasCC or false) && buildPackages.stdenv.cc != "/dev/null") (import ../expand-response-params { inherit (buildPackages) stdenv; }); - useGccForLibs = isClang + useGccForLibs = useCcForLibs && libcxx == null && !stdenv.targetPlatform.isDarwin && !(stdenv.targetPlatform.useLLVM or false) diff --git a/third_party/nixpkgs/pkgs/build-support/docker/default.nix b/third_party/nixpkgs/pkgs/build-support/docker/default.nix index bdc93f3643..7fa5aeafc8 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/docker/default.nix @@ -229,6 +229,15 @@ rec { mount /dev/${vmTools.hd} disk cd disk + function dedup() { + declare -A seen + while read ln; do + if [[ -z "''${seen["$ln"]:-}" ]]; then + echo "$ln"; seen["$ln"]=1 + fi + done + } + if [[ -n "$fromImage" ]]; then echo "Unpacking base image..." mkdir image @@ -245,7 +254,8 @@ rec { parentID="$(cat "image/manifest.json" | jq -r '.[0].Config | rtrimstr(".json")')" fi - cat ./image/manifest.json | jq -r '.[0].Layers | .[]' > layer-list + # In case of repeated layers, unpack only the last occurrence of each + cat ./image/manifest.json | jq -r '.[0].Layers | .[]' | tac | dedup | tac > layer-list else touch layer-list fi diff --git a/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.nix b/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.nix index edbe3ed971..3f6a224fa6 100644 --- a/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.nix +++ b/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.nix @@ -42,6 +42,8 @@ let nativeComp = emacs.nativeComp or false; + treeSitter = emacs.treeSitter or false; + in packagesFun: # packages explicitly requested by the user @@ -109,6 +111,9 @@ runCommand ${optionalString nativeComp '' mkdir -p $out/share/emacs/native-lisp ''} + ${optionalString treeSitter '' + mkdir -p $out/lib + ''} local requires for pkg in $explicitRequires; do @@ -133,6 +138,9 @@ runCommand ${optionalString nativeComp '' linkPath "$1" "share/emacs/native-lisp" "share/emacs/native-lisp" ''} + ${optionalString treeSitter '' + linkPath "$1" "lib" "lib" + ''} } # Iterate over the array of inputs (avoiding nix's own interpolation) @@ -164,6 +172,9 @@ runCommand ${optionalString nativeComp '' (add-to-list 'native-comp-eln-load-path "$out/share/emacs/native-lisp/") ''} + ${optionalString treeSitter '' + (add-to-list 'treesit-extra-load-path "$out/lib/") + ''} EOF # Generate a subdirs.el that statically adds all subdirectories to load-path. diff --git a/third_party/nixpkgs/pkgs/build-support/fetchdarcs/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchdarcs/builder.sh index ce5537f46f..75b9066dba 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchdarcs/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchdarcs/builder.sh @@ -3,11 +3,15 @@ source $stdenv/setup tagtext="" tagflags="" -if test -n "$rev"; then - tagtext="(tag $rev) " +# Darcs hashes are sha1 (120 bits, 40-character hex) +if [[ "$rev" =~ [a-fA-F0-9]{40} ]]; then + tagtext="(hash $rev)" + tagflags="--to-hash=$rev" +elif test -n "$rev"; then + tagtext="(tag $rev)" tagflags="--tag=$rev" elif test -n "$context"; then - tagtext="(context) " + tagtext="(context)" tagflags="--context=$context" fi diff --git a/third_party/nixpkgs/pkgs/build-support/fetchdarcs/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchdarcs/default.nix index 02777c9900..ae38edee4f 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchdarcs/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchdarcs/default.nix @@ -1,12 +1,17 @@ {stdenvNoCC, darcs, cacert}: -{url, rev ? null, context ? null, md5 ? "", sha256 ? ""}: +{ url +, rev ? null +, context ? null +, md5 ? "" +, sha256 ? "" +, name ? "fetchdarcs" +}: if md5 != "" then throw "fetchdarcs does not support md5 anymore, please use sha256" else stdenvNoCC.mkDerivation { - name = "fetchdarcs"; builder = ./builder.sh; nativeBuildInputs = [cacert darcs]; @@ -14,5 +19,5 @@ stdenvNoCC.mkDerivation { outputHashMode = "recursive"; outputHash = sha256; - inherit url rev context; + inherit url rev context name; } diff --git a/third_party/nixpkgs/pkgs/build-support/fetchpatch/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchpatch/default.nix index d059715ced..a3ca668514 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchpatch/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchpatch/default.nix @@ -8,6 +8,7 @@ { relative ? null , stripLen ? 0 +, decode ? "cat" # custom command to decode patch e.g. base64 -d , extraPrefix ? null , excludes ? [] , includes ? [] @@ -36,6 +37,17 @@ fetchurl ({ exit 1 fi + set +e + ${decode} < "$out" > "$tmpfile" + if [ $? -ne 0 ] || [ ! -s "$tmpfile" ]; then + echo 'Failed to decode patch with command "'${lib.escapeShellArg decode}'"' >&2 + echo 'Fetched file was (limited to 128 bytes):' >&2 + od -A x -t x1z -v -N 128 "$out" >&2 + exit 1 + fi + set -e + mv "$tmpfile" "$out" + "${patchutils}/bin/lsdiff" \ ${lib.optionalString (relative != null) "-p1 -i ${lib.escapeShellArg relative}/'*'"} \ "$out" \ @@ -76,5 +88,6 @@ fetchurl ({ mv "$tmpfile" "$out" '' + postFetch; } // builtins.removeAttrs args [ - "relative" "stripLen" "extraPrefix" "excludes" "includes" "revert" "postFetch" + "relative" "stripLen" "decode" "extraPrefix" "excludes" "includes" "revert" + "postFetch" ]) diff --git a/third_party/nixpkgs/pkgs/build-support/fetchpatch/tests.nix b/third_party/nixpkgs/pkgs/build-support/fetchpatch/tests.nix index 38bbb8ba69..0a27f1bc70 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchpatch/tests.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchpatch/tests.nix @@ -25,4 +25,11 @@ in revert = true; sha256 = if isFetchpatch2 then "sha256-+UKmEbr2rIAweCav/hR/7d4ZrYV84ht/domTrHtm8sM=" else "sha256-+UKmEbr2rIAweCav/hR/7d4ZrYV84ht/domTrHtm8sM="; }; + + decode = testers.invalidateFetcherByDrvHash fetchpatch { + name = "gcc.patch"; + url = "https://chromium.googlesource.com/aosp/platform/external/libchrome/+/f37ae3b1a873d74182a2ac31d96742ead9c1f523^!?format=TEXT"; + decode = "base64 -d"; + sha256 = if isFetchpatch2 then "sha256-oMvPlmzE51ArI+EvFxONXkqmNee39106/O1ikG0Bdso=" else "sha256-SJHk8XrutqAyoIdORlhCpBCN626P+uzed7mjKz5eQYY="; + }; } diff --git a/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix b/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix index ce3b389b9c..81f1010e46 100644 --- a/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix +++ b/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix @@ -30,7 +30,10 @@ stdenv.mkDerivation ({ ''; installPhase = '' runHook preInstall - dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname} + dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname} \ + ${if lib.versionAtLeast Dune.version "2.9" + then "--docdir $out/share/doc --man $out/share/man" + else ""} runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix index 9ed88bb4f0..18dc38dc5a 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix @@ -278,7 +278,9 @@ crate_: lib.makeOverridable name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}"; version = crate.version; depsBuildBuild = [ pkgsBuildBuild.stdenv.cc ]; - nativeBuildInputs = [ rust stdenv.cc cargo jq ] ++ (crate.nativeBuildInputs or [ ]) ++ nativeBuildInputs_; + nativeBuildInputs = [ rust stdenv.cc cargo jq ] + ++ lib.optionals stdenv.buildPlatform.isDarwin [ libiconv ] + ++ (crate.nativeBuildInputs or [ ]) ++ nativeBuildInputs_; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ] ++ (crate.buildInputs or [ ]) ++ buildInputs_; dependencies = map lib.getLib dependencies_; buildDependencies = map lib.getLib buildDependencies_; diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix index 5ba166bae1..2c5d4ae100 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix @@ -24,7 +24,9 @@ , src ? null , srcs ? null +, preUnpack ? null , unpackPhase ? null +, postUnpack ? null , cargoPatches ? [] , patches ? [] , sourceRoot ? null @@ -68,7 +70,7 @@ let if cargoVendorDir != null then null else if cargoLock != null then importCargoLock cargoLock else fetchCargoTarball ({ - inherit src srcs sourceRoot unpackPhase cargoUpdateHook; + inherit src srcs sourceRoot preUnpack unpackPhase postUnpack cargoUpdateHook; name = cargoDepsName; patches = cargoPatches; } // lib.optionalAttrs (args ? cargoHash) { diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-setup-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-setup-hook.sh index 90a81d68b5..693c0b0875 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-setup-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-setup-hook.sh @@ -1,14 +1,18 @@ cargoSetupPostUnpackHook() { echo "Executing cargoSetupPostUnpackHook" - export NIX_LDFLAGS+=" @aarch64LinuxGccWorkaround@" - # Some cargo builds include build hooks that modify their own vendor # dependencies. This copies the vendor directory into the build tree and makes # it writable. If we're using a tarball, the unpackFile hook already handles # this for us automatically. if [ -z $cargoVendorDir ]; then - unpackFile "$cargoDeps" + if [ -d "$cargoDeps" ]; then + local dest=$(stripHash "$cargoDeps") + cp -Lr --reflink=auto -- "$cargoDeps" "$dest" + chmod -R +644 -- "$dest" + else + unpackFile "$cargoDeps" + fi export cargoDepsCopy="$(realpath "$(stripHash $cargoDeps)")" else cargoDepsCopy="$(realpath "$(pwd)/$sourceRoot/${cargoRoot:+$cargoRoot/}${cargoVendorDir}")" diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/hooks/default.nix index b403412010..168224e39b 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/default.nix @@ -108,9 +108,6 @@ in { host-config = true target-applies-to-host = true ''; - - # https://github.com/NixOS/nixpkgs/issues/201254 - aarch64LinuxGccWorkaround = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; }; } ./cargo-setup-hook.sh) {}; diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/patch-shebangs.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/patch-shebangs.sh index a26113abea..9a48440deb 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -62,15 +62,21 @@ patchShebangs() { fi if [[ "$oldPath" == *"/bin/env" ]]; then + if [[ $arg0 == "-S" ]]; then + arg0=${args%% *} + args=${args#* } + newPath="$(PATH="${!pathName}" command -v "env" || true)" + args="-S $(PATH="${!pathName}" command -v "$arg0" || true) $args" + # Check for unsupported 'env' functionality: - # - options: something starting with a '-' + # - options: something starting with a '-' besides '-S' # - environment variables: foo=bar - if [[ $arg0 == "-"* || $arg0 == *"="* ]]; then + elif [[ $arg0 == "-"* || $arg0 == *"="* ]]; then echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" >&2 exit 1 + else + newPath="$(PATH="${!pathName}" command -v "$arg0" || true)" fi - - newPath="$(PATH="${!pathName}" command -v "$arg0" || true)" else if [[ -z $oldPath ]]; then # If no interpreter is specified linux will use /bin/sh. Set diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/reproducible-builds.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/reproducible-builds.sh index 7b52f84df6..5e27ce8a25 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/reproducible-builds.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/reproducible-builds.sh @@ -3,7 +3,8 @@ # derivation and not easily collide with other builds. # We also truncate the hash so that it cannot cause reference cycles. NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE:-} -frandom-seed=$( - outbase="${out##*/}" + randSeed=${NIX_OUTPATH_USED_AS_RANDOM_SEED:-$out} + outbase="${randSeed##*/}" randomseed="${outbase:0:10}" echo $randomseed )" diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix b/third_party/nixpkgs/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix index 99633a3c7c..3c5199be31 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix @@ -17,6 +17,24 @@ makeSetupHook { propagatedBuildInputs = [ # We use the wrapProgram function. makeWrapper + ] ++ lib.optionals isGraphical [ + # TODO: remove this, packages should depend on GTK explicitly. + gtk3 + + librsvg + ]; + + # depsTargetTargetPropagated will essentially be buildInputs when wrapGAppsHook is placed into nativeBuildInputs + # the librsvg and gtk3 above should be removed but kept to not break anything that implicitly depended on its binaries + depsTargetTargetPropagated = assert (lib.assertMsg (!targetPackages ? raw) "wrapGAppsHook must be in nativeBuildInputs"); lib.optionals isGraphical [ + # librsvg provides a module for gdk-pixbuf to allow rendering + # SVG icons. Most icon themes are SVG-based and so are some + # graphics in GTK (e.g. cross for closing window in window title bar) + # so it is pretty much required for applications using GTK. + librsvg + + # TODO: remove this, packages should depend on GTK explicitly. + gtk3 ] ++ lib.optionals (!stdenv.isDarwin) [ # It is highly probable that a program will use GSettings, # at minimum through GTK file chooser dialogue. @@ -26,22 +44,6 @@ makeSetupHook { # Unfortunately, it also requires the user to have dconf # D-Bus service enabled globally (e.g. through a NixOS module). dconf.lib - - ] ++ lib.optionals isGraphical [ - # TODO: remove this, packages should depend on GTK explicitly. - gtk3 - - librsvg - ]; - - # depsTargetTargetPropagated will essentially be buildInputs when wrapGAppsHook is placed into nativeBuildInputs - # the librsvg above should be removed but kept to not break anything that implicitly depended on its binaries - depsTargetTargetPropagated = assert (lib.assertMsg (!targetPackages ? raw) "wrapGAppsHook must be in nativeBuildInputs"); lib.optionals isGraphical [ - # librsvg provides a module for gdk-pixbuf to allow rendering - # SVG icons. Most icon themes are SVG-based and so are some - # graphics in GTK (e.g. cross for closing window in window title bar) - # so it is pretty much required for applications using GTK. - librsvg ]; passthru = { tests = let @@ -56,6 +58,7 @@ makeSetupHook { src = sample-project; + strictDeps = true; nativeBuildInputs = [ wrapGAppsHook ]; installFlags = [ "bin-foo" "libexec-bar" ]; @@ -86,6 +89,8 @@ makeSetupHook { src = sample-project; + strictDeps = true; + installFlags = [ "typelib-Mahjong" ]; }; @@ -95,6 +100,7 @@ makeSetupHook { src = sample-project; + strictDeps = true; nativeBuildInputs = [ gobject-introspection wrapGAppsHook @@ -126,6 +132,8 @@ makeSetupHook { src = sample-project; + strictDeps = true; + makeFlags = [ "LIBDIR=${placeholder "lib"}/lib" ]; @@ -139,6 +147,7 @@ makeSetupHook { src = sample-project; + strictDeps = true; nativeBuildInputs = [ gobject-introspection wrapGAppsHook @@ -169,6 +178,7 @@ makeSetupHook { src = sample-project; + strictDeps = true; nativeBuildInputs = [ gobject-introspection wrapGAppsHook diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix index ce3dfc83e1..d8b4ae5dd9 100644 --- a/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck }: +{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck, haskell }: let inherit (lib) @@ -341,7 +341,9 @@ rec { if checkPhase == null then '' runHook preCheck ${stdenv.shellDryRun} "$target" - ${lib.getExe shellcheck} "$target" + # use shellcheck which does not include docs + # pandoc takes long to build and documentation isn't needed for in nixpkgs usage + ${lib.getExe (haskell.lib.compose.justStaticExecutables shellcheck.unwrapped)} "$target" runHook postCheck '' else checkPhase; diff --git a/third_party/nixpkgs/pkgs/build-support/writers/default.nix b/third_party/nixpkgs/pkgs/build-support/writers/default.nix index 88da1ca54a..ca0184beeb 100644 --- a/third_party/nixpkgs/pkgs/build-support/writers/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/writers/default.nix @@ -76,6 +76,11 @@ let passAsFile = [ "content" ]; } else { contentPath = content; + } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) { + # post-link-hook expects codesign_allocate to be in PATH + # https://github.com/NixOS/nixpkgs/issues/154203 + # https://github.com/NixOS/nixpkgs/issues/148189 + nativeBuildInputs = [ stdenv.cc.bintools ]; }) '' ${compileScript} ${lib.optionalString strip diff --git a/third_party/nixpkgs/pkgs/data/fonts/charis-sil/default.nix b/third_party/nixpkgs/pkgs/data/fonts/charis-sil/default.nix index 52c32fcc3d..b4880fd218 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/charis-sil/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/charis-sil/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "charis-sil"; - version = "6.101"; + version = "6.200"; src = fetchzip { url = "https://software.sil.org/downloads/r/charis/CharisSIL-${version}.zip"; - hash = "sha256-Rf5eKQVZw7zgTv6KkJUdNdd4sSJPdvjy/GDLusvlgzE="; + hash = "sha256-q451lec/l13Uanmr8K/C55Cr3avRvqQUkPK/ZZ1kgHo="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/fonts/monocraft/default.nix b/third_party/nixpkgs/pkgs/data/fonts/monocraft/default.nix index 427e9ea822..c1e4be656c 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/monocraft/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/monocraft/default.nix @@ -1,15 +1,25 @@ -{ stdenv, lib, fetchFromGitHub }: +{ stdenv, lib, fetchurl }: -stdenv.mkDerivation rec { - pname = "monocraft"; - version = "1.4"; - - src = fetchFromGitHub { - owner = "IdreesInc"; - repo = "Monocraft"; - rev = "v${version}"; - sha256 = "sha256-YF0uPCc+dajJtG6mh/JpoSr6GirAhif5L5sp6hFmKLE="; +let + version = "2.4"; + relArtifact = name: hash: fetchurl { + inherit name hash; + url = "https://github.com/IdreesInc/Monocraft/releases/download/v${version}/${name}"; }; +in +stdenv.mkDerivation { + pname = "monocraft"; + inherit version; + + srcs = [ + (relArtifact "Monocraft.otf" "sha256-PA1W+gOUStGw7cDmtEbG+B6M+sAYr8cft+Ckxj5LciU=") + (relArtifact "Monocraft.ttf" "sha256-S4j5v2bTJbhujT3Bt8daNN1YGYYP8zVPf9XXjuR64+o=") + (relArtifact "Monocraft-no-ligatures.ttf" "sha256-MuHfoP+dsXe+ODN4vWFIj50jwOxYyIiS0dd1tzVxHts=") + (relArtifact "Monocraft-nerd-fonts-patched.ttf" "sha256-QxMp8UwcRjWySNHWoNeX2sX9teZ4+tCFj+DG41azsXw=") + ]; + + sourceRoot = "."; + unpackCmd = ''cp "$curSrc" $(basename $curSrc)''; dontConfigure = true; dontBuild = true; @@ -17,6 +27,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall install -Dm644 -t $out/share/fonts/opentype *.otf + install -Dm644 -t $out/share/fonts/truetype *.ttf runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/data/fonts/mononoki/default.nix b/third_party/nixpkgs/pkgs/data/fonts/mononoki/default.nix index 7f7c287669..1b9ce45a05 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/mononoki/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/mononoki/default.nix @@ -2,19 +2,19 @@ stdenvNoCC.mkDerivation rec { pname = "mononoki"; - version = "1.3"; + version = "1.5"; src = fetchzip { url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip"; stripRoot = false; - hash = "sha256-bZYBRdmbQVs4i6UzMIHwJnoLWggX4CW8ZogNFYiX/9w="; + hash = "sha256-H5Iu7nSrB5UGlCSjTM3SLu+IjaAffk9TCm5OoOleKvw="; }; installPhase = '' runHook preInstall mkdir -p $out/share/fonts/mononoki - cp webfont/* $out/share/fonts/mononoki + cp * $out/share/fonts/mononoki runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/data/fonts/openmoji/default.nix b/third_party/nixpkgs/pkgs/data/fonts/openmoji/default.nix index 3a9b91deb2..c9722f60f2 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/openmoji/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/openmoji/default.nix @@ -63,6 +63,12 @@ in stdenv.mkDerivation rec { nodePackages.lodash ]; + postPatch = '' + # this is API change in glob >9 + substituteInPlace helpers/generate-font-glyphs.js \ + --replace "require('glob').sync" "require('glob').globSync" + ''; + buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix b/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix index b0e341cf88..a15e0d50ae 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "sarasa-gothic"; - version = "0.40.1"; + version = "0.40.3"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - hash = "sha256-cpgFOhmFSyJA2yhGCCud9jF3LEboiRKyfb3NPiRzJdQ="; + hash = "sha256-lhjsmsgFEXMX5byp50qRoHoX9nuKcsrAp6NGDdfXo3I="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/data/fonts/siji/default.nix b/third_party/nixpkgs/pkgs/data/fonts/siji/default.nix index e83c79cca5..4429729f7a 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/siji/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/siji/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, libfaketime, xorg }: stdenv.mkDerivation rec { - name = "siji-${version}"; + pname = "siji"; version = "2016-05-13"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix index 951cb96a18..0aff16a31f 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "23.02.28"; + version = "23.03.04"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-dSD5mjWH7ho+1LiZgzVjDkAIbj4XubC3ZKamyMokkds="; + sha256 = "sha256-2do/8NKO47zj3+V5+P79el41jy7q6aXdhYXVRRoVusI="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/misc/clash-geoip/default.nix b/third_party/nixpkgs/pkgs/data/misc/clash-geoip/default.nix index 7c28c82e86..e6d6cccf20 100644 --- a/third_party/nixpkgs/pkgs/data/misc/clash-geoip/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/clash-geoip/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "clash-geoip"; - version = "20230212"; + version = "20230312"; src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-Tnma6tpET4Vrm5G8KmLpsVnpD2JIKts56kZQsBIbRZ8="; + sha256 = "sha256-Y/glz6HUfjox9Mn+gPzA8+tUHqV/KkIInUn4SyajUiE="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json index 57ed980f0f..71c87c15ea 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": "1f7cec5b787f338430007a1176f686ddbd85cbc5", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/1f7cec5b787f338430007a1176f686ddbd85cbc5.tar.gz", - "sha256": "0ddnzb8l5gbpsar1pz2dq86xa1mv4840f9ppk5viwnzgyfiqzfv8", - "msg": "Update from Hackage at 2023-02-19T09:15:19Z" + "commit": "083bd4855df26eb1db1c38c31fdf79ccf67c2f13", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/083bd4855df26eb1db1c38c31fdf79ccf67c2f13.tar.gz", + "sha256": "0m0d33xd1zfpcdbyhq7akq73dpgwggi39l1wp99vpfgpi220ad5a", + "msg": "Update from Hackage at 2023-03-01T16:43:25Z" } diff --git a/third_party/nixpkgs/pkgs/data/misc/publicsuffix-list/default.nix b/third_party/nixpkgs/pkgs/data/misc/publicsuffix-list/default.nix index 02b0ba0b43..d5608036b5 100644 --- a/third_party/nixpkgs/pkgs/data/misc/publicsuffix-list/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/publicsuffix-list/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation { pname = "publicsuffix-list"; - version = "unstable-2021-09-03"; + version = "unstable-2023-02-16"; src = fetchFromGitHub { owner = "publicsuffix"; repo = "list"; - rev = "2533d032871e1ef1f410fc0754b848d4587c8021"; - hash = "sha256-moibTN9KovABcg+ubKUgMXg4b8sMrTVo6Itmiati/Vk="; + rev = "8ec4d3049fe139f92937b6137155c33b81dcaf18"; + hash = "sha256-wA8zk0iADFNP33veIf+Mfx22zdMzHsMNWEizMp1SnuA="; }; dontBuild = true; 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 4df61f1f41..adbbbb201e 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 = "20230227064844"; + version = "20230311145412"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-popSTy1BXKUhWtYePlERVqui+wiltyTaYk7071z08i8="; + hash = "sha256-dHXfj1f/wnv7W8e1jTclt7qaag5OzP4zCZflN8p0v3M="; }; vendorHash = "sha256-wqOpZ5MSWN3L+rVKdA2E/Zbwqb/KHwMKoGlSIPBKgv0="; 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 ab972e0ce9..a49cbe11d3 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 = "202303020053"; + version = "202303090050"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "c002daa9332a673ce2fabe61eb9c45dc6a54f3fa"; - sha256 = "sha256-Pfny59HitidyXgXaI/1V3UNdM18X0+vVCyKP4qkL1rY="; + rev = "e1cd759a93ff7e65cd8099ee628803a83ab8cae0"; + sha256 = "sha256-m6TYu6cT57MDOXXfI76ufGDWJYmxjtVZg5vSToM8btE="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-compressor/default.nix index d62c72ca0b..0a7c2e82d6 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-compressor/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-compressor/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "deepin-compressor"; - version = "5.12.9"; + version = "5.12.14"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-HJDtUvXUT94G4WqrK92UMmijnuC4ApkKHU3yE3rOKHQ="; + sha256 = "sha256-0F1LdoeGtIKOVepifwdNMohbEb9fakpQLiNHg5H9Nlw="; }; postPatch = '' @@ -58,6 +58,8 @@ stdenv.mkDerivation rec { "-DUSE_TEST=OFF" ]; + strictDeps = true; + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-draw/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-draw/default.nix index 2138d91096..c43cc77b51 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-draw/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-draw/default.nix @@ -2,25 +2,26 @@ , lib , fetchFromGitHub , fetchpatch -, dtkwidget -, qt5integration -, qt5platform-plugins , cmake , qttools , pkg-config , wrapQtAppsHook , qtbase +, qtsvg +, dtkwidget +, qt5integration +, qt5platform-plugins }: stdenv.mkDerivation rec { pname = "deepin-draw"; - version = "5.11.4"; + version = "5.11.7"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-49RQQ52HR5aqzeVEjGm9vQpTOxhY7I0X724x/Bboo90="; + sha256 = "sha256-oryh1b7/78Hp3JclN9vKvfcKRg58nsfGZQvBx6VyJBs"; }; patches = [ @@ -44,12 +45,16 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + qtbase + qtsvg dtkwidget qt5platform-plugins ]; cmakeFlags = [ "-DVERSION=${version}" ]; + strictDeps = true; + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/default.nix index f7ab5220b6..b72ae4b603 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/default.nix @@ -16,19 +16,18 @@ , libspectre , openjpeg , djvulibre -, gtest , qtbase }: stdenv.mkDerivation rec { pname = "deepin-reader"; - version = "5.10.28"; + version = "5.10.29"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-0jHhsxEjBbu3ktvjX1eKnkZDwzRk9MrUSJSdYeOvWtI="; + sha256 = "sha256-IpgmTmnrPWc9EFZVM+S2nFxdpPjbgXqEWUnK/O9FmUg="; }; patches = [ ./use-pkg-config.diff ]; @@ -56,7 +55,10 @@ stdenv.mkDerivation rec { libspectre djvulibre openjpeg - gtest + ]; + + qmakeFlags = [ + "DEFINES+=VERSION=${version}" ]; # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix index 657b69e6d9..91373b9598 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix @@ -8,6 +8,7 @@ , dde-qt-dbus-factory , cmake , qtbase +, qtsvg , qttools , qtx11extras , pkg-config @@ -21,13 +22,13 @@ stdenv.mkDerivation rec { pname = "deepin-terminal"; - version = "5.4.34"; + version = "5.9.40"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-CpI7dyQwrYOYzqVZ6aa+/OAUC3xRyY4ZwzH1mqURTfY="; + sha256 = "sha256-GtrbR59IUYNAOmioW5NYhDsPKBmK4uybyDjHsbelkE4="; }; patches = [ @@ -49,6 +50,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + qtbase + qtsvg dtkwidget qt5platform-plugins dde-qt-dbus-factory diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/gio-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/gio-qt/default.nix index 5c27afe7e4..d00b5ffabe 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/gio-qt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/gio-qt/default.nix @@ -26,12 +26,12 @@ stdenv.mkDerivation rec { cmake pkg-config wrapQtAppsHook - ] ++ lib.optional buildDocs [ doxygen qttools.dev ]; + ] ++ lib.optionals buildDocs [ doxygen qttools.dev ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DPROJECT_VERSION=${version}" - ] ++ lib.optional (!buildDocs) [ "-DBUILD_DOCS=OFF" ]; + ] ++ lib.optionals (!buildDocs) [ "-DBUILD_DOCS=OFF" ]; propagatedBuildInputs = [ glibmm ]; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix index 6ebe542398..1a1d866156 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { qmakeFlags = [ "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms" ] - ++ lib.optional (!waylandSupport) [ "CONFIG+=DISABLE_WAYLAND" ]; + ++ lib.optionals (!waylandSupport) [ "CONFIG+=DISABLE_WAYLAND" ]; meta = with lib; { description = "Qt platform plugins for DDE"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/accerciser/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/accerciser/default.nix index 7d4f5969d0..d21d1c2006 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/accerciser/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/accerciser/default.nix @@ -13,6 +13,7 @@ , gettext , libwnck , adwaita-icon-theme +, librsvg }: python3.pkgs.buildPythonApplication rec { @@ -41,6 +42,7 @@ python3.pkgs.buildPythonApplication rec { at-spi2-core gtk3 libwnck + librsvg ]; propagatedBuildInputs = with python3.pkgs; [ @@ -52,10 +54,6 @@ python3.pkgs.buildPythonApplication rec { xlib ]; - # Strict deps breaks accerciser - # and https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - passthru = { updateScript = gnome.updateScript { packageName = "accerciser"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/collisions.json b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/collisions.json index 808f6f3874..7b117086ad 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/collisions.json +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/collisions.json @@ -241,6 +241,10 @@ "workspace-indicator@gnome-shell-extensions.gcampax.github.com", "horizontal-workspace-indicator@tty2.io" ], + "persian-calendar": [ + "PersianCalendar@oxygenws.com", + "persian-calendar@iamrezamousavi.gmail.com" + ], "clipboard-indicator": [ "clipboard-indicator@tudmotu.com", "clipboard-indicator@Dieg0Js.github.io" diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionRenames.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionRenames.nix index 51ea513abc..faa0e1898f 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionRenames.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionRenames.nix @@ -12,6 +12,9 @@ "workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator"; "horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2"; + "PersianCalendar@oxygenws.com" = "persian-calendar"; + "persian-calendar@iamrezamousavi.gmail.com" = "persian-calendar-2"; + "clipboard-indicator@tudmotu.com" = "clipboard-indicator"; "clipboard-indicator@Dieg0Js.github.io" = "clipboard-indicator-2"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json index 377f38065d..664ed26b6c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json @@ -24,10 +24,10 @@ , {"uuid": "touchpad-indicator@orangeshirt", "name": "Touchpad Indicator", "pname": "touchpad-indicator", "description": "Automatically disable other pointing devices when an external mouse is plugged in.", "link": "https://extensions.gnome.org/extension/131/touchpad-indicator/", "shell_version_map": {"38": {"version": "37", "sha256": "19rjxnawwnxx30j1i91vkg39q9ky5h64lhvsiq08ngvfck590ghh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGlzYWJsZSBvdGhlciBwb2ludGluZyBkZXZpY2VzIHdoZW4gYW4gZXh0ZXJuYWwgbW91c2UgaXMgcGx1Z2dlZCBpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0b3VjaHBhZC1pbmRpY2F0b3IiLAogICJuYW1lIjogIlRvdWNocGFkIEluZGljYXRvciIsCiAgInJlcG9zaXRvcnkiOiAiaHR0cHM6Ly9naXRodWIuY29tL3VzZXI1MDEyNTQvVG91Y2hwYWRJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXNrbXJzaW5oL3RvdWNocGFkLWluZGljYXRvciIsCiAgInV1aWQiOiAidG91Y2hwYWQtaW5kaWNhdG9yQG9yYW5nZXNoaXJ0IiwKICAidmVyc2lvbiI6IDM3Cn0="}, "40": {"version": "37", "sha256": "19rjxnawwnxx30j1i91vkg39q9ky5h64lhvsiq08ngvfck590ghh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGlzYWJsZSBvdGhlciBwb2ludGluZyBkZXZpY2VzIHdoZW4gYW4gZXh0ZXJuYWwgbW91c2UgaXMgcGx1Z2dlZCBpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0b3VjaHBhZC1pbmRpY2F0b3IiLAogICJuYW1lIjogIlRvdWNocGFkIEluZGljYXRvciIsCiAgInJlcG9zaXRvcnkiOiAiaHR0cHM6Ly9naXRodWIuY29tL3VzZXI1MDEyNTQvVG91Y2hwYWRJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXNrbXJzaW5oL3RvdWNocGFkLWluZGljYXRvciIsCiAgInV1aWQiOiAidG91Y2hwYWQtaW5kaWNhdG9yQG9yYW5nZXNoaXJ0IiwKICAidmVyc2lvbiI6IDM3Cn0="}}} , {"uuid": "Fuzzy_Clock@dallagi", "name": "Fuzzy Clock", "pname": "fuzzy-clock", "description": "A human-readable clock for the gnome-shell panel", "link": "https://extensions.gnome.org/extension/202/fuzzy-clock/", "shell_version_map": {"38": {"version": "9", "sha256": "1cga3192balji63zmbbyixb4r53j48zhil4hnv57l3b25k4rmk0i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYWxsYWdpL2dub21lLXNoZWxsLWZ1enp5LWNsb2NrIiwKICAidXVpZCI6ICJGdXp6eV9DbG9ja0BkYWxsYWdpIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "PersianCalendar@oxygenws.com", "name": "Persian Calendar", "pname": "persian-calendar", "description": "Shows Persian date in the top panel.\n\nIt shows:\n1. Persian calendar\n2. It can show, today is a holiday or not!\n3. Show notification onDayChanged!\n4. Date converter between Persian, Gregorian and Lunar Hijri\n5. Events:\n5.1. Official solar events.\n5.2. Official lunar events.\n5.3. Official international events.\n5.4. Traditional Persian events.\n5.5. Persian personages.\n\nPlease “rate” here and “star” the project on GitHub.\nPlease open an issue on GitHub if you found something or have an idea!", "link": "https://extensions.gnome.org/extension/240/persian-calendar/", "shell_version_map": {"38": {"version": "73", "sha256": "0q2wvlyy95n1h6rhd3955a07a9zvnar2y2ncn7pkb7ib5h1zpvzc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEuIFBlcnNpYW4gY2FsZW5kYXJcbjIuIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy4gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC4gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LiBFdmVudHM6XG41LjEuIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUuMi4gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS4zLiBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUuNC4gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LjUuIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFx1MjAxY3JhdGVcdTIwMWQgaGVyZSBhbmQgXHUyMDFjc3Rhclx1MjAxZCB0aGUgcHJvamVjdCBvbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJPbWlkIE1vdHRhZ2hpIFJhZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29taWQvUGVyc2lhbi1DYWxlbmRhci1mb3ItR25vbWUtU2hlbGwiLAogICJ1dWlkIjogIlBlcnNpYW5DYWxlbmRhckBveHlnZW53cy5jb20iLAogICJ2ZXJzaW9uIjogNzMKfQ=="}, "40": {"version": "100", "sha256": "16rj52m661cjcpwcnivqiyrb64l5gh3cvgi1yb03dmm4vjmgacip", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEuIFBlcnNpYW4gY2FsZW5kYXJcbjIuIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy4gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC4gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LiBFdmVudHM6XG41LjEuIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUuMi4gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS4zLiBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUuNC4gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LjUuIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFx1MjAxY3JhdGVcdTIwMWQgaGVyZSBhbmQgXHUyMDFjc3Rhclx1MjAxZCB0aGUgcHJvamVjdCBvbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJPbWlkIE1vdHRhZ2hpIFJhZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJzaWFuLWNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29taWQvUGVyc2lhbi1DYWxlbmRhci1mb3ItR25vbWUtU2hlbGwiLAogICJ1dWlkIjogIlBlcnNpYW5DYWxlbmRhckBveHlnZW53cy5jb20iLAogICJ2ZXJzaW9uIjogMTAwCn0="}, "41": {"version": "100", "sha256": "16rj52m661cjcpwcnivqiyrb64l5gh3cvgi1yb03dmm4vjmgacip", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEuIFBlcnNpYW4gY2FsZW5kYXJcbjIuIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy4gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC4gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LiBFdmVudHM6XG41LjEuIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUuMi4gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS4zLiBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUuNC4gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LjUuIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFx1MjAxY3JhdGVcdTIwMWQgaGVyZSBhbmQgXHUyMDFjc3Rhclx1MjAxZCB0aGUgcHJvamVjdCBvbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJPbWlkIE1vdHRhZ2hpIFJhZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJzaWFuLWNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29taWQvUGVyc2lhbi1DYWxlbmRhci1mb3ItR25vbWUtU2hlbGwiLAogICJ1dWlkIjogIlBlcnNpYW5DYWxlbmRhckBveHlnZW53cy5jb20iLAogICJ2ZXJzaW9uIjogMTAwCn0="}, "42": {"version": "100", "sha256": "16rj52m661cjcpwcnivqiyrb64l5gh3cvgi1yb03dmm4vjmgacip", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEuIFBlcnNpYW4gY2FsZW5kYXJcbjIuIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy4gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC4gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LiBFdmVudHM6XG41LjEuIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUuMi4gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS4zLiBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUuNC4gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LjUuIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFx1MjAxY3JhdGVcdTIwMWQgaGVyZSBhbmQgXHUyMDFjc3Rhclx1MjAxZCB0aGUgcHJvamVjdCBvbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJPbWlkIE1vdHRhZ2hpIFJhZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJzaWFuLWNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29taWQvUGVyc2lhbi1DYWxlbmRhci1mb3ItR25vbWUtU2hlbGwiLAogICJ1dWlkIjogIlBlcnNpYW5DYWxlbmRhckBveHlnZW53cy5jb20iLAogICJ2ZXJzaW9uIjogMTAwCn0="}, "43": {"version": "100", "sha256": "16rj52m661cjcpwcnivqiyrb64l5gh3cvgi1yb03dmm4vjmgacip", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEuIFBlcnNpYW4gY2FsZW5kYXJcbjIuIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy4gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC4gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LiBFdmVudHM6XG41LjEuIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUuMi4gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS4zLiBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUuNC4gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LjUuIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFx1MjAxY3JhdGVcdTIwMWQgaGVyZSBhbmQgXHUyMDFjc3Rhclx1MjAxZCB0aGUgcHJvamVjdCBvbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJPbWlkIE1vdHRhZ2hpIFJhZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJzaWFuLWNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29taWQvUGVyc2lhbi1DYWxlbmRhci1mb3ItR25vbWUtU2hlbGwiLAogICJ1dWlkIjogIlBlcnNpYW5DYWxlbmRhckBveHlnZW53cy5jb20iLAogICJ2ZXJzaW9uIjogMTAwCn0="}}} -, {"uuid": "kimpanel@kde.org", "name": "Input Method Panel", "pname": "kimpanel", "description": "Input Method Panel using KDE's kimpanel protocol for Gnome-Shell", "link": "https://extensions.gnome.org/extension/261/kimpanel/", "shell_version_map": {"38": {"version": "59", "sha256": "0rh2in9cm9khvmhhzyyw98z6bwvv95v59zcapkjpd7kbs38hqdw2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93ZW5neHQvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbXBhbmVsIiwKICAidXVpZCI6ICJraW1wYW5lbEBrZGUub3JnIiwKICAidmVyc2lvbiI6IDU5Cn0="}, "40": {"version": "71", "sha256": "13issxrjdkwlcwiy5ipiq2z9kcfikxyk4qbpn6n1y005cv3czyp4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2VuZ3h0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1raW1wYW5lbCIsCiAgInV1aWQiOiAia2ltcGFuZWxAa2RlLm9yZyIsCiAgInZlcnNpb24iOiA3MQp9"}, "41": {"version": "71", "sha256": "13issxrjdkwlcwiy5ipiq2z9kcfikxyk4qbpn6n1y005cv3czyp4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2VuZ3h0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1raW1wYW5lbCIsCiAgInV1aWQiOiAia2ltcGFuZWxAa2RlLm9yZyIsCiAgInZlcnNpb24iOiA3MQp9"}, "42": {"version": "71", "sha256": "13issxrjdkwlcwiy5ipiq2z9kcfikxyk4qbpn6n1y005cv3czyp4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2VuZ3h0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1raW1wYW5lbCIsCiAgInV1aWQiOiAia2ltcGFuZWxAa2RlLm9yZyIsCiAgInZlcnNpb24iOiA3MQp9"}, "43": {"version": "71", "sha256": "13issxrjdkwlcwiy5ipiq2z9kcfikxyk4qbpn6n1y005cv3czyp4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2VuZ3h0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1raW1wYW5lbCIsCiAgInV1aWQiOiAia2ltcGFuZWxAa2RlLm9yZyIsCiAgInZlcnNpb24iOiA3MQp9"}}} +, {"uuid": "kimpanel@kde.org", "name": "Input Method Panel", "pname": "kimpanel", "description": "Input Method Panel using KDE's kimpanel protocol for Gnome-Shell", "link": "https://extensions.gnome.org/extension/261/kimpanel/", "shell_version_map": {"38": {"version": "59", "sha256": "0rh2in9cm9khvmhhzyyw98z6bwvv95v59zcapkjpd7kbs38hqdw2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93ZW5neHQvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbXBhbmVsIiwKICAidXVpZCI6ICJraW1wYW5lbEBrZGUub3JnIiwKICAidmVyc2lvbiI6IDU5Cn0="}, "40": {"version": "72", "sha256": "0rrkxca287mviak2pgzfra9lmrf4y7ipz72jx3qdqh7h3wg56s3f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dlbmd4dC9nbm9tZS1zaGVsbC1leHRlbnNpb24ta2ltcGFuZWwiLAogICJ1dWlkIjogImtpbXBhbmVsQGtkZS5vcmciLAogICJ2ZXJzaW9uIjogNzIKfQ=="}, "41": {"version": "72", "sha256": "0rrkxca287mviak2pgzfra9lmrf4y7ipz72jx3qdqh7h3wg56s3f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dlbmd4dC9nbm9tZS1zaGVsbC1leHRlbnNpb24ta2ltcGFuZWwiLAogICJ1dWlkIjogImtpbXBhbmVsQGtkZS5vcmciLAogICJ2ZXJzaW9uIjogNzIKfQ=="}, "42": {"version": "72", "sha256": "0rrkxca287mviak2pgzfra9lmrf4y7ipz72jx3qdqh7h3wg56s3f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dlbmd4dC9nbm9tZS1zaGVsbC1leHRlbnNpb24ta2ltcGFuZWwiLAogICJ1dWlkIjogImtpbXBhbmVsQGtkZS5vcmciLAogICJ2ZXJzaW9uIjogNzIKfQ=="}, "43": {"version": "72", "sha256": "0rrkxca287mviak2pgzfra9lmrf4y7ipz72jx3qdqh7h3wg56s3f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dlbmd4dC9nbm9tZS1zaGVsbC1leHRlbnNpb24ta2ltcGFuZWwiLAogICJ1dWlkIjogImtpbXBhbmVsQGtkZS5vcmciLAogICJ2ZXJzaW9uIjogNzIKfQ=="}}} , {"uuid": "impatience@gfxmonk.net", "name": "Impatience", "pname": "impatience", "description": "Speed up the gnome-shell animation speed", "link": "https://extensions.gnome.org/extension/277/impatience/", "shell_version_map": {"40": {"version": "21", "sha256": "15r6d84ap8vc9why8dlval7wckwh0ijrwph3z5nqc9qb34ihkb37", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2Z4bW9uay5uZXQvZGlzdC8waW5zdGFsbC9nbm9tZS1zaGVsbC1pbXBhdGllbmNlLnhtbCIsCiAgInV1aWQiOiAiaW1wYXRpZW5jZUBnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAyMQp9"}, "41": {"version": "21", "sha256": "15r6d84ap8vc9why8dlval7wckwh0ijrwph3z5nqc9qb34ihkb37", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2Z4bW9uay5uZXQvZGlzdC8waW5zdGFsbC9nbm9tZS1zaGVsbC1pbXBhdGllbmNlLnhtbCIsCiAgInV1aWQiOiAiaW1wYXRpZW5jZUBnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAyMQp9"}, "42": {"version": "21", "sha256": "15r6d84ap8vc9why8dlval7wckwh0ijrwph3z5nqc9qb34ihkb37", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2Z4bW9uay5uZXQvZGlzdC8waW5zdGFsbC9nbm9tZS1zaGVsbC1pbXBhdGllbmNlLnhtbCIsCiAgInV1aWQiOiAiaW1wYXRpZW5jZUBnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAyMQp9"}, "43": {"version": "21", "sha256": "15r6d84ap8vc9why8dlval7wckwh0ijrwph3z5nqc9qb34ihkb37", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2Z4bW9uay5uZXQvZGlzdC8waW5zdGFsbC9nbm9tZS1zaGVsbC1pbXBhdGllbmNlLnhtbCIsCiAgInV1aWQiOiAiaW1wYXRpZW5jZUBnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAyMQp9"}}} , {"uuid": "windowoverlay-icons@sustmidown.centrum.cz", "name": "WindowOverlay Icons", "pname": "windowoverlay-icons", "description": "Add application icons to window overview", "link": "https://extensions.gnome.org/extension/302/windowoverlay-icons/", "shell_version_map": {"38": {"version": "37", "sha256": "108a5i5v62a9i61av5pib3b0hcpmb6pw3np7c29jfngs25n14wd3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhcHBsaWNhdGlvbiBpY29ucyB0byB3aW5kb3cgb3ZlcnZpZXciLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aW5kb3dvdmVybGF5LWljb25zIiwKICAibmFtZSI6ICJXaW5kb3dPdmVybGF5IEljb25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvd292ZXJsYXktaWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdXN0bWkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd292ZXJsYXktaWNvbnMiLAogICJ1dWlkIjogIndpbmRvd292ZXJsYXktaWNvbnNAc3VzdG1pZG93bi5jZW50cnVtLmN6IiwKICAidmVyc2lvbiI6IDM3Cn0="}}} -, {"uuid": "dash-to-dock@micxgx.gmail.com", "name": "Dash to Dock", "pname": "dash-to-dock", "description": "A dock for the Gnome Shell. This extension moves the dash out of the overview transforming it in a dock for an easier launching of applications and a faster switching between windows and desktops. Side and bottom placement options are available.", "link": "https://extensions.gnome.org/extension/307/dash-to-dock/", "shell_version_map": {"38": {"version": "69", "sha256": "1nmqg875lxbxn8plwgmsrkhq126hcv56yl6iyq5wc4ljp98niaw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbWljaGVsZWcuZ2l0aHViLmlvL2Rhc2gtdG8tZG9jay8iLAogICJ1dWlkIjogImRhc2gtdG8tZG9ja0BtaWN4Z3guZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDY5Cn0="}, "40": {"version": "78", "sha256": "1f1a4rz79nd7jmp0sj0g9v3lqqh67a0w8s3sb29nyh0dklwbm7pj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9taWNoZWxlZy5naXRodWIuaW8vZGFzaC10by1kb2NrLyIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrQG1pY3hneC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNzgKfQ=="}, "41": {"version": "78", "sha256": "1f1a4rz79nd7jmp0sj0g9v3lqqh67a0w8s3sb29nyh0dklwbm7pj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9taWNoZWxlZy5naXRodWIuaW8vZGFzaC10by1kb2NrLyIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrQG1pY3hneC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNzgKfQ=="}, "42": {"version": "78", "sha256": "1f1a4rz79nd7jmp0sj0g9v3lqqh67a0w8s3sb29nyh0dklwbm7pj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9taWNoZWxlZy5naXRodWIuaW8vZGFzaC10by1kb2NrLyIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrQG1pY3hneC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNzgKfQ=="}, "43": {"version": "78", "sha256": "1f1a4rz79nd7jmp0sj0g9v3lqqh67a0w8s3sb29nyh0dklwbm7pj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9taWNoZWxlZy5naXRodWIuaW8vZGFzaC10by1kb2NrLyIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrQG1pY3hneC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNzgKfQ=="}}} +, {"uuid": "dash-to-dock@micxgx.gmail.com", "name": "Dash to Dock", "pname": "dash-to-dock", "description": "A dock for the Gnome Shell. This extension moves the dash out of the overview transforming it in a dock for an easier launching of applications and a faster switching between windows and desktops. Side and bottom placement options are available.", "link": "https://extensions.gnome.org/extension/307/dash-to-dock/", "shell_version_map": {"38": {"version": "69", "sha256": "1nmqg875lxbxn8plwgmsrkhq126hcv56yl6iyq5wc4ljp98niaw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbWljaGVsZWcuZ2l0aHViLmlvL2Rhc2gtdG8tZG9jay8iLAogICJ1dWlkIjogImRhc2gtdG8tZG9ja0BtaWN4Z3guZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDY5Cn0="}, "40": {"version": "79", "sha256": "0bm7khxqrsrx6bdzi4kfjx57ygrv83mnk015aq2fsigsg48jszy3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9taWNoZWxlZy5naXRodWIuaW8vZGFzaC10by1kb2NrLyIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrQG1pY3hneC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNzkKfQ=="}, "41": {"version": "79", "sha256": "0bm7khxqrsrx6bdzi4kfjx57ygrv83mnk015aq2fsigsg48jszy3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9taWNoZWxlZy5naXRodWIuaW8vZGFzaC10by1kb2NrLyIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrQG1pY3hneC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNzkKfQ=="}, "42": {"version": "79", "sha256": "0bm7khxqrsrx6bdzi4kfjx57ygrv83mnk015aq2fsigsg48jszy3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9taWNoZWxlZy5naXRodWIuaW8vZGFzaC10by1kb2NrLyIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrQG1pY3hneC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNzkKfQ=="}, "43": {"version": "79", "sha256": "0bm7khxqrsrx6bdzi4kfjx57ygrv83mnk015aq2fsigsg48jszy3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9taWNoZWxlZy5naXRodWIuaW8vZGFzaC10by1kb2NrLyIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrQG1pY3hneC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNzkKfQ=="}}} , {"uuid": "mythtv-fnx@fnxweb.com", "name": "MythTV", "pname": "mythtv", "description": "Displays MythTV status (free space and upcoming recordings)", "link": "https://extensions.gnome.org/extension/321/mythtv/", "shell_version_map": {"38": {"version": "10", "sha256": "070h11gk5zpxn5xbc71skdz174hbb72l0isia2vp7d9wy4ackl0k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIE15dGhUViBzdGF0dXMgKGZyZWUgc3BhY2UgYW5kIHVwY29taW5nIHJlY29yZGluZ3MpIiwKICAibmFtZSI6ICJNeXRoVFYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mbnh3ZWIvZ25vbWUtc2hlbGwtbXl0aHR2IiwKICAidXVpZCI6ICJteXRodHYtZm54QGZueHdlYi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "13", "sha256": "1zacmlidmkf1jys1cvwpx4yqkjj6hp0bdpw83gnmg7rmgnyls39d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIE15dGhUViBzdGF0dXMgKGZyZWUgc3BhY2UgYW5kIHVwY29taW5nIHJlY29yZGluZ3MpIiwKICAibmFtZSI6ICJNeXRoVFYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZueHdlYi9nbm9tZS1zaGVsbC1teXRodHYiLAogICJ1dWlkIjogIm15dGh0di1mbnhAZm54d2ViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "42": {"version": "13", "sha256": "1zacmlidmkf1jys1cvwpx4yqkjj6hp0bdpw83gnmg7rmgnyls39d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIE15dGhUViBzdGF0dXMgKGZyZWUgc3BhY2UgYW5kIHVwY29taW5nIHJlY29yZGluZ3MpIiwKICAibmFtZSI6ICJNeXRoVFYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZueHdlYi9nbm9tZS1zaGVsbC1teXRodHYiLAogICJ1dWlkIjogIm15dGh0di1mbnhAZm54d2ViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}}} , {"uuid": "middleclickclose@paolo.tranquilli.gmail.com", "name": "Quick Close in Overview", "pname": "middle-click-to-close-in-overview", "description": "Close windows with a button click (the middle one by default) when in overview mode", "link": "https://extensions.gnome.org/extension/352/middle-click-to-close-in-overview/", "shell_version_map": {"38": {"version": "17", "sha256": "1nv6cjyiz1i7fddh21h0zmrvzfi3y70y1f0xsv2zd0rfg6rf0r77", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJRdWljayBDbG9zZSBpbiBPdmVydmlldyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiUGFvbG8gVHJhbnF1aWxsaSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3A5MXBhdWwvbWlkZGxlY2xpY2tjbG9zZSIsCiAgInV1aWQiOiAibWlkZGxlY2xpY2tjbG9zZUBwYW9sby50cmFucXVpbGxpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "40": {"version": "23", "sha256": "1zbnizandqdsakncs3q7p6ylagdf49v5wz658vx47mh4mzbmisfa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgImxvY2FsZSI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiUXVpY2sgQ2xvc2UgaW4gT3ZlcnZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIlBhb2xvIFRyYW5xdWlsbGkiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pZGRsZWNsaWNrY2xvc2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3A5MXBhdWwvbWlkZGxlY2xpY2tjbG9zZSIsCiAgInV1aWQiOiAibWlkZGxlY2xpY2tjbG9zZUBwYW9sby50cmFucXVpbGxpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "41": {"version": "23", "sha256": "1zbnizandqdsakncs3q7p6ylagdf49v5wz658vx47mh4mzbmisfa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgImxvY2FsZSI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiUXVpY2sgQ2xvc2UgaW4gT3ZlcnZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIlBhb2xvIFRyYW5xdWlsbGkiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pZGRsZWNsaWNrY2xvc2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3A5MXBhdWwvbWlkZGxlY2xpY2tjbG9zZSIsCiAgInV1aWQiOiAibWlkZGxlY2xpY2tjbG9zZUBwYW9sby50cmFucXVpbGxpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "42": {"version": "26", "sha256": "1wapknvsvwpbbrlm7v4i4vvnhrp3x7xp8fh312rzh3pvmil9vmb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgImxvY2FsZSI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiUXVpY2sgQ2xvc2UgaW4gT3ZlcnZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIlBhb2xvIFRyYW5xdWlsbGkiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pZGRsZWNsaWNrY2xvc2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3A5MXBhdWwvbWlkZGxlY2xpY2tjbG9zZSIsCiAgInV1aWQiOiAibWlkZGxlY2xpY2tjbG9zZUBwYW9sby50cmFucXVpbGxpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, "43": {"version": "26", "sha256": "1wapknvsvwpbbrlm7v4i4vvnhrp3x7xp8fh312rzh3pvmil9vmb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgImxvY2FsZSI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiUXVpY2sgQ2xvc2UgaW4gT3ZlcnZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIlBhb2xvIFRyYW5xdWlsbGkiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pZGRsZWNsaWNrY2xvc2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3A5MXBhdWwvbWlkZGxlY2xpY2tjbG9zZSIsCiAgInV1aWQiOiAibWlkZGxlY2xpY2tjbG9zZUBwYW9sby50cmFucXVpbGxpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}}} , {"uuid": "status-area-horizontal-spacing@mathematical.coffee.gmail.com", "name": "Status Area Horizontal Spacing", "pname": "status-area-horizontal-spacing", "description": "Reduce the horizontal spacing between icons in the top-right status area", "link": "https://extensions.gnome.org/extension/355/status-area-horizontal-spacing/", "shell_version_map": {"38": {"version": "16", "sha256": "05hhj10hlcpbgd9sbvq89vxzqj6ndf21syas8zidy6yfy613b6l3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjQiLAogICAgIjMuNiIsCiAgICAiMy44IiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "40": {"version": "21", "sha256": "1szpxz6ybvq76di2a6bkyv234v0afw2bn12xjcgdzpzvxzr9y3da", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "41": {"version": "21", "sha256": "1szpxz6ybvq76di2a6bkyv234v0afw2bn12xjcgdzpzvxzr9y3da", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "42": {"version": "23", "sha256": "00lypvnl99131qf76wcacrygrrg8alar0gsma8il3c6bvspqp76d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "43": {"version": "23", "sha256": "00lypvnl99131qf76wcacrygrrg8alar0gsma8il3c6bvspqp76d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}}} @@ -46,7 +46,7 @@ , {"uuid": "launch-new-instance@gnome-shell-extensions.gcampax.github.com", "name": "Launch new instance", "pname": "launch-new-instance", "description": "Always launch a new instance when clicking in the dash or the application view.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/600/launch-new-instance/", "shell_version_map": {"38": {"version": "29", "sha256": "0qb1ajjwm076zxsd314n7f5vl72ih7j4h9y84bqwb9cxa53mp4g4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJMYXVuY2ggbmV3IGluc3RhbmNlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsYXVuY2gtbmV3LWluc3RhbmNlQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}, "40": {"version": "31", "sha256": "0c667wdrpfd8bh2wygglzk1bp63z6xvknhj2rhw8v3vlmhpn8994", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJMYXVuY2ggbmV3IGluc3RhbmNlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAibGF1bmNoLW5ldy1pbnN0YW5jZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMQp9"}, "41": {"version": "33", "sha256": "1z2kjrqaziw5v5sig92kng302w3pdkkkcl7dlhwjqlgfhkhpdxlm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "42": {"version": "34", "sha256": "1vx1dbb8sq5ss3ilqah92nja6ivqnijywj2wkg29akz8ijbss19f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "43": {"version": "35", "sha256": "1i96p4jzi3yfkccbzv7r7x059xr834wispzg1n2888im51zz6x4h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}}} , {"uuid": "window-list@gnome-shell-extensions.gcampax.github.com", "name": "Window List", "pname": "window-list", "description": "Display a window list at the bottom of the screen.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/602/window-list/", "shell_version_map": {"38": {"version": "34", "sha256": "06jww5sv3a32plbvnl1xch10y19q807dx6zn6z5gwpvq8n0nvnx3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIldpbmRvdyBMaXN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvdy1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "40": {"version": "41", "sha256": "16vf0b3wqr5s6fqxqlz3ly28nkvsv3ygvfk1sqxgrpqnw823x8bl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDEKfQ=="}, "41": {"version": "42", "sha256": "1jhgnzlrpnbhqx4rkr9nf7yrwdbc9h6n46aindfpp7kdgv2spymi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}, "42": {"version": "46", "sha256": "12h8601f1hl4cfr3gh9pykibb9lh7l0v01s80cjz0lc72c64j9qz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDYKfQ=="}, "43": {"version": "47", "sha256": "1nzdl0zb8i7wipsnnrixkpj6rrsv3vz4c1snqspb23h494232wmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDcKfQ=="}}} , {"uuid": "MultiClock@mibus.org", "name": "MultiClock", "pname": "multiclock", "description": "A clock for showing a second timezone in the panel.", "link": "https://extensions.gnome.org/extension/605/multiclock/", "shell_version_map": {"40": {"version": "8", "sha256": "1pp1cnmpix668mrywpv6mkyb45lw7f6cwibjl6bc7cgb01hkzd53", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgY2xvY2sgZm9yIHNob3dpbmcgYSBzZWNvbmQgdGltZXpvbmUgaW4gdGhlIHBhbmVsLiIsCiAgIm5hbWUiOiAiTXVsdGlDbG9jayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5taWJ1c011bHRpQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWJ1cy9NdWx0aUNsb2NrIiwKICAidXVpZCI6ICJNdWx0aUNsb2NrQG1pYnVzLm9yZyIsCiAgInZlcnNpb24iOiA4Cn0="}}} -, {"uuid": "appindicatorsupport@rgcjonas.gmail.com", "name": "AppIndicator and KStatusNotifierItem Support", "pname": "appindicator-support", "description": "Adds AppIndicator, KStatusNotifierItem and legacy Tray icons support to the Shell", "link": "https://extensions.gnome.org/extension/615/appindicator-support/", "shell_version_map": {"38": {"version": "49", "sha256": "1zbcc35zpmkky7w44x04pq3b5mayjqqxm1aj294nijf0vjgzxms9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDkKfQ=="}, "40": {"version": "49", "sha256": "1zbcc35zpmkky7w44x04pq3b5mayjqqxm1aj294nijf0vjgzxms9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDkKfQ=="}, "41": {"version": "49", "sha256": "1zbcc35zpmkky7w44x04pq3b5mayjqqxm1aj294nijf0vjgzxms9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDkKfQ=="}, "42": {"version": "49", "sha256": "1zbcc35zpmkky7w44x04pq3b5mayjqqxm1aj294nijf0vjgzxms9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDkKfQ=="}, "43": {"version": "49", "sha256": "1zbcc35zpmkky7w44x04pq3b5mayjqqxm1aj294nijf0vjgzxms9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDkKfQ=="}}} +, {"uuid": "appindicatorsupport@rgcjonas.gmail.com", "name": "AppIndicator and KStatusNotifierItem Support", "pname": "appindicator-support", "description": "Adds AppIndicator, KStatusNotifierItem and legacy Tray icons support to the Shell", "link": "https://extensions.gnome.org/extension/615/appindicator-support/", "shell_version_map": {"38": {"version": "52", "sha256": "0big129cfbl4hl0f9yaxav3sy4wbqzdkvq2p8fzky9ixrf3s0m89", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTIKfQ=="}, "40": {"version": "52", "sha256": "0big129cfbl4hl0f9yaxav3sy4wbqzdkvq2p8fzky9ixrf3s0m89", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTIKfQ=="}, "41": {"version": "52", "sha256": "0big129cfbl4hl0f9yaxav3sy4wbqzdkvq2p8fzky9ixrf3s0m89", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTIKfQ=="}, "42": {"version": "52", "sha256": "0big129cfbl4hl0f9yaxav3sy4wbqzdkvq2p8fzky9ixrf3s0m89", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTIKfQ=="}, "43": {"version": "52", "sha256": "0big129cfbl4hl0f9yaxav3sy4wbqzdkvq2p8fzky9ixrf3s0m89", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTIKfQ=="}}} , {"uuid": "bitcoin-markets@ottoallmendinger.github.com", "name": "Bitcoin Markets", "pname": "bitcoin-markets", "description": "Display info on various crypto-currency exchanges.", "link": "https://extensions.gnome.org/extension/648/bitcoin-markets/", "shell_version_map": {"38": {"version": "57", "sha256": "1dbrkr49gi93nps610afvw2q68d1ialkhxsxd0waa8xgwjxwzyxd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjU3IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vT3R0b0FsbG1lbmRpbmdlci9nbm9tZS1zaGVsbC1iaXRjb2luLW1hcmtldHMvIiwKICAidXVpZCI6ICJiaXRjb2luLW1hcmtldHNAb3R0b2FsbG1lbmRpbmdlci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU3Cn0="}, "40": {"version": "65", "sha256": "10jg1ixk0zfb67licr807wf68bzsdiv9fb9j40xjg49li72c6hrf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY1IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLWJpdGNvaW4tbWFya2V0cy8iLAogICJ1dWlkIjogImJpdGNvaW4tbWFya2V0c0BvdHRvYWxsbWVuZGluZ2VyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjUKfQ=="}, "41": {"version": "65", "sha256": "10jg1ixk0zfb67licr807wf68bzsdiv9fb9j40xjg49li72c6hrf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY1IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLWJpdGNvaW4tbWFya2V0cy8iLAogICJ1dWlkIjogImJpdGNvaW4tbWFya2V0c0BvdHRvYWxsbWVuZGluZ2VyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjUKfQ=="}, "42": {"version": "66", "sha256": "0a1156n4ding1ypjnxm1xz5cqihrf5m2d4bf2zmci29nsjina9c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY2IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzLyIsCiAgInV1aWQiOiAiYml0Y29pbi1tYXJrZXRzQG90dG9hbGxtZW5kaW5nZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Ngp9"}, "43": {"version": "67", "sha256": "114kwp1q0qzkd03851mky1syxz8i5zgvazb53rh800wacb4wsh5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY3IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzLyIsCiAgInV1aWQiOiAiYml0Y29pbi1tYXJrZXRzQG90dG9hbGxtZW5kaW5nZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Nwp9"}}} , {"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": "69", "sha256": "1kpsqaq2fcj1z3jcbvgh23c8k6bv9l6vyl05kpw0fclzsmy60mh1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdGlsaW5nIHdpbmRvdyBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBKdXN0IG1vdmUgYSB3aW5kb3cgdG8gdGhlIGVkZ2VzIG9mIHRoZSBzY3JlZW4gdG8gY3JlYXRlIGEgdGlsaW5nLCBvdGhlcndpc2UgbW92ZSBhIHdpbmRvdyBvdmVyIGFub3RoZXIgb25lLCBob2xkaW5nIGRvd24gdGhlIENvbnRyb2wga2V5LiBHcm91cGVkIHdpbmRvd3MgbWluaW1pemUsIHJlc2l6ZSwgcmFpc2UgYW5kIGNoYW5nZSB3b3Jrc3BhY2UgdG9nZXRoZXIuIE1vdmUgb3IgbWF4aW1pemUgYSB3aW5kb3cgdG8gcmVtb3ZlIGl0IGZyb20gdGhlIGdyb3VwLiIsCiAgImdldHRleHQtZG9tYWluIjogInNoZWxsdGlsZSIsCiAgIm5hbWUiOiAiU2hlbGxUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNoZWxsdGlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy44IiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZW1hc2FiL3NoZWxsdGlsZSIsCiAgInV1aWQiOiAiU2hlbGxUaWxlQGVtYXNhYi5pdCIsCiAgInZlcnNpb24iOiA2OQp9"}}} , {"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": "30", "sha256": "0k8740vjail6ld8vgq3ilbkz2kzjfzwaaah8l3dzn5spvfsmgmb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDMwCn0="}, "41": {"version": "30", "sha256": "0k8740vjail6ld8vgq3ilbkz2kzjfzwaaah8l3dzn5spvfsmgmb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDMwCn0="}, "42": {"version": "30", "sha256": "0k8740vjail6ld8vgq3ilbkz2kzjfzwaaah8l3dzn5spvfsmgmb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDMwCn0="}, "43": {"version": "30", "sha256": "0k8740vjail6ld8vgq3ilbkz2kzjfzwaaah8l3dzn5spvfsmgmb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDMwCn0="}}} @@ -133,7 +133,7 @@ , {"uuid": "sensory-perception@HarlemSquirrel.github.io", "name": "Sensory Perception", "pname": "sensory-perception", "description": "Requires lm-sensors (or lm_sensors). Shows CPU temperature, disk temperature, video card temperature, voltage and fan RPM.", "link": "https://extensions.gnome.org/extension/1145/sensory-perception/", "shell_version_map": {"38": {"version": "13", "sha256": "16wc49khyk5arsis8kzpjgl6nl8gccc2y5sspq8rwnab22jnzwjh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcXVpcmVzIGxtLXNlbnNvcnMgKG9yIGxtX3NlbnNvcnMpLiBTaG93cyBDUFUgdGVtcGVyYXR1cmUsIGRpc2sgdGVtcGVyYXR1cmUsIHZpZGVvIGNhcmQgdGVtcGVyYXR1cmUsIHZvbHRhZ2UgYW5kIGZhbiBSUE0uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2Vuc29yeS1wZXJjZXB0aW9uIiwKICAibmFtZSI6ICJTZW5zb3J5IFBlcmNlcHRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2Vuc29yeS1wZXJjZXB0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGFybGVtU3F1aXJyZWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNlbnNvcnktcGVyY2VwdGlvbiIsCiAgInV1aWQiOiAic2Vuc29yeS1wZXJjZXB0aW9uQEhhcmxlbVNxdWlycmVsLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "18", "sha256": "0wlba8jkpvzirczc54jbapywds5icbsg97bjbzhc0qjiwbmicb96", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcXVpcmVzIGxtLXNlbnNvcnMgKG9yIGxtX3NlbnNvcnMpLiBTaG93cyBDUFUgdGVtcGVyYXR1cmUsIGRpc2sgdGVtcGVyYXR1cmUsIHZpZGVvIGNhcmQgdGVtcGVyYXR1cmUsIHZvbHRhZ2UgYW5kIGZhbiBSUE0uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2Vuc29yeS1wZXJjZXB0aW9uIiwKICAibmFtZSI6ICJTZW5zb3J5IFBlcmNlcHRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2Vuc29yeS1wZXJjZXB0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGFybGVtU3F1aXJyZWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNlbnNvcnktcGVyY2VwdGlvbiIsCiAgInV1aWQiOiAic2Vuc29yeS1wZXJjZXB0aW9uQEhhcmxlbVNxdWlycmVsLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxOAp9"}, "41": {"version": "18", "sha256": "0wlba8jkpvzirczc54jbapywds5icbsg97bjbzhc0qjiwbmicb96", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcXVpcmVzIGxtLXNlbnNvcnMgKG9yIGxtX3NlbnNvcnMpLiBTaG93cyBDUFUgdGVtcGVyYXR1cmUsIGRpc2sgdGVtcGVyYXR1cmUsIHZpZGVvIGNhcmQgdGVtcGVyYXR1cmUsIHZvbHRhZ2UgYW5kIGZhbiBSUE0uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2Vuc29yeS1wZXJjZXB0aW9uIiwKICAibmFtZSI6ICJTZW5zb3J5IFBlcmNlcHRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2Vuc29yeS1wZXJjZXB0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGFybGVtU3F1aXJyZWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNlbnNvcnktcGVyY2VwdGlvbiIsCiAgInV1aWQiOiAic2Vuc29yeS1wZXJjZXB0aW9uQEhhcmxlbVNxdWlycmVsLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxOAp9"}, "42": {"version": "18", "sha256": "0wlba8jkpvzirczc54jbapywds5icbsg97bjbzhc0qjiwbmicb96", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcXVpcmVzIGxtLXNlbnNvcnMgKG9yIGxtX3NlbnNvcnMpLiBTaG93cyBDUFUgdGVtcGVyYXR1cmUsIGRpc2sgdGVtcGVyYXR1cmUsIHZpZGVvIGNhcmQgdGVtcGVyYXR1cmUsIHZvbHRhZ2UgYW5kIGZhbiBSUE0uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2Vuc29yeS1wZXJjZXB0aW9uIiwKICAibmFtZSI6ICJTZW5zb3J5IFBlcmNlcHRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2Vuc29yeS1wZXJjZXB0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGFybGVtU3F1aXJyZWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNlbnNvcnktcGVyY2VwdGlvbiIsCiAgInV1aWQiOiAic2Vuc29yeS1wZXJjZXB0aW9uQEhhcmxlbVNxdWlycmVsLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxOAp9"}}} , {"uuid": "activityAppLauncher@rastersoft.com", "name": "Activity App Launcher", "pname": "activity-app-launcher", "description": "Integrates a category-based application launcher in the activities window. IMPORTANT: it needs the 'gnome-menus' and 'libgnome-menu-3-dev'; they must be installed in the system before installing this extension.", "link": "https://extensions.gnome.org/extension/1149/activity-app-launcher/", "shell_version_map": {"38": {"version": "31", "sha256": "18jqnk4psdvdx1hydfss1870v0gnpxkmsm5yasnb0m5m484in0qv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmFzdGVyc29mdC9hY3Rpdml0eUFwcExhdW5jaGVyIiwKICAidXVpZCI6ICJhY3Rpdml0eUFwcExhdW5jaGVyQHJhc3RlcnNvZnQuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}, "40": {"version": "35", "sha256": "1b1mr30kpn26hhhp871pybymk23w0s5zdn18zsp4lnvf2f618j25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvYWN0aXZpdHlBcHBMYXVuY2hlciIsCiAgInV1aWQiOiAiYWN0aXZpdHlBcHBMYXVuY2hlckByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}, "41": {"version": "35", "sha256": "1b1mr30kpn26hhhp871pybymk23w0s5zdn18zsp4lnvf2f618j25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvYWN0aXZpdHlBcHBMYXVuY2hlciIsCiAgInV1aWQiOiAiYWN0aXZpdHlBcHBMYXVuY2hlckByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}, "42": {"version": "35", "sha256": "1b1mr30kpn26hhhp871pybymk23w0s5zdn18zsp4lnvf2f618j25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvYWN0aXZpdHlBcHBMYXVuY2hlciIsCiAgInV1aWQiOiAiYWN0aXZpdHlBcHBMYXVuY2hlckByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}, "43": {"version": "35", "sha256": "1b1mr30kpn26hhhp871pybymk23w0s5zdn18zsp4lnvf2f618j25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvYWN0aXZpdHlBcHBMYXVuY2hlciIsCiAgInV1aWQiOiAiYWN0aXZpdHlBcHBMYXVuY2hlckByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}}} , {"uuid": "shutdown-timer-gnome-shell-extension", "name": "ShutdownTimer", "pname": "shutdowntimer", "description": "Allows to shutdown, restart and suspend computer after selected amount of time or in selected time.", "link": "https://extensions.gnome.org/extension/1152/shutdowntimer/", "shell_version_map": {"40": {"version": "9", "sha256": "1y69lv3mq66xxfxabngnbb104d26i05cyhmx3dqf4kyf1kd6jqvx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBzaHV0ZG93biwgcmVzdGFydCBhbmQgc3VzcGVuZCBjb21wdXRlciBhZnRlciBzZWxlY3RlZCBhbW91bnQgb2YgdGltZSBvciBpbiBzZWxlY3RlZCB0aW1lLiIsCiAgImdldHRleHQtZG9tYWluIjogIkF1dG9tYXRpY1NodXRkb3duVGltZXIiLAogICJuYW1lIjogIlNodXRkb3duVGltZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXV0b21hdGljLXNodXRkb3duLXRpbWVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21rcmFqbmFrL3NodXRkb3duLXRpbWVyLWdub21lLXNoZWxsLWV4dGVuc2lvbi8iLAogICJ1dWlkIjogInNodXRkb3duLXRpbWVyLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInZlcnNpb24iOiA5Cn0="}}} -, {"uuid": "dash-to-panel@jderose9.github.com", "name": "Dash to Panel", "pname": "dash-to-panel", "description": "An icon taskbar for the Gnome Shell. This extension moves the dash into the gnome main panel so that the application launchers and system tray are combined into a single panel, similar to that found in KDE Plasma and Windows 7+. A separate dock is no longer needed for easy access to running and favorited applications.\n\nFor a more traditional experience, you may also want to use Tweak Tool to enable Windows > Titlebar Buttons > Minimize & Maximize.\n\nFor the best support, please report any issues on Github. Dash-to-panel is developed and maintained by @jderose9 and @charlesg99.", "link": "https://extensions.gnome.org/extension/1160/dash-to-panel/", "shell_version_map": {"38": {"version": "42", "sha256": "1v9n4g9gx5kv21mb15i7b3k6svcv7jynw4zjfi2gh2pr7ii98b5z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJleHRlbnNpb24taWQiOiAiZGFzaC10by1wYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtdG8tcGFuZWwiLAogICJuYW1lIjogIkRhc2ggdG8gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ob21lLXN3ZWV0LWdub21lL2Rhc2gtdG8tcGFuZWwiLAogICJ1dWlkIjogImRhc2gtdG8tcGFuZWxAamRlcm9zZTkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Mgp9"}, "40": {"version": "44", "sha256": "0vdi0dznbawdavqr9j8w480av04r8m0k9czizzvk9bia33cqryi1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJleHRlbnNpb24taWQiOiAiZGFzaC10by1wYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtdG8tcGFuZWwiLAogICJuYW1lIjogIkRhc2ggdG8gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaG9tZS1zd2VldC1nbm9tZS9kYXNoLXRvLXBhbmVsIiwKICAidXVpZCI6ICJkYXNoLXRvLXBhbmVsQGpkZXJvc2U5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDQKfQ=="}, "41": {"version": "52", "sha256": "12z3hgxd8d15qz3529jzgv5slf7isa2f4krrn6c26gla5j6ryay4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJleHRlbnNpb24taWQiOiAiZGFzaC10by1wYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtdG8tcGFuZWwiLAogICJuYW1lIjogIkRhc2ggdG8gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ob21lLXN3ZWV0LWdub21lL2Rhc2gtdG8tcGFuZWwiLAogICJ1dWlkIjogImRhc2gtdG8tcGFuZWxAamRlcm9zZTkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}, "42": {"version": "52", "sha256": "12z3hgxd8d15qz3529jzgv5slf7isa2f4krrn6c26gla5j6ryay4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJleHRlbnNpb24taWQiOiAiZGFzaC10by1wYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtdG8tcGFuZWwiLAogICJuYW1lIjogIkRhc2ggdG8gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ob21lLXN3ZWV0LWdub21lL2Rhc2gtdG8tcGFuZWwiLAogICJ1dWlkIjogImRhc2gtdG8tcGFuZWxAamRlcm9zZTkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}, "43": {"version": "52", "sha256": "12z3hgxd8d15qz3529jzgv5slf7isa2f4krrn6c26gla5j6ryay4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJleHRlbnNpb24taWQiOiAiZGFzaC10by1wYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtdG8tcGFuZWwiLAogICJuYW1lIjogIkRhc2ggdG8gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ob21lLXN3ZWV0LWdub21lL2Rhc2gtdG8tcGFuZWwiLAogICJ1dWlkIjogImRhc2gtdG8tcGFuZWxAamRlcm9zZTkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}}} +, {"uuid": "dash-to-panel@jderose9.github.com", "name": "Dash to Panel", "pname": "dash-to-panel", "description": "An icon taskbar for the Gnome Shell. This extension moves the dash into the gnome main panel so that the application launchers and system tray are combined into a single panel, similar to that found in KDE Plasma and Windows 7+. A separate dock is no longer needed for easy access to running and favorited applications.\n\nFor a more traditional experience, you may also want to use Tweak Tool to enable Windows > Titlebar Buttons > Minimize & Maximize.\n\nFor the best support, please report any issues on Github. Dash-to-panel is developed and maintained by @jderose9 and @charlesg99.", "link": "https://extensions.gnome.org/extension/1160/dash-to-panel/", "shell_version_map": {"38": {"version": "42", "sha256": "1v9n4g9gx5kv21mb15i7b3k6svcv7jynw4zjfi2gh2pr7ii98b5z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJleHRlbnNpb24taWQiOiAiZGFzaC10by1wYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtdG8tcGFuZWwiLAogICJuYW1lIjogIkRhc2ggdG8gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ob21lLXN3ZWV0LWdub21lL2Rhc2gtdG8tcGFuZWwiLAogICJ1dWlkIjogImRhc2gtdG8tcGFuZWxAamRlcm9zZTkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Mgp9"}, "40": {"version": "44", "sha256": "0vdi0dznbawdavqr9j8w480av04r8m0k9czizzvk9bia33cqryi1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJleHRlbnNpb24taWQiOiAiZGFzaC10by1wYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtdG8tcGFuZWwiLAogICJuYW1lIjogIkRhc2ggdG8gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaG9tZS1zd2VldC1nbm9tZS9kYXNoLXRvLXBhbmVsIiwKICAidXVpZCI6ICJkYXNoLXRvLXBhbmVsQGpkZXJvc2U5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDQKfQ=="}, "41": {"version": "52", "sha256": "12z3hgxd8d15qz3529jzgv5slf7isa2f4krrn6c26gla5j6ryay4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJleHRlbnNpb24taWQiOiAiZGFzaC10by1wYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtdG8tcGFuZWwiLAogICJuYW1lIjogIkRhc2ggdG8gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ob21lLXN3ZWV0LWdub21lL2Rhc2gtdG8tcGFuZWwiLAogICJ1dWlkIjogImRhc2gtdG8tcGFuZWxAamRlcm9zZTkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}, "42": {"version": "54", "sha256": "0z34vjmicdx22k8714ps59a1xiqddyppvm45y87ah5xdnkc5ajjg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJleHRlbnNpb24taWQiOiAiZGFzaC10by1wYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtdG8tcGFuZWwiLAogICJuYW1lIjogIkRhc2ggdG8gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ob21lLXN3ZWV0LWdub21lL2Rhc2gtdG8tcGFuZWwiLAogICJ1dWlkIjogImRhc2gtdG8tcGFuZWxAamRlcm9zZTkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"}, "43": {"version": "54", "sha256": "0z34vjmicdx22k8714ps59a1xiqddyppvm45y87ah5xdnkc5ajjg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJleHRlbnNpb24taWQiOiAiZGFzaC10by1wYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtdG8tcGFuZWwiLAogICJuYW1lIjogIkRhc2ggdG8gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ob21lLXN3ZWV0LWdub21lL2Rhc2gtdG8tcGFuZWwiLAogICJ1dWlkIjogImRhc2gtdG8tcGFuZWxAamRlcm9zZTkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"}}} , {"uuid": "emoji-selector@maestroschan.fr", "name": "Emoji Selector", "pname": "emoji-selector", "description": "This extension provides a parametrable popup menu displaying most emojis, clicking on an emoji copies it to the clipboard. An appropriate font like 'Twitter Color Emoji' or 'JoyPixels Color' should be installed on your system for a better visual result.", "link": "https://extensions.gnome.org/extension/1162/emoji-selector/", "shell_version_map": {"38": {"version": "20", "sha256": "1i6py149m46xig5a0ry7y5v887nlzw644mw72gcr2hkfsn8b0gnd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGEgcGFyYW1ldHJhYmxlIHBvcHVwIG1lbnUgZGlzcGxheWluZyBtb3N0IGVtb2ppcywgY2xpY2tpbmcgb24gYW4gZW1vamkgY29waWVzIGl0IHRvIHRoZSBjbGlwYm9hcmQuIEFuIGFwcHJvcHJpYXRlIGZvbnQgbGlrZSAnVHdpdHRlciBDb2xvciBFbW9qaScgb3IgJ0pveVBpeGVscyBDb2xvcicgc2hvdWxkIGJlIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbSBmb3IgYSBiZXR0ZXIgdmlzdWFsIHJlc3VsdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1zZWxlY3RvciIsCiAgIm5hbWUiOiAiRW1vamkgU2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1vamktc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovZW1vamktc2VsZWN0b3ItZm9yLWdub21lIiwKICAidXVpZCI6ICJlbW9qaS1zZWxlY3RvckBtYWVzdHJvc2NoYW4uZnIiLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "40": {"version": "23", "sha256": "053l31j8ir3sba7577z5wqvcx7v53wl71g9dfpsbka29flz2m1hg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGEgcGFyYW1ldHJhYmxlIHBvcHVwIG1lbnUgZGlzcGxheWluZyBtb3N0IGVtb2ppcywgY2xpY2tpbmcgb24gYW4gZW1vamkgY29waWVzIGl0IHRvIHRoZSBjbGlwYm9hcmQuIEFuIGFwcHJvcHJpYXRlIGZvbnQgbGlrZSAnVHdpdHRlciBDb2xvciBFbW9qaScgb3IgJ0pveVBpeGVscyBDb2xvcicgc2hvdWxkIGJlIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbSBmb3IgYSBiZXR0ZXIgdmlzdWFsIHJlc3VsdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1zZWxlY3RvciIsCiAgIm5hbWUiOiAiRW1vamkgU2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1vamktc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFvc2NoYW56L2Vtb2ppLXNlbGVjdG9yLWZvci1nbm9tZSIsCiAgInV1aWQiOiAiZW1vamktc2VsZWN0b3JAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDIzCn0="}, "41": {"version": "23", "sha256": "053l31j8ir3sba7577z5wqvcx7v53wl71g9dfpsbka29flz2m1hg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGEgcGFyYW1ldHJhYmxlIHBvcHVwIG1lbnUgZGlzcGxheWluZyBtb3N0IGVtb2ppcywgY2xpY2tpbmcgb24gYW4gZW1vamkgY29waWVzIGl0IHRvIHRoZSBjbGlwYm9hcmQuIEFuIGFwcHJvcHJpYXRlIGZvbnQgbGlrZSAnVHdpdHRlciBDb2xvciBFbW9qaScgb3IgJ0pveVBpeGVscyBDb2xvcicgc2hvdWxkIGJlIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbSBmb3IgYSBiZXR0ZXIgdmlzdWFsIHJlc3VsdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1zZWxlY3RvciIsCiAgIm5hbWUiOiAiRW1vamkgU2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1vamktc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFvc2NoYW56L2Vtb2ppLXNlbGVjdG9yLWZvci1nbm9tZSIsCiAgInV1aWQiOiAiZW1vamktc2VsZWN0b3JAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDIzCn0="}, "42": {"version": "23", "sha256": "053l31j8ir3sba7577z5wqvcx7v53wl71g9dfpsbka29flz2m1hg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGEgcGFyYW1ldHJhYmxlIHBvcHVwIG1lbnUgZGlzcGxheWluZyBtb3N0IGVtb2ppcywgY2xpY2tpbmcgb24gYW4gZW1vamkgY29waWVzIGl0IHRvIHRoZSBjbGlwYm9hcmQuIEFuIGFwcHJvcHJpYXRlIGZvbnQgbGlrZSAnVHdpdHRlciBDb2xvciBFbW9qaScgb3IgJ0pveVBpeGVscyBDb2xvcicgc2hvdWxkIGJlIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbSBmb3IgYSBiZXR0ZXIgdmlzdWFsIHJlc3VsdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1zZWxlY3RvciIsCiAgIm5hbWUiOiAiRW1vamkgU2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1vamktc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFvc2NoYW56L2Vtb2ppLXNlbGVjdG9yLWZvci1nbm9tZSIsCiAgInV1aWQiOiAiZW1vamktc2VsZWN0b3JAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDIzCn0="}, "43": {"version": "23", "sha256": "053l31j8ir3sba7577z5wqvcx7v53wl71g9dfpsbka29flz2m1hg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGEgcGFyYW1ldHJhYmxlIHBvcHVwIG1lbnUgZGlzcGxheWluZyBtb3N0IGVtb2ppcywgY2xpY2tpbmcgb24gYW4gZW1vamkgY29waWVzIGl0IHRvIHRoZSBjbGlwYm9hcmQuIEFuIGFwcHJvcHJpYXRlIGZvbnQgbGlrZSAnVHdpdHRlciBDb2xvciBFbW9qaScgb3IgJ0pveVBpeGVscyBDb2xvcicgc2hvdWxkIGJlIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbSBmb3IgYSBiZXR0ZXIgdmlzdWFsIHJlc3VsdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1zZWxlY3RvciIsCiAgIm5hbWUiOiAiRW1vamkgU2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1vamktc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFvc2NoYW56L2Vtb2ppLXNlbGVjdG9yLWZvci1nbm9tZSIsCiAgInV1aWQiOiAiZW1vamktc2VsZWN0b3JAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDIzCn0="}}} , {"uuid": "gnome-kinit@bonzini.gnu.org", "name": "Kerberos login", "pname": "kerberos-login", "description": "Provide a system menu item to renew Kerberos tickets", "link": "https://extensions.gnome.org/extension/1165/kerberos-login/", "shell_version_map": {"40": {"version": "5", "sha256": "03drgiaxvnxh8sbng3f8aj54gpz73w2ls779zyz9rx3f877w6n9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBzeXN0ZW0gbWVudSBpdGVtIHRvIHJlbmV3IEtlcmJlcm9zIHRpY2tldHMiLAogICJuYW1lIjogIktlcmJlcm9zIGxvZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyLjIiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9ib256aW5pL2dub21lLWtpbml0IiwKICAidXVpZCI6ICJnbm9tZS1raW5pdEBib256aW5pLmdudS5vcmciLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "03drgiaxvnxh8sbng3f8aj54gpz73w2ls779zyz9rx3f877w6n9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBzeXN0ZW0gbWVudSBpdGVtIHRvIHJlbmV3IEtlcmJlcm9zIHRpY2tldHMiLAogICJuYW1lIjogIktlcmJlcm9zIGxvZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyLjIiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9ib256aW5pL2dub21lLWtpbml0IiwKICAidXVpZCI6ICJnbm9tZS1raW5pdEBib256aW5pLmdudS5vcmciLAogICJ2ZXJzaW9uIjogNQp9"}, "42": {"version": "7", "sha256": "0ykqd0yazwrrb93gq07mbb0jcyfpmj8imbk324iq1828zsvfld8z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBzeXN0ZW0gbWVudSBpdGVtIHRvIHJlbmV3IEtlcmJlcm9zIHRpY2tldHMiLAogICJuYW1lIjogIktlcmJlcm9zIGxvZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2JvbnppbmkvZ25vbWUta2luaXQiLAogICJ1dWlkIjogImdub21lLWtpbml0QGJvbnppbmkuZ251Lm9yZyIsCiAgInZlcnNpb24iOiA3Cn0="}, "43": {"version": "10", "sha256": "0810pljxcwxyyvxfy57fwk2n9jxv39llq07fdcc2wc3rqpbzc8gi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBzeXN0ZW0gbWVudSBpdGVtIHRvIHJlbmV3IEtlcmJlcm9zIHRpY2tldHMiLAogICJuYW1lIjogIktlcmJlcm9zIGxvZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2JvbnppbmkvZ25vbWUta2luaXQiLAogICJ1dWlkIjogImdub21lLWtpbml0QGJvbnppbmkuZ251Lm9yZyIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "calculator-button@amivaleo", "name": "Calculator Button", "pname": "calculator-button", "description": "A button to easily open gnome-calculator.\n Credits to extensions.gnome.org/extension/939/display-button/\n\nv10:\n1 - added support for gnome 3.38\n2 - added support for flatpak version of gnome-calculator", "link": "https://extensions.gnome.org/extension/1168/calculator-button/", "shell_version_map": {"38": {"version": "10", "sha256": "1c6b53im6xj4yaf4skvchvgipxfjs2yh3i5r75cw9avnw7imnwk6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYnV0dG9uIHRvIGVhc2lseSBvcGVuIGdub21lLWNhbGN1bGF0b3IuXG4gQ3JlZGl0cyB0byBleHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vOTM5L2Rpc3BsYXktYnV0dG9uL1xuXG52MTA6XG4xIC0gYWRkZWQgc3VwcG9ydCBmb3IgZ25vbWUgMy4zOFxuMiAtIGFkZGVkIHN1cHBvcnQgZm9yIGZsYXRwYWsgdmVyc2lvbiBvZiBnbm9tZS1jYWxjdWxhdG9yIiwKICAibmFtZSI6ICJDYWxjdWxhdG9yIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtaXZhbGVvL0NhbGN1bGF0b3ItQnV0dG9uIiwKICAidXVpZCI6ICJjYWxjdWxhdG9yLWJ1dHRvbkBhbWl2YWxlbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} @@ -197,7 +197,7 @@ , {"uuid": "transparent-window-moving@noobsai.github.com", "name": "Transparent Window Moving", "pname": "transparent-window-moving", "description": "Makes the window semi-transparent when moving or resizing", "link": "https://extensions.gnome.org/extension/1446/transparent-window-moving/", "shell_version_map": {"38": {"version": "6", "sha256": "0vllnrscjaqx77wb44803q6n3wk590dxacjfsw7ympbgqhikzc0p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS90cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "12", "sha256": "0h4f4abl3x1qrvwi6s12kclvg2sv1c697ayk2ps8yy2pq6ri62mf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvdHJhbnNwYXJlbnQtd2luZG93LW1vdmluZyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93LW1vdmluZ0Bub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "41": {"version": "12", "sha256": "0h4f4abl3x1qrvwi6s12kclvg2sv1c697ayk2ps8yy2pq6ri62mf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvdHJhbnNwYXJlbnQtd2luZG93LW1vdmluZyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93LW1vdmluZ0Bub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "42": {"version": "12", "sha256": "0h4f4abl3x1qrvwi6s12kclvg2sv1c697ayk2ps8yy2pq6ri62mf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvdHJhbnNwYXJlbnQtd2luZG93LW1vdmluZyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93LW1vdmluZ0Bub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "43": {"version": "12", "sha256": "0h4f4abl3x1qrvwi6s12kclvg2sv1c697ayk2ps8yy2pq6ri62mf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvdHJhbnNwYXJlbnQtd2luZG93LW1vdmluZyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93LW1vdmluZ0Bub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}}} , {"uuid": "transparent-window@pbxqdown.github.com", "name": "Transparent Window", "pname": "transparent-window", "description": "Change the opacity of windows by compiz-style shortcut Alt+scroll.\nYou can customize hotkey in Preference page if Alt key doesn't work.\n\nUse following modifer key code list to calculate hotkey code(E.g. Ctrl+Alt is 4 + 8 = 12):\nShift 1\n AltGr 2\n Control 4\n Alt 8\n ShiftL 16\n ShiftR 32\n CtrlL 64\n CtrlR 128\n CapsShift 256\nhttps://man7.org/linux/man-pages/man5/keymaps.5.html", "link": "https://extensions.gnome.org/extension/1454/transparent-window/", "shell_version_map": {"38": {"version": "12", "sha256": "0padnsq8if6kzws2sqi3yza2401pdxpzpsnrpydscrfl7xb91r5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay5cblxuVXNlIGZvbGxvd2luZyBtb2RpZmVyIGtleSBjb2RlIGxpc3QgdG8gY2FsY3VsYXRlIGhvdGtleSBjb2RlKEUuZy4gQ3RybCtBbHQgaXMgNCArIDggPSAxMik6XG5TaGlmdCAgICAgICAgICAgICAgICAgIDFcbiAgICAgICAgICAgICAgQWx0R3IgICAgICAgICAgICAgICAgICAyXG4gICAgICAgICAgICAgIENvbnRyb2wgICAgICAgICAgICAgICAgNFxuICAgICAgICAgICAgICBBbHQgICAgICAgICAgICAgICAgICAgIDhcbiAgICAgICAgICAgICAgU2hpZnRMICAgICAgICAgICAgICAgIDE2XG4gICAgICAgICAgICAgIFNoaWZ0UiAgICAgICAgICAgICAgICAzMlxuICAgICAgICAgICAgICBDdHJsTCAgICAgICAgICAgICAgICAgNjRcbiAgICAgICAgICAgICAgQ3RybFIgICAgICAgICAgICAgICAgMTI4XG4gICAgICAgICAgICAgIENhcHNTaGlmdCAgICAgICAgICAgIDI1NlxuaHR0cHM6Ly9tYW43Lm9yZy9saW51eC9tYW4tcGFnZXMvbWFuNS9rZXltYXBzLjUuaHRtbCIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlRyYW5zcGFyZW50V2luZG93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4LjEiLAogICAgIjMuMzYuMSIsCiAgICAiMy4zOC4xIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "40": {"version": "12", "sha256": "0padnsq8if6kzws2sqi3yza2401pdxpzpsnrpydscrfl7xb91r5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay5cblxuVXNlIGZvbGxvd2luZyBtb2RpZmVyIGtleSBjb2RlIGxpc3QgdG8gY2FsY3VsYXRlIGhvdGtleSBjb2RlKEUuZy4gQ3RybCtBbHQgaXMgNCArIDggPSAxMik6XG5TaGlmdCAgICAgICAgICAgICAgICAgIDFcbiAgICAgICAgICAgICAgQWx0R3IgICAgICAgICAgICAgICAgICAyXG4gICAgICAgICAgICAgIENvbnRyb2wgICAgICAgICAgICAgICAgNFxuICAgICAgICAgICAgICBBbHQgICAgICAgICAgICAgICAgICAgIDhcbiAgICAgICAgICAgICAgU2hpZnRMICAgICAgICAgICAgICAgIDE2XG4gICAgICAgICAgICAgIFNoaWZ0UiAgICAgICAgICAgICAgICAzMlxuICAgICAgICAgICAgICBDdHJsTCAgICAgICAgICAgICAgICAgNjRcbiAgICAgICAgICAgICAgQ3RybFIgICAgICAgICAgICAgICAgMTI4XG4gICAgICAgICAgICAgIENhcHNTaGlmdCAgICAgICAgICAgIDI1NlxuaHR0cHM6Ly9tYW43Lm9yZy9saW51eC9tYW4tcGFnZXMvbWFuNS9rZXltYXBzLjUuaHRtbCIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlRyYW5zcGFyZW50V2luZG93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4LjEiLAogICAgIjMuMzYuMSIsCiAgICAiMy4zOC4xIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "41": {"version": "12", "sha256": "0padnsq8if6kzws2sqi3yza2401pdxpzpsnrpydscrfl7xb91r5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay5cblxuVXNlIGZvbGxvd2luZyBtb2RpZmVyIGtleSBjb2RlIGxpc3QgdG8gY2FsY3VsYXRlIGhvdGtleSBjb2RlKEUuZy4gQ3RybCtBbHQgaXMgNCArIDggPSAxMik6XG5TaGlmdCAgICAgICAgICAgICAgICAgIDFcbiAgICAgICAgICAgICAgQWx0R3IgICAgICAgICAgICAgICAgICAyXG4gICAgICAgICAgICAgIENvbnRyb2wgICAgICAgICAgICAgICAgNFxuICAgICAgICAgICAgICBBbHQgICAgICAgICAgICAgICAgICAgIDhcbiAgICAgICAgICAgICAgU2hpZnRMICAgICAgICAgICAgICAgIDE2XG4gICAgICAgICAgICAgIFNoaWZ0UiAgICAgICAgICAgICAgICAzMlxuICAgICAgICAgICAgICBDdHJsTCAgICAgICAgICAgICAgICAgNjRcbiAgICAgICAgICAgICAgQ3RybFIgICAgICAgICAgICAgICAgMTI4XG4gICAgICAgICAgICAgIENhcHNTaGlmdCAgICAgICAgICAgIDI1NlxuaHR0cHM6Ly9tYW43Lm9yZy9saW51eC9tYW4tcGFnZXMvbWFuNS9rZXltYXBzLjUuaHRtbCIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlRyYW5zcGFyZW50V2luZG93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4LjEiLAogICAgIjMuMzYuMSIsCiAgICAiMy4zOC4xIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "42": {"version": "12", "sha256": "0padnsq8if6kzws2sqi3yza2401pdxpzpsnrpydscrfl7xb91r5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay5cblxuVXNlIGZvbGxvd2luZyBtb2RpZmVyIGtleSBjb2RlIGxpc3QgdG8gY2FsY3VsYXRlIGhvdGtleSBjb2RlKEUuZy4gQ3RybCtBbHQgaXMgNCArIDggPSAxMik6XG5TaGlmdCAgICAgICAgICAgICAgICAgIDFcbiAgICAgICAgICAgICAgQWx0R3IgICAgICAgICAgICAgICAgICAyXG4gICAgICAgICAgICAgIENvbnRyb2wgICAgICAgICAgICAgICAgNFxuICAgICAgICAgICAgICBBbHQgICAgICAgICAgICAgICAgICAgIDhcbiAgICAgICAgICAgICAgU2hpZnRMICAgICAgICAgICAgICAgIDE2XG4gICAgICAgICAgICAgIFNoaWZ0UiAgICAgICAgICAgICAgICAzMlxuICAgICAgICAgICAgICBDdHJsTCAgICAgICAgICAgICAgICAgNjRcbiAgICAgICAgICAgICAgQ3RybFIgICAgICAgICAgICAgICAgMTI4XG4gICAgICAgICAgICAgIENhcHNTaGlmdCAgICAgICAgICAgIDI1NlxuaHR0cHM6Ly9tYW43Lm9yZy9saW51eC9tYW4tcGFnZXMvbWFuNS9rZXltYXBzLjUuaHRtbCIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlRyYW5zcGFyZW50V2luZG93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4LjEiLAogICAgIjMuMzYuMSIsCiAgICAiMy4zOC4xIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "43": {"version": "12", "sha256": "0padnsq8if6kzws2sqi3yza2401pdxpzpsnrpydscrfl7xb91r5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay5cblxuVXNlIGZvbGxvd2luZyBtb2RpZmVyIGtleSBjb2RlIGxpc3QgdG8gY2FsY3VsYXRlIGhvdGtleSBjb2RlKEUuZy4gQ3RybCtBbHQgaXMgNCArIDggPSAxMik6XG5TaGlmdCAgICAgICAgICAgICAgICAgIDFcbiAgICAgICAgICAgICAgQWx0R3IgICAgICAgICAgICAgICAgICAyXG4gICAgICAgICAgICAgIENvbnRyb2wgICAgICAgICAgICAgICAgNFxuICAgICAgICAgICAgICBBbHQgICAgICAgICAgICAgICAgICAgIDhcbiAgICAgICAgICAgICAgU2hpZnRMICAgICAgICAgICAgICAgIDE2XG4gICAgICAgICAgICAgIFNoaWZ0UiAgICAgICAgICAgICAgICAzMlxuICAgICAgICAgICAgICBDdHJsTCAgICAgICAgICAgICAgICAgNjRcbiAgICAgICAgICAgICAgQ3RybFIgICAgICAgICAgICAgICAgMTI4XG4gICAgICAgICAgICAgIENhcHNTaGlmdCAgICAgICAgICAgIDI1NlxuaHR0cHM6Ly9tYW43Lm9yZy9saW51eC9tYW4tcGFnZXMvbWFuNS9rZXltYXBzLjUuaHRtbCIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlRyYW5zcGFyZW50V2luZG93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4LjEiLAogICAgIjMuMzYuMSIsCiAgICAiMy4zOC4xIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}}} , {"uuid": "miniview@thesecretaryofwar.com", "name": "Miniview", "pname": "miniview", "description": "Displays a mini window preview (like picture-in-picture on a TV):\n— Left-mouse drag: move preview window\n— Right-mouse drag (or ctrl + left mouse drag): resize preview window\n— Scroll wheel (or shift + click): change target window\n— Double click: raise target window\n— Shift + F12: toggle preview window (this can be changed or disabled in preferences)\n— Ctrl + scroll wheel: adjust opacity", "link": "https://extensions.gnome.org/extension/1459/miniview/", "shell_version_map": {"38": {"version": "13", "sha256": "09bkkqhah75pgx38a601pb65w44d9q8b2n24bxnvwc6bzh1rcbbv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbWluaSB3aW5kb3cgcHJldmlldyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVik6XG5cdTIwMTQgTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG5cdTIwMTQgUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuXHUyMDE0IFNjcm9sbCB3aGVlbCAob3Igc2hpZnQgKyBjbGljayk6IGNoYW5nZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgU2hpZnQgKyBGMTI6IHRvZ2dsZSBwcmV2aWV3IHdpbmRvdyAodGhpcyBjYW4gYmUgY2hhbmdlZCBvciBkaXNhYmxlZCBpbiBwcmVmZXJlbmNlcylcblx1MjAxNCBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWFtbGVtZWMvbWluaXZpZXciLAogICJ1dWlkIjogIm1pbml2aWV3QHRoZXNlY3JldGFyeW9md2FyLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "15", "sha256": "04r06w0yr4agzjhizmx9grvvymnlihk5idchzicyby55zvzma48l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbWluaSB3aW5kb3cgcHJldmlldyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVik6XG5cdTIwMTQgTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG5cdTIwMTQgUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuXHUyMDE0IFNjcm9sbCB3aGVlbCAob3Igc2hpZnQgKyBjbGljayk6IGNoYW5nZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgU2hpZnQgKyBGMTI6IHRvZ2dsZSBwcmV2aWV3IHdpbmRvdyAodGhpcyBjYW4gYmUgY2hhbmdlZCBvciBkaXNhYmxlZCBpbiBwcmVmZXJlbmNlcylcblx1MjAxNCBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lhbWxlbWVjL21pbml2aWV3IiwKICAidXVpZCI6ICJtaW5pdmlld0B0aGVzZWNyZXRhcnlvZndhci5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "41": {"version": "15", "sha256": "04r06w0yr4agzjhizmx9grvvymnlihk5idchzicyby55zvzma48l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbWluaSB3aW5kb3cgcHJldmlldyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVik6XG5cdTIwMTQgTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG5cdTIwMTQgUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuXHUyMDE0IFNjcm9sbCB3aGVlbCAob3Igc2hpZnQgKyBjbGljayk6IGNoYW5nZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgU2hpZnQgKyBGMTI6IHRvZ2dsZSBwcmV2aWV3IHdpbmRvdyAodGhpcyBjYW4gYmUgY2hhbmdlZCBvciBkaXNhYmxlZCBpbiBwcmVmZXJlbmNlcylcblx1MjAxNCBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lhbWxlbWVjL21pbml2aWV3IiwKICAidXVpZCI6ICJtaW5pdmlld0B0aGVzZWNyZXRhcnlvZndhci5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "42": {"version": "15", "sha256": "04r06w0yr4agzjhizmx9grvvymnlihk5idchzicyby55zvzma48l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbWluaSB3aW5kb3cgcHJldmlldyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVik6XG5cdTIwMTQgTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG5cdTIwMTQgUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuXHUyMDE0IFNjcm9sbCB3aGVlbCAob3Igc2hpZnQgKyBjbGljayk6IGNoYW5nZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgU2hpZnQgKyBGMTI6IHRvZ2dsZSBwcmV2aWV3IHdpbmRvdyAodGhpcyBjYW4gYmUgY2hhbmdlZCBvciBkaXNhYmxlZCBpbiBwcmVmZXJlbmNlcylcblx1MjAxNCBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lhbWxlbWVjL21pbml2aWV3IiwKICAidXVpZCI6ICJtaW5pdmlld0B0aGVzZWNyZXRhcnlvZndhci5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "43": {"version": "15", "sha256": "04r06w0yr4agzjhizmx9grvvymnlihk5idchzicyby55zvzma48l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbWluaSB3aW5kb3cgcHJldmlldyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVik6XG5cdTIwMTQgTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG5cdTIwMTQgUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuXHUyMDE0IFNjcm9sbCB3aGVlbCAob3Igc2hpZnQgKyBjbGljayk6IGNoYW5nZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgU2hpZnQgKyBGMTI6IHRvZ2dsZSBwcmV2aWV3IHdpbmRvdyAodGhpcyBjYW4gYmUgY2hhbmdlZCBvciBkaXNhYmxlZCBpbiBwcmVmZXJlbmNlcylcblx1MjAxNCBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lhbWxlbWVjL21pbml2aWV3IiwKICAidXVpZCI6ICJtaW5pdmlld0B0aGVzZWNyZXRhcnlvZndhci5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} -, {"uuid": "Vitals@CoreCoding.com", "name": "Vitals", "pname": "vitals", "description": "A glimpse into your computer's temperature, voltage, fan speed, memory usage, processor load, system resources, network speed and storage stats. This is a one stop shop to monitor all of your vital sensors. Uses asynchronous polling to provide a smooth user experience. Feature requests or bugs? Please use GitHub.", "link": "https://extensions.gnome.org/extension/1460/vitals/", "shell_version_map": {"38": {"version": "57", "sha256": "1q6h9pc1d31993v5knnb7c4224h6f7x1jida2xnwi0047nz5b8zn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="}, "40": {"version": "59", "sha256": "0ws5qdj8h9i2g2fa3dpzrawaabcx785qdwb58a9b7zmvr0k5a0ha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNTkKfQ=="}, "41": {"version": "59", "sha256": "0ws5qdj8h9i2g2fa3dpzrawaabcx785qdwb58a9b7zmvr0k5a0ha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNTkKfQ=="}, "42": {"version": "59", "sha256": "0ws5qdj8h9i2g2fa3dpzrawaabcx785qdwb58a9b7zmvr0k5a0ha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNTkKfQ=="}, "43": {"version": "59", "sha256": "0ws5qdj8h9i2g2fa3dpzrawaabcx785qdwb58a9b7zmvr0k5a0ha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNTkKfQ=="}}} +, {"uuid": "Vitals@CoreCoding.com", "name": "Vitals", "pname": "vitals", "description": "A glimpse into your computer's temperature, voltage, fan speed, memory usage, processor load, system resources, network speed and storage stats. This is a one stop shop to monitor all of your vital sensors. Uses asynchronous polling to provide a smooth user experience. Feature requests or bugs? Please use GitHub.", "link": "https://extensions.gnome.org/extension/1460/vitals/", "shell_version_map": {"38": {"version": "57", "sha256": "1q6h9pc1d31993v5knnb7c4224h6f7x1jida2xnwi0047nz5b8zn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="}, "40": {"version": "60", "sha256": "1jkzxpy5919873a76245ypf0g46mkfqwb8qc7sas457d3dmd9lbf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb3JlY29kaW5nL1ZpdGFscyIsCiAgInV1aWQiOiAiVml0YWxzQENvcmVDb2RpbmcuY29tIiwKICAidmVyc2lvbiI6IDYwCn0="}, "41": {"version": "60", "sha256": "1jkzxpy5919873a76245ypf0g46mkfqwb8qc7sas457d3dmd9lbf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb3JlY29kaW5nL1ZpdGFscyIsCiAgInV1aWQiOiAiVml0YWxzQENvcmVDb2RpbmcuY29tIiwKICAidmVyc2lvbiI6IDYwCn0="}, "42": {"version": "60", "sha256": "1jkzxpy5919873a76245ypf0g46mkfqwb8qc7sas457d3dmd9lbf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb3JlY29kaW5nL1ZpdGFscyIsCiAgInV1aWQiOiAiVml0YWxzQENvcmVDb2RpbmcuY29tIiwKICAidmVyc2lvbiI6IDYwCn0="}, "43": {"version": "60", "sha256": "1jkzxpy5919873a76245ypf0g46mkfqwb8qc7sas457d3dmd9lbf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb3JlY29kaW5nL1ZpdGFscyIsCiAgInV1aWQiOiAiVml0YWxzQENvcmVDb2RpbmcuY29tIiwKICAidmVyc2lvbiI6IDYwCn0="}}} , {"uuid": "panel-date-format@keiii.github.com", "name": "Panel Date Format", "pname": "panel-date-format", "description": "Allows to customize the date format on the panel.", "link": "https://extensions.gnome.org/extension/1462/panel-date-format/", "shell_version_map": {"40": {"version": "9", "sha256": "1g6jfb8pq1k88k5fvwavhb77nkkn8kgxy9y8f3kc26hyjwbfpn11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tFSUlJL2dub21lLXNoZWxsLXBhbmVsLWRhdGUtZm9ybWF0IiwKICAidXVpZCI6ICJwYW5lbC1kYXRlLWZvcm1hdEBrZWlpaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "1g6jfb8pq1k88k5fvwavhb77nkkn8kgxy9y8f3kc26hyjwbfpn11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tFSUlJL2dub21lLXNoZWxsLXBhbmVsLWRhdGUtZm9ybWF0IiwKICAidXVpZCI6ICJwYW5lbC1kYXRlLWZvcm1hdEBrZWlpaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "1g6jfb8pq1k88k5fvwavhb77nkkn8kgxy9y8f3kc26hyjwbfpn11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tFSUlJL2dub21lLXNoZWxsLXBhbmVsLWRhdGUtZm9ybWF0IiwKICAidXVpZCI6ICJwYW5lbC1kYXRlLWZvcm1hdEBrZWlpaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "43": {"version": "9", "sha256": "1g6jfb8pq1k88k5fvwavhb77nkkn8kgxy9y8f3kc26hyjwbfpn11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tFSUlJL2dub21lLXNoZWxsLXBhbmVsLWRhdGUtZm9ybWF0IiwKICAidXVpZCI6ICJwYW5lbC1kYXRlLWZvcm1hdEBrZWlpaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "desktop-icons@csoriano", "name": "Desktop Icons", "pname": "desktop-icons", "description": "Add icons to the desktop", "link": "https://extensions.gnome.org/extension/1465/desktop-icons/", "shell_version_map": {"38": {"version": "19", "sha256": "01qdh1kigl3ck1mzgha1a9218lpam5b54ai72mpvr64gkaax2mcv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBpY29ucyB0byB0aGUgZGVza3RvcCIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvV29ybGQvU2hlbGxFeHRlbnNpb25zL2Rlc2t0b3AtaWNvbnMiLAogICJ1dWlkIjogImRlc2t0b3AtaWNvbnNAY3Nvcmlhbm8iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}}} , {"uuid": "fullbattery@categulario.tk", "name": "Full Battery indicator", "pname": "full-battery-indicator", "description": "Notifies when battery is full", "link": "https://extensions.gnome.org/extension/1466/full-battery-indicator/", "shell_version_map": {"38": {"version": "4", "sha256": "167d84phf68fi5bg9fvm4l7l8jq7k86a80adm0l56ngqygxqsyy8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWVzIHdoZW4gYmF0dGVyeSBpcyBmdWxsIiwKICAibmFtZSI6ICJGdWxsIEJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjMyIiwKICAgICIzLjI4LjMiLAogICAgIjMuMzQuNCIsCiAgICAiMy4zNi4wIiwKICAgICIzLjM4IiwKICAgICI0MC4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2F0ZWd1bGFyaW8vZnVsbC1iYXR0ZXJ5LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZnVsbGJhdHRlcnlAY2F0ZWd1bGFyaW8udGsiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "167d84phf68fi5bg9fvm4l7l8jq7k86a80adm0l56ngqygxqsyy8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWVzIHdoZW4gYmF0dGVyeSBpcyBmdWxsIiwKICAibmFtZSI6ICJGdWxsIEJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjMyIiwKICAgICIzLjI4LjMiLAogICAgIjMuMzQuNCIsCiAgICAiMy4zNi4wIiwKICAgICIzLjM4IiwKICAgICI0MC4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2F0ZWd1bGFyaW8vZnVsbC1iYXR0ZXJ5LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZnVsbGJhdHRlcnlAY2F0ZWd1bGFyaW8udGsiLAogICJ2ZXJzaW9uIjogNAp9"}}} @@ -281,9 +281,9 @@ , {"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": "9", "sha256": "06rgadbhjkayyjjqffkrq7xija49fzd1n0xzxddkin8s121h1mr7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6IDEpIE5ldyBtZXNzYWdlIGluZGljYXRvciBpcyBhbHdheXMgc2hvd24gaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIDIpIFRoZSBjb2xvciBvZiB0aGUgaW5kaWNhdG9yIGNhbiBiZSBjdXN0b21pemVkLiAzKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYWx3YXlzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQWx3YXlzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHdheXMtaW5kaWNhdG9yLXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtYWx3YXlzLWluZGljYXRvciIsCiAgInV1aWQiOiAiYWx3YXlzLWluZGljYXRvckBtYXJ0aW4uenVyb3dpZXR6LmRlIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "06rgadbhjkayyjjqffkrq7xija49fzd1n0xzxddkin8s121h1mr7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6IDEpIE5ldyBtZXNzYWdlIGluZGljYXRvciBpcyBhbHdheXMgc2hvd24gaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIDIpIFRoZSBjb2xvciBvZiB0aGUgaW5kaWNhdG9yIGNhbiBiZSBjdXN0b21pemVkLiAzKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYWx3YXlzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQWx3YXlzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHdheXMtaW5kaWNhdG9yLXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtYWx3YXlzLWluZGljYXRvciIsCiAgInV1aWQiOiAiYWx3YXlzLWluZGljYXRvckBtYXJ0aW4uenVyb3dpZXR6LmRlIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "06rgadbhjkayyjjqffkrq7xija49fzd1n0xzxddkin8s121h1mr7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6IDEpIE5ldyBtZXNzYWdlIGluZGljYXRvciBpcyBhbHdheXMgc2hvd24gaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIDIpIFRoZSBjb2xvciBvZiB0aGUgaW5kaWNhdG9yIGNhbiBiZSBjdXN0b21pemVkLiAzKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYWx3YXlzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQWx3YXlzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHdheXMtaW5kaWNhdG9yLXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtYWx3YXlzLWluZGljYXRvciIsCiAgInV1aWQiOiAiYWx3YXlzLWluZGljYXRvckBtYXJ0aW4uenVyb3dpZXR6LmRlIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "43": {"version": "9", "sha256": "06rgadbhjkayyjjqffkrq7xija49fzd1n0xzxddkin8s121h1mr7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6IDEpIE5ldyBtZXNzYWdlIGluZGljYXRvciBpcyBhbHdheXMgc2hvd24gaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIDIpIFRoZSBjb2xvciBvZiB0aGUgaW5kaWNhdG9yIGNhbiBiZSBjdXN0b21pemVkLiAzKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYWx3YXlzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQWx3YXlzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHdheXMtaW5kaWNhdG9yLXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtYWx3YXlzLWluZGljYXRvciIsCiAgInV1aWQiOiAiYWx3YXlzLWluZGljYXRvckBtYXJ0aW4uenVyb3dpZXR6LmRlIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "eruption-profile-switcher@x3n0m0rph59.org", "name": "Eruption Profile Switcher", "pname": "eruption-profile-switcher", "description": "Runtime Profile switcher for the Eruption Realtime RGB LED Driver for Linux", "link": "https://extensions.gnome.org/extension/2621/eruption-profile-switcher/", "shell_version_map": {"38": {"version": "15", "sha256": "14zgczf2z7jv707whimggl3h31c44m1qdzncin38vdcdzhm2g7hv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuYmV0YSIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9YM24wbTBycGg1OS9lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJlcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyQHgzbjBtMHJwaDU5Lm9yZyIsCiAgInZlcnNpb24iOiAxNQp9"}, "40": {"version": "32", "sha256": "1rqhyb1f3mw93df6v7qdh1y5ih5n4dangg8qzi6jynw9ajndlfcc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1gzbjBtMHJwaDU5L2VydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogImVydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXJAeDNuMG0wcnBoNTkub3JnIiwKICAidmVyc2lvbiI6IDMyCn0="}, "41": {"version": "32", "sha256": "1rqhyb1f3mw93df6v7qdh1y5ih5n4dangg8qzi6jynw9ajndlfcc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1gzbjBtMHJwaDU5L2VydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogImVydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXJAeDNuMG0wcnBoNTkub3JnIiwKICAidmVyc2lvbiI6IDMyCn0="}, "42": {"version": "32", "sha256": "1rqhyb1f3mw93df6v7qdh1y5ih5n4dangg8qzi6jynw9ajndlfcc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1gzbjBtMHJwaDU5L2VydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogImVydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXJAeDNuMG0wcnBoNTkub3JnIiwKICAidmVyc2lvbiI6IDMyCn0="}, "43": {"version": "32", "sha256": "1rqhyb1f3mw93df6v7qdh1y5ih5n4dangg8qzi6jynw9ajndlfcc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1gzbjBtMHJwaDU5L2VydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogImVydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXJAeDNuMG0wcnBoNTkub3JnIiwKICAidmVyc2lvbiI6IDMyCn0="}}} , {"uuid": "nbfcindicator@mgokcaykdev.gmail.com", "name": "Nbfc Indicator", "pname": "nbfc-indicator", "description": "Notebook Fan Control Indicator for Gnome Shell", "link": "https://extensions.gnome.org/extension/2624/nbfc-indicator/", "shell_version_map": {"40": {"version": "7", "sha256": "0hp7giwdcsk8p442q0x9214dv59ziyjswli6mccyb8v814k3p8ic", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGVib29rIEZhbiBDb250cm9sIEluZGljYXRvciBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYmZjaW5kaWNhdG9yIiwKICAibmFtZSI6ICJOYmZjIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYmZjaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01Hb2tjYXlLL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtbmJmY2luZGljYXRvciIsCiAgInV1aWQiOiAibmJmY2luZGljYXRvckBtZ29rY2F5a2Rldi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} -, {"uuid": "user-id-in-top-panel@fthx", "name": "User id in top panel", "pname": "user-id-in-top-panel", "description": "Add ( user name :: user id @ host ) in top panel.", "link": "https://extensions.gnome.org/extension/2633/user-id-in-top-panel/", "shell_version_map": {"38": {"version": "6", "sha256": "16s1782mzb5ckshsy86ac9xj5xfk15hwzvzk4cfiimphfvkkw8x4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ1c2VyLWlkLWluLXRvcC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "8", "sha256": "1qzjh4gf6gry6xy6759bha3s3rsnfmizw32isap4j0rdsyl77j90", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidXNlci1pZC1pbi10b3AtcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "1qzjh4gf6gry6xy6759bha3s3rsnfmizw32isap4j0rdsyl77j90", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidXNlci1pZC1pbi10b3AtcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1qzjh4gf6gry6xy6759bha3s3rsnfmizw32isap4j0rdsyl77j90", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidXNlci1pZC1pbi10b3AtcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "1qzjh4gf6gry6xy6759bha3s3rsnfmizw32isap4j0rdsyl77j90", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidXNlci1pZC1pbi10b3AtcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiA4Cn0="}}} +, {"uuid": "user-id-in-top-panel@fthx", "name": "User id in top panel", "pname": "user-id-in-top-panel", "description": "Add ( user name :: user id @ host ) in top panel.", "link": "https://extensions.gnome.org/extension/2633/user-id-in-top-panel/", "shell_version_map": {"38": {"version": "6", "sha256": "16s1782mzb5ckshsy86ac9xj5xfk15hwzvzk4cfiimphfvkkw8x4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ1c2VyLWlkLWluLXRvcC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "8", "sha256": "1qzjh4gf6gry6xy6759bha3s3rsnfmizw32isap4j0rdsyl77j90", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidXNlci1pZC1pbi10b3AtcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "1qzjh4gf6gry6xy6759bha3s3rsnfmizw32isap4j0rdsyl77j90", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidXNlci1pZC1pbi10b3AtcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1qzjh4gf6gry6xy6759bha3s3rsnfmizw32isap4j0rdsyl77j90", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidXNlci1pZC1pbi10b3AtcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "10", "sha256": "0w3xh2bdyc2x2scj70qvjpj39hjhsayfsy8065dp0qmlhfi7z9kz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInVzZXItaWQtaW4tdG9wLXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} , {"uuid": "hide-minimized@danigm.net", "name": "Hide minimized", "pname": "hide-minimized", "description": "Hide minimized in overview", "link": "https://extensions.gnome.org/extension/2639/hide-minimized/", "shell_version_map": {"38": {"version": "7", "sha256": "03x65bms6ns9jz1m0kmklpjaq1lgdl9h2pmqvfczmk2vf3bmjjwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vaGlkZS1taW5pbWl6ZWQiLAogICJ1dWlkIjogImhpZGUtbWluaW1pemVkQGRhbmlnbS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "03x65bms6ns9jz1m0kmklpjaq1lgdl9h2pmqvfczmk2vf3bmjjwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vaGlkZS1taW5pbWl6ZWQiLAogICJ1dWlkIjogImhpZGUtbWluaW1pemVkQGRhbmlnbS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "03x65bms6ns9jz1m0kmklpjaq1lgdl9h2pmqvfczmk2vf3bmjjwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vaGlkZS1taW5pbWl6ZWQiLAogICJ1dWlkIjogImhpZGUtbWluaW1pemVkQGRhbmlnbS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "03x65bms6ns9jz1m0kmklpjaq1lgdl9h2pmqvfczmk2vf3bmjjwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vaGlkZS1taW5pbWl6ZWQiLAogICJ1dWlkIjogImhpZGUtbWluaW1pemVkQGRhbmlnbS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "03x65bms6ns9jz1m0kmklpjaq1lgdl9h2pmqvfczmk2vf3bmjjwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vaGlkZS1taW5pbWl6ZWQiLAogICJ1dWlkIjogImhpZGUtbWluaW1pemVkQGRhbmlnbS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}}} -, {"uuid": "display-brightness-ddcutil@themightydeity.github.com", "name": "Brightness control using ddcutil", "pname": "brightness-control-using-ddcutil", "description": "Brightness control for all the monitors detected by ddcutil\nThis tool uses ddcutil as backend for communication with your display.\n\nRead setup instructions from: https://github.com/daitj/gnome-display-brightness-ddcutil/blob/master/README.md", "link": "https://extensions.gnome.org/extension/2645/brightness-control-using-ddcutil/", "shell_version_map": {"38": {"version": "10", "sha256": "1a9ndhkjx6myqynx6smyjxd9f9f4520wfwyh92lghg8c6bvr4mb6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJuYW1lIjogIkJyaWdodG5lc3MgY29udHJvbCB1c2luZyBkZGN1dGlsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "30", "sha256": "121kw0impmq3vpaikngjxr7jm98dk54c0cfxkr6zzcbvz3ni0rrl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgInV1aWQiOiAiZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWxAdGhlbWlnaHR5ZGVpdHkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMAp9"}, "41": {"version": "30", "sha256": "121kw0impmq3vpaikngjxr7jm98dk54c0cfxkr6zzcbvz3ni0rrl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgInV1aWQiOiAiZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWxAdGhlbWlnaHR5ZGVpdHkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMAp9"}, "42": {"version": "31", "sha256": "035j0qswaw2hj06ybq2qdhlsshwfi2fyh2l0mca7jq1qp2w955xw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzEKfQ=="}, "43": {"version": "35", "sha256": "06bji8hg3ffvwp1mslzqlbgjq6zpjn6c652h9lrk9vswwzwriffs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}}} +, {"uuid": "display-brightness-ddcutil@themightydeity.github.com", "name": "Brightness control using ddcutil", "pname": "brightness-control-using-ddcutil", "description": "Brightness control for all the monitors detected by ddcutil\nThis tool uses ddcutil as backend for communication with your display.\n\nRead setup instructions from: https://github.com/daitj/gnome-display-brightness-ddcutil/blob/master/README.md", "link": "https://extensions.gnome.org/extension/2645/brightness-control-using-ddcutil/", "shell_version_map": {"38": {"version": "10", "sha256": "1a9ndhkjx6myqynx6smyjxd9f9f4520wfwyh92lghg8c6bvr4mb6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJuYW1lIjogIkJyaWdodG5lc3MgY29udHJvbCB1c2luZyBkZGN1dGlsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "30", "sha256": "121kw0impmq3vpaikngjxr7jm98dk54c0cfxkr6zzcbvz3ni0rrl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgInV1aWQiOiAiZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWxAdGhlbWlnaHR5ZGVpdHkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMAp9"}, "41": {"version": "30", "sha256": "121kw0impmq3vpaikngjxr7jm98dk54c0cfxkr6zzcbvz3ni0rrl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgInV1aWQiOiAiZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWxAdGhlbWlnaHR5ZGVpdHkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMAp9"}, "42": {"version": "31", "sha256": "035j0qswaw2hj06ybq2qdhlsshwfi2fyh2l0mca7jq1qp2w955xw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzEKfQ=="}, "43": {"version": "38", "sha256": "1ccs2d7bzw5nvij3y3083m2hwkimn8lpp9nkb0k8ch2wpk4cykr4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzgKfQ=="}}} , {"uuid": "timezones@masquerade-circus.net", "name": "Timezones extension", "pname": "timezones-extension", "description": "Show multiple clocks in the panel. For those who need more than one additional clock.", "link": "https://extensions.gnome.org/extension/2657/timezones-extension/", "shell_version_map": {"38": {"version": "3", "sha256": "178yi4wm7h52al01a9l0q765rm6hwj0j19sg29jw4pgm0c11kywq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbXVsdGlwbGUgY2xvY2tzIGluIHRoZSBwYW5lbC4gRm9yIHRob3NlIHdobyBuZWVkIG1vcmUgdGhhbiBvbmUgYWRkaXRpb25hbCBjbG9jay4iLAogICJuYW1lIjogIlRpbWV6b25lcyBleHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hc3F1ZXJhZGUtQ2lyY3VzL2dub21lLXRpbWV6b25lcy1leHRlbnNpb24iLAogICJ1dWlkIjogInRpbWV6b25lc0BtYXNxdWVyYWRlLWNpcmN1cy5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "178yi4wm7h52al01a9l0q765rm6hwj0j19sg29jw4pgm0c11kywq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbXVsdGlwbGUgY2xvY2tzIGluIHRoZSBwYW5lbC4gRm9yIHRob3NlIHdobyBuZWVkIG1vcmUgdGhhbiBvbmUgYWRkaXRpb25hbCBjbG9jay4iLAogICJuYW1lIjogIlRpbWV6b25lcyBleHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hc3F1ZXJhZGUtQ2lyY3VzL2dub21lLXRpbWV6b25lcy1leHRlbnNpb24iLAogICJ1dWlkIjogInRpbWV6b25lc0BtYXNxdWVyYWRlLWNpcmN1cy5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "178yi4wm7h52al01a9l0q765rm6hwj0j19sg29jw4pgm0c11kywq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbXVsdGlwbGUgY2xvY2tzIGluIHRoZSBwYW5lbC4gRm9yIHRob3NlIHdobyBuZWVkIG1vcmUgdGhhbiBvbmUgYWRkaXRpb25hbCBjbG9jay4iLAogICJuYW1lIjogIlRpbWV6b25lcyBleHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hc3F1ZXJhZGUtQ2lyY3VzL2dub21lLXRpbWV6b25lcy1leHRlbnNpb24iLAogICJ1dWlkIjogInRpbWV6b25lc0BtYXNxdWVyYWRlLWNpcmN1cy5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "178yi4wm7h52al01a9l0q765rm6hwj0j19sg29jw4pgm0c11kywq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbXVsdGlwbGUgY2xvY2tzIGluIHRoZSBwYW5lbC4gRm9yIHRob3NlIHdobyBuZWVkIG1vcmUgdGhhbiBvbmUgYWRkaXRpb25hbCBjbG9jay4iLAogICJuYW1lIjogIlRpbWV6b25lcyBleHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hc3F1ZXJhZGUtQ2lyY3VzL2dub21lLXRpbWV6b25lcy1leHRlbnNpb24iLAogICJ1dWlkIjogInRpbWV6b25lc0BtYXNxdWVyYWRlLWNpcmN1cy5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"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=="}, "42": {"version": "4", "sha256": "1af8hyfvrpl7slqc1sdnc82zkrqrrvw16qw47qqxfdiybyk7381z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsOiB0cmFuc3BhcmVudCwgc3RyYWlnaHQsIHJlZHVjZWQgaGVpZ2h0LCBub24tYm9sZCBmb250cy4gTm90aGluZyBtb3JlLlxuXG5Mb29rcyByb3VnaGx5IGxpa2UgVWJ1bnR1IHNlc3Npb24ncyBwYW5lbCAoWWFydSkuIFlvdSBjYW4gZWFzaWx5IG1vZGlmeSB0aGUgdHJhbnNwYXJlbmN5IGxldmVsIHRocm91Z2ggdGhlIENTUyBzdHlsZXNoZWV0IGluIHRoZSBleHRlbnNpb25zJ3MgZm9sZGVyLiIsCiAgIm5hbWUiOiAiVWJ1bnR1LWxpa2UgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"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"}}} @@ -306,7 +306,7 @@ , {"uuid": "overview_full_bright@fawtytoo", "name": "Overview Full Bright", "pname": "overview-full-bright", "description": "Shows the Overview in full brightness and without the vignette.\n\nNOTE: This will not be developed beyond GS 3.38.", "link": "https://extensions.gnome.org/extension/2884/overview-full-bright/", "shell_version_map": {"38": {"version": "4", "sha256": "1dm5h1kl40lsly9a80ch4mfi67ppwd7dgg4idx8vrcx5iksnzxil", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBPdmVydmlldyBpbiBmdWxsIGJyaWdodG5lc3MgYW5kIHdpdGhvdXQgdGhlIHZpZ25ldHRlLlxuXG5OT1RFOiBUaGlzIHdpbGwgbm90IGJlIGRldmVsb3BlZCBiZXlvbmQgR1MgMy4zOC4iLAogICJuYW1lIjogIk92ZXJ2aWV3IEZ1bGwgQnJpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm92ZXJ2aWV3X2Z1bGxfYnJpZ2h0QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "trayIconsReloaded@selfmade.pl", "name": "Tray Icons: Reloaded", "pname": "tray-icons-reloaded", "description": "Tray Icons Reloaded is a GNOME Shell extension which bring back Tray Icons to top panel, with additional features.", "link": "https://extensions.gnome.org/extension/2890/tray-icons-reloaded/", "shell_version_map": {"38": {"version": "11", "sha256": "16dx06l7m8jjcy1xr7s3vj57csnbdmdwlmmjwxhilq10a1dapiw8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJheUljb25zUmVsb2FkZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "16", "sha256": "0ywl1v26b3qfkj58g2l7y1g2qf1fi7kkjd6403546hwyzcqkph0z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJheUljb25zUmVsb2FkZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvVHJheS1JY29ucy1SZWxvYWRlZCIsCiAgInV1aWQiOiAidHJheUljb25zUmVsb2FkZWRAc2VsZm1hZGUucGwiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "41": {"version": "22", "sha256": "0nmrjpk93afmywq0zrm7qjpkil6s6wszmr9f78q0ybnjv58jf953", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIsCiAgICAiWWFkIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmF5SWNvbnNSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAyMgp9"}, "42": {"version": "25", "sha256": "0y3sks6idn9v2r54rb4i69gliip0c9na5q5kwl9vfc7irncgmqjr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIsCiAgICAiWWFkIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmF5SWNvbnNSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAyNQp9"}, "43": {"version": "26", "sha256": "1yx9w70ql13f0gnjbihkscyhi8mgapbl6p0hy0aqmnirhwn3fc31", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIsCiAgICAiWWFkIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmF5SWNvbnNSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAyNgp9"}}} , {"uuid": "messagingmenu@lauinger-clan.de", "name": "Messaging Menu", "pname": "messaging-menu", "description": "A Messaging Menu for the Gnome Shell. All Email and Chat Applications in one Place.", "link": "https://extensions.gnome.org/extension/2896/messaging-menu/", "shell_version_map": {"38": {"version": "4", "sha256": "1xa0hyvs2aw1z7kg5gcsgh2pjn7b13zhps98j4xpwfiv6zm0sa73", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvbWVzc2FnaW5nbWVudSIsCiAgInV1aWQiOiAibWVzc2FnaW5nbWVudUBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "21", "sha256": "0wm9r34k1xng9fvasz4mcmqbzy5fhwg00jdrnzh7b4a2rqhqv9dg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9tZXNzYWdpbmdtZW51IiwKICAidXVpZCI6ICJtZXNzYWdpbmdtZW51QGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "41": {"version": "21", "sha256": "0wm9r34k1xng9fvasz4mcmqbzy5fhwg00jdrnzh7b4a2rqhqv9dg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9tZXNzYWdpbmdtZW51IiwKICAidXVpZCI6ICJtZXNzYWdpbmdtZW51QGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "42": {"version": "21", "sha256": "0wm9r34k1xng9fvasz4mcmqbzy5fhwg00jdrnzh7b4a2rqhqv9dg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9tZXNzYWdpbmdtZW51IiwKICAidXVpZCI6ICJtZXNzYWdpbmdtZW51QGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "43": {"version": "21", "sha256": "0wm9r34k1xng9fvasz4mcmqbzy5fhwg00jdrnzh7b4a2rqhqv9dg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9tZXNzYWdpbmdtZW51IiwKICAidXVpZCI6ICJtZXNzYWdpbmdtZW51QGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMjEKfQ=="}}} -, {"uuid": "SettingsCenter@lauinger-clan.de", "name": "SettingsCenter", "pname": "settingscenter", "description": "Settings Center is a customizable drop-down menu for quickly launching frequently used apps in Gnome:Shell via the quicksettings. Originally created by XES.\n\nSettings shortcuts : gnome-tweak-tool, dconf-editor, gconf-editor, gnome-session-properties, gnome-shell-extension-prefs, seahorse and nvidia-settings. You can add your own\n\nOriginal source : http://svn.xesnet.fr/gnomeextensions", "link": "https://extensions.gnome.org/extension/2899/settingscenter/", "shell_version_map": {"38": {"version": "2", "sha256": "0sywdlmfgy4k5bkxmawcb7b8100g8wnpndmwvdzjq51xv5605gcs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjQiLAogICAgIjMuNiIsCiAgICAiMy41LjQiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9YRVMtU2V0dGluZ3MtQ2VudGVyLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2V0dGluZ3NDZW50ZXJAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "11", "sha256": "17na0a5bm4qkh1lcch9frpmlxn44kg7d4lx96lmpx8v0zp4v0c2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlNldHRpbmdzQ2VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "17na0a5bm4qkh1lcch9frpmlxn44kg7d4lx96lmpx8v0zp4v0c2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlNldHRpbmdzQ2VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "17na0a5bm4qkh1lcch9frpmlxn44kg7d4lx96lmpx8v0zp4v0c2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlNldHRpbmdzQ2VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}, "43": {"version": "17", "sha256": "12npd6sm5nksabk6nf6gd7kmpimhwzagy6k3d2ch005yf19vwdx1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImdldHRleHQtZG9tYWluIjogIlNldHRpbmdzQ2VudGVyIiwKICAibmFtZSI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJYZXMsIGwzMDBsdmwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuU2V0dGluZ3NDZW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9YRVMtU2V0dGluZ3MtQ2VudGVyLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2V0dGluZ3NDZW50ZXJAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAxNwp9"}}} +, {"uuid": "SettingsCenter@lauinger-clan.de", "name": "SettingsCenter", "pname": "settingscenter", "description": "Settings Center is a customizable drop-down menu for quickly launching frequently used apps in Gnome:Shell via the quicksettings. Originally created by XES.\n\nSettings shortcuts : gnome-tweak-tool, dconf-editor, gconf-editor, gnome-session-properties, gnome-shell-extension-prefs, seahorse and nvidia-settings. You can add your own\n\nOriginal source : http://svn.xesnet.fr/gnomeextensions", "link": "https://extensions.gnome.org/extension/2899/settingscenter/", "shell_version_map": {"38": {"version": "2", "sha256": "0sywdlmfgy4k5bkxmawcb7b8100g8wnpndmwvdzjq51xv5605gcs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjQiLAogICAgIjMuNiIsCiAgICAiMy41LjQiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9YRVMtU2V0dGluZ3MtQ2VudGVyLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2V0dGluZ3NDZW50ZXJAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "11", "sha256": "17na0a5bm4qkh1lcch9frpmlxn44kg7d4lx96lmpx8v0zp4v0c2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlNldHRpbmdzQ2VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "17na0a5bm4qkh1lcch9frpmlxn44kg7d4lx96lmpx8v0zp4v0c2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlNldHRpbmdzQ2VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "17na0a5bm4qkh1lcch9frpmlxn44kg7d4lx96lmpx8v0zp4v0c2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlNldHRpbmdzQ2VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}, "43": {"version": "20", "sha256": "0j3iyclcz6y6lgh4nh8izrx65q6pldw86gpk06h9lxzqcm4x6qnw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImdldHRleHQtZG9tYWluIjogIlNldHRpbmdzQ2VudGVyIiwKICAibmFtZSI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJYZXMsIGwzMDBsdmwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuU2V0dGluZ3NDZW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9YRVMtU2V0dGluZ3MtQ2VudGVyLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2V0dGluZ3NDZW50ZXJAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAyMAp9"}}} , {"uuid": "auto-mute-toggle@garotosopa.github.io", "name": "Auto-mute toggle", "pname": "auto-mute-toggle", "description": "Toggle whether to auto-mute speakers when headphones are plugged in.", "link": "https://extensions.gnome.org/extension/2905/auto-mute-toggle/", "shell_version_map": {"40": {"version": "6", "sha256": "1lyh51gvsh9ydip77vjj8rigjiah97lh8gp91jcpqblwx69fs3dk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB3aGV0aGVyIHRvIGF1dG8tbXV0ZSBzcGVha2VycyB3aGVuIGhlYWRwaG9uZXMgYXJlIHBsdWdnZWQgaW4uIiwKICAibmFtZSI6ICJBdXRvLW11dGUgdG9nZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dhcm90b3NvcGEvZ3NlLWF1dG8tbXV0ZS10b2dnbGUiLAogICJ1dWlkIjogImF1dG8tbXV0ZS10b2dnbGVAZ2Fyb3Rvc29wYS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "optimus-manager-indicator@andr3slelouch.github.com", "name": "Optimus Manager Indicator", "pname": "optimus-manager-indicator", "description": "Intel/Hybrid/NVIDIA GPU Switch Note: The GPU mode activated doesn't show up in the options, by example: When you turn on the PC you are gonna be in Intel mode so Intel option is not gonna be shown. Note: Optimus Manager Indicator is made(for the moment) for Arch based distributions with optimus-manager.", "link": "https://extensions.gnome.org/extension/2908/optimus-manager-indicator/", "shell_version_map": {"38": {"version": "5", "sha256": "1mqgnwfdbd2460ngkkq6wiswvb9bvwgm5n32j7jgvn1xhb3mqn58", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVsL0h5YnJpZC9OVklESUEgR1BVIFN3aXRjaCBOb3RlOiBUaGUgR1BVIG1vZGUgYWN0aXZhdGVkIGRvZXNuJ3Qgc2hvdyB1cCBpbiB0aGUgb3B0aW9ucywgYnkgZXhhbXBsZTogV2hlbiB5b3UgdHVybiBvbiB0aGUgUEMgeW91IGFyZSBnb25uYSBiZSBpbiBJbnRlbCBtb2RlIHNvIEludGVsIG9wdGlvbiBpcyBub3QgZ29ubmEgYmUgc2hvd24uIE5vdGU6IE9wdGltdXMgTWFuYWdlciBJbmRpY2F0b3IgaXMgbWFkZShmb3IgdGhlIG1vbWVudCkgZm9yIEFyY2ggYmFzZWQgZGlzdHJpYnV0aW9ucyB3aXRoIG9wdGltdXMtbWFuYWdlci4iLAogICJuYW1lIjogIk9wdGltdXMgTWFuYWdlciBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmRyM3NsZWxvdWNoL09wdGltdXMtTWFuYWdlci1JbmRpY2F0b3IiLAogICJ1dWlkIjogIm9wdGltdXMtbWFuYWdlci1pbmRpY2F0b3JAYW5kcjNzbGVsb3VjaC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "5", "sha256": "1mqgnwfdbd2460ngkkq6wiswvb9bvwgm5n32j7jgvn1xhb3mqn58", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVsL0h5YnJpZC9OVklESUEgR1BVIFN3aXRjaCBOb3RlOiBUaGUgR1BVIG1vZGUgYWN0aXZhdGVkIGRvZXNuJ3Qgc2hvdyB1cCBpbiB0aGUgb3B0aW9ucywgYnkgZXhhbXBsZTogV2hlbiB5b3UgdHVybiBvbiB0aGUgUEMgeW91IGFyZSBnb25uYSBiZSBpbiBJbnRlbCBtb2RlIHNvIEludGVsIG9wdGlvbiBpcyBub3QgZ29ubmEgYmUgc2hvd24uIE5vdGU6IE9wdGltdXMgTWFuYWdlciBJbmRpY2F0b3IgaXMgbWFkZShmb3IgdGhlIG1vbWVudCkgZm9yIEFyY2ggYmFzZWQgZGlzdHJpYnV0aW9ucyB3aXRoIG9wdGltdXMtbWFuYWdlci4iLAogICJuYW1lIjogIk9wdGltdXMgTWFuYWdlciBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmRyM3NsZWxvdWNoL09wdGltdXMtTWFuYWdlci1JbmRpY2F0b3IiLAogICJ1dWlkIjogIm9wdGltdXMtbWFuYWdlci1pbmRpY2F0b3JAYW5kcjNzbGVsb3VjaC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "BringOutSubmenuOfPowerOffLogoutButton@pratap.fastmail.fm", "name": "Bring Out Submenu Of Power Off/Logout Button", "pname": "bring-out-submenu-of-power-offlogout-button", "description": "Bring Out Submenu Of Power Off/Logout Button and Rearrange the Order of System Menu.", "link": "https://extensions.gnome.org/extension/2917/bring-out-submenu-of-power-offlogout-button/", "shell_version_map": {"38": {"version": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "40": {"version": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "41": {"version": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "42": {"version": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "43": {"version": "36", "sha256": "1jqkj799jz7s7kpis2sp2iqx5h8sxmqfswilncfvyyxkgs7v5lk2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQnJpbmctT3V0LVN1Ym1lbnUtb2YtUG93ZXItT2ZmLUxvZ291dCIsCiAgInV1aWQiOiAiQnJpbmdPdXRTdWJtZW51T2ZQb3dlck9mZkxvZ291dEJ1dHRvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMzYKfQ=="}}} @@ -328,7 +328,7 @@ , {"uuid": "ssss@tu.berry", "name": "Simple Subscriber", "pname": "ss-subscriber", "description": "Simple shadowsocks subscriber (SSD only), yet another proxy switcher for GNOME Shell\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3073/ss-subscriber/", "shell_version_map": {"38": {"version": "18", "sha256": "03gryl577559h2l1s3adi5gxa8ivp454p4lq7jng1db6smlpj95a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzcy1zdWJzY3JpYmVyIiwKICAibmFtZSI6ICJTaW1wbGUgU3Vic2NyaWJlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcy1zdWJzY3JpYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9zcy1zdWJzY3JpYmVyIiwKICAidXVpZCI6ICJzc3NzQHR1LmJlcnJ5IiwKICAidmVyc2lvbiI6IDE4Cn0="}, "40": {"version": "20", "sha256": "075d00xsbmr4qs554p2anddhkmgcx7xd4nn8prgmf4wpyfk87552", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzcy1zdWJzY3JpYmVyIiwKICAibmFtZSI6ICJTaW1wbGUgU3Vic2NyaWJlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcy1zdWJzY3JpYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc3Mtc3Vic2NyaWJlciIsCiAgInV1aWQiOiAic3Nzc0B0dS5iZXJyeSIsCiAgInZlcnNpb24iOiAyMAp9"}, "41": {"version": "21", "sha256": "06ybzk62fbi88iqssl4pw0amsbcp09pnw99wxanh2jlvaakqgday", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc3Mtc3Vic2NyaWJlciIsCiAgIm5hbWUiOiAiU2ltcGxlIFN1YnNjcmliZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3Mtc3Vic2NyaWJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3NzLXN1YnNjcmliZXIiLAogICJ1dWlkIjogInNzc3NAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "42": {"version": "23", "sha256": "078111h68zv03n6i4yw9jgdn9idxb91qpami64xl5g1rc75sc91w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc3Mtc3Vic2NyaWJlciIsCiAgIm5hbWUiOiAiU2ltcGxlIFN1YnNjcmliZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3Mtc3Vic2NyaWJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3NzLXN1YnNjcmliZXIiLAogICJ1dWlkIjogInNzc3NAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "43": {"version": "25", "sha256": "0s33s1gq6na12ygzmjf4kkcbv4zz6mwg449456m0pxhblmwng093", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc3Mtc3Vic2NyaWJlciIsCiAgIm5hbWUiOiAiU2ltcGxlIFN1YnNjcmliZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3Mtc3Vic2NyaWJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3NzLXN1YnNjcmliZXIiLAogICJ1dWlkIjogInNzc3NAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMjUKfQ=="}}} , {"uuid": "extension-list@tu.berry", "name": "Extension List", "pname": "extension-list", "description": "Simple GNOME Shell extension manager in the top panel\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3088/extension-list/", "shell_version_map": {"38": {"version": "25", "sha256": "0cwabswbb5p0z156488ag095h558hf541650vfnjgw4nas7v2ccx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVuc2lvbi1saXN0IiwKICAibmFtZSI6ICJFeHRlbnNpb24gTGlzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHRlbnNpb24tbGlzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvZXh0ZW5zaW9uLWxpc3QiLAogICJ1dWlkIjogImV4dGVuc2lvbi1saXN0QHR1LmJlcnJ5IiwKICAidmVyc2lvbiI6IDI1Cn0="}, "40": {"version": "27", "sha256": "0m13qzzbbx5rnq8a9xn09nvr3dy9zqkp8y9529y12250wyjafl1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVuc2lvbi1saXN0IiwKICAibmFtZSI6ICJFeHRlbnNpb24gTGlzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHRlbnNpb24tbGlzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2V4dGVuc2lvbi1saXN0IiwKICAidXVpZCI6ICJleHRlbnNpb24tbGlzdEB0dS5iZXJyeSIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "29", "sha256": "1yl2b9phvrgsdpkwqjfqpaqi2xcj5bcd4zabqkrfwngqsg17s85j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1leHRlbnNpb24tbGlzdCIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9uIExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9uLWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9leHRlbnNpb24tbGlzdCIsCiAgInV1aWQiOiAiZXh0ZW5zaW9uLWxpc3RAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, "42": {"version": "30", "sha256": "1hnidb1f6cawfhmkql4y8kz3rq0ibqcfk678yz1n12l2gp3vvvz3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1leHRlbnNpb24tbGlzdCIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9uIExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9uLWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9leHRlbnNpb24tbGlzdCIsCiAgInV1aWQiOiAiZXh0ZW5zaW9uLWxpc3RAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "43": {"version": "34", "sha256": "0jq0c80y20d8rljn1478v537lch6klwir0gkzp35y03s1wj0ma36", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1leHRlbnNpb24tbGlzdCIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9uIExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9uLWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9leHRlbnNpb24tbGlzdCIsCiAgInV1aWQiOiAiZXh0ZW5zaW9uLWxpc3RAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMzQKfQ=="}}} , {"uuid": "MaximizeToEmptyWorkspace-extension@kaisersite.de", "name": "Maximize To Empty Workspace", "pname": "maximize-to-empty-workspace", "description": "New and maximized windows will be moved to empty workspaces.\nSupports multiple monitors.", "link": "https://extensions.gnome.org/extension/3100/maximize-to-empty-workspace/", "shell_version_map": {"38": {"version": "12", "sha256": "13srjh0zhhc0v3sqsa2drksy8p0b3whfszbrwvjp1qgjd8k1rn9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2Fpc2VyYWNtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tYXhpbWl6ZS10by1lbXB0eS13b3Jrc3BhY2UiLAogICJ1dWlkIjogIk1heGltaXplVG9FbXB0eVdvcmtzcGFjZS1leHRlbnNpb25Aa2Fpc2Vyc2l0ZS5kZSIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "13srjh0zhhc0v3sqsa2drksy8p0b3whfszbrwvjp1qgjd8k1rn9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2Fpc2VyYWNtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tYXhpbWl6ZS10by1lbXB0eS13b3Jrc3BhY2UiLAogICJ1dWlkIjogIk1heGltaXplVG9FbXB0eVdvcmtzcGFjZS1leHRlbnNpb25Aa2Fpc2Vyc2l0ZS5kZSIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "13srjh0zhhc0v3sqsa2drksy8p0b3whfszbrwvjp1qgjd8k1rn9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2Fpc2VyYWNtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tYXhpbWl6ZS10by1lbXB0eS13b3Jrc3BhY2UiLAogICJ1dWlkIjogIk1heGltaXplVG9FbXB0eVdvcmtzcGFjZS1leHRlbnNpb25Aa2Fpc2Vyc2l0ZS5kZSIsCiAgInZlcnNpb24iOiAxMgp9"}, "42": {"version": "12", "sha256": "13srjh0zhhc0v3sqsa2drksy8p0b3whfszbrwvjp1qgjd8k1rn9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2Fpc2VyYWNtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tYXhpbWl6ZS10by1lbXB0eS13b3Jrc3BhY2UiLAogICJ1dWlkIjogIk1heGltaXplVG9FbXB0eVdvcmtzcGFjZS1leHRlbnNpb25Aa2Fpc2Vyc2l0ZS5kZSIsCiAgInZlcnNpb24iOiAxMgp9"}, "43": {"version": "12", "sha256": "13srjh0zhhc0v3sqsa2drksy8p0b3whfszbrwvjp1qgjd8k1rn9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2Fpc2VyYWNtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tYXhpbWl6ZS10by1lbXB0eS13b3Jrc3BhY2UiLAogICJ1dWlkIjogIk1heGltaXplVG9FbXB0eVdvcmtzcGFjZS1leHRlbnNpb25Aa2Fpc2Vyc2l0ZS5kZSIsCiAgInZlcnNpb24iOiAxMgp9"}}} -, {"uuid": "eye-extended@als.kz", "name": "Eye and Mouse Extended", "pname": "eye-extended", "description": "An eye on the top panel that follows your cursor.\nIt includes a mouse indicator to better keep track of your mouse location.", "link": "https://extensions.gnome.org/extension/3139/eye-extended/", "shell_version_map": {"38": {"version": "10", "sha256": "0jh8ic9krn8fqnaar3lwcvd255y5ibi1kdjmgw7vjwq42psnc1nd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRXllRXh0ZW5kZWQiLAogICJuYW1lIjogIkV5ZSBhbmQgTW91c2UgRXh0ZW5kZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAia3ouYWxzLmV5ZS1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNi4wIiwKICAgICIzLjM4LjAiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZXlsb3ZjaGlrb3YvZXllLWV4dGVuZGVkLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZXllLWV4dGVuZGVkQGFscy5reiIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "12", "sha256": "1a334plhay126wlkh4vn2z8b6kmibygz45rjvg38ridkkpqzjprb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "41": {"version": "12", "sha256": "1a334plhay126wlkh4vn2z8b6kmibygz45rjvg38ridkkpqzjprb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "42": {"version": "12", "sha256": "1a334plhay126wlkh4vn2z8b6kmibygz45rjvg38ridkkpqzjprb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "43": {"version": "12", "sha256": "1a334plhay126wlkh4vn2z8b6kmibygz45rjvg38ridkkpqzjprb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}}} +, {"uuid": "eye-extended@als.kz", "name": "Eye and Mouse Extended", "pname": "eye-extended", "description": "An eye on the top panel that follows your cursor.\nIt includes a mouse indicator to better keep track of your mouse location.", "link": "https://extensions.gnome.org/extension/3139/eye-extended/", "shell_version_map": {"38": {"version": "10", "sha256": "0jh8ic9krn8fqnaar3lwcvd255y5ibi1kdjmgw7vjwq42psnc1nd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRXllRXh0ZW5kZWQiLAogICJuYW1lIjogIkV5ZSBhbmQgTW91c2UgRXh0ZW5kZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAia3ouYWxzLmV5ZS1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNi4wIiwKICAgICIzLjM4LjAiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZXlsb3ZjaGlrb3YvZXllLWV4dGVuZGVkLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZXllLWV4dGVuZGVkQGFscy5reiIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "13", "sha256": "09fiwqiwvff8pscz2bg9yn9mczj5i2lipayzwc3l9fmvclnqsawy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "09fiwqiwvff8pscz2bg9yn9mczj5i2lipayzwc3l9fmvclnqsawy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "42": {"version": "13", "sha256": "09fiwqiwvff8pscz2bg9yn9mczj5i2lipayzwc3l9fmvclnqsawy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "43": {"version": "13", "sha256": "09fiwqiwvff8pscz2bg9yn9mczj5i2lipayzwc3l9fmvclnqsawy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} , {"uuid": "wireguard-indicator@gregos.me", "name": "Wireguard Indicator", "pname": "wireguard-indicator", "description": "Enable, disable, and view details of Wireguard.\nDeveloped by Gregos-Winus.", "link": "https://extensions.gnome.org/extension/3160/wireguard-indicator/", "shell_version_map": {"38": {"version": "4", "sha256": "1r12pw550v3h5f6zxl0psnsx031b5c7sj374f9h078lwqs85wb8w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSwgZGlzYWJsZSwgYW5kIHZpZXcgZGV0YWlscyBvZiBXaXJlZ3VhcmQuXG5EZXZlbG9wZWQgYnkgR3JlZ29zLVdpbnVzLiIsCiAgIm5hbWUiOiAiV2lyZWd1YXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGdyZWdvcy5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "1r12pw550v3h5f6zxl0psnsx031b5c7sj374f9h078lwqs85wb8w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSwgZGlzYWJsZSwgYW5kIHZpZXcgZGV0YWlscyBvZiBXaXJlZ3VhcmQuXG5EZXZlbG9wZWQgYnkgR3JlZ29zLVdpbnVzLiIsCiAgIm5hbWUiOiAiV2lyZWd1YXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGdyZWdvcy5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1r12pw550v3h5f6zxl0psnsx031b5c7sj374f9h078lwqs85wb8w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSwgZGlzYWJsZSwgYW5kIHZpZXcgZGV0YWlscyBvZiBXaXJlZ3VhcmQuXG5EZXZlbG9wZWQgYnkgR3JlZ29zLVdpbnVzLiIsCiAgIm5hbWUiOiAiV2lyZWd1YXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGdyZWdvcy5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "1r12pw550v3h5f6zxl0psnsx031b5c7sj374f9h078lwqs85wb8w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSwgZGlzYWJsZSwgYW5kIHZpZXcgZGV0YWlscyBvZiBXaXJlZ3VhcmQuXG5EZXZlbG9wZWQgYnkgR3JlZ29zLVdpbnVzLiIsCiAgIm5hbWUiOiAiV2lyZWd1YXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGdyZWdvcy5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "no_activities@yaya.cout", "name": "No activities button", "pname": "no-activities-button", "description": "Hide the activities button", "link": "https://extensions.gnome.org/extension/3184/no-activities-button/", "shell_version_map": {"38": {"version": "4", "sha256": "1759h1yp2hndbksaqm2zid2lsca9zmxwfb5n8jrlx7rjfgr7cb11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjdGl2aXRpZXMgYnV0dG9uIiwKICAibmFtZSI6ICJObyBhY3Rpdml0aWVzIGJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibm9fYWN0aXZpdGllc0B5YXlhLmNvdXQiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "1759h1yp2hndbksaqm2zid2lsca9zmxwfb5n8jrlx7rjfgr7cb11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjdGl2aXRpZXMgYnV0dG9uIiwKICAibmFtZSI6ICJObyBhY3Rpdml0aWVzIGJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibm9fYWN0aXZpdGllc0B5YXlhLmNvdXQiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "1759h1yp2hndbksaqm2zid2lsca9zmxwfb5n8jrlx7rjfgr7cb11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjdGl2aXRpZXMgYnV0dG9uIiwKICAibmFtZSI6ICJObyBhY3Rpdml0aWVzIGJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibm9fYWN0aXZpdGllc0B5YXlhLmNvdXQiLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "1759h1yp2hndbksaqm2zid2lsca9zmxwfb5n8jrlx7rjfgr7cb11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjdGl2aXRpZXMgYnV0dG9uIiwKICAibmFtZSI6ICJObyBhY3Rpdml0aWVzIGJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibm9fYWN0aXZpdGllc0B5YXlhLmNvdXQiLAogICJ2ZXJzaW9uIjogNAp9"}, "43": {"version": "4", "sha256": "1759h1yp2hndbksaqm2zid2lsca9zmxwfb5n8jrlx7rjfgr7cb11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjdGl2aXRpZXMgYnV0dG9uIiwKICAibmFtZSI6ICJObyBhY3Rpdml0aWVzIGJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibm9fYWN0aXZpdGllc0B5YXlhLmNvdXQiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "blur-my-shell@aunetx", "name": "Blur my Shell", "pname": "blur-my-shell", "description": "Adds a blur look to different parts of the GNOME Shell, including the top panel, dash and overview.\n\nYou can support my work by sponsoring me on:\n- github: https://github.com/sponsors/aunetx\n- ko-fi: https://ko-fi.com/aunetx\n\nNote: if the extension shows an error after updating, please make sure to restart your session to see if it persists. This is due to a bug in gnome shell, which I can't fix by myself.", "link": "https://extensions.gnome.org/extension/3193/blur-my-shell/", "shell_version_map": {"38": {"version": "22", "sha256": "1ss5vhzjkp2bpllxpjlk1l2i8n7p4xjpzkn0q6jg3gd472kkanfx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJuYW1lIjogIkJsdXIgbXkgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWJsdXItbXktc2hlbGwiLAogICJ1dWlkIjogImJsdXItbXktc2hlbGxAYXVuZXR4IiwKICAidmVyc2lvbiI6IDIyCn0="}, "40": {"version": "29", "sha256": "09zflyqk5mlybc4avm812hqr32q0yzrkkw0qy5q4lbkdid7cpqpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJuYW1lIjogIkJsdXIgbXkgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, "41": {"version": "29", "sha256": "09zflyqk5mlybc4avm812hqr32q0yzrkkw0qy5q4lbkdid7cpqpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJuYW1lIjogIkJsdXIgbXkgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, "42": {"version": "44", "sha256": "1cgr803nh5vmc62adsmxjmd5aba3ln4fxn3g4ynqfjql7s2ymkz9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJuYW1lIjogIkJsdXIgbXkgU2hlbGwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIm1lQGF1bmV0eC5kZXYiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdXItbXktc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogNDQKfQ=="}, "43": {"version": "44", "sha256": "1cgr803nh5vmc62adsmxjmd5aba3ln4fxn3g4ynqfjql7s2ymkz9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJuYW1lIjogIkJsdXIgbXkgU2hlbGwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIm1lQGF1bmV0eC5kZXYiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdXItbXktc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogNDQKfQ=="}}} @@ -365,7 +365,7 @@ , {"uuid": "transparent-shell@siroj42.github.io", "name": "Transparent Shell", "pname": "transparent-shell", "description": "Make the main shell components (Top bar, dash, workspace view) transparent.", "link": "https://extensions.gnome.org/extension/3518/transparent-shell/", "shell_version_map": {"38": {"version": "6", "sha256": "11xdqaf7w2ki0q2m0798hk2am0ygglnbd4cq9hd77jl8akr8m20c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgd29ya3NwYWNlIHZpZXcpIHRyYW5zcGFyZW50LiIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TaXJvajQyL2dub21lLWV4dGVuc2lvbi10cmFuc3BhcmVudC1zaGVsbCIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtc2hlbGxAc2lyb2o0Mi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "11", "sha256": "08cbigb0dkvk900y52hqqf7cwccbr2sbkirzfgayp6kks6kf51zp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgd29ya3NwYWNlIHZpZXcpIHRyYW5zcGFyZW50LiIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgU2hlbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNwYXJlbnQtc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2lyb2o0Mi9nbm9tZS1leHRlbnNpb24tdHJhbnNwYXJlbnQtc2hlbGwiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXNoZWxsQHNpcm9qNDIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "08cbigb0dkvk900y52hqqf7cwccbr2sbkirzfgayp6kks6kf51zp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgd29ya3NwYWNlIHZpZXcpIHRyYW5zcGFyZW50LiIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgU2hlbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNwYXJlbnQtc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2lyb2o0Mi9nbm9tZS1leHRlbnNpb24tdHJhbnNwYXJlbnQtc2hlbGwiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXNoZWxsQHNpcm9qNDIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "08cbigb0dkvk900y52hqqf7cwccbr2sbkirzfgayp6kks6kf51zp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgd29ya3NwYWNlIHZpZXcpIHRyYW5zcGFyZW50LiIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgU2hlbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNwYXJlbnQtc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2lyb2o0Mi9nbm9tZS1leHRlbnNpb24tdHJhbnNwYXJlbnQtc2hlbGwiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXNoZWxsQHNpcm9qNDIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDExCn0="}, "43": {"version": "11", "sha256": "08cbigb0dkvk900y52hqqf7cwccbr2sbkirzfgayp6kks6kf51zp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgd29ya3NwYWNlIHZpZXcpIHRyYW5zcGFyZW50LiIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgU2hlbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNwYXJlbnQtc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2lyb2o0Mi9nbm9tZS1leHRlbnNpb24tdHJhbnNwYXJlbnQtc2hlbGwiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXNoZWxsQHNpcm9qNDIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"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": "11", "sha256": "10hfxck76ka8grpdy7d4alfrs1jax2jk5wbk7058san6a6jjfbrm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJUcnVlIENvbG9yIEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLWludmVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2phY2trZW5uZXkvZ25vbWUtdHJ1ZS1jb2xvci1pbnZlcnQiLAogICJ1dWlkIjogInRydWUtY29sb3ItaW52ZXJ0QGphY2trZW5uZXkiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "11", "sha256": "10hfxck76ka8grpdy7d4alfrs1jax2jk5wbk7058san6a6jjfbrm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJUcnVlIENvbG9yIEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLWludmVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2phY2trZW5uZXkvZ25vbWUtdHJ1ZS1jb2xvci1pbnZlcnQiLAogICJ1dWlkIjogInRydWUtY29sb3ItaW52ZXJ0QGphY2trZW5uZXkiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "10hfxck76ka8grpdy7d4alfrs1jax2jk5wbk7058san6a6jjfbrm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJUcnVlIENvbG9yIEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLWludmVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2phY2trZW5uZXkvZ25vbWUtdHJ1ZS1jb2xvci1pbnZlcnQiLAogICJ1dWlkIjogInRydWUtY29sb3ItaW52ZXJ0QGphY2trZW5uZXkiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "10hfxck76ka8grpdy7d4alfrs1jax2jk5wbk7058san6a6jjfbrm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJUcnVlIENvbG9yIEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLWludmVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2phY2trZW5uZXkvZ25vbWUtdHJ1ZS1jb2xvci1pbnZlcnQiLAogICJ1dWlkIjogInRydWUtY29sb3ItaW52ZXJ0QGphY2trZW5uZXkiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"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"}, "42": {"version": "7", "sha256": "063d61mk4wavrclf09vxbl1qxd66475fblqhnl2yq5rv7zrl5ys6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdExhYiBleHRlbnNpb24gdXRpbGl6ZXMgdGhlIG9mZmljaWFsIEdpdExhYiBBUEkgdG8gcHJvdmlkZSBhIGNvbWZvcnRhYmxlIG92ZXJ2aWV3IGFib3V0IHlvdXIgcHJvamVjdHMsIGNvbW1pdHMgJiBwaXBlbGluZXMuXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tZ2l0bGFiIiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJHaXRMYWIgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdpdGxhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaW5hdGljL2dpdGxhYi1leHRlbnNpb24iLAogICJ1dWlkIjogImdpdGxhYi1leHRlbnNpb25AaW5maW5pY29kZS5kZSIsCiAgInZlcnNpb24iOiA3Cn0="}, "43": {"version": "8", "sha256": "0mzb78ldrj8sh06ngf5vwnjpjw1in00n8djxxrd7s2hr2gavxssi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdExhYiBleHRlbnNpb24gdXRpbGl6ZXMgdGhlIG9mZmljaWFsIEdpdExhYiBBUEkgdG8gcHJvdmlkZSBhIGNvbWZvcnRhYmxlIG92ZXJ2aWV3IGFib3V0IHlvdXIgcHJvamVjdHMsIGNvbW1pdHMgJiBwaXBlbGluZXMuXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tZ2l0bGFiIiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJHaXRMYWIgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdpdGxhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaW5hdGljL2dpdGxhYi1leHRlbnNpb24iLAogICJ1dWlkIjogImdpdGxhYi1leHRlbnNpb25AaW5maW5pY29kZS5kZSIsCiAgInZlcnNpb24iOiA4Cn0="}}} -, {"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": "22", "sha256": "12s8c2685w07fi84widdw8wrniwhhn0k96ggypgv47jkmhv31v3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b3JjdWx1cy9Eb3duRmFsbCIsCiAgInV1aWQiOiAiZG93bmZhbGxAdG9yY3VsdXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "40": {"version": "22", "sha256": "12s8c2685w07fi84widdw8wrniwhhn0k96ggypgv47jkmhv31v3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b3JjdWx1cy9Eb3duRmFsbCIsCiAgInV1aWQiOiAiZG93bmZhbGxAdG9yY3VsdXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "41": {"version": "22", "sha256": "12s8c2685w07fi84widdw8wrniwhhn0k96ggypgv47jkmhv31v3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b3JjdWx1cy9Eb3duRmFsbCIsCiAgInV1aWQiOiAiZG93bmZhbGxAdG9yY3VsdXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "42": {"version": "22", "sha256": "12s8c2685w07fi84widdw8wrniwhhn0k96ggypgv47jkmhv31v3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b3JjdWx1cy9Eb3duRmFsbCIsCiAgInV1aWQiOiAiZG93bmZhbGxAdG9yY3VsdXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "43": {"version": "22", "sha256": "12s8c2685w07fi84widdw8wrniwhhn0k96ggypgv47jkmhv31v3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b3JjdWx1cy9Eb3duRmFsbCIsCiAgInV1aWQiOiAiZG93bmZhbGxAdG9yY3VsdXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}}} +, {"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": "23", "sha256": "0h56ljq9a5l63wwbc8m9c80i8rcj6rgmn06izv9qsx5196b6n675", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9yY3VsdXMvRG93bkZhbGwiLAogICJ1dWlkIjogImRvd25mYWxsQHRvcmN1bHVzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "40": {"version": "23", "sha256": "0h56ljq9a5l63wwbc8m9c80i8rcj6rgmn06izv9qsx5196b6n675", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9yY3VsdXMvRG93bkZhbGwiLAogICJ1dWlkIjogImRvd25mYWxsQHRvcmN1bHVzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "41": {"version": "23", "sha256": "0h56ljq9a5l63wwbc8m9c80i8rcj6rgmn06izv9qsx5196b6n675", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9yY3VsdXMvRG93bkZhbGwiLAogICJ1dWlkIjogImRvd25mYWxsQHRvcmN1bHVzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "42": {"version": "23", "sha256": "0h56ljq9a5l63wwbc8m9c80i8rcj6rgmn06izv9qsx5196b6n675", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9yY3VsdXMvRG93bkZhbGwiLAogICJ1dWlkIjogImRvd25mYWxsQHRvcmN1bHVzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "43": {"version": "23", "sha256": "0h56ljq9a5l63wwbc8m9c80i8rcj6rgmn06izv9qsx5196b6n675", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9yY3VsdXMvRG93bkZhbGwiLAogICJ1dWlkIjogImRvd25mYWxsQHRvcmN1bHVzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}}} , {"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": "8", "sha256": "1fwdbmq4ibbgjlqrnagv8qwp64ak719dz745fvg96qy5bc4ws19r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9zci5odC9+a2FwcGEvZ25vbWUtc2hlbGwtdGltZS1hd2FyZW5lc3MvIiwKICAidXVpZCI6ICJ0aW1lLWF3YXJlbmVzc0Bnbm9tZS1leHRlbnNpb25zLmthcHJhbm9mZi5ydSIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "1fwdbmq4ibbgjlqrnagv8qwp64ak719dz745fvg96qy5bc4ws19r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9zci5odC9+a2FwcGEvZ25vbWUtc2hlbGwtdGltZS1hd2FyZW5lc3MvIiwKICAidXVpZCI6ICJ0aW1lLWF3YXJlbmVzc0Bnbm9tZS1leHRlbnNpb25zLmthcHJhbm9mZi5ydSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "1fwdbmq4ibbgjlqrnagv8qwp64ak719dz745fvg96qy5bc4ws19r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9zci5odC9+a2FwcGEvZ25vbWUtc2hlbGwtdGltZS1hd2FyZW5lc3MvIiwKICAidXVpZCI6ICJ0aW1lLWF3YXJlbmVzc0Bnbm9tZS1leHRlbnNpb25zLmthcHJhbm9mZi5ydSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1fwdbmq4ibbgjlqrnagv8qwp64ak719dz745fvg96qy5bc4ws19r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9zci5odC9+a2FwcGEvZ25vbWUtc2hlbGwtdGltZS1hd2FyZW5lc3MvIiwKICAidXVpZCI6ICJ0aW1lLWF3YXJlbmVzc0Bnbm9tZS1leHRlbnNpb25zLmthcHJhbm9mZi5ydSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "1fwdbmq4ibbgjlqrnagv8qwp64ak719dz745fvg96qy5bc4ws19r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9zci5odC9+a2FwcGEvZ25vbWUtc2hlbGwtdGltZS1hd2FyZW5lc3MvIiwKICAidXVpZCI6ICJ0aW1lLWF3YXJlbmVzc0Bnbm9tZS1leHRlbnNpb25zLmthcHJhbm9mZi5ydSIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"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": "5", "sha256": "0xzb1bc8y0chkg6pkg2ax11g2xfrxqd9cjnmxhrahmabh30db451", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11bGx2YWQgY29ubmVjdGlvbiBzdGF0dXMgaW5kaWNhdG9yIiwKICAibmFtZSI6ICJNdWxsdmFkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BvYmVnYS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXVsbHZhZC1pbmRpY2F0b3IiLAogICJ1dWlkIjogIm11bGx2YWRpbmRpY2F0b3JAcG9iZWdhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "0xzb1bc8y0chkg6pkg2ax11g2xfrxqd9cjnmxhrahmabh30db451", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11bGx2YWQgY29ubmVjdGlvbiBzdGF0dXMgaW5kaWNhdG9yIiwKICAibmFtZSI6ICJNdWxsdmFkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BvYmVnYS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXVsbHZhZC1pbmRpY2F0b3IiLAogICJ1dWlkIjogIm11bGx2YWRpbmRpY2F0b3JAcG9iZWdhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "0xzb1bc8y0chkg6pkg2ax11g2xfrxqd9cjnmxhrahmabh30db451", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11bGx2YWQgY29ubmVjdGlvbiBzdGF0dXMgaW5kaWNhdG9yIiwKICAibmFtZSI6ICJNdWxsdmFkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BvYmVnYS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXVsbHZhZC1pbmRpY2F0b3IiLAogICJ1dWlkIjogIm11bGx2YWRpbmRpY2F0b3JAcG9iZWdhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "42": {"version": "5", "sha256": "0xzb1bc8y0chkg6pkg2ax11g2xfrxqd9cjnmxhrahmabh30db451", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11bGx2YWQgY29ubmVjdGlvbiBzdGF0dXMgaW5kaWNhdG9yIiwKICAibmFtZSI6ICJNdWxsdmFkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BvYmVnYS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXVsbHZhZC1pbmRpY2F0b3IiLAogICJ1dWlkIjogIm11bGx2YWRpbmRpY2F0b3JAcG9iZWdhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "43": {"version": "11", "sha256": "1wz1wfvbbjhy763jw5r530f0sglms38an443s34vwrivhiqvy0sq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11bGx2YWQgY29ubmVjdGlvbiBzdGF0dXMgaW5kaWNhdG9yIiwKICAibmFtZSI6ICJNdWxsdmFkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Qb2JlZ2EvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW11bGx2YWQtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJtdWxsdmFkaW5kaWNhdG9yQHBvYmVnYS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"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": "14", "sha256": "0kpjjgcxdla29h371ad1jl9811bvvjm4ycxav0wvsqxns6a2028n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldCIsCiAgInV1aWQiOiAidGFzay13aWRnZXRAanVvemFzbWlza2luaXMuZ2l0bGFiLmlvIiwKICAidmVyc2lvbiI6IDE0LAogICJ3aWtpIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzIgp9"}, "40": {"version": "14", "sha256": "0kpjjgcxdla29h371ad1jl9811bvvjm4ycxav0wvsqxns6a2028n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldCIsCiAgInV1aWQiOiAidGFzay13aWRnZXRAanVvemFzbWlza2luaXMuZ2l0bGFiLmlvIiwKICAidmVyc2lvbiI6IDE0LAogICJ3aWtpIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzIgp9"}, "41": {"version": "14", "sha256": "0kpjjgcxdla29h371ad1jl9811bvvjm4ycxav0wvsqxns6a2028n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldCIsCiAgInV1aWQiOiAidGFzay13aWRnZXRAanVvemFzbWlza2luaXMuZ2l0bGFiLmlvIiwKICAidmVyc2lvbiI6IDE0LAogICJ3aWtpIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzIgp9"}, "42": {"version": "14", "sha256": "0kpjjgcxdla29h371ad1jl9811bvvjm4ycxav0wvsqxns6a2028n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldCIsCiAgInV1aWQiOiAidGFzay13aWRnZXRAanVvemFzbWlza2luaXMuZ2l0bGFiLmlvIiwKICAidmVyc2lvbiI6IDE0LAogICJ3aWtpIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzIgp9"}, "43": {"version": "14", "sha256": "0kpjjgcxdla29h371ad1jl9811bvvjm4ycxav0wvsqxns6a2028n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldCIsCiAgInV1aWQiOiAidGFzay13aWRnZXRAanVvemFzbWlza2luaXMuZ2l0bGFiLmlvIiwKICAidmVyc2lvbiI6IDE0LAogICJ3aWtpIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzIgp9"}}} @@ -376,7 +376,7 @@ , {"uuid": "wireguard-indicator@atareao.es", "name": "WireGuard Indicator", "pname": "wireguard-indicator", "description": "Manage WireGuard VPN from Desktop", "link": "https://extensions.gnome.org/extension/3612/wireguard-indicator/", "shell_version_map": {"40": {"version": "9", "sha256": "058sqbzj2is7n6j8nrf23n6g5mxi1agwmdfv2q8lwmi444bl8xjx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBXaXJlR3VhcmQgVlBOIGZyb20gRGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJpY29uIjogIndpcmVndWFyZC1pY29uIiwKICAibmFtZSI6ICJXaXJlR3VhcmQgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImVzLmF0YXJlYW8ud2lyZWd1YXJkLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F0YXJlYW8vd2lyZWd1YXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAid2lyZWd1YXJkLWluZGljYXRvckBhdGFyZWFvLmVzIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "058sqbzj2is7n6j8nrf23n6g5mxi1agwmdfv2q8lwmi444bl8xjx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBXaXJlR3VhcmQgVlBOIGZyb20gRGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJpY29uIjogIndpcmVndWFyZC1pY29uIiwKICAibmFtZSI6ICJXaXJlR3VhcmQgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImVzLmF0YXJlYW8ud2lyZWd1YXJkLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F0YXJlYW8vd2lyZWd1YXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAid2lyZWd1YXJkLWluZGljYXRvckBhdGFyZWFvLmVzIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "058sqbzj2is7n6j8nrf23n6g5mxi1agwmdfv2q8lwmi444bl8xjx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBXaXJlR3VhcmQgVlBOIGZyb20gRGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJpY29uIjogIndpcmVndWFyZC1pY29uIiwKICAibmFtZSI6ICJXaXJlR3VhcmQgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImVzLmF0YXJlYW8ud2lyZWd1YXJkLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F0YXJlYW8vd2lyZWd1YXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAid2lyZWd1YXJkLWluZGljYXRvckBhdGFyZWFvLmVzIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "shamsi-calendar@gnome.scr.ir", "name": "Iranian Persian Calendar", "pname": "shamsi-calendar", "description": "تقویم هجری شمسی،قمری و میلادی در میز‌کار گنوم لینوکس\nقابلیت نمایش اوقات شرعی و پخش اذان\nدرج تعطیلی‌ها و مناسبت‌های رسمی تقویم\nزبان کاملاً فارسی\nتاریخ قمری هلالی ایران\nسازگار با اکثر نسخه‌های گنوم\nدر حال توسعه...\n\nShows Persian + Islamic + Gregorian date in the panel of gnome.\n\nIt shows:\n1- Persian calendar\n2- It can show, today is holiday or not!\n3- Show notification onDayChanged!\n4- Date converter between Persian, Gregorian and Lunar Hijri(Islamic)\n5- Show calendar Events.\n6- Show PrayTimes and play sound (Azan).\n\nPlease \"rate\" here and \"star\" project in GitHub.\nPlease open an issue in GitHub if you found something or have an idea!\nگزارش مشکلات:\nhttps://github.com/SCR-IR/gnome-shamsi-calendar/issues", "link": "https://extensions.gnome.org/extension/3618/shamsi-calendar/", "shell_version_map": {"38": {"version": "25", "sha256": "0ms8cgfl5fy0j5ykpkcm17z01kamy09qfp5inbnb8izkvn34mzmr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNQp9"}, "40": {"version": "25", "sha256": "0ms8cgfl5fy0j5ykpkcm17z01kamy09qfp5inbnb8izkvn34mzmr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNQp9"}, "41": {"version": "25", "sha256": "0ms8cgfl5fy0j5ykpkcm17z01kamy09qfp5inbnb8izkvn34mzmr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNQp9"}, "42": {"version": "25", "sha256": "0ms8cgfl5fy0j5ykpkcm17z01kamy09qfp5inbnb8izkvn34mzmr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNQp9"}, "43": {"version": "25", "sha256": "0ms8cgfl5fy0j5ykpkcm17z01kamy09qfp5inbnb8izkvn34mzmr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNQp9"}}} , {"uuid": "tunnel-indicator@atareao.es", "name": "Tunnel Indicator", "pname": "tunnel-indicator", "description": "Manage SSH Tunnels from Desktop", "link": "https://extensions.gnome.org/extension/3622/tunnel-indicator/", "shell_version_map": {"40": {"version": "2", "sha256": "0ma4a711mgjxyhy4d21p2m7wvbnmmwlfdsf6xk9i36ranjcqs9as", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBTU0ggVHVubmVscyBmcm9tIERlc2t0b3AiLAogICJleHRlbnNpb24taWQiOiAidHVubmVsLWluZGljYXRvckBhdGFyZWFvLmVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidHVubmVsLWluZGljYXRvckBhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJ0dW5uZWwtaWNvbiIsCiAgIm5hbWUiOiAiVHVubmVsIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJlcy5hdGFyZWFvLnR1bm5lbC1pbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXRhcmVhby90dW5uZWwtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJ0dW5uZWwtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJ2ZXJzaW9uIjogMgp9"}}} -, {"uuid": "arcmenu@arcmenu.com", "name": "ArcMenu", "pname": "arcmenu", "description": "Application menu for GNOME Shell\n\nFeatures include: various menu layouts, built in GNOME search, quick access to system shortcuts, and much more!\n\nCommon solutions for ERROR message:\n - Restart your GNOME session after updating ArcMenu.\n - Install one of the following packages: 'gir1.2-gmenu-3.0' or 'gnome-menus'\n\nGeneral Help:\n - Visit https://gitlab.com/arcmenu/ArcMenu/-/wikis/home\n\nPlease report all bugs or issues at https://gitlab.com/arcmenu/ArcMenu", "link": "https://extensions.gnome.org/extension/3628/arcmenu/", "shell_version_map": {"38": {"version": "13", "sha256": "1sqsj5vj234c53m508wa2zxjkqnf1pcgm6iqmj2k33dq7h75nhlw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIG1lbnUgZm9yIEdOT01FIFNoZWxsXG5cbkZlYXR1cmVzIGluY2x1ZGU6IHZhcmlvdXMgbWVudSBsYXlvdXRzLCBidWlsdCBpbiBHTk9NRSBzZWFyY2gsIHF1aWNrIGFjY2VzcyB0byBzeXN0ZW0gc2hvcnRjdXRzLCBhbmQgbXVjaCBtb3JlIVxuXG5Db21tb24gc29sdXRpb25zIGZvciBFUlJPUiBtZXNzYWdlOlxuIC0gUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbiAtIEluc3RhbGwgb25lIG9mIHRoZSBmb2xsb3dpbmcgcGFja2FnZXM6ICdnaXIxLjItZ21lbnUtMy4wJyBvciAnZ25vbWUtbWVudXMnXG5cbkdlbmVyYWwgSGVscDpcbiAtIFZpc2l0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUvLS93aWtpcy9ob21lXG5cblBsZWFzZSByZXBvcnQgYWxsIGJ1Z3Mgb3IgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJleHRlbnNpb24taWQiOiAiYXJjbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgInV1aWQiOiAiYXJjbWVudUBhcmNtZW51LmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "27", "sha256": "01h4r7alddj1fly4l4rxpji17ilmf0v56559rdnsl0sy1lx8bkrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIG1lbnUgZm9yIEdOT01FIFNoZWxsXG5cbkZlYXR1cmVzIGluY2x1ZGU6IHZhcmlvdXMgbWVudSBsYXlvdXRzLCBidWlsdCBpbiBHTk9NRSBzZWFyY2gsIHF1aWNrIGFjY2VzcyB0byBzeXN0ZW0gc2hvcnRjdXRzLCBhbmQgbXVjaCBtb3JlIVxuXG5Db21tb24gc29sdXRpb25zIGZvciBFUlJPUiBtZXNzYWdlOlxuIC0gUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbiAtIEluc3RhbGwgb25lIG9mIHRoZSBmb2xsb3dpbmcgcGFja2FnZXM6ICdnaXIxLjItZ21lbnUtMy4wJyBvciAnZ25vbWUtbWVudXMnXG5cbkdlbmVyYWwgSGVscDpcbiAtIFZpc2l0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUvLS93aWtpcy9ob21lXG5cblBsZWFzZSByZXBvcnQgYWxsIGJ1Z3Mgb3IgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJleHRlbnNpb24taWQiOiAiYXJjbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "41": {"version": "27", "sha256": "01h4r7alddj1fly4l4rxpji17ilmf0v56559rdnsl0sy1lx8bkrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIG1lbnUgZm9yIEdOT01FIFNoZWxsXG5cbkZlYXR1cmVzIGluY2x1ZGU6IHZhcmlvdXMgbWVudSBsYXlvdXRzLCBidWlsdCBpbiBHTk9NRSBzZWFyY2gsIHF1aWNrIGFjY2VzcyB0byBzeXN0ZW0gc2hvcnRjdXRzLCBhbmQgbXVjaCBtb3JlIVxuXG5Db21tb24gc29sdXRpb25zIGZvciBFUlJPUiBtZXNzYWdlOlxuIC0gUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbiAtIEluc3RhbGwgb25lIG9mIHRoZSBmb2xsb3dpbmcgcGFja2FnZXM6ICdnaXIxLjItZ21lbnUtMy4wJyBvciAnZ25vbWUtbWVudXMnXG5cbkdlbmVyYWwgSGVscDpcbiAtIFZpc2l0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUvLS93aWtpcy9ob21lXG5cblBsZWFzZSByZXBvcnQgYWxsIGJ1Z3Mgb3IgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJleHRlbnNpb24taWQiOiAiYXJjbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "42": {"version": "43", "sha256": "18dqnr0jsi7crkmd03vdywkhmkkd0zwf5bq7p0kkgg27cmbgx6dy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIG1lbnUgZm9yIEdOT01FIFNoZWxsXG5cbkZlYXR1cmVzIGluY2x1ZGU6IHZhcmlvdXMgbWVudSBsYXlvdXRzLCBidWlsdCBpbiBHTk9NRSBzZWFyY2gsIHF1aWNrIGFjY2VzcyB0byBzeXN0ZW0gc2hvcnRjdXRzLCBhbmQgbXVjaCBtb3JlIVxuXG5Db21tb24gc29sdXRpb25zIGZvciBFUlJPUiBtZXNzYWdlOlxuIC0gUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbiAtIEluc3RhbGwgb25lIG9mIHRoZSBmb2xsb3dpbmcgcGFja2FnZXM6ICdnaXIxLjItZ21lbnUtMy4wJyBvciAnZ25vbWUtbWVudXMnXG5cbkdlbmVyYWwgSGVscDpcbiAtIFZpc2l0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUvLS93aWtpcy9ob21lXG5cblBsZWFzZSByZXBvcnQgYWxsIGJ1Z3Mgb3IgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJleHRlbnNpb24taWQiOiAiYXJjbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}, "43": {"version": "43", "sha256": "18dqnr0jsi7crkmd03vdywkhmkkd0zwf5bq7p0kkgg27cmbgx6dy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIG1lbnUgZm9yIEdOT01FIFNoZWxsXG5cbkZlYXR1cmVzIGluY2x1ZGU6IHZhcmlvdXMgbWVudSBsYXlvdXRzLCBidWlsdCBpbiBHTk9NRSBzZWFyY2gsIHF1aWNrIGFjY2VzcyB0byBzeXN0ZW0gc2hvcnRjdXRzLCBhbmQgbXVjaCBtb3JlIVxuXG5Db21tb24gc29sdXRpb25zIGZvciBFUlJPUiBtZXNzYWdlOlxuIC0gUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbiAtIEluc3RhbGwgb25lIG9mIHRoZSBmb2xsb3dpbmcgcGFja2FnZXM6ICdnaXIxLjItZ21lbnUtMy4wJyBvciAnZ25vbWUtbWVudXMnXG5cbkdlbmVyYWwgSGVscDpcbiAtIFZpc2l0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUvLS93aWtpcy9ob21lXG5cblBsZWFzZSByZXBvcnQgYWxsIGJ1Z3Mgb3IgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJleHRlbnNpb24taWQiOiAiYXJjbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}}} +, {"uuid": "arcmenu@arcmenu.com", "name": "ArcMenu", "pname": "arcmenu", "description": "Application menu for GNOME Shell\n\nFeatures include: various menu layouts, built in GNOME search, quick access to system shortcuts, and much more!\n\nCommon solutions for ERROR message:\n - Restart your GNOME session after updating ArcMenu.\n - Install one of the following packages: 'gir1.2-gmenu-3.0' or 'gnome-menus'\n\nGeneral Help:\n - Visit https://gitlab.com/arcmenu/ArcMenu/-/wikis/home\n\nPlease report all bugs or issues at https://gitlab.com/arcmenu/ArcMenu", "link": "https://extensions.gnome.org/extension/3628/arcmenu/", "shell_version_map": {"38": {"version": "13", "sha256": "1sqsj5vj234c53m508wa2zxjkqnf1pcgm6iqmj2k33dq7h75nhlw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIG1lbnUgZm9yIEdOT01FIFNoZWxsXG5cbkZlYXR1cmVzIGluY2x1ZGU6IHZhcmlvdXMgbWVudSBsYXlvdXRzLCBidWlsdCBpbiBHTk9NRSBzZWFyY2gsIHF1aWNrIGFjY2VzcyB0byBzeXN0ZW0gc2hvcnRjdXRzLCBhbmQgbXVjaCBtb3JlIVxuXG5Db21tb24gc29sdXRpb25zIGZvciBFUlJPUiBtZXNzYWdlOlxuIC0gUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbiAtIEluc3RhbGwgb25lIG9mIHRoZSBmb2xsb3dpbmcgcGFja2FnZXM6ICdnaXIxLjItZ21lbnUtMy4wJyBvciAnZ25vbWUtbWVudXMnXG5cbkdlbmVyYWwgSGVscDpcbiAtIFZpc2l0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUvLS93aWtpcy9ob21lXG5cblBsZWFzZSByZXBvcnQgYWxsIGJ1Z3Mgb3IgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJleHRlbnNpb24taWQiOiAiYXJjbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgInV1aWQiOiAiYXJjbWVudUBhcmNtZW51LmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "27", "sha256": "01h4r7alddj1fly4l4rxpji17ilmf0v56559rdnsl0sy1lx8bkrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIG1lbnUgZm9yIEdOT01FIFNoZWxsXG5cbkZlYXR1cmVzIGluY2x1ZGU6IHZhcmlvdXMgbWVudSBsYXlvdXRzLCBidWlsdCBpbiBHTk9NRSBzZWFyY2gsIHF1aWNrIGFjY2VzcyB0byBzeXN0ZW0gc2hvcnRjdXRzLCBhbmQgbXVjaCBtb3JlIVxuXG5Db21tb24gc29sdXRpb25zIGZvciBFUlJPUiBtZXNzYWdlOlxuIC0gUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbiAtIEluc3RhbGwgb25lIG9mIHRoZSBmb2xsb3dpbmcgcGFja2FnZXM6ICdnaXIxLjItZ21lbnUtMy4wJyBvciAnZ25vbWUtbWVudXMnXG5cbkdlbmVyYWwgSGVscDpcbiAtIFZpc2l0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUvLS93aWtpcy9ob21lXG5cblBsZWFzZSByZXBvcnQgYWxsIGJ1Z3Mgb3IgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJleHRlbnNpb24taWQiOiAiYXJjbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "41": {"version": "27", "sha256": "01h4r7alddj1fly4l4rxpji17ilmf0v56559rdnsl0sy1lx8bkrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIG1lbnUgZm9yIEdOT01FIFNoZWxsXG5cbkZlYXR1cmVzIGluY2x1ZGU6IHZhcmlvdXMgbWVudSBsYXlvdXRzLCBidWlsdCBpbiBHTk9NRSBzZWFyY2gsIHF1aWNrIGFjY2VzcyB0byBzeXN0ZW0gc2hvcnRjdXRzLCBhbmQgbXVjaCBtb3JlIVxuXG5Db21tb24gc29sdXRpb25zIGZvciBFUlJPUiBtZXNzYWdlOlxuIC0gUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbiAtIEluc3RhbGwgb25lIG9mIHRoZSBmb2xsb3dpbmcgcGFja2FnZXM6ICdnaXIxLjItZ21lbnUtMy4wJyBvciAnZ25vbWUtbWVudXMnXG5cbkdlbmVyYWwgSGVscDpcbiAtIFZpc2l0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUvLS93aWtpcy9ob21lXG5cblBsZWFzZSByZXBvcnQgYWxsIGJ1Z3Mgb3IgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJleHRlbnNpb24taWQiOiAiYXJjbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "42": {"version": "44", "sha256": "1x4afxl2krahzaviqzpcp85b4x52bjv09sz5qzl2dbmpvk7xb4y7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIG1lbnUgZm9yIEdOT01FIFNoZWxsXG5cbkZlYXR1cmVzIGluY2x1ZGU6IHZhcmlvdXMgbWVudSBsYXlvdXRzLCBidWlsdCBpbiBHTk9NRSBzZWFyY2gsIHF1aWNrIGFjY2VzcyB0byBzeXN0ZW0gc2hvcnRjdXRzLCBhbmQgbXVjaCBtb3JlIVxuXG5Db21tb24gc29sdXRpb25zIGZvciBFUlJPUiBtZXNzYWdlOlxuIC0gUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbiAtIEluc3RhbGwgb25lIG9mIHRoZSBmb2xsb3dpbmcgcGFja2FnZXM6ICdnaXIxLjItZ21lbnUtMy4wJyBvciAnZ25vbWUtbWVudXMnXG5cbkdlbmVyYWwgSGVscDpcbiAtIFZpc2l0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUvLS93aWtpcy9ob21lXG5cblBsZWFzZSByZXBvcnQgYWxsIGJ1Z3Mgb3IgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcmNtZW51IiwKICAibmFtZSI6ICJBcmNNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFyY21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogNDQKfQ=="}, "43": {"version": "44", "sha256": "1x4afxl2krahzaviqzpcp85b4x52bjv09sz5qzl2dbmpvk7xb4y7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIG1lbnUgZm9yIEdOT01FIFNoZWxsXG5cbkZlYXR1cmVzIGluY2x1ZGU6IHZhcmlvdXMgbWVudSBsYXlvdXRzLCBidWlsdCBpbiBHTk9NRSBzZWFyY2gsIHF1aWNrIGFjY2VzcyB0byBzeXN0ZW0gc2hvcnRjdXRzLCBhbmQgbXVjaCBtb3JlIVxuXG5Db21tb24gc29sdXRpb25zIGZvciBFUlJPUiBtZXNzYWdlOlxuIC0gUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbiAtIEluc3RhbGwgb25lIG9mIHRoZSBmb2xsb3dpbmcgcGFja2FnZXM6ICdnaXIxLjItZ21lbnUtMy4wJyBvciAnZ25vbWUtbWVudXMnXG5cbkdlbmVyYWwgSGVscDpcbiAtIFZpc2l0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUvLS93aWtpcy9ob21lXG5cblBsZWFzZSByZXBvcnQgYWxsIGJ1Z3Mgb3IgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcmNtZW51IiwKICAibmFtZSI6ICJBcmNNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFyY21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogNDQKfQ=="}}} , {"uuid": "fixedimelist@alynx.one", "name": "Fixed IME List", "pname": "fixed-ime-list", "description": "Make the IME list in fixed sequence instead of MRU.", "link": "https://extensions.gnome.org/extension/3663/fixed-ime-list/", "shell_version_map": {"38": {"version": "7", "sha256": "18z9h0fcq6w3kmcc5v8swjn18nc9hkck54jfzyv2697py6cd83kf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "18z9h0fcq6w3kmcc5v8swjn18nc9hkck54jfzyv2697py6cd83kf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "18z9h0fcq6w3kmcc5v8swjn18nc9hkck54jfzyv2697py6cd83kf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "18z9h0fcq6w3kmcc5v8swjn18nc9hkck54jfzyv2697py6cd83kf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "18z9h0fcq6w3kmcc5v8swjn18nc9hkck54jfzyv2697py6cd83kf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "topindicatorapp@quiro9.com", "name": "Top Indicator App", "pname": "top-indicator-app", "description": "This extension is 'appindicators' from ubuntu, renamed 'top indicator app' under the terms of the GPL v2 +. it is the extension itself that Ubuntu offers as a native experience on your system, but so you can install it in other distros since the current one in gnome-extensions is empty.I will offer stable updates when possible.", "link": "https://extensions.gnome.org/extension/3681/top-indicator-app/", "shell_version_map": {"38": {"version": "2", "sha256": "12r4fxgsgd7jn001vlzqrsd86ci62zxk0b9p3bkdqh6g5hj3la35", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGlzICdhcHBpbmRpY2F0b3JzJyBmcm9tIHVidW50dSwgcmVuYW1lZCAndG9wIGluZGljYXRvciBhcHAnIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR1BMIHYyICsuIGl0IGlzIHRoZSBleHRlbnNpb24gaXRzZWxmIHRoYXQgVWJ1bnR1IG9mZmVycyBhcyBhIG5hdGl2ZSBleHBlcmllbmNlIG9uIHlvdXIgc3lzdGVtLCBidXQgc28geW91IGNhbiBpbnN0YWxsIGl0IGluIG90aGVyIGRpc3Ryb3Mgc2luY2UgdGhlIGN1cnJlbnQgb25lIGluIGdub21lLWV4dGVuc2lvbnMgaXMgZW1wdHkuSSB3aWxsIG9mZmVyIHN0YWJsZSB1cGRhdGVzIHdoZW4gcG9zc2libGUuIiwKICAibmFtZSI6ICJUb3AgSW5kaWNhdG9yIEFwcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3VidW50dS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXBwaW5kaWNhdG9yIiwKICAidXVpZCI6ICJ0b3BpbmRpY2F0b3JhcHBAcXVpcm85LmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "reorder-workspaces@jer.dev", "name": "Reorder Workspaces", "pname": "reorder-workspaces", "description": "Reorder workspaces in the overview with Alt+Up/Alt+Down", "link": "https://extensions.gnome.org/extension/3685/reorder-workspaces/", "shell_version_map": {"38": {"version": "12", "sha256": "0l4ivdbhsnpmr2bngqrzmybal6i1ni85dlpd5ir0dafd95yl7y04", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbW1yMC9nbm9tZS1yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInJlb3JkZXItd29ya3NwYWNlc0BqZXIuZGV2IiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "12", "sha256": "0l4ivdbhsnpmr2bngqrzmybal6i1ni85dlpd5ir0dafd95yl7y04", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbW1yMC9nbm9tZS1yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInJlb3JkZXItd29ya3NwYWNlc0BqZXIuZGV2IiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "0l4ivdbhsnpmr2bngqrzmybal6i1ni85dlpd5ir0dafd95yl7y04", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbW1yMC9nbm9tZS1yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInJlb3JkZXItd29ya3NwYWNlc0BqZXIuZGV2IiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "17", "sha256": "0xwbkg75z8cbnwc9mkwh4wlh6yr674aivdxyg4xla9p6nkr4d1wi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbW1yMC9nbm9tZS1yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInJlb3JkZXItd29ya3NwYWNlc0BqZXIuZGV2IiwKICAidmVyc2lvbiI6IDE3Cn0="}, "43": {"version": "17", "sha256": "0xwbkg75z8cbnwc9mkwh4wlh6yr674aivdxyg4xla9p6nkr4d1wi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbW1yMC9nbm9tZS1yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInJlb3JkZXItd29ya3NwYWNlc0BqZXIuZGV2IiwKICAidmVyc2lvbiI6IDE3Cn0="}}} @@ -463,7 +463,7 @@ , {"uuid": "custom-vpn-toggler@giteduberger.fr", "name": "Custom VPN Toggler (and indicator)", "pname": "custom-vpn-toggler", "description": "See the status of a VPN (with its icon) and toggle VPN. \nCompatible with FortinetVPN, GlobalProtect, NetExtender, NordVpn, OpenVPN...", "link": "https://extensions.gnome.org/extension/4061/custom-vpn-toggler/", "shell_version_map": {"38": {"version": "8", "sha256": "01nmh9bmwp2w70d4icn61hxl548bspcy7k49ld5pqnpch3i0pa47", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSB0aGUgc3RhdHVzIG9mIGEgVlBOICh3aXRoIGl0cyBpY29uKSBhbmQgdG9nZ2xlIFZQTi4gXG5Db21wYXRpYmxlIHdpdGggRm9ydGluZXRWUE4sIEdsb2JhbFByb3RlY3QsIE5ldEV4dGVuZGVyLCBOb3JkVnBuLCBPcGVuVlBOLi4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLXZwbi10b2dnbGVyQGdpdGVkdWJlcmdlci5mciIsCiAgIm5hbWUiOiAiQ3VzdG9tIFZQTiBUb2dnbGVyIChhbmQgaW5kaWNhdG9yKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJmci5naXRlZHViZXJnZXIuY3VzdG9tLXZwbi10b2dnbGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vWGF2aWVyQmVyZ2VyL2N1c3RvbS12cG4tdG9nZ2xlciIsCiAgInV1aWQiOiAiY3VzdG9tLXZwbi10b2dnbGVyQGdpdGVkdWJlcmdlci5mciIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "10", "sha256": "1rawssdlj563nzp5i1w6is8q3v0699zaf12apn7h7jxsqr6qwajf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSB0aGUgc3RhdHVzIG9mIGEgVlBOICh3aXRoIGl0cyBpY29uKSBhbmQgdG9nZ2xlIFZQTi4gXG5Db21wYXRpYmxlIHdpdGggRm9ydGluZXRWUE4sIEdsb2JhbFByb3RlY3QsIE5ldEV4dGVuZGVyLCBOb3JkVnBuLCBPcGVuVlBOLi4uIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbS12cG4tdG9nZ2xlci5naXRlZHViZXJnZXIuZnIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20tdnBuLXRvZ2dsZXIiLAogICJuYW1lIjogIkN1c3RvbSBWUE4gVG9nZ2xlciAoYW5kIGluZGljYXRvcikiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9tLXZwbi10b2dnbGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vWGF2aWVyQmVyZ2VyL2N1c3RvbS12cG4tdG9nZ2xlciIsCiAgInV1aWQiOiAiY3VzdG9tLXZwbi10b2dnbGVyQGdpdGVkdWJlcmdlci5mciIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "1rawssdlj563nzp5i1w6is8q3v0699zaf12apn7h7jxsqr6qwajf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSB0aGUgc3RhdHVzIG9mIGEgVlBOICh3aXRoIGl0cyBpY29uKSBhbmQgdG9nZ2xlIFZQTi4gXG5Db21wYXRpYmxlIHdpdGggRm9ydGluZXRWUE4sIEdsb2JhbFByb3RlY3QsIE5ldEV4dGVuZGVyLCBOb3JkVnBuLCBPcGVuVlBOLi4uIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbS12cG4tdG9nZ2xlci5naXRlZHViZXJnZXIuZnIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20tdnBuLXRvZ2dsZXIiLAogICJuYW1lIjogIkN1c3RvbSBWUE4gVG9nZ2xlciAoYW5kIGluZGljYXRvcikiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9tLXZwbi10b2dnbGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vWGF2aWVyQmVyZ2VyL2N1c3RvbS12cG4tdG9nZ2xlciIsCiAgInV1aWQiOiAiY3VzdG9tLXZwbi10b2dnbGVyQGdpdGVkdWJlcmdlci5mciIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "1rawssdlj563nzp5i1w6is8q3v0699zaf12apn7h7jxsqr6qwajf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSB0aGUgc3RhdHVzIG9mIGEgVlBOICh3aXRoIGl0cyBpY29uKSBhbmQgdG9nZ2xlIFZQTi4gXG5Db21wYXRpYmxlIHdpdGggRm9ydGluZXRWUE4sIEdsb2JhbFByb3RlY3QsIE5ldEV4dGVuZGVyLCBOb3JkVnBuLCBPcGVuVlBOLi4uIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbS12cG4tdG9nZ2xlci5naXRlZHViZXJnZXIuZnIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20tdnBuLXRvZ2dsZXIiLAogICJuYW1lIjogIkN1c3RvbSBWUE4gVG9nZ2xlciAoYW5kIGluZGljYXRvcikiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9tLXZwbi10b2dnbGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vWGF2aWVyQmVyZ2VyL2N1c3RvbS12cG4tdG9nZ2xlciIsCiAgInV1aWQiOiAiY3VzdG9tLXZwbi10b2dnbGVyQGdpdGVkdWJlcmdlci5mciIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "geary-tray-icon@taylantatli.github.com", "name": "Geary Tray Icon", "pname": "geary-tray-icon", "description": "Adds an icon to the panel to open mailbox and creating new mail.", "link": "https://extensions.gnome.org/extension/4073/geary-tray-icon/", "shell_version_map": {"38": {"version": "3", "sha256": "0nq7jf63yln8w4fivflwncdrdzagzky0ds9qzj43s1vhp046wbf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiB0byB0aGUgcGFuZWwgdG8gb3BlbiBtYWlsYm94IGFuZCBjcmVhdGluZyBuZXcgbWFpbC4iLAogICJuYW1lIjogIkdlYXJ5IFRyYXkgSWNvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RheWxhblRhdGxpL2dlYXJ5LXRyYXktaWNvbiIsCiAgInV1aWQiOiAiZ2VhcnktdHJheS1pY29uQHRheWxhbnRhdGxpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "0nq7jf63yln8w4fivflwncdrdzagzky0ds9qzj43s1vhp046wbf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiB0byB0aGUgcGFuZWwgdG8gb3BlbiBtYWlsYm94IGFuZCBjcmVhdGluZyBuZXcgbWFpbC4iLAogICJuYW1lIjogIkdlYXJ5IFRyYXkgSWNvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RheWxhblRhdGxpL2dlYXJ5LXRyYXktaWNvbiIsCiAgInV1aWQiOiAiZ2VhcnktdHJheS1pY29uQHRheWxhbnRhdGxpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "0nq7jf63yln8w4fivflwncdrdzagzky0ds9qzj43s1vhp046wbf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiB0byB0aGUgcGFuZWwgdG8gb3BlbiBtYWlsYm94IGFuZCBjcmVhdGluZyBuZXcgbWFpbC4iLAogICJuYW1lIjogIkdlYXJ5IFRyYXkgSWNvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RheWxhblRhdGxpL2dlYXJ5LXRyYXktaWNvbiIsCiAgInV1aWQiOiAiZ2VhcnktdHJheS1pY29uQHRheWxhbnRhdGxpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "0nq7jf63yln8w4fivflwncdrdzagzky0ds9qzj43s1vhp046wbf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiB0byB0aGUgcGFuZWwgdG8gb3BlbiBtYWlsYm94IGFuZCBjcmVhdGluZyBuZXcgbWFpbC4iLAogICJuYW1lIjogIkdlYXJ5IFRyYXkgSWNvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RheWxhblRhdGxpL2dlYXJ5LXRyYXktaWNvbiIsCiAgInV1aWQiOiAiZ2VhcnktdHJheS1pY29uQHRheWxhbnRhdGxpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "shell-restarter@koolskateguy89.github.io", "name": "Shell Restarter", "pname": "shell-restarter", "description": "Tired of pressing Alt+F2+R?\nWell you can restart GNOME Shell with just the press of a button! (May or may not work on Wayland)", "link": "https://extensions.gnome.org/extension/4075/shell-restarter/", "shell_version_map": {"38": {"version": "5", "sha256": "19v3sxbsrk0cskq7cikwz6w95m8q2v56hyrkwj595c8m8i0x6i1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpcmVkIG9mIHByZXNzaW5nIEFsdCtGMitSP1xuV2VsbCB5b3UgY2FuIHJlc3RhcnQgR05PTUUgU2hlbGwgd2l0aCBqdXN0IHRoZSBwcmVzcyBvZiBhIGJ1dHRvbiEgKE1heSBvciBtYXkgbm90IHdvcmsgb24gV2F5bGFuZCkiLAogICJuYW1lIjogIlNoZWxsIFJlc3RhcnRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaGVsbC1yZXN0YXJ0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29vbHNrYXRlZ3V5ODkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNoZWxsLXJlc3RhcnRlciIsCiAgInV1aWQiOiAic2hlbGwtcmVzdGFydGVyQGtvb2xza2F0ZWd1eTg5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "19v3sxbsrk0cskq7cikwz6w95m8q2v56hyrkwj595c8m8i0x6i1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpcmVkIG9mIHByZXNzaW5nIEFsdCtGMitSP1xuV2VsbCB5b3UgY2FuIHJlc3RhcnQgR05PTUUgU2hlbGwgd2l0aCBqdXN0IHRoZSBwcmVzcyBvZiBhIGJ1dHRvbiEgKE1heSBvciBtYXkgbm90IHdvcmsgb24gV2F5bGFuZCkiLAogICJuYW1lIjogIlNoZWxsIFJlc3RhcnRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaGVsbC1yZXN0YXJ0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29vbHNrYXRlZ3V5ODkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNoZWxsLXJlc3RhcnRlciIsCiAgInV1aWQiOiAic2hlbGwtcmVzdGFydGVyQGtvb2xza2F0ZWd1eTg5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}}} -, {"uuid": "iqair@wotmshuaisi_github", "name": "Iqair Gnome Extension", "pname": "iqair-gnome-extension", "description": "Gnome extension for tracking air quality in real-time. data provider: https://iqair.com/. to get an API token: https://www.iqair.com/us/dashboard/api", "link": "https://extensions.gnome.org/extension/4082/iqair-gnome-extension/", "shell_version_map": {"38": {"version": "6", "sha256": "150rn9gk6nzba30g38bjpgjyqr2a25cysg6fd6p1is92w8lknls4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "17", "sha256": "07fv1z9rk9xjdrqrvs9cglmq5dbcnf3dgjfz7dnflabcrb9yqisv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "07fv1z9rk9xjdrqrvs9cglmq5dbcnf3dgjfz7dnflabcrb9yqisv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "42": {"version": "17", "sha256": "07fv1z9rk9xjdrqrvs9cglmq5dbcnf3dgjfz7dnflabcrb9yqisv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "43": {"version": "21", "sha256": "0h2hfizx3ysyhnl3cwwjrq1wmgf3szh0hbnb3w06wqaav6rq1y42", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd290bXNodWFpc2kvaXFhaXJHbm9tZUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaXFhaXJAd290bXNodWFpc2lfZ2l0aHViIiwKICAidmVyc2lvbiI6IDIxCn0="}}} +, {"uuid": "iqair@wotmshuaisi_github", "name": "Iqair Gnome Extension", "pname": "iqair-gnome-extension", "description": "Gnome extension for tracking air quality in real-time. data provider: https://iqair.com/. to get an API token: https://www.iqair.com/us/dashboard/api", "link": "https://extensions.gnome.org/extension/4082/iqair-gnome-extension/", "shell_version_map": {"38": {"version": "6", "sha256": "150rn9gk6nzba30g38bjpgjyqr2a25cysg6fd6p1is92w8lknls4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "17", "sha256": "07fv1z9rk9xjdrqrvs9cglmq5dbcnf3dgjfz7dnflabcrb9yqisv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "07fv1z9rk9xjdrqrvs9cglmq5dbcnf3dgjfz7dnflabcrb9yqisv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "42": {"version": "17", "sha256": "07fv1z9rk9xjdrqrvs9cglmq5dbcnf3dgjfz7dnflabcrb9yqisv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "43": {"version": "22", "sha256": "1lm38mx2wm7vycl8aqr60b1q8sn4gqj4q7j25almxwlay08q97ax", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd290bXNodWFpc2kvaXFhaXJHbm9tZUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaXFhaXJAd290bXNodWFpc2lfZ2l0aHViIiwKICAidmVyc2lvbiI6IDIyCn0="}}} , {"uuid": "bigSur-StatusArea@ordissimo.com", "name": "Big Sur Status Area", "pname": "big-sur-status-area", "description": "Move the Power/Network/Volume/User/Date/Notifications menus to the status area. It is a fork of :https://github.com/Fausto-Korpsvart/Big-Sur-StatusArea", "link": "https://extensions.gnome.org/extension/4085/big-sur-status-area/", "shell_version_map": {"38": {"version": "25", "sha256": "0dg2fg98l0wxr4hgaz2lwb30p93asbm5693svm8kq51v3g3wpdw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PcmRpc3NpbW8vQmlnLVN1ci1TdGF0dXNBcmVhIiwKICAidXVpZCI6ICJiaWdTdXItU3RhdHVzQXJlYUBvcmRpc3NpbW8uY29tIiwKICAidmVyc2lvbiI6IDI1Cn0="}, "40": {"version": "44", "sha256": "0z8rpw3dfcfjxnk1p42vzpndb33yww6zmbrzc2dz2df5rfgp2lpv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL09yZGlzc2ltby9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJ1dWlkIjogImJpZ1N1ci1TdGF0dXNBcmVhQG9yZGlzc2ltby5jb20iLAogICJ2ZXJzaW9uIjogNDQKfQ=="}, "41": {"version": "44", "sha256": "0z8rpw3dfcfjxnk1p42vzpndb33yww6zmbrzc2dz2df5rfgp2lpv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL09yZGlzc2ltby9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJ1dWlkIjogImJpZ1N1ci1TdGF0dXNBcmVhQG9yZGlzc2ltby5jb20iLAogICJ2ZXJzaW9uIjogNDQKfQ=="}, "42": {"version": "47", "sha256": "15p910lncf5g0v9xphqmsk55vc9wr276s00dlnxlwx7261bk5a3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vT3JkaXNzaW1vL0JpZy1TdXItU3RhdHVzQXJlYSIsCiAgInV1aWQiOiAiYmlnU3VyLVN0YXR1c0FyZWFAb3JkaXNzaW1vLmNvbSIsCiAgInZlcnNpb24iOiA0Nwp9"}}} , {"uuid": "disable-touch-osk@pardus.org.tr", "name": "disable-touch-osk", "pname": "disable-touch-osk", "description": "Disable on screen keyboard for touchscreens", "link": "https://extensions.gnome.org/extension/4087/disable-touch-osk/", "shell_version_map": {"38": {"version": "3", "sha256": "10ljbjbswzn9y30n2h39iiz673hhmazr2h14lhhws05m71xvbbfy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgb24gc2NyZWVuIGtleWJvYXJkIGZvciB0b3VjaHNjcmVlbnMiLAogICJuYW1lIjogImRpc2FibGUtdG91Y2gtb3NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5wYXJkdXMub3JnLnRyLyIsCiAgInV1aWQiOiAiZGlzYWJsZS10b3VjaC1vc2tAcGFyZHVzLm9yZy50ciIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "mprispanel@kennedn.msn.com", "name": "MPRIS Panel Player", "pname": "mpris-panel-player", "description": "Implements playback controls for MPRIS enabled players in panel.", "link": "https://extensions.gnome.org/extension/4088/mpris-panel-player/", "shell_version_map": {"40": {"version": "4", "sha256": "1kk8y8l1ybknja58xh1smavja97rkrp8l5xx7aqy7xn4fl1ghjis", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcGxlbWVudHMgcGxheWJhY2sgY29udHJvbHMgZm9yIE1QUklTIGVuYWJsZWQgcGxheWVycyBpbiBwYW5lbC4iLAogICJuYW1lIjogIk1QUklTIFBhbmVsIFBsYXllciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VubmVkbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXByaXNwYW5lbCIsCiAgInV1aWQiOiAibXByaXNwYW5lbEBrZW5uZWRuLm1zbi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "1kk8y8l1ybknja58xh1smavja97rkrp8l5xx7aqy7xn4fl1ghjis", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcGxlbWVudHMgcGxheWJhY2sgY29udHJvbHMgZm9yIE1QUklTIGVuYWJsZWQgcGxheWVycyBpbiBwYW5lbC4iLAogICJuYW1lIjogIk1QUklTIFBhbmVsIFBsYXllciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VubmVkbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXByaXNwYW5lbCIsCiAgInV1aWQiOiAibXByaXNwYW5lbEBrZW5uZWRuLm1zbi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} @@ -476,7 +476,7 @@ , {"uuid": "notification-position@drugo.dev", "name": "Notification Banner Position", "pname": "notification-banner-position", "description": "Changes position of the notification banner from the default to the right side of the screen.", "link": "https://extensions.gnome.org/extension/4105/notification-banner-position/", "shell_version_map": {"38": {"version": "7", "sha256": "0fa1kxg6ii6l4r22jgbv6fxhhwfp7cfvkbjwn6vg287gadjrl70s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icnVub2RydWdvd2ljay9ub3RpZmljYXRpb24tcG9zaXRpb24tZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tcG9zaXRpb25AZHJ1Z28uZGV2IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "0fa1kxg6ii6l4r22jgbv6fxhhwfp7cfvkbjwn6vg287gadjrl70s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icnVub2RydWdvd2ljay9ub3RpZmljYXRpb24tcG9zaXRpb24tZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tcG9zaXRpb25AZHJ1Z28uZGV2IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0fa1kxg6ii6l4r22jgbv6fxhhwfp7cfvkbjwn6vg287gadjrl70s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icnVub2RydWdvd2ljay9ub3RpZmljYXRpb24tcG9zaXRpb24tZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tcG9zaXRpb25AZHJ1Z28uZGV2IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "0fa1kxg6ii6l4r22jgbv6fxhhwfp7cfvkbjwn6vg287gadjrl70s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icnVub2RydWdvd2ljay9ub3RpZmljYXRpb24tcG9zaXRpb24tZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tcG9zaXRpb25AZHJ1Z28uZGV2IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "43": {"version": "7", "sha256": "0fa1kxg6ii6l4r22jgbv6fxhhwfp7cfvkbjwn6vg287gadjrl70s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icnVub2RydWdvd2ljay9ub3RpZmljYXRpb24tcG9zaXRpb24tZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tcG9zaXRpb25AZHJ1Z28uZGV2IiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "volume_scroller@trflynn89.pm.me", "name": "Volume Scroller", "pname": "volume-scroller", "description": "Scroll up or down in the Top Bar to adjust volume.", "link": "https://extensions.gnome.org/extension/4109/volume-scroller/", "shell_version_map": {"38": {"version": "7", "sha256": "13ha95kxcp018p390d49qcakfy91y23lf80wvfdvzilcbficpjk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RyZmx5bm44OS9nbm9tZS1zaGVsbC12b2x1bWUtc2Nyb2xsZXIiLAogICJ1dWlkIjogInZvbHVtZV9zY3JvbGxlckB0cmZseW5uODkucG0ubWUiLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "13ha95kxcp018p390d49qcakfy91y23lf80wvfdvzilcbficpjk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RyZmx5bm44OS9nbm9tZS1zaGVsbC12b2x1bWUtc2Nyb2xsZXIiLAogICJ1dWlkIjogInZvbHVtZV9zY3JvbGxlckB0cmZseW5uODkucG0ubWUiLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "13ha95kxcp018p390d49qcakfy91y23lf80wvfdvzilcbficpjk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RyZmx5bm44OS9nbm9tZS1zaGVsbC12b2x1bWUtc2Nyb2xsZXIiLAogICJ1dWlkIjogInZvbHVtZV9zY3JvbGxlckB0cmZseW5uODkucG0ubWUiLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "13ha95kxcp018p390d49qcakfy91y23lf80wvfdvzilcbficpjk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RyZmx5bm44OS9nbm9tZS1zaGVsbC12b2x1bWUtc2Nyb2xsZXIiLAogICJ1dWlkIjogInZvbHVtZV9zY3JvbGxlckB0cmZseW5uODkucG0ubWUiLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "13ha95kxcp018p390d49qcakfy91y23lf80wvfdvzilcbficpjk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RyZmx5bm44OS9nbm9tZS1zaGVsbC12b2x1bWUtc2Nyb2xsZXIiLAogICJ1dWlkIjogInZvbHVtZV9zY3JvbGxlckB0cmZseW5uODkucG0ubWUiLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "Mock-Universal-Menu@zacharygough", "name": "Mock Universal Menu", "pname": "mock-universal-menu", "description": "Creates a Mock Apple Menu (THIS DOES NOTHING WHEN CLICKED)", "link": "https://extensions.gnome.org/extension/4111/mock-universal-menu/", "shell_version_map": {"40": {"version": "5", "sha256": "0irq4aamfdvnsjcb9cj4grp7z0s2rg5dv349v095ss7n7jxcmdx2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgYSBNb2NrIEFwcGxlIE1lbnUgKFRISVMgRE9FUyBOT1RISU5HIFdIRU4gQ0xJQ0tFRCkiLAogICJuYW1lIjogIk1vY2sgVW5pdmVyc2FsIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1phbnktWmFjaGFyeTEvTW9jay1Vbml2ZXJzYWwtTWVudSIsCiAgInV1aWQiOiAiTW9jay1Vbml2ZXJzYWwtTWVudUB6YWNoYXJ5Z291Z2giLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "0irq4aamfdvnsjcb9cj4grp7z0s2rg5dv349v095ss7n7jxcmdx2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgYSBNb2NrIEFwcGxlIE1lbnUgKFRISVMgRE9FUyBOT1RISU5HIFdIRU4gQ0xJQ0tFRCkiLAogICJuYW1lIjogIk1vY2sgVW5pdmVyc2FsIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1phbnktWmFjaGFyeTEvTW9jay1Vbml2ZXJzYWwtTWVudSIsCiAgInV1aWQiOiAiTW9jay1Vbml2ZXJzYWwtTWVudUB6YWNoYXJ5Z291Z2giLAogICJ2ZXJzaW9uIjogNQp9"}}} -, {"uuid": "customize-ibus@hollowman.ml", "name": "Customize IBus", "pname": "customize-ibus", "description": "Full customization of appearance, behavior, system tray and input source indicator for IBus\n\nSupport Customization of:\n* Candidate Box Orientation\n* Candidate Box Animation\n* Right-click Candidate Box to Switch the Input Mode or Open the Tray Menu\n* Scroll on Candidate Box to Switch among Pages or Candidates\n* Fix Candidate Box to Not Follow the Caret and Set Fixed Position\n* Candidate Box Font\n* Input Mode Remember and Auto-switch by APP\n* Change Candidate Box Opacity\n* Fix IME List Order\n* Drag Candidate Box to Reposition\n* Show or Hide Candidate Box Page Buttons\n* System Tray Menus and Interaction Settings\n* * Show or Hide Tray Icon\n* * Directly Click Tray Icon to Switch Input Mode\n* * Add Additional Menu\n* Input Source Indicator Appearance and Interaction Settings\n* * Enable Indicator\n* * Only Indicate when Switching Input Mode\n* * Only Indicate when Using ASCII Input Mode\n* * Not Indicate when Using Single Mode IME\n* * Right-click Indicator to Hide\n* * Scroll on Indicator to Switch Input Mode\n* * Indicator Animation\n* * Customize Font\n* * Left-click Indicator to Drag to Move Indicator or Switch Input Mode\n* * Change Opacity\n* * Enable Indicator Show Delay and Configure Showing Timeout\n* * Enable Auto-hide Indicator and Configure Auto-hide Timeout\n* Theme (Stylesheet Provided or Extracted from GNOME Shell Themes, Refer to Help Instructions in Extension for More)\n* Candidate Box Background and its Displaying Style\n* Theme and Background Picture Follow GNOME Night Light Mode\n\nUser Guide: https://hollowmansblog.wordpress.com/2021/08/21/customize-ibus-user-guide/\n\n深度定制 IBus 的外观、行为、系统托盘以及输入指示\n\n支持自定义：\n* 候选框方向\n* 候选框动画\n* 右键单击候选框以切换输入源或打开任务栏菜单\n* 候选框上滚动以切换页面或候选词\n* 固定候选框使其不跟随光标以及设定固定位置\n* 候选框字体\n* 输入模式根据应用记忆并自动切换\n* 更改候选框透明度\n* 固定输入法列表顺序\n* 拖拽移动候选框\n* 显示或隐藏候选框调页按钮\n* 系统任务栏托盘显示和交互设置\n* * 显示或隐藏托盘图标\n* * 直接点击托盘图标切换输入源\n* * 添加额外菜单\n* 输入源指示器及其显示和交互设置\n* * 启用指示器\n* * 仅在切换输入法时指示\n* * 仅在英文输入时指示\n* * 使用单模式输入法时不指示\n* * 右击指示器来将其隐藏\n* * 指示器上滚动来切换输入源\n* * 指示器显示动画\n* * 自定义字体\n* * 左击指示器以拖拽移动或者切换输入源\n* * 更改透明度\n* * 启用延时显示以及配置显示时延\n* * 启用自动隐藏以及配置自动隐藏时延\n* 皮肤样式主题（提供的或者从GNOME Shell主题中提取的样式表，参见扩展的帮助部分来获取更多指导）\n* 候选框背景图片及其显示样式\n* 主题和背景图片跟随GNOME夜灯\n\n使用指南：https://blog.csdn.net/qq_18572023/article/details/116331601", "link": "https://extensions.gnome.org/extension/4112/customize-ibus/", "shell_version_map": {"38": {"version": "85", "sha256": "12hqxcxxd4d4yh19ichsy8zmyh134c7rcks5smijv6d9ifslkigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vcGVuU1VTRS9DdXN0b21pemUtSUJ1cyIsCiAgInV1aWQiOiAiY3VzdG9taXplLWlidXNAaG9sbG93bWFuLm1sIiwKICAidmVyc2lvbiI6IDg1Cn0="}, "40": {"version": "85", "sha256": "12hqxcxxd4d4yh19ichsy8zmyh134c7rcks5smijv6d9ifslkigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vcGVuU1VTRS9DdXN0b21pemUtSUJ1cyIsCiAgInV1aWQiOiAiY3VzdG9taXplLWlidXNAaG9sbG93bWFuLm1sIiwKICAidmVyc2lvbiI6IDg1Cn0="}, "41": {"version": "85", "sha256": "12hqxcxxd4d4yh19ichsy8zmyh134c7rcks5smijv6d9ifslkigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vcGVuU1VTRS9DdXN0b21pemUtSUJ1cyIsCiAgInV1aWQiOiAiY3VzdG9taXplLWlidXNAaG9sbG93bWFuLm1sIiwKICAidmVyc2lvbiI6IDg1Cn0="}, "42": {"version": "85", "sha256": "12hqxcxxd4d4yh19ichsy8zmyh134c7rcks5smijv6d9ifslkigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vcGVuU1VTRS9DdXN0b21pemUtSUJ1cyIsCiAgInV1aWQiOiAiY3VzdG9taXplLWlidXNAaG9sbG93bWFuLm1sIiwKICAidmVyc2lvbiI6IDg1Cn0="}, "43": {"version": "85", "sha256": "12hqxcxxd4d4yh19ichsy8zmyh134c7rcks5smijv6d9ifslkigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vcGVuU1VTRS9DdXN0b21pemUtSUJ1cyIsCiAgInV1aWQiOiAiY3VzdG9taXplLWlidXNAaG9sbG93bWFuLm1sIiwKICAidmVyc2lvbiI6IDg1Cn0="}}} +, {"uuid": "customize-ibus@hollowman.ml", "name": "Customize IBus", "pname": "customize-ibus", "description": "Full customization of appearance, behavior, system tray and input source indicator for IBus\n\nSupport Customization of:\n* Candidate Box Orientation\n* Candidate Box Animation\n* Right-click Candidate Box to Switch the Input Mode or Open the Tray Menu\n* Scroll on Candidate Box to Switch among Pages or Candidates\n* Fix Candidate Box to Not Follow the Caret and Set Fixed Position\n* Candidate Box Font\n* Input Mode Remember and Auto-switch by APP\n* Change Candidate Box Opacity\n* Fix IME List Order\n* Drag Candidate Box to Reposition\n* Show or Hide Candidate Box Page Buttons\n* System Tray Menus and Interaction Settings\n* * Show or Hide Tray Icon\n* * Directly Click Tray Icon to Switch Input Mode\n* * Add Additional Menu\n* Input Source Indicator Appearance and Interaction Settings\n* * Enable Indicator\n* * Only Indicate when Switching Input Mode\n* * Only Indicate when Using ASCII Input Mode\n* * Not Indicate when Using Single Mode IME\n* * Right-click Indicator to Hide\n* * Scroll on Indicator to Switch Input Mode\n* * Indicator Animation\n* * Customize Font\n* * Left-click Indicator to Drag to Move Indicator or Switch Input Mode\n* * Change Opacity\n* * Enable Indicator Show Delay and Configure Showing Timeout\n* * Enable Auto-hide Indicator and Configure Auto-hide Timeout\n* Theme (Stylesheet Provided or Extracted from GNOME Shell Themes, Refer to Help Instructions in Extension for More)\n* Candidate Box Background and its Displaying Style\n* Theme and Background Picture Follow GNOME Night Light Mode\n\nUser Guide: https://hollowmansblog.wordpress.com/2021/08/21/customize-ibus-user-guide/\n\n深度定制 IBus 的外观、行为、系统托盘以及输入指示\n\n支持自定义：\n* 候选框方向\n* 候选框动画\n* 右键单击候选框以切换输入源或打开任务栏菜单\n* 候选框上滚动以切换页面或候选词\n* 固定候选框使其不跟随光标以及设定固定位置\n* 候选框字体\n* 输入模式根据应用记忆并自动切换\n* 更改候选框透明度\n* 固定输入法列表顺序\n* 拖拽移动候选框\n* 显示或隐藏候选框调页按钮\n* 系统任务栏托盘显示和交互设置\n* * 显示或隐藏托盘图标\n* * 直接点击托盘图标切换输入源\n* * 添加额外菜单\n* 输入源指示器及其显示和交互设置\n* * 启用指示器\n* * 仅在切换输入法时指示\n* * 仅在英文输入时指示\n* * 使用单模式输入法时不指示\n* * 右击指示器来将其隐藏\n* * 指示器上滚动来切换输入源\n* * 指示器显示动画\n* * 自定义字体\n* * 左击指示器以拖拽移动或者切换输入源\n* * 更改透明度\n* * 启用延时显示以及配置显示时延\n* * 启用自动隐藏以及配置自动隐藏时延\n* 皮肤样式主题（提供的或者从GNOME Shell主题中提取的样式表，参见扩展的帮助部分来获取更多指导）\n* 候选框背景图片及其显示样式\n* 主题和背景图片跟随GNOME夜灯\n\n使用指南：https://blog.csdn.net/qq_18572023/article/details/116331601", "link": "https://extensions.gnome.org/extension/4112/customize-ibus/", "shell_version_map": {"38": {"version": "86", "sha256": "0cbgfqjwn6q9ppy19bx5qiiz9mhpj0yxgsmb3ckxrlsd71s916w6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3BlblNVU0UvQ3VzdG9taXplLUlCdXMiLAogICJ1dWlkIjogImN1c3RvbWl6ZS1pYnVzQGhvbGxvd21hbi5tbCIsCiAgInZlcnNpb24iOiA4Ngp9"}, "40": {"version": "86", "sha256": "0cbgfqjwn6q9ppy19bx5qiiz9mhpj0yxgsmb3ckxrlsd71s916w6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3BlblNVU0UvQ3VzdG9taXplLUlCdXMiLAogICJ1dWlkIjogImN1c3RvbWl6ZS1pYnVzQGhvbGxvd21hbi5tbCIsCiAgInZlcnNpb24iOiA4Ngp9"}, "41": {"version": "86", "sha256": "0cbgfqjwn6q9ppy19bx5qiiz9mhpj0yxgsmb3ckxrlsd71s916w6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3BlblNVU0UvQ3VzdG9taXplLUlCdXMiLAogICJ1dWlkIjogImN1c3RvbWl6ZS1pYnVzQGhvbGxvd21hbi5tbCIsCiAgInZlcnNpb24iOiA4Ngp9"}, "42": {"version": "86", "sha256": "0cbgfqjwn6q9ppy19bx5qiiz9mhpj0yxgsmb3ckxrlsd71s916w6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3BlblNVU0UvQ3VzdG9taXplLUlCdXMiLAogICJ1dWlkIjogImN1c3RvbWl6ZS1pYnVzQGhvbGxvd21hbi5tbCIsCiAgInZlcnNpb24iOiA4Ngp9"}, "43": {"version": "86", "sha256": "0cbgfqjwn6q9ppy19bx5qiiz9mhpj0yxgsmb3ckxrlsd71s916w6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3BlblNVU0UvQ3VzdG9taXplLUlCdXMiLAogICJ1dWlkIjogImN1c3RvbWl6ZS1pYnVzQGhvbGxvd21hbi5tbCIsCiAgInZlcnNpb24iOiA4Ngp9"}}} , {"uuid": "fildemGMenu@gonza.com", "name": "Fildem global menu", "pname": "fildem-global-menu", "description": "Global menu for Gnome", "link": "https://extensions.gnome.org/extension/4114/fildem-global-menu/", "shell_version_map": {"38": {"version": "2", "sha256": "0776vx09b1nxf6j5w9gmzg1gmzijh1mpsnfzv41svbfqyfc8zv2w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdsb2JhbCBtZW51IGZvciBHbm9tZSIsCiAgIm5hbWUiOiAiRmlsZGVtIGdsb2JhbCBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpbGRlbS1nbG9iYWwtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL0ZpbGRlbSIsCiAgInV1aWQiOiAiZmlsZGVtR01lbnVAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "0776vx09b1nxf6j5w9gmzg1gmzijh1mpsnfzv41svbfqyfc8zv2w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdsb2JhbCBtZW51IGZvciBHbm9tZSIsCiAgIm5hbWUiOiAiRmlsZGVtIGdsb2JhbCBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpbGRlbS1nbG9iYWwtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL0ZpbGRlbSIsCiAgInV1aWQiOiAiZmlsZGVtR01lbnVAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "0776vx09b1nxf6j5w9gmzg1gmzijh1mpsnfzv41svbfqyfc8zv2w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdsb2JhbCBtZW51IGZvciBHbm9tZSIsCiAgIm5hbWUiOiAiRmlsZGVtIGdsb2JhbCBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpbGRlbS1nbG9iYWwtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL0ZpbGRlbSIsCiAgInV1aWQiOiAiZmlsZGVtR01lbnVAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "remove-panel@sulincix", "name": "RemovePanel", "pname": "removepanel", "description": "remove top panel from gnome-shell", "link": "https://extensions.gnome.org/extension/4118/removepanel/", "shell_version_map": {"38": {"version": "5", "sha256": "022cznjpi2a3ld31cjk1942cyc4r6s6k58ik5qd49xh8wl8y2b3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInJlbW92ZSB0b3AgcGFuZWwgZnJvbSBnbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiUmVtb3ZlUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJyZW1vdmUtcGFuZWxAc3VsaW5jaXgiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "022cznjpi2a3ld31cjk1942cyc4r6s6k58ik5qd49xh8wl8y2b3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInJlbW92ZSB0b3AgcGFuZWwgZnJvbSBnbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiUmVtb3ZlUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJyZW1vdmUtcGFuZWxAc3VsaW5jaXgiLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "022cznjpi2a3ld31cjk1942cyc4r6s6k58ik5qd49xh8wl8y2b3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInJlbW92ZSB0b3AgcGFuZWwgZnJvbSBnbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiUmVtb3ZlUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJyZW1vdmUtcGFuZWxAc3VsaW5jaXgiLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "bottom-triggers-activities@papjul", "name": "Bottom triggers Activities overview", "pname": "bottom-triggers-activities-overview", "description": "DEPRECATION NOTICE: No longer maintained. Please migrate to another extension such as Hot Edge https://extensions.gnome.org/extension/4222/hot-edge/\n\nAllows to toggle Activities overview when the mouse reaches the bottom edge of the screen.\nPLEASE report your bugs to the extension homepage link below. I cannot reply to you if you write a review here.\n\nThis is a fork of Dash to Dock focusing only on doing this, it adds support for Gnome Shell 40 and is mainly aimed at Gnome Shell 40 users to reduce mouse travel.\n\nI may backport fixes from upstream, but I don't intend to add any new feature and may not fix any bug if I'm not affected/cannot reproduce. However, I will accept pull requests that keep the extension in the KISS principle. It could be adding a prefs UI for toggle delay and edge(s) triggered, or supporting multiple monitors.\n\nYou can customize the following parameters from the constructor of extension.js:\n this._position = St.Side.BOTTOM;\n this._toggleDelay = 0.25;", "link": "https://extensions.gnome.org/extension/4120/bottom-triggers-activities-overview/", "shell_version_map": {"38": {"version": "2", "sha256": "1q1ahz612w2fzbvky8ydwns2kykbj2vqcr5ddyncg16lhrfzx9vq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRFUFJFQ0FUSU9OIE5PVElDRTogTm8gbG9uZ2VyIG1haW50YWluZWQuIFBsZWFzZSBtaWdyYXRlIHRvIGFub3RoZXIgZXh0ZW5zaW9uIHN1Y2ggYXMgSG90IEVkZ2UgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDIyMi9ob3QtZWRnZS9cblxuQWxsb3dzIHRvIHRvZ2dsZSBBY3Rpdml0aWVzIG92ZXJ2aWV3IHdoZW4gdGhlIG1vdXNlIHJlYWNoZXMgdGhlIGJvdHRvbSBlZGdlIG9mIHRoZSBzY3JlZW4uXG5QTEVBU0UgcmVwb3J0IHlvdXIgYnVncyB0byB0aGUgZXh0ZW5zaW9uIGhvbWVwYWdlIGxpbmsgYmVsb3cuIEkgY2Fubm90IHJlcGx5IHRvIHlvdSBpZiB5b3Ugd3JpdGUgYSByZXZpZXcgaGVyZS5cblxuVGhpcyBpcyBhIGZvcmsgb2YgRGFzaCB0byBEb2NrIGZvY3VzaW5nIG9ubHkgb24gZG9pbmcgdGhpcywgaXQgYWRkcyBzdXBwb3J0IGZvciBHbm9tZSBTaGVsbCA0MCBhbmQgaXMgbWFpbmx5IGFpbWVkIGF0IEdub21lIFNoZWxsIDQwIHVzZXJzIHRvIHJlZHVjZSBtb3VzZSB0cmF2ZWwuXG5cbkkgbWF5IGJhY2twb3J0IGZpeGVzIGZyb20gdXBzdHJlYW0sIGJ1dCBJIGRvbid0IGludGVuZCB0byBhZGQgYW55IG5ldyBmZWF0dXJlIGFuZCBtYXkgbm90IGZpeCBhbnkgYnVnIGlmIEknbSBub3QgYWZmZWN0ZWQvY2Fubm90IHJlcHJvZHVjZS4gSG93ZXZlciwgSSB3aWxsIGFjY2VwdCBwdWxsIHJlcXVlc3RzIHRoYXQga2VlcCB0aGUgZXh0ZW5zaW9uIGluIHRoZSBLSVNTIHByaW5jaXBsZS4gSXQgY291bGQgYmUgYWRkaW5nIGEgcHJlZnMgVUkgZm9yIHRvZ2dsZSBkZWxheSBhbmQgZWRnZShzKSB0cmlnZ2VyZWQsIG9yIHN1cHBvcnRpbmcgbXVsdGlwbGUgbW9uaXRvcnMuXG5cbllvdSBjYW4gY3VzdG9taXplIHRoZSBmb2xsb3dpbmcgcGFyYW1ldGVycyBmcm9tIHRoZSBjb25zdHJ1Y3RvciBvZiBleHRlbnNpb24uanM6XG4gICAgICAgIHRoaXMuX3Bvc2l0aW9uID0gU3QuU2lkZS5CT1RUT007XG4gICAgICAgIHRoaXMuX3RvZ2dsZURlbGF5ID0gMC4yNTsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJib3R0b210cmlnZ2Vyc2FjdGl2aXRpZXMiLAogICJuYW1lIjogIkJvdHRvbSB0cmlnZ2VycyBBY3Rpdml0aWVzIG92ZXJ2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhcGp1bCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXBqdWwvYm90dG9tLXRyaWdnZXJzLWFjdGl2aXRpZXMiLAogICJ1dWlkIjogImJvdHRvbS10cmlnZ2Vycy1hY3Rpdml0aWVzQHBhcGp1bCIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "1q1ahz612w2fzbvky8ydwns2kykbj2vqcr5ddyncg16lhrfzx9vq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRFUFJFQ0FUSU9OIE5PVElDRTogTm8gbG9uZ2VyIG1haW50YWluZWQuIFBsZWFzZSBtaWdyYXRlIHRvIGFub3RoZXIgZXh0ZW5zaW9uIHN1Y2ggYXMgSG90IEVkZ2UgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDIyMi9ob3QtZWRnZS9cblxuQWxsb3dzIHRvIHRvZ2dsZSBBY3Rpdml0aWVzIG92ZXJ2aWV3IHdoZW4gdGhlIG1vdXNlIHJlYWNoZXMgdGhlIGJvdHRvbSBlZGdlIG9mIHRoZSBzY3JlZW4uXG5QTEVBU0UgcmVwb3J0IHlvdXIgYnVncyB0byB0aGUgZXh0ZW5zaW9uIGhvbWVwYWdlIGxpbmsgYmVsb3cuIEkgY2Fubm90IHJlcGx5IHRvIHlvdSBpZiB5b3Ugd3JpdGUgYSByZXZpZXcgaGVyZS5cblxuVGhpcyBpcyBhIGZvcmsgb2YgRGFzaCB0byBEb2NrIGZvY3VzaW5nIG9ubHkgb24gZG9pbmcgdGhpcywgaXQgYWRkcyBzdXBwb3J0IGZvciBHbm9tZSBTaGVsbCA0MCBhbmQgaXMgbWFpbmx5IGFpbWVkIGF0IEdub21lIFNoZWxsIDQwIHVzZXJzIHRvIHJlZHVjZSBtb3VzZSB0cmF2ZWwuXG5cbkkgbWF5IGJhY2twb3J0IGZpeGVzIGZyb20gdXBzdHJlYW0sIGJ1dCBJIGRvbid0IGludGVuZCB0byBhZGQgYW55IG5ldyBmZWF0dXJlIGFuZCBtYXkgbm90IGZpeCBhbnkgYnVnIGlmIEknbSBub3QgYWZmZWN0ZWQvY2Fubm90IHJlcHJvZHVjZS4gSG93ZXZlciwgSSB3aWxsIGFjY2VwdCBwdWxsIHJlcXVlc3RzIHRoYXQga2VlcCB0aGUgZXh0ZW5zaW9uIGluIHRoZSBLSVNTIHByaW5jaXBsZS4gSXQgY291bGQgYmUgYWRkaW5nIGEgcHJlZnMgVUkgZm9yIHRvZ2dsZSBkZWxheSBhbmQgZWRnZShzKSB0cmlnZ2VyZWQsIG9yIHN1cHBvcnRpbmcgbXVsdGlwbGUgbW9uaXRvcnMuXG5cbllvdSBjYW4gY3VzdG9taXplIHRoZSBmb2xsb3dpbmcgcGFyYW1ldGVycyBmcm9tIHRoZSBjb25zdHJ1Y3RvciBvZiBleHRlbnNpb24uanM6XG4gICAgICAgIHRoaXMuX3Bvc2l0aW9uID0gU3QuU2lkZS5CT1RUT007XG4gICAgICAgIHRoaXMuX3RvZ2dsZURlbGF5ID0gMC4yNTsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJib3R0b210cmlnZ2Vyc2FjdGl2aXRpZXMiLAogICJuYW1lIjogIkJvdHRvbSB0cmlnZ2VycyBBY3Rpdml0aWVzIG92ZXJ2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhcGp1bCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXBqdWwvYm90dG9tLXRyaWdnZXJzLWFjdGl2aXRpZXMiLAogICJ1dWlkIjogImJvdHRvbS10cmlnZ2Vycy1hY3Rpdml0aWVzQHBhcGp1bCIsCiAgInZlcnNpb24iOiAyCn0="}}} @@ -566,7 +566,7 @@ , {"uuid": "appMenuIcon@pratap.fastmail.fm", "name": "Colored Application Menu Icon", "pname": "app-menu-icon-remove-symbolic", "description": "Remove Symbolic Icons and Saturation Effect for App Menu Icon", "link": "https://extensions.gnome.org/extension/4408/app-menu-icon-remove-symbolic/", "shell_version_map": {"38": {"version": "4", "sha256": "0vksxvigc4aam3s5bh0bs7n9yn0ls10rdlb6whxjk2qns0p8l268", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBTeW1ib2xpYyBJY29ucyBhbmQgU2F0dXJhdGlvbiBFZmZlY3QgZm9yIEFwcCBNZW51IEljb24iLAogICJuYW1lIjogIkNvbG9yZWQgQXBwbGljYXRpb24gTWVudSBJY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhcHBNZW51SWNvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "0vksxvigc4aam3s5bh0bs7n9yn0ls10rdlb6whxjk2qns0p8l268", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBTeW1ib2xpYyBJY29ucyBhbmQgU2F0dXJhdGlvbiBFZmZlY3QgZm9yIEFwcCBNZW51IEljb24iLAogICJuYW1lIjogIkNvbG9yZWQgQXBwbGljYXRpb24gTWVudSBJY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhcHBNZW51SWNvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "0vksxvigc4aam3s5bh0bs7n9yn0ls10rdlb6whxjk2qns0p8l268", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBTeW1ib2xpYyBJY29ucyBhbmQgU2F0dXJhdGlvbiBFZmZlY3QgZm9yIEFwcCBNZW51IEljb24iLAogICJuYW1lIjogIkNvbG9yZWQgQXBwbGljYXRpb24gTWVudSBJY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhcHBNZW51SWNvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "0vksxvigc4aam3s5bh0bs7n9yn0ls10rdlb6whxjk2qns0p8l268", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBTeW1ib2xpYyBJY29ucyBhbmQgU2F0dXJhdGlvbiBFZmZlY3QgZm9yIEFwcCBNZW51IEljb24iLAogICJuYW1lIjogIkNvbG9yZWQgQXBwbGljYXRpb24gTWVudSBJY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhcHBNZW51SWNvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogNAp9"}, "43": {"version": "4", "sha256": "0vksxvigc4aam3s5bh0bs7n9yn0ls10rdlb6whxjk2qns0p8l268", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBTeW1ib2xpYyBJY29ucyBhbmQgU2F0dXJhdGlvbiBFZmZlY3QgZm9yIEFwcCBNZW51IEljb24iLAogICJuYW1lIjogIkNvbG9yZWQgQXBwbGljYXRpb24gTWVudSBJY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhcHBNZW51SWNvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "gnome-trash@b00f.github.io", "name": "Gnome Trash", "pname": "gnome-trash", "description": "A gnome shell extension to manage your home trash. You can manage trash items from the panel and open or empty the trash.", "link": "https://extensions.gnome.org/extension/4410/gnome-trash/", "shell_version_map": {"38": {"version": "3", "sha256": "03pyala1i21izg5rl4qqh5bxk36fp8d52bs9ggrik2kav420xhhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGhvbWUgdHJhc2guIFlvdSBjYW4gbWFuYWdlIHRyYXNoIGl0ZW1zIGZyb20gdGhlIHBhbmVsIGFuZCBvcGVuIG9yIGVtcHR5IHRoZSB0cmFzaC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS10cmFzaCIsCiAgIm5hbWUiOiAiR25vbWUgVHJhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iMDBmL2dub21lLXRyYXNoIiwKICAidXVpZCI6ICJnbm9tZS10cmFzaEBiMDBmLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "10", "sha256": "1zx6r0zf751hw6l0kvmyc0izw6x59p0zm2dn9x4aijrdfvaz69gp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGhvbWUgdHJhc2guIFlvdSBjYW4gbWFuYWdlIHRyYXNoIGl0ZW1zIGZyb20gdGhlIHBhbmVsIGFuZCBvcGVuIG9yIGVtcHR5IHRoZSB0cmFzaC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS10cmFzaCIsCiAgIm5hbWUiOiAiR25vbWUgVHJhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iMDBmL2dub21lLXRyYXNoIiwKICAidXVpZCI6ICJnbm9tZS10cmFzaEBiMDBmLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "1zx6r0zf751hw6l0kvmyc0izw6x59p0zm2dn9x4aijrdfvaz69gp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGhvbWUgdHJhc2guIFlvdSBjYW4gbWFuYWdlIHRyYXNoIGl0ZW1zIGZyb20gdGhlIHBhbmVsIGFuZCBvcGVuIG9yIGVtcHR5IHRoZSB0cmFzaC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS10cmFzaCIsCiAgIm5hbWUiOiAiR25vbWUgVHJhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iMDBmL2dub21lLXRyYXNoIiwKICAidXVpZCI6ICJnbm9tZS10cmFzaEBiMDBmLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "1zx6r0zf751hw6l0kvmyc0izw6x59p0zm2dn9x4aijrdfvaz69gp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGhvbWUgdHJhc2guIFlvdSBjYW4gbWFuYWdlIHRyYXNoIGl0ZW1zIGZyb20gdGhlIHBhbmVsIGFuZCBvcGVuIG9yIGVtcHR5IHRoZSB0cmFzaC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS10cmFzaCIsCiAgIm5hbWUiOiAiR25vbWUgVHJhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iMDBmL2dub21lLXRyYXNoIiwKICAidXVpZCI6ICJnbm9tZS10cmFzaEBiMDBmLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "advanced-alt-tab@G-dH.github.com", "name": "AATWS - Advanced Alt-Tab Window Switcher", "pname": "advanced-alttab-window-switcher", "description": "Highly customizable replacement for the Alt/Super+Tab window/app switchers that offers 'type to search' mode, various filtering and sorting options, workspace and monitor navigation, configurable hotkeys for navigation and window/app control and an app launcher.\nAATWS is compatible with Custom Hot Corners - Extended extension, allows to configure any mouse button and scroll wheel and can be used as a mouse controlled 'dock'.\n\nNote that GNOME has 3 built-in window switcher popups and this extension replaces all of them. The first one is grouping windows by applications and is used as default in vanilla GNOME distributions. The second one offers window list and the third one windows of the currently focused application. You can set keyboard shortcuts for all the switchers in the Gnome Settings.\n\nFollow the link below for more information and bug reports.\n\nKeywords: alttab, search, find, window search, popup delay, applications, apps, dock, monitor, thumbnail, preview, move windows, launch app, switch, VIM.", "link": "https://extensions.gnome.org/extension/4412/advanced-alttab-window-switcher/", "shell_version_map": {"38": {"version": "22", "sha256": "1a75rhv0cll97mcswryj6qq7waagnaywzjahrla49x46zn8zwj60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvYWR2YW5jZWQtYWx0dGFiLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYWR2YW5jZWQtYWx0LXRhYkBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "40": {"version": "22", "sha256": "1a75rhv0cll97mcswryj6qq7waagnaywzjahrla49x46zn8zwj60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvYWR2YW5jZWQtYWx0dGFiLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYWR2YW5jZWQtYWx0LXRhYkBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "41": {"version": "22", "sha256": "1a75rhv0cll97mcswryj6qq7waagnaywzjahrla49x46zn8zwj60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvYWR2YW5jZWQtYWx0dGFiLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYWR2YW5jZWQtYWx0LXRhYkBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "42": {"version": "22", "sha256": "1a75rhv0cll97mcswryj6qq7waagnaywzjahrla49x46zn8zwj60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvYWR2YW5jZWQtYWx0dGFiLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYWR2YW5jZWQtYWx0LXRhYkBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "43": {"version": "22", "sha256": "1a75rhv0cll97mcswryj6qq7waagnaywzjahrla49x46zn8zwj60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvYWR2YW5jZWQtYWx0dGFiLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYWR2YW5jZWQtYWx0LXRhYkBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}}} -, {"uuid": "improvedosk@nick-shmyrev.dev", "name": "Improved OSK", "pname": "improved-osk", "description": "Makes Gnome's onscreen keyboard more useable with e.g. more keys.\nThis extension is a fork of https://extensions.gnome.org/extension/3330/improved-onscreen-keyboard/ by SebastianLuebke.", "link": "https://extensions.gnome.org/extension/4413/improved-osk/", "shell_version_map": {"38": {"version": "9", "sha256": "17cdv570c9smkvkkzpk9nlrkh03300m4dqd66g9f4bjlqmx5mjl5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmljay1zaG15cmV2L2ltcHJvdmVkLW9zay1nbm9tZS1leHQiLAogICJ1dWlkIjogImltcHJvdmVkb3NrQG5pY2stc2hteXJldi5kZXYiLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "17cdv570c9smkvkkzpk9nlrkh03300m4dqd66g9f4bjlqmx5mjl5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmljay1zaG15cmV2L2ltcHJvdmVkLW9zay1nbm9tZS1leHQiLAogICJ1dWlkIjogImltcHJvdmVkb3NrQG5pY2stc2hteXJldi5kZXYiLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "17cdv570c9smkvkkzpk9nlrkh03300m4dqd66g9f4bjlqmx5mjl5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmljay1zaG15cmV2L2ltcHJvdmVkLW9zay1nbm9tZS1leHQiLAogICJ1dWlkIjogImltcHJvdmVkb3NrQG5pY2stc2hteXJldi5kZXYiLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "17cdv570c9smkvkkzpk9nlrkh03300m4dqd66g9f4bjlqmx5mjl5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmljay1zaG15cmV2L2ltcHJvdmVkLW9zay1nbm9tZS1leHQiLAogICJ1dWlkIjogImltcHJvdmVkb3NrQG5pY2stc2hteXJldi5kZXYiLAogICJ2ZXJzaW9uIjogOQp9"}}} +, {"uuid": "improvedosk@nick-shmyrev.dev", "name": "Improved OSK", "pname": "improved-osk", "description": "Makes Gnome's OnScreen Keyboard more usable.\n\nFeatures:\n* Includes additional buttons: Arrow keys, Esc, Tab, Ctrl, Alt, F1-12\n* Supports key combinations like `Ctrl + C`, `Alt + Tab`, `Ctrl + Shift + C`, etc.\n* Configurable keyboard size (landscape/portrait)\n* Statusbar indicator to toggle keyboard\n* Works in Gnome password modals\n\nThis extension is a fork of https://extensions.gnome.org/extension/3330/improved-onscreen-keyboard/ by SebastianLuebke.", "link": "https://extensions.gnome.org/extension/4413/improved-osk/", "shell_version_map": {"38": {"version": "9", "sha256": "0x5c1788njd9d1svjfk084b9k8avv5f7m0fh5141x9d6wjrk29wy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3MgT25TY3JlZW4gS2V5Ym9hcmQgbW9yZSB1c2FibGUuXG5cbkZlYXR1cmVzOlxuKiBJbmNsdWRlcyBhZGRpdGlvbmFsIGJ1dHRvbnM6IEFycm93IGtleXMsIEVzYywgVGFiLCBDdHJsLCBBbHQsIEYxLTEyXG4qIFN1cHBvcnRzIGtleSBjb21iaW5hdGlvbnMgbGlrZSBgQ3RybCArIENgLCBgQWx0ICsgVGFiYCwgYEN0cmwgKyBTaGlmdCArIENgLCBldGMuXG4qIENvbmZpZ3VyYWJsZSBrZXlib2FyZCBzaXplIChsYW5kc2NhcGUvcG9ydHJhaXQpXG4qIFN0YXR1c2JhciBpbmRpY2F0b3IgdG8gdG9nZ2xlIGtleWJvYXJkXG4qIFdvcmtzIGluIEdub21lIHBhc3N3b3JkIG1vZGFsc1xuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmljay1zaG15cmV2L2ltcHJvdmVkLW9zay1nbm9tZS1leHQiLAogICJ1dWlkIjogImltcHJvdmVkb3NrQG5pY2stc2hteXJldi5kZXYiLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "0x5c1788njd9d1svjfk084b9k8avv5f7m0fh5141x9d6wjrk29wy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3MgT25TY3JlZW4gS2V5Ym9hcmQgbW9yZSB1c2FibGUuXG5cbkZlYXR1cmVzOlxuKiBJbmNsdWRlcyBhZGRpdGlvbmFsIGJ1dHRvbnM6IEFycm93IGtleXMsIEVzYywgVGFiLCBDdHJsLCBBbHQsIEYxLTEyXG4qIFN1cHBvcnRzIGtleSBjb21iaW5hdGlvbnMgbGlrZSBgQ3RybCArIENgLCBgQWx0ICsgVGFiYCwgYEN0cmwgKyBTaGlmdCArIENgLCBldGMuXG4qIENvbmZpZ3VyYWJsZSBrZXlib2FyZCBzaXplIChsYW5kc2NhcGUvcG9ydHJhaXQpXG4qIFN0YXR1c2JhciBpbmRpY2F0b3IgdG8gdG9nZ2xlIGtleWJvYXJkXG4qIFdvcmtzIGluIEdub21lIHBhc3N3b3JkIG1vZGFsc1xuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmljay1zaG15cmV2L2ltcHJvdmVkLW9zay1nbm9tZS1leHQiLAogICJ1dWlkIjogImltcHJvdmVkb3NrQG5pY2stc2hteXJldi5kZXYiLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "0x5c1788njd9d1svjfk084b9k8avv5f7m0fh5141x9d6wjrk29wy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3MgT25TY3JlZW4gS2V5Ym9hcmQgbW9yZSB1c2FibGUuXG5cbkZlYXR1cmVzOlxuKiBJbmNsdWRlcyBhZGRpdGlvbmFsIGJ1dHRvbnM6IEFycm93IGtleXMsIEVzYywgVGFiLCBDdHJsLCBBbHQsIEYxLTEyXG4qIFN1cHBvcnRzIGtleSBjb21iaW5hdGlvbnMgbGlrZSBgQ3RybCArIENgLCBgQWx0ICsgVGFiYCwgYEN0cmwgKyBTaGlmdCArIENgLCBldGMuXG4qIENvbmZpZ3VyYWJsZSBrZXlib2FyZCBzaXplIChsYW5kc2NhcGUvcG9ydHJhaXQpXG4qIFN0YXR1c2JhciBpbmRpY2F0b3IgdG8gdG9nZ2xlIGtleWJvYXJkXG4qIFdvcmtzIGluIEdub21lIHBhc3N3b3JkIG1vZGFsc1xuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmljay1zaG15cmV2L2ltcHJvdmVkLW9zay1nbm9tZS1leHQiLAogICJ1dWlkIjogImltcHJvdmVkb3NrQG5pY2stc2hteXJldi5kZXYiLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "0x5c1788njd9d1svjfk084b9k8avv5f7m0fh5141x9d6wjrk29wy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3MgT25TY3JlZW4gS2V5Ym9hcmQgbW9yZSB1c2FibGUuXG5cbkZlYXR1cmVzOlxuKiBJbmNsdWRlcyBhZGRpdGlvbmFsIGJ1dHRvbnM6IEFycm93IGtleXMsIEVzYywgVGFiLCBDdHJsLCBBbHQsIEYxLTEyXG4qIFN1cHBvcnRzIGtleSBjb21iaW5hdGlvbnMgbGlrZSBgQ3RybCArIENgLCBgQWx0ICsgVGFiYCwgYEN0cmwgKyBTaGlmdCArIENgLCBldGMuXG4qIENvbmZpZ3VyYWJsZSBrZXlib2FyZCBzaXplIChsYW5kc2NhcGUvcG9ydHJhaXQpXG4qIFN0YXR1c2JhciBpbmRpY2F0b3IgdG8gdG9nZ2xlIGtleWJvYXJkXG4qIFdvcmtzIGluIEdub21lIHBhc3N3b3JkIG1vZGFsc1xuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmljay1zaG15cmV2L2ltcHJvdmVkLW9zay1nbm9tZS1leHQiLAogICJ1dWlkIjogImltcHJvdmVkb3NrQG5pY2stc2hteXJldi5kZXYiLAogICJ2ZXJzaW9uIjogOQp9"}, "43": {"version": "12", "sha256": "1g4c2mr346jywxqyjvqv1cssnnfvv94vvyy2bjf0wkpq2hqr2vg0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3MgT25TY3JlZW4gS2V5Ym9hcmQgbW9yZSB1c2FibGUuXG5cbkZlYXR1cmVzOlxuKiBJbmNsdWRlcyBhZGRpdGlvbmFsIGJ1dHRvbnM6IEFycm93IGtleXMsIEVzYywgVGFiLCBDdHJsLCBBbHQsIEYxLTEyXG4qIFN1cHBvcnRzIGtleSBjb21iaW5hdGlvbnMgbGlrZSBgQ3RybCArIENgLCBgQWx0ICsgVGFiYCwgYEN0cmwgKyBTaGlmdCArIENgLCBldGMuXG4qIENvbmZpZ3VyYWJsZSBrZXlib2FyZCBzaXplIChsYW5kc2NhcGUvcG9ydHJhaXQpXG4qIFN0YXR1c2JhciBpbmRpY2F0b3IgdG8gdG9nZ2xlIGtleWJvYXJkXG4qIFdvcmtzIGluIEdub21lIHBhc3N3b3JkIG1vZGFsc1xuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25pY2stc2hteXJldi9pbXByb3ZlZC1vc2stZ25vbWUtZXh0IiwKICAidXVpZCI6ICJpbXByb3ZlZG9za0BuaWNrLXNobXlyZXYuZGV2IiwKICAidmVyc2lvbiI6IDEyCn0="}}} , {"uuid": "fedora-update@pepe386", "name": "Fedora Linux Updates Indicator", "pname": "fedora-linux-updates-indicator", "description": "Update indicator for Fedora Linux and GNOME Shell.", "link": "https://extensions.gnome.org/extension/4415/fedora-linux-updates-indicator/", "shell_version_map": {"40": {"version": "5", "sha256": "1j6q1mgl75mjbr53z88vj2ablnrp4nx0q2a416wdgbiiwdazidbw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eCBhbmQgR05PTUUgU2hlbGwuIiwKICAibmFtZSI6ICJGZWRvcmEgTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wZXBlMzg2L2ZlZG9yYS11cGRhdGUiLAogICJ1dWlkIjogImZlZG9yYS11cGRhdGVAcGVwZTM4NiIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1j6q1mgl75mjbr53z88vj2ablnrp4nx0q2a416wdgbiiwdazidbw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eCBhbmQgR05PTUUgU2hlbGwuIiwKICAibmFtZSI6ICJGZWRvcmEgTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wZXBlMzg2L2ZlZG9yYS11cGRhdGUiLAogICJ1dWlkIjogImZlZG9yYS11cGRhdGVAcGVwZTM4NiIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "1j6q1mgl75mjbr53z88vj2ablnrp4nx0q2a416wdgbiiwdazidbw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eCBhbmQgR05PTUUgU2hlbGwuIiwKICAibmFtZSI6ICJGZWRvcmEgTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wZXBlMzg2L2ZlZG9yYS11cGRhdGUiLAogICJ1dWlkIjogImZlZG9yYS11cGRhdGVAcGVwZTM4NiIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "readingstrip@lupantano.gihthub", "name": "Reading Strip", "pname": "reading-strip", "description": "It’s an extension for Gnome-Shell. It works as a reading guide for computer and this is really useful for people affected by dyslexia. It works great in helping children focusing to read very well, it marks the sentence that they are reading and hides the previous and the next one. It's already used in education projects at schools, it puts the attention on screen but it's also really useful for programmers and graphic designers who want to check their works.", "link": "https://extensions.gnome.org/extension/4419/reading-strip/", "shell_version_map": {"38": {"version": "26", "sha256": "07qvw42vl2pk9f856a9b4dzzh5jia3gp9xp9r7bgra97c05qwd6b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0XHUyMDE5cyBhbiBleHRlbnNpb24gZm9yIEdub21lLVNoZWxsLiBJdCB3b3JrcyBhcyBhIHJlYWRpbmcgZ3VpZGUgZm9yIGNvbXB1dGVyIGFuZCB0aGlzIGlzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSBhZmZlY3RlZCBieSBkeXNsZXhpYS4gSXQgd29ya3MgZ3JlYXQgaW4gaGVscGluZyBjaGlsZHJlbiBmb2N1c2luZyB0byByZWFkIHZlcnkgd2VsbCwgaXQgbWFya3MgdGhlIHNlbnRlbmNlIHRoYXQgdGhleSBhcmUgcmVhZGluZyBhbmQgaGlkZXMgdGhlIHByZXZpb3VzIGFuZCB0aGUgbmV4dCBvbmUuIEl0J3MgYWxyZWFkeSB1c2VkIGluIGVkdWNhdGlvbiBwcm9qZWN0cyBhdCBzY2hvb2xzLCBpdCBwdXRzIHRoZSBhdHRlbnRpb24gb24gc2NyZWVuIGJ1dCBpdCdzIGFsc28gcmVhbGx5IHVzZWZ1bCBmb3IgcHJvZ3JhbW1lcnMgYW5kIGdyYXBoaWMgZGVzaWduZXJzIHdobyB3YW50IHRvIGNoZWNrIHRoZWlyIHdvcmtzLiIsCiAgImdldHRleHQtZG9tYWluIjogInJlYWRpbmctc3RyaXAiLAogICJuYW1lIjogIlJlYWRpbmcgU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1cGFudGFuby9yZWFkaW5nc3RyaXAiLAogICJ1dWlkIjogInJlYWRpbmdzdHJpcEBsdXBhbnRhbm8uZ2lodGh1YiIsCiAgInZlcnNpb24iOiAyNgp9"}, "40": {"version": "26", "sha256": "07qvw42vl2pk9f856a9b4dzzh5jia3gp9xp9r7bgra97c05qwd6b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0XHUyMDE5cyBhbiBleHRlbnNpb24gZm9yIEdub21lLVNoZWxsLiBJdCB3b3JrcyBhcyBhIHJlYWRpbmcgZ3VpZGUgZm9yIGNvbXB1dGVyIGFuZCB0aGlzIGlzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSBhZmZlY3RlZCBieSBkeXNsZXhpYS4gSXQgd29ya3MgZ3JlYXQgaW4gaGVscGluZyBjaGlsZHJlbiBmb2N1c2luZyB0byByZWFkIHZlcnkgd2VsbCwgaXQgbWFya3MgdGhlIHNlbnRlbmNlIHRoYXQgdGhleSBhcmUgcmVhZGluZyBhbmQgaGlkZXMgdGhlIHByZXZpb3VzIGFuZCB0aGUgbmV4dCBvbmUuIEl0J3MgYWxyZWFkeSB1c2VkIGluIGVkdWNhdGlvbiBwcm9qZWN0cyBhdCBzY2hvb2xzLCBpdCBwdXRzIHRoZSBhdHRlbnRpb24gb24gc2NyZWVuIGJ1dCBpdCdzIGFsc28gcmVhbGx5IHVzZWZ1bCBmb3IgcHJvZ3JhbW1lcnMgYW5kIGdyYXBoaWMgZGVzaWduZXJzIHdobyB3YW50IHRvIGNoZWNrIHRoZWlyIHdvcmtzLiIsCiAgImdldHRleHQtZG9tYWluIjogInJlYWRpbmctc3RyaXAiLAogICJuYW1lIjogIlJlYWRpbmcgU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1cGFudGFuby9yZWFkaW5nc3RyaXAiLAogICJ1dWlkIjogInJlYWRpbmdzdHJpcEBsdXBhbnRhbm8uZ2lodGh1YiIsCiAgInZlcnNpb24iOiAyNgp9"}, "41": {"version": "26", "sha256": "07qvw42vl2pk9f856a9b4dzzh5jia3gp9xp9r7bgra97c05qwd6b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0XHUyMDE5cyBhbiBleHRlbnNpb24gZm9yIEdub21lLVNoZWxsLiBJdCB3b3JrcyBhcyBhIHJlYWRpbmcgZ3VpZGUgZm9yIGNvbXB1dGVyIGFuZCB0aGlzIGlzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSBhZmZlY3RlZCBieSBkeXNsZXhpYS4gSXQgd29ya3MgZ3JlYXQgaW4gaGVscGluZyBjaGlsZHJlbiBmb2N1c2luZyB0byByZWFkIHZlcnkgd2VsbCwgaXQgbWFya3MgdGhlIHNlbnRlbmNlIHRoYXQgdGhleSBhcmUgcmVhZGluZyBhbmQgaGlkZXMgdGhlIHByZXZpb3VzIGFuZCB0aGUgbmV4dCBvbmUuIEl0J3MgYWxyZWFkeSB1c2VkIGluIGVkdWNhdGlvbiBwcm9qZWN0cyBhdCBzY2hvb2xzLCBpdCBwdXRzIHRoZSBhdHRlbnRpb24gb24gc2NyZWVuIGJ1dCBpdCdzIGFsc28gcmVhbGx5IHVzZWZ1bCBmb3IgcHJvZ3JhbW1lcnMgYW5kIGdyYXBoaWMgZGVzaWduZXJzIHdobyB3YW50IHRvIGNoZWNrIHRoZWlyIHdvcmtzLiIsCiAgImdldHRleHQtZG9tYWluIjogInJlYWRpbmctc3RyaXAiLAogICJuYW1lIjogIlJlYWRpbmcgU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1cGFudGFuby9yZWFkaW5nc3RyaXAiLAogICJ1dWlkIjogInJlYWRpbmdzdHJpcEBsdXBhbnRhbm8uZ2lodGh1YiIsCiAgInZlcnNpb24iOiAyNgp9"}, "42": {"version": "26", "sha256": "07qvw42vl2pk9f856a9b4dzzh5jia3gp9xp9r7bgra97c05qwd6b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0XHUyMDE5cyBhbiBleHRlbnNpb24gZm9yIEdub21lLVNoZWxsLiBJdCB3b3JrcyBhcyBhIHJlYWRpbmcgZ3VpZGUgZm9yIGNvbXB1dGVyIGFuZCB0aGlzIGlzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSBhZmZlY3RlZCBieSBkeXNsZXhpYS4gSXQgd29ya3MgZ3JlYXQgaW4gaGVscGluZyBjaGlsZHJlbiBmb2N1c2luZyB0byByZWFkIHZlcnkgd2VsbCwgaXQgbWFya3MgdGhlIHNlbnRlbmNlIHRoYXQgdGhleSBhcmUgcmVhZGluZyBhbmQgaGlkZXMgdGhlIHByZXZpb3VzIGFuZCB0aGUgbmV4dCBvbmUuIEl0J3MgYWxyZWFkeSB1c2VkIGluIGVkdWNhdGlvbiBwcm9qZWN0cyBhdCBzY2hvb2xzLCBpdCBwdXRzIHRoZSBhdHRlbnRpb24gb24gc2NyZWVuIGJ1dCBpdCdzIGFsc28gcmVhbGx5IHVzZWZ1bCBmb3IgcHJvZ3JhbW1lcnMgYW5kIGdyYXBoaWMgZGVzaWduZXJzIHdobyB3YW50IHRvIGNoZWNrIHRoZWlyIHdvcmtzLiIsCiAgImdldHRleHQtZG9tYWluIjogInJlYWRpbmctc3RyaXAiLAogICJuYW1lIjogIlJlYWRpbmcgU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1cGFudGFuby9yZWFkaW5nc3RyaXAiLAogICJ1dWlkIjogInJlYWRpbmdzdHJpcEBsdXBhbnRhbm8uZ2lodGh1YiIsCiAgInZlcnNpb24iOiAyNgp9"}, "43": {"version": "26", "sha256": "07qvw42vl2pk9f856a9b4dzzh5jia3gp9xp9r7bgra97c05qwd6b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0XHUyMDE5cyBhbiBleHRlbnNpb24gZm9yIEdub21lLVNoZWxsLiBJdCB3b3JrcyBhcyBhIHJlYWRpbmcgZ3VpZGUgZm9yIGNvbXB1dGVyIGFuZCB0aGlzIGlzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSBhZmZlY3RlZCBieSBkeXNsZXhpYS4gSXQgd29ya3MgZ3JlYXQgaW4gaGVscGluZyBjaGlsZHJlbiBmb2N1c2luZyB0byByZWFkIHZlcnkgd2VsbCwgaXQgbWFya3MgdGhlIHNlbnRlbmNlIHRoYXQgdGhleSBhcmUgcmVhZGluZyBhbmQgaGlkZXMgdGhlIHByZXZpb3VzIGFuZCB0aGUgbmV4dCBvbmUuIEl0J3MgYWxyZWFkeSB1c2VkIGluIGVkdWNhdGlvbiBwcm9qZWN0cyBhdCBzY2hvb2xzLCBpdCBwdXRzIHRoZSBhdHRlbnRpb24gb24gc2NyZWVuIGJ1dCBpdCdzIGFsc28gcmVhbGx5IHVzZWZ1bCBmb3IgcHJvZ3JhbW1lcnMgYW5kIGdyYXBoaWMgZGVzaWduZXJzIHdobyB3YW50IHRvIGNoZWNrIHRoZWlyIHdvcmtzLiIsCiAgImdldHRleHQtZG9tYWluIjogInJlYWRpbmctc3RyaXAiLAogICJuYW1lIjogIlJlYWRpbmcgU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1cGFudGFuby9yZWFkaW5nc3RyaXAiLAogICJ1dWlkIjogInJlYWRpbmdzdHJpcEBsdXBhbnRhbm8uZ2lodGh1YiIsCiAgInZlcnNpb24iOiAyNgp9"}}} , {"uuid": "gnome-clipboard@b00f.github.io", "name": "Gnome Clipboard", "pname": "gnome-clipboard", "description": "A gnome shell extension to manage your clipboard.", "link": "https://extensions.gnome.org/extension/4422/gnome-clipboard/", "shell_version_map": {"38": {"version": "8", "sha256": "1zgymry549c6pmj1c0f6gvpyyfj0z93fwbhhxa67fx3nf95gb3kv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2IwMGYvZ25vbWUtY2xpcGJvYXJkIiwKICAidXVpZCI6ICJnbm9tZS1jbGlwYm9hcmRAYjAwZi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "17", "sha256": "0lqn0x4a216fq2073rs1kvgf81fkrr2vcf64xxb0na0nzgb0syb2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iMDBmL2dub21lLWNsaXBib2FyZCIsCiAgInV1aWQiOiAiZ25vbWUtY2xpcGJvYXJkQGIwMGYuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "41": {"version": "17", "sha256": "0lqn0x4a216fq2073rs1kvgf81fkrr2vcf64xxb0na0nzgb0syb2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iMDBmL2dub21lLWNsaXBib2FyZCIsCiAgInV1aWQiOiAiZ25vbWUtY2xpcGJvYXJkQGIwMGYuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "42": {"version": "17", "sha256": "0lqn0x4a216fq2073rs1kvgf81fkrr2vcf64xxb0na0nzgb0syb2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iMDBmL2dub21lLWNsaXBib2FyZCIsCiAgInV1aWQiOiAiZ25vbWUtY2xpcGJvYXJkQGIwMGYuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "43": {"version": "17", "sha256": "0lqn0x4a216fq2073rs1kvgf81fkrr2vcf64xxb0na0nzgb0syb2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iMDBmL2dub21lLWNsaXBib2FyZCIsCiAgInV1aWQiOiAiZ25vbWUtY2xpcGJvYXJkQGIwMGYuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE3Cn0="}}} @@ -592,7 +592,7 @@ , {"uuid": "dark-variant@hardpixel.eu", "name": "Dark Variant", "pname": "dark-variant", "description": "Enable dark window decorations on applications. This extension is not compatible with applications that use Client Side Decorations (CSD).\n\nThis extension depends on some Xorg utilities. To install them:\n- Debian/Ubuntu: apt install x11-utils\n- Fedora/RHEL: dnf install xorg-x11-utils\n- Arch: pacman -S xorg-xprop\n\n*Settings are provided to enable/disable applications.", "link": "https://extensions.gnome.org/extension/4488/dark-variant/", "shell_version_map": {"40": {"version": "6", "sha256": "1j5pbkxqiqi6nnm1q0ygq9cw9qbrrpsykbrd9zami230wqz6adhy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBkYXJrIHdpbmRvdyBkZWNvcmF0aW9ucyBvbiBhcHBsaWNhdGlvbnMuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBjb21wYXRpYmxlIHdpdGggYXBwbGljYXRpb25zIHRoYXQgdXNlIENsaWVudCBTaWRlIERlY29yYXRpb25zIChDU0QpLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgeDExLXV0aWxzXG4tIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIGFwcGxpY2F0aW9ucy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXJrLXZhcmlhbnQiLAogICJuYW1lIjogIkRhcmsgVmFyaWFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXJrLXZhcmlhbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvZGFyay12YXJpYW50IiwKICAidXVpZCI6ICJkYXJrLXZhcmlhbnRAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "1j5pbkxqiqi6nnm1q0ygq9cw9qbrrpsykbrd9zami230wqz6adhy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBkYXJrIHdpbmRvdyBkZWNvcmF0aW9ucyBvbiBhcHBsaWNhdGlvbnMuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBjb21wYXRpYmxlIHdpdGggYXBwbGljYXRpb25zIHRoYXQgdXNlIENsaWVudCBTaWRlIERlY29yYXRpb25zIChDU0QpLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgeDExLXV0aWxzXG4tIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIGFwcGxpY2F0aW9ucy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXJrLXZhcmlhbnQiLAogICJuYW1lIjogIkRhcmsgVmFyaWFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXJrLXZhcmlhbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvZGFyay12YXJpYW50IiwKICAidXVpZCI6ICJkYXJrLXZhcmlhbnRAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "8", "sha256": "1cvfifkp1z8qazc39aq6b2yc3xwsfnpdwr66mjvgrj6j06ldbraf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBkYXJrIHdpbmRvdyBkZWNvcmF0aW9ucyBvbiBhcHBsaWNhdGlvbnMuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBjb21wYXRpYmxlIHdpdGggYXBwbGljYXRpb25zIHRoYXQgdXNlIENsaWVudCBTaWRlIERlY29yYXRpb25zIChDU0QpLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgeDExLXV0aWxzXG4tIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIGFwcGxpY2F0aW9ucy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXJrLXZhcmlhbnQiLAogICJuYW1lIjogIkRhcmsgVmFyaWFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXJrLXZhcmlhbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXJrLXZhcmlhbnQiLAogICJ1dWlkIjogImRhcmstdmFyaWFudEBoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogOAp9"}, "43": {"version": "8", "sha256": "1cvfifkp1z8qazc39aq6b2yc3xwsfnpdwr66mjvgrj6j06ldbraf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBkYXJrIHdpbmRvdyBkZWNvcmF0aW9ucyBvbiBhcHBsaWNhdGlvbnMuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBjb21wYXRpYmxlIHdpdGggYXBwbGljYXRpb25zIHRoYXQgdXNlIENsaWVudCBTaWRlIERlY29yYXRpb25zIChDU0QpLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgeDExLXV0aWxzXG4tIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIGFwcGxpY2F0aW9ucy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXJrLXZhcmlhbnQiLAogICJuYW1lIjogIkRhcmsgVmFyaWFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXJrLXZhcmlhbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXJrLXZhcmlhbnQiLAogICJ1dWlkIjogImRhcmstdmFyaWFudEBoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "PrivacyMenu@stuarthayhurst", "name": "Privacy Quick Settings Menu", "pname": "privacy-settings-menu", "description": "Add a privacy menu to the top bar for quick access to privacy settings", "link": "https://extensions.gnome.org/extension/4491/privacy-settings-menu/", "shell_version_map": {"38": {"version": "10", "sha256": "1nva6flsxgbf7dnvy3b8l2r81bw0vh6vrzzz615cv4pbrmvysxb7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHByaXZhY3kgbWVudSB0byB0aGUgdG9wIGJhciBmb3IgcXVpY2sgYWNjZXNzIHRvIHByaXZhY3kgc2V0dGluZ3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBRdWljayBTZXR0aW5ncyBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaXZhY3ktbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvcHJpdmFjeS1tZW51LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiUHJpdmFjeU1lbnVAc3R1YXJ0aGF5aHVyc3QiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "10", "sha256": "1nva6flsxgbf7dnvy3b8l2r81bw0vh6vrzzz615cv4pbrmvysxb7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHByaXZhY3kgbWVudSB0byB0aGUgdG9wIGJhciBmb3IgcXVpY2sgYWNjZXNzIHRvIHByaXZhY3kgc2V0dGluZ3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBRdWljayBTZXR0aW5ncyBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaXZhY3ktbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvcHJpdmFjeS1tZW51LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiUHJpdmFjeU1lbnVAc3R1YXJ0aGF5aHVyc3QiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "1nva6flsxgbf7dnvy3b8l2r81bw0vh6vrzzz615cv4pbrmvysxb7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHByaXZhY3kgbWVudSB0byB0aGUgdG9wIGJhciBmb3IgcXVpY2sgYWNjZXNzIHRvIHByaXZhY3kgc2V0dGluZ3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBRdWljayBTZXR0aW5ncyBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaXZhY3ktbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvcHJpdmFjeS1tZW51LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiUHJpdmFjeU1lbnVAc3R1YXJ0aGF5aHVyc3QiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "42": {"version": "10", "sha256": "1nva6flsxgbf7dnvy3b8l2r81bw0vh6vrzzz615cv4pbrmvysxb7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHByaXZhY3kgbWVudSB0byB0aGUgdG9wIGJhciBmb3IgcXVpY2sgYWNjZXNzIHRvIHByaXZhY3kgc2V0dGluZ3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBRdWljayBTZXR0aW5ncyBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaXZhY3ktbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvcHJpdmFjeS1tZW51LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiUHJpdmFjeU1lbnVAc3R1YXJ0aGF5aHVyc3QiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "43": {"version": "10", "sha256": "1nva6flsxgbf7dnvy3b8l2r81bw0vh6vrzzz615cv4pbrmvysxb7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHByaXZhY3kgbWVudSB0byB0aGUgdG9wIGJhciBmb3IgcXVpY2sgYWNjZXNzIHRvIHByaXZhY3kgc2V0dGluZ3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBRdWljayBTZXR0aW5ncyBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaXZhY3ktbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvcHJpdmFjeS1tZW51LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiUHJpdmFjeU1lbnVAc3R1YXJ0aGF5aHVyc3QiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} , {"uuid": "hide-panel-lite@fthx", "name": "Hide Panel Lite", "pname": "hide-panel-light-version-without-hot-corner", "description": "Hide top panel except in overview.\n\nFor those who don't need a hot corner (e.g. running GNOME 40+ with three fingers gestures). Very very light extension. No options, no bugs. ;-)", "link": "https://extensions.gnome.org/extension/4496/hide-panel-light-version-without-hot-corner/", "shell_version_map": {"38": {"version": "2", "sha256": "13kwd7sh0w34881wwaqvv0mchd7ym7av5s658jcrq2n8n2zma4xi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy5cblxuRm9yIHRob3NlIHdobyBkb24ndCBuZWVkIGEgaG90IGNvcm5lciAoZS5nLiBydW5uaW5nIEdOT01FIDQwKyB3aXRoIHRocmVlIGZpbmdlcnMgZ2VzdHVyZXMpLiBWZXJ5IHZlcnkgbGlnaHQgZXh0ZW5zaW9uLiBObyBvcHRpb25zLCBubyBidWdzLiA7LSkiLAogICJuYW1lIjogIkhpZGUgUGFuZWwgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaGlkZS1wYW5lbC1saXRlIiwKICAidXVpZCI6ICJoaWRlLXBhbmVsLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "13kwd7sh0w34881wwaqvv0mchd7ym7av5s658jcrq2n8n2zma4xi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy5cblxuRm9yIHRob3NlIHdobyBkb24ndCBuZWVkIGEgaG90IGNvcm5lciAoZS5nLiBydW5uaW5nIEdOT01FIDQwKyB3aXRoIHRocmVlIGZpbmdlcnMgZ2VzdHVyZXMpLiBWZXJ5IHZlcnkgbGlnaHQgZXh0ZW5zaW9uLiBObyBvcHRpb25zLCBubyBidWdzLiA7LSkiLAogICJuYW1lIjogIkhpZGUgUGFuZWwgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaGlkZS1wYW5lbC1saXRlIiwKICAidXVpZCI6ICJoaWRlLXBhbmVsLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "13kwd7sh0w34881wwaqvv0mchd7ym7av5s658jcrq2n8n2zma4xi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy5cblxuRm9yIHRob3NlIHdobyBkb24ndCBuZWVkIGEgaG90IGNvcm5lciAoZS5nLiBydW5uaW5nIEdOT01FIDQwKyB3aXRoIHRocmVlIGZpbmdlcnMgZ2VzdHVyZXMpLiBWZXJ5IHZlcnkgbGlnaHQgZXh0ZW5zaW9uLiBObyBvcHRpb25zLCBubyBidWdzLiA7LSkiLAogICJuYW1lIjogIkhpZGUgUGFuZWwgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaGlkZS1wYW5lbC1saXRlIiwKICAidXVpZCI6ICJoaWRlLXBhbmVsLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "13kwd7sh0w34881wwaqvv0mchd7ym7av5s658jcrq2n8n2zma4xi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy5cblxuRm9yIHRob3NlIHdobyBkb24ndCBuZWVkIGEgaG90IGNvcm5lciAoZS5nLiBydW5uaW5nIEdOT01FIDQwKyB3aXRoIHRocmVlIGZpbmdlcnMgZ2VzdHVyZXMpLiBWZXJ5IHZlcnkgbGlnaHQgZXh0ZW5zaW9uLiBObyBvcHRpb25zLCBubyBidWdzLiA7LSkiLAogICJuYW1lIjogIkhpZGUgUGFuZWwgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaGlkZS1wYW5lbC1saXRlIiwKICAidXVpZCI6ICJoaWRlLXBhbmVsLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"uuid": "ssm-gnome@lgiki.net", "name": "Simple System Monitor", "pname": "simple-system-monitor", "description": "Show current CPU usage, memory usage and net speed on panel.\nFor best experience, please use monospaced font.\n\nThis is a fork of https://extensions.gnome.org/extension/4478/net-speed/.", "link": "https://extensions.gnome.org/extension/4506/simple-system-monitor/", "shell_version_map": {"38": {"version": "13", "sha256": "0847xfj5x5g9hb2y0ric95dx4qjr72i0fgfqvji2nmwdzdd4clmc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuRm9yIGJlc3QgZXhwZXJpZW5jZSwgcGxlYXNlIHVzZSBtb25vc3BhY2VkIGZvbnQuXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ0NzgvbmV0LXNwZWVkLy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltcGxlLXN5c3RlbS1tb25pdG9yIiwKICAibmFtZSI6ICJTaW1wbGUgU3lzdGVtIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTEdpa2kvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXBsZS1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAic3NtLWdub21lQGxnaWtpLm5ldCIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "13", "sha256": "0847xfj5x5g9hb2y0ric95dx4qjr72i0fgfqvji2nmwdzdd4clmc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuRm9yIGJlc3QgZXhwZXJpZW5jZSwgcGxlYXNlIHVzZSBtb25vc3BhY2VkIGZvbnQuXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ0NzgvbmV0LXNwZWVkLy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltcGxlLXN5c3RlbS1tb25pdG9yIiwKICAibmFtZSI6ICJTaW1wbGUgU3lzdGVtIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTEdpa2kvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXBsZS1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAic3NtLWdub21lQGxnaWtpLm5ldCIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "0847xfj5x5g9hb2y0ric95dx4qjr72i0fgfqvji2nmwdzdd4clmc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuRm9yIGJlc3QgZXhwZXJpZW5jZSwgcGxlYXNlIHVzZSBtb25vc3BhY2VkIGZvbnQuXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ0NzgvbmV0LXNwZWVkLy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltcGxlLXN5c3RlbS1tb25pdG9yIiwKICAibmFtZSI6ICJTaW1wbGUgU3lzdGVtIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTEdpa2kvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXBsZS1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAic3NtLWdub21lQGxnaWtpLm5ldCIsCiAgInZlcnNpb24iOiAxMwp9"}, "42": {"version": "13", "sha256": "0847xfj5x5g9hb2y0ric95dx4qjr72i0fgfqvji2nmwdzdd4clmc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuRm9yIGJlc3QgZXhwZXJpZW5jZSwgcGxlYXNlIHVzZSBtb25vc3BhY2VkIGZvbnQuXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ0NzgvbmV0LXNwZWVkLy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltcGxlLXN5c3RlbS1tb25pdG9yIiwKICAibmFtZSI6ICJTaW1wbGUgU3lzdGVtIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTEdpa2kvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXBsZS1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAic3NtLWdub21lQGxnaWtpLm5ldCIsCiAgInZlcnNpb24iOiAxMwp9"}, "43": {"version": "13", "sha256": "0847xfj5x5g9hb2y0ric95dx4qjr72i0fgfqvji2nmwdzdd4clmc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuRm9yIGJlc3QgZXhwZXJpZW5jZSwgcGxlYXNlIHVzZSBtb25vc3BhY2VkIGZvbnQuXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ0NzgvbmV0LXNwZWVkLy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltcGxlLXN5c3RlbS1tb25pdG9yIiwKICAibmFtZSI6ICJTaW1wbGUgU3lzdGVtIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTEdpa2kvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXBsZS1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAic3NtLWdub21lQGxnaWtpLm5ldCIsCiAgInZlcnNpb24iOiAxMwp9"}}} +, {"uuid": "ssm-gnome@lgiki.net", "name": "Simple System Monitor", "pname": "simple-system-monitor", "description": "Show current CPU usage, memory usage and net speed on panel.\nFor best experience, please use monospaced font.\n\nThis is a fork of https://extensions.gnome.org/extension/4478/net-speed/.", "link": "https://extensions.gnome.org/extension/4506/simple-system-monitor/", "shell_version_map": {"38": {"version": "14", "sha256": "19zlf4hvlv2r0n65axdmbddg68p2jmqfg2j8a55fa90g4i1qf4y9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuRm9yIGJlc3QgZXhwZXJpZW5jZSwgcGxlYXNlIHVzZSBtb25vc3BhY2VkIGZvbnQuXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ0NzgvbmV0LXNwZWVkLy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltcGxlLXN5c3RlbS1tb25pdG9yIiwKICAibmFtZSI6ICJTaW1wbGUgU3lzdGVtIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xHaWtpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW1wbGUtc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogInNzbS1nbm9tZUBsZ2lraS5uZXQiLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "40": {"version": "14", "sha256": "19zlf4hvlv2r0n65axdmbddg68p2jmqfg2j8a55fa90g4i1qf4y9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuRm9yIGJlc3QgZXhwZXJpZW5jZSwgcGxlYXNlIHVzZSBtb25vc3BhY2VkIGZvbnQuXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ0NzgvbmV0LXNwZWVkLy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltcGxlLXN5c3RlbS1tb25pdG9yIiwKICAibmFtZSI6ICJTaW1wbGUgU3lzdGVtIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xHaWtpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW1wbGUtc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogInNzbS1nbm9tZUBsZ2lraS5uZXQiLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "41": {"version": "14", "sha256": "19zlf4hvlv2r0n65axdmbddg68p2jmqfg2j8a55fa90g4i1qf4y9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuRm9yIGJlc3QgZXhwZXJpZW5jZSwgcGxlYXNlIHVzZSBtb25vc3BhY2VkIGZvbnQuXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ0NzgvbmV0LXNwZWVkLy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltcGxlLXN5c3RlbS1tb25pdG9yIiwKICAibmFtZSI6ICJTaW1wbGUgU3lzdGVtIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xHaWtpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW1wbGUtc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogInNzbS1nbm9tZUBsZ2lraS5uZXQiLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "42": {"version": "14", "sha256": "19zlf4hvlv2r0n65axdmbddg68p2jmqfg2j8a55fa90g4i1qf4y9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuRm9yIGJlc3QgZXhwZXJpZW5jZSwgcGxlYXNlIHVzZSBtb25vc3BhY2VkIGZvbnQuXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ0NzgvbmV0LXNwZWVkLy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltcGxlLXN5c3RlbS1tb25pdG9yIiwKICAibmFtZSI6ICJTaW1wbGUgU3lzdGVtIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xHaWtpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW1wbGUtc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogInNzbS1nbm9tZUBsZ2lraS5uZXQiLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "43": {"version": "14", "sha256": "19zlf4hvlv2r0n65axdmbddg68p2jmqfg2j8a55fa90g4i1qf4y9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuRm9yIGJlc3QgZXhwZXJpZW5jZSwgcGxlYXNlIHVzZSBtb25vc3BhY2VkIGZvbnQuXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ0NzgvbmV0LXNwZWVkLy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltcGxlLXN5c3RlbS1tb25pdG9yIiwKICAibmFtZSI6ICJTaW1wbGUgU3lzdGVtIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xHaWtpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW1wbGUtc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogInNzbS1nbm9tZUBsZ2lraS5uZXQiLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} , {"uuid": "unredirect@aunetx", "name": "Disable unredirect fullscreen windows", "pname": "disable-unredirect-fullscreen-windows", "description": "Disables unredirect fullscreen windows in gnome-shell to prevent artifacts when in fullscreen.\n\nThis version makes sure the unredirect option is not re-enabled automatically by the shell.", "link": "https://extensions.gnome.org/extension/4509/disable-unredirect-fullscreen-windows/", "shell_version_map": {"40": {"version": "3", "sha256": "1mgvpzzfdzn5qsxwz5911a8qgq0r34az6xpmqr72ksx6yf13l85z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHByZXZlbnQgYXJ0aWZhY3RzIHdoZW4gaW4gZnVsbHNjcmVlbi5cblxuVGhpcyB2ZXJzaW9uIG1ha2VzIHN1cmUgdGhlIHVucmVkaXJlY3Qgb3B0aW9uIGlzIG5vdCByZS1lbmFibGVkIGF1dG9tYXRpY2FsbHkgYnkgdGhlIHNoZWxsLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSB1bnJlZGlyZWN0IGZ1bGxzY3JlZW4gd2luZG93cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNhYmxlLXVucmVkaXJlY3QiLAogICJ1dWlkIjogInVucmVkaXJlY3RAYXVuZXR4IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "1mgvpzzfdzn5qsxwz5911a8qgq0r34az6xpmqr72ksx6yf13l85z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHByZXZlbnQgYXJ0aWZhY3RzIHdoZW4gaW4gZnVsbHNjcmVlbi5cblxuVGhpcyB2ZXJzaW9uIG1ha2VzIHN1cmUgdGhlIHVucmVkaXJlY3Qgb3B0aW9uIGlzIG5vdCByZS1lbmFibGVkIGF1dG9tYXRpY2FsbHkgYnkgdGhlIHNoZWxsLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSB1bnJlZGlyZWN0IGZ1bGxzY3JlZW4gd2luZG93cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNhYmxlLXVucmVkaXJlY3QiLAogICJ1dWlkIjogInVucmVkaXJlY3RAYXVuZXR4IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "nepali-date@biplab", "name": "Nepali Date", "pname": "nepali-calendar", "description": "Shows nepali date on the panel.", "link": "https://extensions.gnome.org/extension/4518/nepali-calendar/", "shell_version_map": {"40": {"version": "17", "sha256": "1b4sybmpbkn3c2w38a063cp1q59l3di602cm197g6q8vqsk8n4zz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIk5lcGFsaSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0JpcGxhYi1EdXR0YS9OZXBhbGlfRGF0ZSIsCiAgInV1aWQiOiAibmVwYWxpLWRhdGVAYmlwbGFiIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "41": {"version": "17", "sha256": "1b4sybmpbkn3c2w38a063cp1q59l3di602cm197g6q8vqsk8n4zz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIk5lcGFsaSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0JpcGxhYi1EdXR0YS9OZXBhbGlfRGF0ZSIsCiAgInV1aWQiOiAibmVwYWxpLWRhdGVAYmlwbGFiIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "42": {"version": "17", "sha256": "1b4sybmpbkn3c2w38a063cp1q59l3di602cm197g6q8vqsk8n4zz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIk5lcGFsaSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0JpcGxhYi1EdXR0YS9OZXBhbGlfRGF0ZSIsCiAgInV1aWQiOiAibmVwYWxpLWRhdGVAYmlwbGFiIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "43": {"version": "17", "sha256": "1b4sybmpbkn3c2w38a063cp1q59l3di602cm197g6q8vqsk8n4zz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIk5lcGFsaSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0JpcGxhYi1EdXR0YS9OZXBhbGlfRGF0ZSIsCiAgInV1aWQiOiAibmVwYWxpLWRhdGVAYmlwbGFiIiwKICAidmVyc2lvbiI6IDE3Cn0="}}} , {"uuid": "clock-left@mapuut", "name": "Clock Left", "pname": "clock-left", "description": "Moves clock to left.\n\nAlso this one might suit you better: extensions.gnome.org/extension/4667/left-clock/", "link": "https://extensions.gnome.org/extension/4526/clock-left/", "shell_version_map": {"38": {"version": "4", "sha256": "0hvr7nmbrn7nqn3nk9p1a659yhkgja3gy9kbw18yykyqf0lbssqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIGNsb2NrIHRvIGxlZnQuXG5cbkFsc28gdGhpcyBvbmUgbWlnaHQgc3VpdCB5b3UgYmV0dGVyOiBleHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDY2Ny9sZWZ0LWNsb2NrLyIsCiAgIm5hbWUiOiAiQ2xvY2sgTGVmdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjbG9jay1sZWZ0QG1hcHV1dCIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "0hvr7nmbrn7nqn3nk9p1a659yhkgja3gy9kbw18yykyqf0lbssqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIGNsb2NrIHRvIGxlZnQuXG5cbkFsc28gdGhpcyBvbmUgbWlnaHQgc3VpdCB5b3UgYmV0dGVyOiBleHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDY2Ny9sZWZ0LWNsb2NrLyIsCiAgIm5hbWUiOiAiQ2xvY2sgTGVmdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjbG9jay1sZWZ0QG1hcHV1dCIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "0hvr7nmbrn7nqn3nk9p1a659yhkgja3gy9kbw18yykyqf0lbssqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIGNsb2NrIHRvIGxlZnQuXG5cbkFsc28gdGhpcyBvbmUgbWlnaHQgc3VpdCB5b3UgYmV0dGVyOiBleHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDY2Ny9sZWZ0LWNsb2NrLyIsCiAgIm5hbWUiOiAiQ2xvY2sgTGVmdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjbG9jay1sZWZ0QG1hcHV1dCIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "0hvr7nmbrn7nqn3nk9p1a659yhkgja3gy9kbw18yykyqf0lbssqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIGNsb2NrIHRvIGxlZnQuXG5cbkFsc28gdGhpcyBvbmUgbWlnaHQgc3VpdCB5b3UgYmV0dGVyOiBleHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDY2Ny9sZWZ0LWNsb2NrLyIsCiAgIm5hbWUiOiAiQ2xvY2sgTGVmdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjbG9jay1sZWZ0QG1hcHV1dCIsCiAgInZlcnNpb24iOiA0Cn0="}}} @@ -617,7 +617,7 @@ , {"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": "9", "sha256": "16lv8hysyc0yla5w6i5l94nc9h425bgf9z3cj9xqfsfzc0icalga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hlbGVkYXJvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3IiLAogICJ1dWlkIjogInNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yQG1pY2hlbGVkYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "16lv8hysyc0yla5w6i5l94nc9h425bgf9z3cj9xqfsfzc0icalga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hlbGVkYXJvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3IiLAogICJ1dWlkIjogInNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yQG1pY2hlbGVkYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "16lv8hysyc0yla5w6i5l94nc9h425bgf9z3cj9xqfsfzc0icalga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hlbGVkYXJvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3IiLAogICJ1dWlkIjogInNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yQG1pY2hlbGVkYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "16lv8hysyc0yla5w6i5l94nc9h425bgf9z3cj9xqfsfzc0icalga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hlbGVkYXJvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3IiLAogICJ1dWlkIjogInNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yQG1pY2hlbGVkYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "43": {"version": "9", "sha256": "16lv8hysyc0yla5w6i5l94nc9h425bgf9z3cj9xqfsfzc0icalga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hlbGVkYXJvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3IiLAogICJ1dWlkIjogInNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yQG1pY2hlbGVkYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"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: \n - Use a shortcut to move the in-focus window to a *new* workspace on the right/left of your current workspace\n\nNew-empty-workspace Shortcut:\n - Use a shortcut to create an *empty* workspace\n\nReorder-workspace Shortcut:\n - Use a shortcut to move an entire workspace left or right of the current workspace", "link": "https://extensions.gnome.org/extension/4597/new-workspace-shortcut/", "shell_version_map": {"41": {"version": "9", "sha256": "0lhfwz45qb6dhfwg6f1hlhixibypzx9w6q1x8xh5pv04y2zb6h2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6IFxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgdGhlIGluLWZvY3VzIHdpbmRvdyB0byBhICpuZXcqIHdvcmtzcGFjZSBvbiB0aGUgcmlnaHQvbGVmdCBvZiB5b3VyIGN1cnJlbnQgd29ya3NwYWNlXG5cbk5ldy1lbXB0eS13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gIC0gVXNlIGEgc2hvcnRjdXQgdG8gY3JlYXRlIGFuICplbXB0eSogd29ya3NwYWNlXG5cblJlb3JkZXItd29ya3NwYWNlIFNob3J0Y3V0OlxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgYW4gZW50aXJlIHdvcmtzcGFjZSBsZWZ0IG9yIHJpZ2h0IG9mIHRoZSBjdXJyZW50IHdvcmtzcGFjZSIsCiAgIm5hbWUiOiAiTmV3IFdvcmtzcGFjZSBTaG9ydGN1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXd3b3Jrc3BhY2VzaG9ydGN1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jhcm5zY290dC9uZXd3b3Jrc3BhY2VzaG9ydGN1dC1iYXJuaXguaW8iLAogICJ1dWlkIjogIm5ld3dvcmtzcGFjZXNob3J0Y3V0QGJhcm5peC5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}, "42": {"version": "9", "sha256": "0lhfwz45qb6dhfwg6f1hlhixibypzx9w6q1x8xh5pv04y2zb6h2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6IFxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgdGhlIGluLWZvY3VzIHdpbmRvdyB0byBhICpuZXcqIHdvcmtzcGFjZSBvbiB0aGUgcmlnaHQvbGVmdCBvZiB5b3VyIGN1cnJlbnQgd29ya3NwYWNlXG5cbk5ldy1lbXB0eS13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gIC0gVXNlIGEgc2hvcnRjdXQgdG8gY3JlYXRlIGFuICplbXB0eSogd29ya3NwYWNlXG5cblJlb3JkZXItd29ya3NwYWNlIFNob3J0Y3V0OlxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgYW4gZW50aXJlIHdvcmtzcGFjZSBsZWZ0IG9yIHJpZ2h0IG9mIHRoZSBjdXJyZW50IHdvcmtzcGFjZSIsCiAgIm5hbWUiOiAiTmV3IFdvcmtzcGFjZSBTaG9ydGN1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXd3b3Jrc3BhY2VzaG9ydGN1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jhcm5zY290dC9uZXd3b3Jrc3BhY2VzaG9ydGN1dC1iYXJuaXguaW8iLAogICJ1dWlkIjogIm5ld3dvcmtzcGFjZXNob3J0Y3V0QGJhcm5peC5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}, "43": {"version": "9", "sha256": "0lhfwz45qb6dhfwg6f1hlhixibypzx9w6q1x8xh5pv04y2zb6h2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6IFxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgdGhlIGluLWZvY3VzIHdpbmRvdyB0byBhICpuZXcqIHdvcmtzcGFjZSBvbiB0aGUgcmlnaHQvbGVmdCBvZiB5b3VyIGN1cnJlbnQgd29ya3NwYWNlXG5cbk5ldy1lbXB0eS13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gIC0gVXNlIGEgc2hvcnRjdXQgdG8gY3JlYXRlIGFuICplbXB0eSogd29ya3NwYWNlXG5cblJlb3JkZXItd29ya3NwYWNlIFNob3J0Y3V0OlxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgYW4gZW50aXJlIHdvcmtzcGFjZSBsZWZ0IG9yIHJpZ2h0IG9mIHRoZSBjdXJyZW50IHdvcmtzcGFjZSIsCiAgIm5hbWUiOiAiTmV3IFdvcmtzcGFjZSBTaG9ydGN1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXd3b3Jrc3BhY2VzaG9ydGN1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jhcm5zY290dC9uZXd3b3Jrc3BhY2VzaG9ydGN1dC1iYXJuaXguaW8iLAogICJ1dWlkIjogIm5ld3dvcmtzcGFjZXNob3J0Y3V0QGJhcm5peC5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"uuid": "p.stonham@switcheroo.org", "name": "Switcheroo", "pname": "switcheroo", "description": "Switch to the first window with the title x\n\nA very small extension to allow you to switch windows via gdbus. This is particularly useful if you are using wayland as utilities such as wmctrl won't work.\n\nSince Gnome 41 removed org.gnome.Shell.Eval for security reasons, if you ever used a command such as:\n\ngdbus call --session --dest org.gnome.Shell --object-path /org/gnome/Shell --method org.gnome.Shell.Eval\"var mw = global.get_window_actors().map(w=>w.meta_window).find(mw=>mw.get_title().includes('Firefox'));mw && mw.activate(0)\"\n\nthis can now be replaced with:\n\ngdbus call --session --dest org.gnome.Shell --object-path /org/switcheroo/Switcheroo --method org.switcheroo.Switcheroo.Set Firefox\n\nThis can then be assigned to a shortcut key in Gnome settings or called programmatically.", "link": "https://extensions.gnome.org/extension/4600/switcheroo/", "shell_version_map": {"41": {"version": "3", "sha256": "0pfjhx8pm26zpizazd2pbpfqsr8vwc6znrm1cbf4ydcyvfxsnwwh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB0byB0aGUgZmlyc3Qgd2luZG93IHdpdGggdGhlIHRpdGxlIHhcblxuQSB2ZXJ5IHNtYWxsIGV4dGVuc2lvbiB0byBhbGxvdyB5b3UgdG8gc3dpdGNoIHdpbmRvd3MgdmlhIGdkYnVzLiBUaGlzIGlzIHBhcnRpY3VsYXJseSB1c2VmdWwgaWYgeW91IGFyZSB1c2luZyB3YXlsYW5kIGFzIHV0aWxpdGllcyBzdWNoIGFzIHdtY3RybCB3b24ndCB3b3JrLlxuXG5TaW5jZSBHbm9tZSA0MSByZW1vdmVkIG9yZy5nbm9tZS5TaGVsbC5FdmFsIGZvciBzZWN1cml0eSByZWFzb25zLCBpZiB5b3UgZXZlciB1c2VkIGEgY29tbWFuZCBzdWNoIGFzOlxuXG5nZGJ1cyBjYWxsIC0tc2Vzc2lvbiAtLWRlc3Qgb3JnLmdub21lLlNoZWxsIC0tb2JqZWN0LXBhdGggL29yZy9nbm9tZS9TaGVsbCAtLW1ldGhvZCBvcmcuZ25vbWUuU2hlbGwuRXZhbFwidmFyIG13ID0gZ2xvYmFsLmdldF93aW5kb3dfYWN0b3JzKCkubWFwKHc9Jmd0O3cubWV0YV93aW5kb3cpLmZpbmQobXc9Jmd0O213LmdldF90aXRsZSgpLmluY2x1ZGVzKCdGaXJlZm94JykpO213ICZhbXA7JmFtcDsgbXcuYWN0aXZhdGUoMClcIlxuXG50aGlzIGNhbiBub3cgYmUgcmVwbGFjZWQgd2l0aDpcblxuZ2RidXMgY2FsbCAtLXNlc3Npb24gLS1kZXN0IG9yZy5nbm9tZS5TaGVsbCAtLW9iamVjdC1wYXRoIC9vcmcvc3dpdGNoZXJvby9Td2l0Y2hlcm9vIC0tbWV0aG9kIG9yZy5zd2l0Y2hlcm9vLlN3aXRjaGVyb28uU2V0IEZpcmVmb3hcblxuVGhpcyBjYW4gdGhlbiBiZSBhc3NpZ25lZCB0byBhIHNob3J0Y3V0IGtleSBpbiBHbm9tZSBzZXR0aW5ncyBvciBjYWxsZWQgcHJvZ3JhbW1hdGljYWxseS4iLAogICJuYW1lIjogIlN3aXRjaGVyb28iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInAuc3RvbmhhbUBzd2l0Y2hlcm9vLm9yZyIsCiAgInZlcnNpb24iOiAzCn0="}}} -, {"uuid": "sane-airplane-mode@kippi", "name": "Sane Airplane Mode", "pname": "sane-airplane-mode", "description": "Make airplane mode sane again! This extension gives you better control over the airplane mode. \nHint: With this extension you can also turn off the annoying \"Bluetooth gets turned on when I disable airplane mode\" behaviour.", "link": "https://extensions.gnome.org/extension/4604/sane-airplane-mode/", "shell_version_map": {"38": {"version": "11", "sha256": "1dwq3ynivdaw6x678iyss5nkvbhzzscgxknibxk4gh5gay8rvsxk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94S2lwcGkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNhbmUtYWlycGxhbmUtbW9kZSIsCiAgInV1aWQiOiAic2FuZS1haXJwbGFuZS1tb2RlQGtpcHBpIiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "1dwq3ynivdaw6x678iyss5nkvbhzzscgxknibxk4gh5gay8rvsxk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94S2lwcGkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNhbmUtYWlycGxhbmUtbW9kZSIsCiAgInV1aWQiOiAic2FuZS1haXJwbGFuZS1tb2RlQGtpcHBpIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "1dwq3ynivdaw6x678iyss5nkvbhzzscgxknibxk4gh5gay8rvsxk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94S2lwcGkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNhbmUtYWlycGxhbmUtbW9kZSIsCiAgInV1aWQiOiAic2FuZS1haXJwbGFuZS1tb2RlQGtpcHBpIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "1dwq3ynivdaw6x678iyss5nkvbhzzscgxknibxk4gh5gay8rvsxk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94S2lwcGkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNhbmUtYWlycGxhbmUtbW9kZSIsCiAgInV1aWQiOiAic2FuZS1haXJwbGFuZS1tb2RlQGtpcHBpIiwKICAidmVyc2lvbiI6IDExCn0="}, "43": {"version": "11", "sha256": "1dwq3ynivdaw6x678iyss5nkvbhzzscgxknibxk4gh5gay8rvsxk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94S2lwcGkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNhbmUtYWlycGxhbmUtbW9kZSIsCiAgInV1aWQiOiAic2FuZS1haXJwbGFuZS1tb2RlQGtpcHBpIiwKICAidmVyc2lvbiI6IDExCn0="}}} +, {"uuid": "sane-airplane-mode@kippi", "name": "Sane Airplane Mode", "pname": "sane-airplane-mode", "description": "Make airplane mode sane again! This extension gives you better control over the airplane mode and lets you turn off the annoying \"Bluetooth turns on when disabling airplane mode\" behaviour.", "link": "https://extensions.gnome.org/extension/4604/sane-airplane-mode/", "shell_version_map": {"38": {"version": "11", "sha256": "1w30akrnl0hb1k6ak9xd9x5zhp4azs7n2z29ap3k1iaxm62a4v5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZSBhbmQgbGV0cyB5b3UgdHVybiBvZmYgdGhlIGFubm95aW5nIFwiQmx1ZXRvb3RoIHR1cm5zIG9uIHdoZW4gZGlzYWJsaW5nIGFpcnBsYW5lIG1vZGVcIiBiZWhhdmlvdXIuIiwKICAibmFtZSI6ICJTYW5lIEFpcnBsYW5lIE1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veEtpcHBpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zYW5lLWFpcnBsYW5lLW1vZGUiLAogICJ1dWlkIjogInNhbmUtYWlycGxhbmUtbW9kZUBraXBwaSIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "11", "sha256": "1w30akrnl0hb1k6ak9xd9x5zhp4azs7n2z29ap3k1iaxm62a4v5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZSBhbmQgbGV0cyB5b3UgdHVybiBvZmYgdGhlIGFubm95aW5nIFwiQmx1ZXRvb3RoIHR1cm5zIG9uIHdoZW4gZGlzYWJsaW5nIGFpcnBsYW5lIG1vZGVcIiBiZWhhdmlvdXIuIiwKICAibmFtZSI6ICJTYW5lIEFpcnBsYW5lIE1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veEtpcHBpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zYW5lLWFpcnBsYW5lLW1vZGUiLAogICJ1dWlkIjogInNhbmUtYWlycGxhbmUtbW9kZUBraXBwaSIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "1w30akrnl0hb1k6ak9xd9x5zhp4azs7n2z29ap3k1iaxm62a4v5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZSBhbmQgbGV0cyB5b3UgdHVybiBvZmYgdGhlIGFubm95aW5nIFwiQmx1ZXRvb3RoIHR1cm5zIG9uIHdoZW4gZGlzYWJsaW5nIGFpcnBsYW5lIG1vZGVcIiBiZWhhdmlvdXIuIiwKICAibmFtZSI6ICJTYW5lIEFpcnBsYW5lIE1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veEtpcHBpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zYW5lLWFpcnBsYW5lLW1vZGUiLAogICJ1dWlkIjogInNhbmUtYWlycGxhbmUtbW9kZUBraXBwaSIsCiAgInZlcnNpb24iOiAxMQp9"}, "42": {"version": "11", "sha256": "1w30akrnl0hb1k6ak9xd9x5zhp4azs7n2z29ap3k1iaxm62a4v5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZSBhbmQgbGV0cyB5b3UgdHVybiBvZmYgdGhlIGFubm95aW5nIFwiQmx1ZXRvb3RoIHR1cm5zIG9uIHdoZW4gZGlzYWJsaW5nIGFpcnBsYW5lIG1vZGVcIiBiZWhhdmlvdXIuIiwKICAibmFtZSI6ICJTYW5lIEFpcnBsYW5lIE1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veEtpcHBpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zYW5lLWFpcnBsYW5lLW1vZGUiLAogICJ1dWlkIjogInNhbmUtYWlycGxhbmUtbW9kZUBraXBwaSIsCiAgInZlcnNpb24iOiAxMQp9"}, "43": {"version": "11", "sha256": "1w30akrnl0hb1k6ak9xd9x5zhp4azs7n2z29ap3k1iaxm62a4v5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZSBhbmQgbGV0cyB5b3UgdHVybiBvZmYgdGhlIGFubm95aW5nIFwiQmx1ZXRvb3RoIHR1cm5zIG9uIHdoZW4gZGlzYWJsaW5nIGFpcnBsYW5lIG1vZGVcIiBiZWhhdmlvdXIuIiwKICAibmFtZSI6ICJTYW5lIEFpcnBsYW5lIE1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veEtpcHBpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zYW5lLWFpcnBsYW5lLW1vZGUiLAogICJ1dWlkIjogInNhbmUtYWlycGxhbmUtbW9kZUBraXBwaSIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "undecorate@tabdeveloper.com", "name": "Undecorate Window for Wayland", "pname": "undecorate-window-for-wayland", "description": "Adds undecorate option to window menu to toggle window decoration.", "link": "https://extensions.gnome.org/extension/4606/undecorate-window-for-wayland/", "shell_version_map": {"40": {"version": "3", "sha256": "1ikbxwqdc204w6vjn1slbrmqvxmkcbyzgqg35jacv8r1z66n6nwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdW5kZWNvcmF0ZSBvcHRpb24gdG8gd2luZG93IG1lbnUgdG8gdG9nZ2xlIHdpbmRvdyBkZWNvcmF0aW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAibmFtZSI6ICJVbmRlY29yYXRlIFdpbmRvdyBmb3IgV2F5bGFuZCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iLAogICAgInRpbUB0YWJkZXZlbG9wZXIuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bmRlY29yYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGJyYW55ZW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVuZGVjb3JhdGUiLAogICJ1dWlkIjogInVuZGVjb3JhdGVAdGFiZGV2ZWxvcGVyLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "1ikbxwqdc204w6vjn1slbrmqvxmkcbyzgqg35jacv8r1z66n6nwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdW5kZWNvcmF0ZSBvcHRpb24gdG8gd2luZG93IG1lbnUgdG8gdG9nZ2xlIHdpbmRvdyBkZWNvcmF0aW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAibmFtZSI6ICJVbmRlY29yYXRlIFdpbmRvdyBmb3IgV2F5bGFuZCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iLAogICAgInRpbUB0YWJkZXZlbG9wZXIuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bmRlY29yYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGJyYW55ZW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVuZGVjb3JhdGUiLAogICJ1dWlkIjogInVuZGVjb3JhdGVAdGFiZGV2ZWxvcGVyLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "1ikbxwqdc204w6vjn1slbrmqvxmkcbyzgqg35jacv8r1z66n6nwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdW5kZWNvcmF0ZSBvcHRpb24gdG8gd2luZG93IG1lbnUgdG8gdG9nZ2xlIHdpbmRvdyBkZWNvcmF0aW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAibmFtZSI6ICJVbmRlY29yYXRlIFdpbmRvdyBmb3IgV2F5bGFuZCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iLAogICAgInRpbUB0YWJkZXZlbG9wZXIuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bmRlY29yYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGJyYW55ZW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVuZGVjb3JhdGUiLAogICJ1dWlkIjogInVuZGVjb3JhdGVAdGFiZGV2ZWxvcGVyLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "zenbook-duo@laurinneff.ch", "name": "Asus ZenBook Duo Integration", "pname": "asus-zenbook-duo-integration", "description": "Integrate the features of the Asus ZenBook Duo into GNOME", "link": "https://extensions.gnome.org/extension/4607/asus-zenbook-duo-integration/", "shell_version_map": {"40": {"version": "5", "sha256": "1xljk5qklm8f9k6hx6ax2axp6r6si510706bksrsbzy72i2dp46w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSB0aGUgZmVhdHVyZXMgb2YgdGhlIEFzdXMgWmVuQm9vayBEdW8gaW50byBHTk9NRSIsCiAgIm5hbWUiOiAiQXN1cyBaZW5Cb29rIER1byBJbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdXJpbm5lZmYvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXplbmJvb2stZHVvIiwKICAidXVpZCI6ICJ6ZW5ib29rLWR1b0BsYXVyaW5uZWZmLmNoIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "1xljk5qklm8f9k6hx6ax2axp6r6si510706bksrsbzy72i2dp46w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSB0aGUgZmVhdHVyZXMgb2YgdGhlIEFzdXMgWmVuQm9vayBEdW8gaW50byBHTk9NRSIsCiAgIm5hbWUiOiAiQXN1cyBaZW5Cb29rIER1byBJbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdXJpbm5lZmYvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXplbmJvb2stZHVvIiwKICAidXVpZCI6ICJ6ZW5ib29rLWR1b0BsYXVyaW5uZWZmLmNoIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "42": {"version": "5", "sha256": "1xljk5qklm8f9k6hx6ax2axp6r6si510706bksrsbzy72i2dp46w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSB0aGUgZmVhdHVyZXMgb2YgdGhlIEFzdXMgWmVuQm9vayBEdW8gaW50byBHTk9NRSIsCiAgIm5hbWUiOiAiQXN1cyBaZW5Cb29rIER1byBJbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdXJpbm5lZmYvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXplbmJvb2stZHVvIiwKICAidXVpZCI6ICJ6ZW5ib29rLWR1b0BsYXVyaW5uZWZmLmNoIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "batterythreshold@francku.gitlab.com", "name": "Battery threshold", "pname": "battery-threshold", "description": "A simple extension for gnome-shell that let easily set a threshold to limit battery charge level.\n\nThis extension uses \"pkexec\" since sudo permissions are needed to change the threshold level.\n\nTested on Fedora Silverblue 35 (gnome-shell 3.41) on an Asus Vivobook.\n\nGithub page: https://github.com/francku/gnome-shell-extension-battery-threshold", "link": "https://extensions.gnome.org/extension/4612/battery-threshold/", "shell_version_map": {"41": {"version": "3", "sha256": "0jydbi1lwz6ls0rg3660b3s7gwlmkd9a08v1mhx12zp89rgrxfm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiBmb3IgZ25vbWUtc2hlbGwgdGhhdCBsZXQgZWFzaWx5IHNldCBhIHRocmVzaG9sZCB0byBsaW1pdCBiYXR0ZXJ5IGNoYXJnZSBsZXZlbC5cblxuVGhpcyBleHRlbnNpb24gdXNlcyBcInBrZXhlY1wiIHNpbmNlIHN1ZG8gcGVybWlzc2lvbnMgYXJlIG5lZWRlZCB0byBjaGFuZ2UgdGhlIHRocmVzaG9sZCBsZXZlbC5cblxuVGVzdGVkIG9uIEZlZG9yYSBTaWx2ZXJibHVlIDM1IChnbm9tZS1zaGVsbCAzLjQxKSBvbiBhbiBBc3VzIFZpdm9ib29rLlxuXG5HaXRodWIgcGFnZTogaHR0cHM6Ly9naXRodWIuY29tL2ZyYW5ja3UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWJhdHRlcnktdGhyZXNob2xkIiwKICAibmFtZSI6ICJCYXR0ZXJ5IHRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJiYXR0ZXJ5dGhyZXNob2xkQGZyYW5ja3UuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "0jydbi1lwz6ls0rg3660b3s7gwlmkd9a08v1mhx12zp89rgrxfm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiBmb3IgZ25vbWUtc2hlbGwgdGhhdCBsZXQgZWFzaWx5IHNldCBhIHRocmVzaG9sZCB0byBsaW1pdCBiYXR0ZXJ5IGNoYXJnZSBsZXZlbC5cblxuVGhpcyBleHRlbnNpb24gdXNlcyBcInBrZXhlY1wiIHNpbmNlIHN1ZG8gcGVybWlzc2lvbnMgYXJlIG5lZWRlZCB0byBjaGFuZ2UgdGhlIHRocmVzaG9sZCBsZXZlbC5cblxuVGVzdGVkIG9uIEZlZG9yYSBTaWx2ZXJibHVlIDM1IChnbm9tZS1zaGVsbCAzLjQxKSBvbiBhbiBBc3VzIFZpdm9ib29rLlxuXG5HaXRodWIgcGFnZTogaHR0cHM6Ly9naXRodWIuY29tL2ZyYW5ja3UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWJhdHRlcnktdGhyZXNob2xkIiwKICAibmFtZSI6ICJCYXR0ZXJ5IHRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJiYXR0ZXJ5dGhyZXNob2xkQGZyYW5ja3UuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "0jydbi1lwz6ls0rg3660b3s7gwlmkd9a08v1mhx12zp89rgrxfm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiBmb3IgZ25vbWUtc2hlbGwgdGhhdCBsZXQgZWFzaWx5IHNldCBhIHRocmVzaG9sZCB0byBsaW1pdCBiYXR0ZXJ5IGNoYXJnZSBsZXZlbC5cblxuVGhpcyBleHRlbnNpb24gdXNlcyBcInBrZXhlY1wiIHNpbmNlIHN1ZG8gcGVybWlzc2lvbnMgYXJlIG5lZWRlZCB0byBjaGFuZ2UgdGhlIHRocmVzaG9sZCBsZXZlbC5cblxuVGVzdGVkIG9uIEZlZG9yYSBTaWx2ZXJibHVlIDM1IChnbm9tZS1zaGVsbCAzLjQxKSBvbiBhbiBBc3VzIFZpdm9ib29rLlxuXG5HaXRodWIgcGFnZTogaHR0cHM6Ly9naXRodWIuY29tL2ZyYW5ja3UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWJhdHRlcnktdGhyZXNob2xkIiwKICAibmFtZSI6ICJCYXR0ZXJ5IHRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJiYXR0ZXJ5dGhyZXNob2xkQGZyYW5ja3UuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} @@ -643,7 +643,7 @@ , {"uuid": "burn-my-windows@schneegans.github.com", "name": "Burn My Windows", "pname": "burn-my-windows", "description": "Disintegrate your windows with style.", "link": "https://extensions.gnome.org/extension/4679/burn-my-windows/", "shell_version_map": {"38": {"version": "27", "sha256": "0hhwvzgqcs76b3kcsaqxll5l3wmmhcz3m471k9yjfx86g4vwkdw7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvQnVybi1NeS1XaW5kb3dzIiwKICAidXVpZCI6ICJidXJuLW15LXdpbmRvd3NAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "40": {"version": "27", "sha256": "0hhwvzgqcs76b3kcsaqxll5l3wmmhcz3m471k9yjfx86g4vwkdw7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvQnVybi1NeS1XaW5kb3dzIiwKICAidXVpZCI6ICJidXJuLW15LXdpbmRvd3NAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "41": {"version": "27", "sha256": "0hhwvzgqcs76b3kcsaqxll5l3wmmhcz3m471k9yjfx86g4vwkdw7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvQnVybi1NeS1XaW5kb3dzIiwKICAidXVpZCI6ICJidXJuLW15LXdpbmRvd3NAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "42": {"version": "27", "sha256": "0hhwvzgqcs76b3kcsaqxll5l3wmmhcz3m471k9yjfx86g4vwkdw7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvQnVybi1NeS1XaW5kb3dzIiwKICAidXVpZCI6ICJidXJuLW15LXdpbmRvd3NAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "43": {"version": "27", "sha256": "0hhwvzgqcs76b3kcsaqxll5l3wmmhcz3m471k9yjfx86g4vwkdw7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvQnVybi1NeS1XaW5kb3dzIiwKICAidXVpZCI6ICJidXJuLW15LXdpbmRvd3NAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}}} , {"uuid": "babar-lite@fthx", "name": "BaBar Lite", "pname": "babar-task-bar-lite-for-gnome-40", "description": "Task bar. App grid, favorites, workspaces and tasks in panel. Light extension.\n\n Replace 'Activities' button by all current workspaces and apps buttons. Switch workspace/app or toggle overview by clicking on these buttons. Drag and drop favorite, task, dash item or app grid item to any workspace (you cannot reorder tasks inside a workspace). Change 'Places' label to an icon. No settings, use BaBar classic for that.\n\n You can use names for workspaces: there are two ways for that. 1) Edit the string array 'org.gnome.desktop.wm.preferences.workspace-names' gsettings key (through dconf editor, e.g.). 2) Use official GNOME extension Workspaces Indicator's settings. You don't have to write a long enough list: numbers are displayed if no workspace name is defined.", "link": "https://extensions.gnome.org/extension/4681/babar-task-bar-lite-for-gnome-40/", "shell_version_map": {"40": {"version": "2", "sha256": "01m48bwpn1as90ahpnl9ari3s2bj8423032nw12ac45wwcnb9yvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gTm8gc2V0dGluZ3MsIHVzZSBCYUJhciBjbGFzc2ljIGZvciB0aGF0LlxuXG4gWW91IGNhbiB1c2UgbmFtZXMgZm9yIHdvcmtzcGFjZXM6IHRoZXJlIGFyZSB0d28gd2F5cyBmb3IgdGhhdC4gMSkgRWRpdCB0aGUgc3RyaW5nIGFycmF5ICdvcmcuZ25vbWUuZGVza3RvcC53bS5wcmVmZXJlbmNlcy53b3Jrc3BhY2UtbmFtZXMnIGdzZXR0aW5ncyBrZXkgKHRocm91Z2ggZGNvbmYgZWRpdG9yLCBlLmcuKS4gMikgVXNlIG9mZmljaWFsIEdOT01FIGV4dGVuc2lvbiBXb3Jrc3BhY2VzIEluZGljYXRvcidzIHNldHRpbmdzLiBZb3UgZG9uJ3QgaGF2ZSB0byB3cml0ZSBhIGxvbmcgZW5vdWdoIGxpc3Q6IG51bWJlcnMgYXJlIGRpc3BsYXllZCBpZiBubyB3b3Jrc3BhY2UgbmFtZSBpcyBkZWZpbmVkLiIsCiAgIm5hbWUiOiAiQmFCYXIgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXItbGl0ZSIsCiAgInV1aWQiOiAiYmFiYXItbGl0ZUBmdGh4IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "01m48bwpn1as90ahpnl9ari3s2bj8423032nw12ac45wwcnb9yvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gTm8gc2V0dGluZ3MsIHVzZSBCYUJhciBjbGFzc2ljIGZvciB0aGF0LlxuXG4gWW91IGNhbiB1c2UgbmFtZXMgZm9yIHdvcmtzcGFjZXM6IHRoZXJlIGFyZSB0d28gd2F5cyBmb3IgdGhhdC4gMSkgRWRpdCB0aGUgc3RyaW5nIGFycmF5ICdvcmcuZ25vbWUuZGVza3RvcC53bS5wcmVmZXJlbmNlcy53b3Jrc3BhY2UtbmFtZXMnIGdzZXR0aW5ncyBrZXkgKHRocm91Z2ggZGNvbmYgZWRpdG9yLCBlLmcuKS4gMikgVXNlIG9mZmljaWFsIEdOT01FIGV4dGVuc2lvbiBXb3Jrc3BhY2VzIEluZGljYXRvcidzIHNldHRpbmdzLiBZb3UgZG9uJ3QgaGF2ZSB0byB3cml0ZSBhIGxvbmcgZW5vdWdoIGxpc3Q6IG51bWJlcnMgYXJlIGRpc3BsYXllZCBpZiBubyB3b3Jrc3BhY2UgbmFtZSBpcyBkZWZpbmVkLiIsCiAgIm5hbWUiOiAiQmFCYXIgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXItbGl0ZSIsCiAgInV1aWQiOiAiYmFiYXItbGl0ZUBmdGh4IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "01m48bwpn1as90ahpnl9ari3s2bj8423032nw12ac45wwcnb9yvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gTm8gc2V0dGluZ3MsIHVzZSBCYUJhciBjbGFzc2ljIGZvciB0aGF0LlxuXG4gWW91IGNhbiB1c2UgbmFtZXMgZm9yIHdvcmtzcGFjZXM6IHRoZXJlIGFyZSB0d28gd2F5cyBmb3IgdGhhdC4gMSkgRWRpdCB0aGUgc3RyaW5nIGFycmF5ICdvcmcuZ25vbWUuZGVza3RvcC53bS5wcmVmZXJlbmNlcy53b3Jrc3BhY2UtbmFtZXMnIGdzZXR0aW5ncyBrZXkgKHRocm91Z2ggZGNvbmYgZWRpdG9yLCBlLmcuKS4gMikgVXNlIG9mZmljaWFsIEdOT01FIGV4dGVuc2lvbiBXb3Jrc3BhY2VzIEluZGljYXRvcidzIHNldHRpbmdzLiBZb3UgZG9uJ3QgaGF2ZSB0byB3cml0ZSBhIGxvbmcgZW5vdWdoIGxpc3Q6IG51bWJlcnMgYXJlIGRpc3BsYXllZCBpZiBubyB3b3Jrc3BhY2UgbmFtZSBpcyBkZWZpbmVkLiIsCiAgIm5hbWUiOiAiQmFCYXIgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXItbGl0ZSIsCiAgInV1aWQiOiAiYmFiYXItbGl0ZUBmdGh4IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "useless-gaps@pimsnel.com", "name": "Useless Gaps", "pname": "useless-gaps", "description": "For aesthetic purposes adds useless gaps around tiled and maximized windows", "link": "https://extensions.gnome.org/extension/4684/useless-gaps/", "shell_version_map": {"38": {"version": "9", "sha256": "00h9p7vhv23r8jb00pwkw5vfjdz21p1hdfhn288jld6kdj4w00zd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "10", "sha256": "0b5gblslp47qiazgg56rxzcsk8si5bycnimlxbykqa64i27kriaj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "0b5gblslp47qiazgg56rxzcsk8si5bycnimlxbykqa64i27kriaj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "0b5gblslp47qiazgg56rxzcsk8si5bycnimlxbykqa64i27kriaj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "43": {"version": "10", "sha256": "0b5gblslp47qiazgg56rxzcsk8si5bycnimlxbykqa64i27kriaj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}}} -, {"uuid": "serverstatus@footeware.ca", "name": "Server Status Indicator", "pname": "server-status-indicator", "description": "Indicator displaying status of entered web server urls, green for up, red for down.", "link": "https://extensions.gnome.org/extension/4687/server-status-indicator/", "shell_version_map": {"40": {"version": "8", "sha256": "1mm2b6fwx58yvcq8fkxrkcb5bcm4ak8al5jw0939mwr8fjhgd13s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJscywgZ3JlZW4gZm9yIHVwLCByZWQgZm9yIGRvd24uIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1mm2b6fwx58yvcq8fkxrkcb5bcm4ak8al5jw0939mwr8fjhgd13s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJscywgZ3JlZW4gZm9yIHVwLCByZWQgZm9yIGRvd24uIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "9", "sha256": "19afjjkkga6ky7ixc03ga7fyg49jkqld01v05pq5jrbf1bhzgvcf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJscywgZ3JlZW4gZm9yIHVwLCByZWQgZm9yIGRvd24uIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0My4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ3JhaWdGb290ZS9jYS5mb290ZXdhcmUuZ25vbWVzaGVsbC5zZXJ2ZXJzdGF0dXMuZ2l0IiwKICAidXVpZCI6ICJzZXJ2ZXJzdGF0dXNAZm9vdGV3YXJlLmNhIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} +, {"uuid": "serverstatus@footeware.ca", "name": "Server Status Indicator", "pname": "server-status-indicator", "description": "Indicator displaying status of entered web server urls, green for up, red for down.", "link": "https://extensions.gnome.org/extension/4687/server-status-indicator/", "shell_version_map": {"40": {"version": "8", "sha256": "1mm2b6fwx58yvcq8fkxrkcb5bcm4ak8al5jw0939mwr8fjhgd13s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJscywgZ3JlZW4gZm9yIHVwLCByZWQgZm9yIGRvd24uIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1mm2b6fwx58yvcq8fkxrkcb5bcm4ak8al5jw0939mwr8fjhgd13s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJscywgZ3JlZW4gZm9yIHVwLCByZWQgZm9yIGRvd24uIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "11", "sha256": "1ypadmnz28qz26bpxjxkpv4p9b9zpg5s1rbpy328yma5ykgpypx7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJscywgZ3JlZW4gZm9yIHVwLCByZWQgZm9yIGRvd24uIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"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", "link": "https://extensions.gnome.org/extension/4688/focus-follows-workspace/", "shell_version_map": {"41": {"version": "3", "sha256": "0hvfl7ip07cvnbgk1yc10x11yc80x7mqwxgrayfl1n7qw6j0b4lv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NocmlzdG9waGVyLWwvZm9jdXMtZm9sbG93cy13b3Jrc3BhY2UiLAogICJ1dWlkIjogImZvY3VzLWZvbGxvd3Mtd29ya3NwYWNlQGNocmlzdG9waGVyLmx1ZWJiZW1laWVyLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "0hvfl7ip07cvnbgk1yc10x11yc80x7mqwxgrayfl1n7qw6j0b4lv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NocmlzdG9waGVyLWwvZm9jdXMtZm9sbG93cy13b3Jrc3BhY2UiLAogICJ1dWlkIjogImZvY3VzLWZvbGxvd3Mtd29ya3NwYWNlQGNocmlzdG9waGVyLmx1ZWJiZW1laWVyLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "0hvfl7ip07cvnbgk1yc10x11yc80x7mqwxgrayfl1n7qw6j0b4lv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NocmlzdG9waGVyLWwvZm9jdXMtZm9sbG93cy13b3Jrc3BhY2UiLAogICJ1dWlkIjogImZvY3VzLWZvbGxvd3Mtd29ya3NwYWNlQGNocmlzdG9waGVyLmx1ZWJiZW1laWVyLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"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": "2", "sha256": "1920nd7dr2159606mlv3c4fkambw1yx0a65rr961qx3w6jwd1pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "1920nd7dr2159606mlv3c4fkambw1yx0a65rr961qx3w6jwd1pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "1920nd7dr2159606mlv3c4fkambw1yx0a65rr961qx3w6jwd1pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "5", "sha256": "1z0alar9zlxd13klapnfggpsiws77pjfjhb1p3fymak4h492k3ra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhZm9zdGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waXAtb24tdG9wIiwKICAidXVpZCI6ICJwaXAtb24tdG9wQHJhZm9zdGFyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "43": {"version": "5", "sha256": "1z0alar9zlxd13klapnfggpsiws77pjfjhb1p3fymak4h492k3ra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhZm9zdGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waXAtb24tdG9wIiwKICAidXVpZCI6ICJwaXAtb24tdG9wQHJhZm9zdGFyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"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": "17", "sha256": "1cwjyw4sc4i4vdm458qdnjzvmiqyz9vscicwarsd9cvik57p44f5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9yb3VuZGVkLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJ1dWlkIjogInJvdW5kZWRTeXN0ZW1NZW51QnV0dG9uc0BwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "40": {"version": "20", "sha256": "044a1vp619lvxrnxiv4af2z4m9x18aqhp97g22wh4y3h8ns5ds8h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvcm91bmRlZC1zeXN0ZW0tbWVudS1idXR0b25zIiwKICAidXVpZCI6ICJyb3VuZGVkU3lzdGVtTWVudUJ1dHRvbnNAcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDIwCn0="}, "41": {"version": "20", "sha256": "044a1vp619lvxrnxiv4af2z4m9x18aqhp97g22wh4y3h8ns5ds8h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvcm91bmRlZC1zeXN0ZW0tbWVudS1idXR0b25zIiwKICAidXVpZCI6ICJyb3VuZGVkU3lzdGVtTWVudUJ1dHRvbnNAcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDIwCn0="}, "42": {"version": "20", "sha256": "044a1vp619lvxrnxiv4af2z4m9x18aqhp97g22wh4y3h8ns5ds8h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvcm91bmRlZC1zeXN0ZW0tbWVudS1idXR0b25zIiwKICAidXVpZCI6ICJyb3VuZGVkU3lzdGVtTWVudUJ1dHRvbnNAcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDIwCn0="}}} @@ -681,7 +681,7 @@ , {"uuid": "compare@eexpss.gmail.com", "name": "Compare or Open", "pname": "compare-filedir-from-clip", "description": "Copy/Select two Dirs/Files from anywhere such as `nautilus` or `gnome-terminal`, and then compare them (use `meld`) or open with Ctrl-O or open with context-menu.", "link": "https://extensions.gnome.org/extension/4789/compare-filedir-from-clip/", "shell_version_map": {"40": {"version": "15", "sha256": "0is8y6cs3qfaljlmyfhjpp71fbd98bizldf0rhrblm91mjfhqi3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "41": {"version": "15", "sha256": "0is8y6cs3qfaljlmyfhjpp71fbd98bizldf0rhrblm91mjfhqi3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "42": {"version": "15", "sha256": "0is8y6cs3qfaljlmyfhjpp71fbd98bizldf0rhrblm91mjfhqi3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}}} , {"uuid": "freq-boost-switch@metal03326", "name": "Frequency Boost Switch", "pname": "frequency-boost-switch", "description": "Add a toggle to enable/disable CPU frequency boost in Gnome Power Profiles menu.", "link": "https://extensions.gnome.org/extension/4792/frequency-boost-switch/", "shell_version_map": {"41": {"version": "6", "sha256": "0yrrh10n7nkj8x1kmsndqlwcv5crad77a52vmq1xbcb24m3aswgp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWV0YWwwMzMyNi9nbm9tZS1mcmVxdWVuY3ktYm9vc3Qtc3dpdGNoIiwKICAidXVpZCI6ICJmcmVxLWJvb3N0LXN3aXRjaEBtZXRhbDAzMzI2IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "8", "sha256": "0ldkfawgpdzzicr7ja1v1lyjg38pw0mh2i91gm3bdf9wxln4d6j7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tZXRhbDAzMzI2L2dub21lLWZyZXF1ZW5jeS1ib29zdC1zd2l0Y2giLAogICJ1dWlkIjogImZyZXEtYm9vc3Qtc3dpdGNoQG1ldGFsMDMzMjYiLAogICJ2ZXJzaW9uIjogOAp9"}, "43": {"version": "9", "sha256": "0fj1bc209l2zz8cwllxm5nadd0hmvikf9d1ydfwc25l201czl68m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tZXRhbDAzMzI2L2dub21lLWZyZXF1ZW5jeS1ib29zdC1zd2l0Y2giLAogICJ1dWlkIjogImZyZXEtYm9vc3Qtc3dpdGNoQG1ldGFsMDMzMjYiLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"uuid": "pop-launcher-super-key@ManeLippert", "name": "Pop Launcher Super-Key", "pname": "pop-launcher-super-key", "description": "Binds Pop-Launcher on Super-Key (Fork of Pop-Cosmic Extension)\n\nSince Pop!_OS moves to its own desktop enviroment (COSMIC DE) and I left linux behind me this extension will not get continued.\n\n! Requirements ! : Pop-Launcher and Pop-Shell have to be installed on used OS", "link": "https://extensions.gnome.org/extension/4797/pop-launcher-super-key/", "shell_version_map": {"38": {"version": "5", "sha256": "03mdqjmlf4zhcp2lim1skzdvr0c90gd4mfmrdiw6bqks8k7ma8n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cblNpbmNlIFBvcCFfT1MgbW92ZXMgdG8gaXRzIG93biBkZXNrdG9wIGVudmlyb21lbnQgKENPU01JQyBERSkgYW5kIEkgbGVmdCBsaW51eCBiZWhpbmQgbWUgdGhpcyBleHRlbnNpb24gd2lsbCBub3QgZ2V0IGNvbnRpbnVlZC5cblxuISBSZXF1aXJlbWVudHMgISA6IFBvcC1MYXVuY2hlciBhbmQgUG9wLVNoZWxsIGhhdmUgdG8gYmUgaW5zdGFsbGVkIG9uIHVzZWQgT1MiLAogICJuYW1lIjogIlBvcCBMYXVuY2hlciBTdXBlci1LZXkiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlN5c3RlbTc2IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "03mdqjmlf4zhcp2lim1skzdvr0c90gd4mfmrdiw6bqks8k7ma8n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cblNpbmNlIFBvcCFfT1MgbW92ZXMgdG8gaXRzIG93biBkZXNrdG9wIGVudmlyb21lbnQgKENPU01JQyBERSkgYW5kIEkgbGVmdCBsaW51eCBiZWhpbmQgbWUgdGhpcyBleHRlbnNpb24gd2lsbCBub3QgZ2V0IGNvbnRpbnVlZC5cblxuISBSZXF1aXJlbWVudHMgISA6IFBvcC1MYXVuY2hlciBhbmQgUG9wLVNoZWxsIGhhdmUgdG8gYmUgaW5zdGFsbGVkIG9uIHVzZWQgT1MiLAogICJuYW1lIjogIlBvcCBMYXVuY2hlciBTdXBlci1LZXkiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlN5c3RlbTc2IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "03mdqjmlf4zhcp2lim1skzdvr0c90gd4mfmrdiw6bqks8k7ma8n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cblNpbmNlIFBvcCFfT1MgbW92ZXMgdG8gaXRzIG93biBkZXNrdG9wIGVudmlyb21lbnQgKENPU01JQyBERSkgYW5kIEkgbGVmdCBsaW51eCBiZWhpbmQgbWUgdGhpcyBleHRlbnNpb24gd2lsbCBub3QgZ2V0IGNvbnRpbnVlZC5cblxuISBSZXF1aXJlbWVudHMgISA6IFBvcC1MYXVuY2hlciBhbmQgUG9wLVNoZWxsIGhhdmUgdG8gYmUgaW5zdGFsbGVkIG9uIHVzZWQgT1MiLAogICJuYW1lIjogIlBvcCBMYXVuY2hlciBTdXBlci1LZXkiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlN5c3RlbTc2IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "03mdqjmlf4zhcp2lim1skzdvr0c90gd4mfmrdiw6bqks8k7ma8n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cblNpbmNlIFBvcCFfT1MgbW92ZXMgdG8gaXRzIG93biBkZXNrdG9wIGVudmlyb21lbnQgKENPU01JQyBERSkgYW5kIEkgbGVmdCBsaW51eCBiZWhpbmQgbWUgdGhpcyBleHRlbnNpb24gd2lsbCBub3QgZ2V0IGNvbnRpbnVlZC5cblxuISBSZXF1aXJlbWVudHMgISA6IFBvcC1MYXVuY2hlciBhbmQgUG9wLVNoZWxsIGhhdmUgdG8gYmUgaW5zdGFsbGVkIG9uIHVzZWQgT1MiLAogICJuYW1lIjogIlBvcCBMYXVuY2hlciBTdXBlci1LZXkiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlN5c3RlbTc2IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA1Cn0="}, "43": {"version": "5", "sha256": "03mdqjmlf4zhcp2lim1skzdvr0c90gd4mfmrdiw6bqks8k7ma8n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cblNpbmNlIFBvcCFfT1MgbW92ZXMgdG8gaXRzIG93biBkZXNrdG9wIGVudmlyb21lbnQgKENPU01JQyBERSkgYW5kIEkgbGVmdCBsaW51eCBiZWhpbmQgbWUgdGhpcyBleHRlbnNpb24gd2lsbCBub3QgZ2V0IGNvbnRpbnVlZC5cblxuISBSZXF1aXJlbWVudHMgISA6IFBvcC1MYXVuY2hlciBhbmQgUG9wLVNoZWxsIGhhdmUgdG8gYmUgaW5zdGFsbGVkIG9uIHVzZWQgT1MiLAogICJuYW1lIjogIlBvcCBMYXVuY2hlciBTdXBlci1LZXkiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlN5c3RlbTc2IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA1Cn0="}}} -, {"uuid": "thinkpad-battery-threshold@marcosdalvarez.org", "name": "Thinkpad Battery Threshold", "pname": "thinkpad-battery-threshold", "description": "Enable/Disable battery threshold on Lenovo Thinkpad laptops.\n\nIf you mainly use the system with the AC power adapter connected and only use the battery sporadically, you can increase battery life by setting the maximum charge value to less than 100%. This is useful because batteries that are used sporadically have a longer lifespan when kept at less than full charge.", "link": "https://extensions.gnome.org/extension/4798/thinkpad-battery-threshold/", "shell_version_map": {"41": {"version": "13", "sha256": "07l1vgv9zhyh8q2h0gnn69x7h8gfn8x9q34p9lab7w08s4zn2rnb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "07l1vgv9zhyh8q2h0gnn69x7h8gfn8x9q34p9lab7w08s4zn2rnb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}, "43": {"version": "20", "sha256": "0bi4mm9i8bhgdfiqklzyhifkbm8cwh4zr4xpza60fmjm8il41w7x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tYXJjb3NkYWx2YXJlei90aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZC1leHRlbnNpb24iLAogICJ1dWlkIjogInRoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkQG1hcmNvc2RhbHZhcmV6Lm9yZyIsCiAgInZlcnNpb24iOiAyMAp9"}}} +, {"uuid": "thinkpad-battery-threshold@marcosdalvarez.org", "name": "Thinkpad Battery Threshold", "pname": "thinkpad-battery-threshold", "description": "Enable/Disable battery threshold on Lenovo Thinkpad laptops.\n\nIf you mainly use the system with the AC power adapter connected and only use the battery sporadically, you can increase battery life by setting the maximum charge value to less than 100%. This is useful because batteries that are used sporadically have a longer lifespan when kept at less than full charge.", "link": "https://extensions.gnome.org/extension/4798/thinkpad-battery-threshold/", "shell_version_map": {"41": {"version": "13", "sha256": "07l1vgv9zhyh8q2h0gnn69x7h8gfn8x9q34p9lab7w08s4zn2rnb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "07l1vgv9zhyh8q2h0gnn69x7h8gfn8x9q34p9lab7w08s4zn2rnb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}, "43": {"version": "22", "sha256": "0kdgc4aw9fdln79zw2v8vlgy0c3n6c27c7vfwirfs2d8phlr6vha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWFyY29zZGFsdmFyZXovdGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZEBtYXJjb3NkYWx2YXJlei5vcmciLAogICJ2ZXJzaW9uIjogMjIKfQ=="}}} , {"uuid": "lock-screen-message@advendradeswanta.gitlab.com", "name": "Lock Screen Message", "pname": "lock-screen-message", "description": "Simple extension that let's you add your message to the lock screen (unlockDialog)", "link": "https://extensions.gnome.org/extension/4801/lock-screen-message/", "shell_version_map": {"40": {"version": "3", "sha256": "0hkr6gm7kr69fc4zjb8rddwj75jpbpvqz4wpkfl659wjn4980s3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BZHZlbmRyYURlc3dhbnRhL2xvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJ1dWlkIjogImxvY2stc2NyZWVuLW1lc3NhZ2VAYWR2ZW5kcmFkZXN3YW50YS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "0hkr6gm7kr69fc4zjb8rddwj75jpbpvqz4wpkfl659wjn4980s3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BZHZlbmRyYURlc3dhbnRhL2xvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJ1dWlkIjogImxvY2stc2NyZWVuLW1lc3NhZ2VAYWR2ZW5kcmFkZXN3YW50YS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "0hkr6gm7kr69fc4zjb8rddwj75jpbpvqz4wpkfl659wjn4980s3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BZHZlbmRyYURlc3dhbnRhL2xvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJ1dWlkIjogImxvY2stc2NyZWVuLW1lc3NhZ2VAYWR2ZW5kcmFkZXN3YW50YS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "panel-corners@aunetx", "name": "Panel corners", "pname": "panel-corners", "description": "A GNOME shell extension to keep the old topbar corners, which were removed for GNOME 42. It also allows you to customize the rounded corners, even if you use GNOME 40 or 41.\n\nIt is widely based on already existing gnome-shell code, and on a merge request by Alexander Mikhaylenko: https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1328", "link": "https://extensions.gnome.org/extension/4805/panel-corners/", "shell_version_map": {"40": {"version": "3", "sha256": "0piacfxwa5ca5cnvrz0s8pqykfixynmvvdmh1rznfsh407v1kw1v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvcGFuZWwtY29ybmVycyIsCiAgInV1aWQiOiAicGFuZWwtY29ybmVyc0BhdW5ldHgiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "0piacfxwa5ca5cnvrz0s8pqykfixynmvvdmh1rznfsh407v1kw1v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvcGFuZWwtY29ybmVycyIsCiAgInV1aWQiOiAicGFuZWwtY29ybmVyc0BhdW5ldHgiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "6", "sha256": "1fzfl8c28cmc0a26gx9xyyk78lapgfc2x2ykgwaq8mgz86vap4f6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9wYW5lbC1jb3JuZXJzIiwKICAidXVpZCI6ICJwYW5lbC1jb3JuZXJzQGF1bmV0eCIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "1fzfl8c28cmc0a26gx9xyyk78lapgfc2x2ykgwaq8mgz86vap4f6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9wYW5lbC1jb3JuZXJzIiwKICAidXVpZCI6ICJwYW5lbC1jb3JuZXJzQGF1bmV0eCIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "WhatWatch@Zappo-II.github.io", "name": "What Watch", "pname": "what-watch", "description": "Shows a customizeable analog desktop clock.\nPlease visit the GitHub repository for documentation and to report any issues.", "link": "https://extensions.gnome.org/extension/4806/what-watch/", "shell_version_map": {"38": {"version": "6", "sha256": "11xlh4c5ypivw3hln0z7qm40xz6yn5yp4rlfz2a2lam3z2664nwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aYXBwby1JSS9XaGF0V2F0Y2giLAogICJ1dWlkIjogIldoYXRXYXRjaEBaYXBwby1JSS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "11xlh4c5ypivw3hln0z7qm40xz6yn5yp4rlfz2a2lam3z2664nwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aYXBwby1JSS9XaGF0V2F0Y2giLAogICJ1dWlkIjogIldoYXRXYXRjaEBaYXBwby1JSS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "11xlh4c5ypivw3hln0z7qm40xz6yn5yp4rlfz2a2lam3z2664nwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aYXBwby1JSS9XaGF0V2F0Y2giLAogICJ1dWlkIjogIldoYXRXYXRjaEBaYXBwby1JSS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "6", "sha256": "11xlh4c5ypivw3hln0z7qm40xz6yn5yp4rlfz2a2lam3z2664nwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aYXBwby1JSS9XaGF0V2F0Y2giLAogICJ1dWlkIjogIldoYXRXYXRjaEBaYXBwby1JSS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}, "43": {"version": "6", "sha256": "11xlh4c5ypivw3hln0z7qm40xz6yn5yp4rlfz2a2lam3z2664nwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aYXBwby1JSS9XaGF0V2F0Y2giLAogICJ1dWlkIjogIldoYXRXYXRjaEBaYXBwby1JSS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}}} @@ -740,7 +740,7 @@ , {"uuid": "dash2dock-lite@icedman.github.com", "name": "Dash2Dock Lite", "pname": "dash2dock-lite", "description": "The Animated & Effectful Dock", "link": "https://extensions.gnome.org/extension/4994/dash2dock-lite/", "shell_version_map": {"40": {"version": "27", "sha256": "06cj6qw18kz8zx15g062f708iyy9w5802va50sk5d6lfsap2a3m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "41": {"version": "27", "sha256": "06cj6qw18kz8zx15g062f708iyy9w5802va50sk5d6lfsap2a3m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "42": {"version": "27", "sha256": "06cj6qw18kz8zx15g062f708iyy9w5802va50sk5d6lfsap2a3m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "43": {"version": "27", "sha256": "06cj6qw18kz8zx15g062f708iyy9w5802va50sk5d6lfsap2a3m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}}} , {"uuid": "animate@eexpss.gmail.com", "name": "animate", "pname": "animate", "description": "Animated small man run through the screen. Scroll mouse can change deferent character. You can use your PNG characters instead of the original ones.", "link": "https://extensions.gnome.org/extension/4995/animate/", "shell_version_map": {"40": {"version": "4", "sha256": "1p110wz7wdr51z2fsn6z72lcnln13h8lfbw9a00hs9qb0y71qf5q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGVkIHNtYWxsIG1hbiBydW4gdGhyb3VnaCB0aGUgc2NyZWVuLiBTY3JvbGwgbW91c2UgY2FuIGNoYW5nZSBkZWZlcmVudCBjaGFyYWN0ZXIuIFlvdSBjYW4gdXNlIHlvdXIgUE5HIGNoYXJhY3RlcnMgaW5zdGVhZCBvZiB0aGUgb3JpZ2luYWwgb25lcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhbmltYXRlIiwKICAibmFtZSI6ICJhbmltYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtYW5pbWF0ZSIsCiAgInV1aWQiOiAiYW5pbWF0ZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1p110wz7wdr51z2fsn6z72lcnln13h8lfbw9a00hs9qb0y71qf5q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGVkIHNtYWxsIG1hbiBydW4gdGhyb3VnaCB0aGUgc2NyZWVuLiBTY3JvbGwgbW91c2UgY2FuIGNoYW5nZSBkZWZlcmVudCBjaGFyYWN0ZXIuIFlvdSBjYW4gdXNlIHlvdXIgUE5HIGNoYXJhY3RlcnMgaW5zdGVhZCBvZiB0aGUgb3JpZ2luYWwgb25lcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhbmltYXRlIiwKICAibmFtZSI6ICJhbmltYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtYW5pbWF0ZSIsCiAgInV1aWQiOiAiYW5pbWF0ZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "1p110wz7wdr51z2fsn6z72lcnln13h8lfbw9a00hs9qb0y71qf5q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGVkIHNtYWxsIG1hbiBydW4gdGhyb3VnaCB0aGUgc2NyZWVuLiBTY3JvbGwgbW91c2UgY2FuIGNoYW5nZSBkZWZlcmVudCBjaGFyYWN0ZXIuIFlvdSBjYW4gdXNlIHlvdXIgUE5HIGNoYXJhY3RlcnMgaW5zdGVhZCBvZiB0aGUgb3JpZ2luYWwgb25lcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhbmltYXRlIiwKICAibmFtZSI6ICJhbmltYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtYW5pbWF0ZSIsCiAgInV1aWQiOiAiYW5pbWF0ZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "legacyschemeautoswitcher@joshimukul29.gmail.com", "name": "Legacy (GTK3) Theme Scheme Auto Switcher", "pname": "legacy-gtk3-theme-scheme-auto-switcher", "description": "Change the GTK3 theme to light/dark variant based on the system color scheme on Gnome 42", "link": "https://extensions.gnome.org/extension/4998/legacy-gtk3-theme-scheme-auto-switcher/", "shell_version_map": {"42": {"version": "4", "sha256": "022drnhrqmgpgfsikxwhy82bds27mr8h1wxm2hh4pry6smmdgx2d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgR1RLMyB0aGVtZSB0byBsaWdodC9kYXJrIHZhcmlhbnQgYmFzZWQgb24gdGhlIHN5c3RlbSBjb2xvciBzY2hlbWUgb24gR25vbWUgNDIiLAogICJuYW1lIjogIkxlZ2FjeSAoR1RLMykgVGhlbWUgU2NoZW1lIEF1dG8gU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL211a3VsMjkvbGVnYWN5LXRoZW1lLWF1dG8tc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJsZWdhY3lzY2hlbWVhdXRvc3dpdGNoZXJAam9zaGltdWt1bDI5LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "022drnhrqmgpgfsikxwhy82bds27mr8h1wxm2hh4pry6smmdgx2d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgR1RLMyB0aGVtZSB0byBsaWdodC9kYXJrIHZhcmlhbnQgYmFzZWQgb24gdGhlIHN5c3RlbSBjb2xvciBzY2hlbWUgb24gR25vbWUgNDIiLAogICJuYW1lIjogIkxlZ2FjeSAoR1RLMykgVGhlbWUgU2NoZW1lIEF1dG8gU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL211a3VsMjkvbGVnYWN5LXRoZW1lLWF1dG8tc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJsZWdhY3lzY2hlbWVhdXRvc3dpdGNoZXJAam9zaGltdWt1bDI5LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "dash-to-dock-cosmic-@halfmexicanhalfamazing@gmail.com", "name": "Dash to Dock for COSMIC", "pname": "dash-to-dock-for-cosmic", "description": "[Unmaintained] You can edit DCONF and CSS for similar effects\n\nA Dash to Dock fork for the COSMIC/GNOME Shell, fixes conflicts with Cosmic Workspace. It prevents Cosmic Workspaces from breaking after suspend. \n\nAdded Features:\nBorder Radius \nBorder Margins\nDock & Icon Alignment\nEtc.", "link": "https://extensions.gnome.org/extension/5004/dash-to-dock-for-cosmic/", "shell_version_map": {"40": {"version": "23", "sha256": "0ni4pizzh9c559jzg1f7m5lnn1a0lln1vwy14i2ykhy0qky4xb3s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIltVbm1haW50YWluZWRdIFlvdSBjYW4gZWRpdCBEQ09ORiBhbmQgQ1NTIGZvciBzaW1pbGFyIGVmZmVjdHNcblxuQSBEYXNoIHRvIERvY2sgZm9yayBmb3IgdGhlIENPU01JQy9HTk9NRSBTaGVsbCwgZml4ZXMgY29uZmxpY3RzIHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC4gXG5cbkFkZGVkIEZlYXR1cmVzOlxuQm9yZGVyIFJhZGl1cyBcbkJvcmRlciBNYXJnaW5zXG5Eb2NrICZhbXA7IEljb24gQWxpZ25tZW50XG5FdGMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIGZvciBDT1NNSUMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiaGFsZm1leGljYW5oYWxmYW1hemluZ0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFsZm1leGljYW4vZGFzaC10by1kb2NrLXBvcC90cmVlL3VidW50dS1kb2NrIiwKICAidXVpZCI6ICJkYXNoLXRvLWRvY2stY29zbWljLUBoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "41": {"version": "23", "sha256": "0ni4pizzh9c559jzg1f7m5lnn1a0lln1vwy14i2ykhy0qky4xb3s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIltVbm1haW50YWluZWRdIFlvdSBjYW4gZWRpdCBEQ09ORiBhbmQgQ1NTIGZvciBzaW1pbGFyIGVmZmVjdHNcblxuQSBEYXNoIHRvIERvY2sgZm9yayBmb3IgdGhlIENPU01JQy9HTk9NRSBTaGVsbCwgZml4ZXMgY29uZmxpY3RzIHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC4gXG5cbkFkZGVkIEZlYXR1cmVzOlxuQm9yZGVyIFJhZGl1cyBcbkJvcmRlciBNYXJnaW5zXG5Eb2NrICZhbXA7IEljb24gQWxpZ25tZW50XG5FdGMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIGZvciBDT1NNSUMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiaGFsZm1leGljYW5oYWxmYW1hemluZ0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFsZm1leGljYW4vZGFzaC10by1kb2NrLXBvcC90cmVlL3VidW50dS1kb2NrIiwKICAidXVpZCI6ICJkYXNoLXRvLWRvY2stY29zbWljLUBoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "42": {"version": "23", "sha256": "0ni4pizzh9c559jzg1f7m5lnn1a0lln1vwy14i2ykhy0qky4xb3s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIltVbm1haW50YWluZWRdIFlvdSBjYW4gZWRpdCBEQ09ORiBhbmQgQ1NTIGZvciBzaW1pbGFyIGVmZmVjdHNcblxuQSBEYXNoIHRvIERvY2sgZm9yayBmb3IgdGhlIENPU01JQy9HTk9NRSBTaGVsbCwgZml4ZXMgY29uZmxpY3RzIHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC4gXG5cbkFkZGVkIEZlYXR1cmVzOlxuQm9yZGVyIFJhZGl1cyBcbkJvcmRlciBNYXJnaW5zXG5Eb2NrICZhbXA7IEljb24gQWxpZ25tZW50XG5FdGMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIGZvciBDT1NNSUMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiaGFsZm1leGljYW5oYWxmYW1hemluZ0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFsZm1leGljYW4vZGFzaC10by1kb2NrLXBvcC90cmVlL3VidW50dS1kb2NrIiwKICAidXVpZCI6ICJkYXNoLXRvLWRvY2stY29zbWljLUBoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "43": {"version": "23", "sha256": "0ni4pizzh9c559jzg1f7m5lnn1a0lln1vwy14i2ykhy0qky4xb3s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIltVbm1haW50YWluZWRdIFlvdSBjYW4gZWRpdCBEQ09ORiBhbmQgQ1NTIGZvciBzaW1pbGFyIGVmZmVjdHNcblxuQSBEYXNoIHRvIERvY2sgZm9yayBmb3IgdGhlIENPU01JQy9HTk9NRSBTaGVsbCwgZml4ZXMgY29uZmxpY3RzIHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC4gXG5cbkFkZGVkIEZlYXR1cmVzOlxuQm9yZGVyIFJhZGl1cyBcbkJvcmRlciBNYXJnaW5zXG5Eb2NrICZhbXA7IEljb24gQWxpZ25tZW50XG5FdGMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIGZvciBDT1NNSUMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiaGFsZm1leGljYW5oYWxmYW1hemluZ0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFsZm1leGljYW4vZGFzaC10by1kb2NrLXBvcC90cmVlL3VidW50dS1kb2NrIiwKICAidXVpZCI6ICJkYXNoLXRvLWRvY2stY29zbWljLUBoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}}} +, {"uuid": "dash-to-dock-cosmic-@halfmexicanhalfamazing@gmail.com", "name": "Dash to Dock for COSMIC", "pname": "dash-to-dock-for-cosmic", "description": "A Dash to Dock fork for the COSMIC/GNOME Shell, fixes conflicts with Cosmic Workspace. It prevents Cosmic Workspaces from breaking after suspend. \n\nAdded Features:\nBorder Radius \nBorder Margins\nDock &amp; Icon Alignment\nEtc.", "link": "https://extensions.gnome.org/extension/5004/dash-to-dock-for-cosmic/", "shell_version_map": {"40": {"version": "23", "sha256": "1780c6zjfyl7ansicd370nf1l42xqsifp2qpyll26mhjnzyzmlqr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0cyB3aXRoIENvc21pYyBXb3Jrc3BhY2UuICBJdCBwcmV2ZW50cyBDb3NtaWMgV29ya3NwYWNlcyBmcm9tIGJyZWFraW5nIGFmdGVyIHN1c3BlbmQuIFxuXG5BZGRlZCBGZWF0dXJlczpcbkJvcmRlciBSYWRpdXMgXG5Cb3JkZXIgTWFyZ2luc1xuRG9jayAmYW1wO2FtcDsgSWNvbiBBbGlnbm1lbnRcbkV0Yy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9kYXNoLXRvLWRvY2stcG9wL3RyZWUvdWJ1bnR1LWRvY2siLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay1jb3NtaWMtQGhhbGZtZXhpY2FuaGFsZmFtYXppbmdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "41": {"version": "23", "sha256": "1780c6zjfyl7ansicd370nf1l42xqsifp2qpyll26mhjnzyzmlqr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0cyB3aXRoIENvc21pYyBXb3Jrc3BhY2UuICBJdCBwcmV2ZW50cyBDb3NtaWMgV29ya3NwYWNlcyBmcm9tIGJyZWFraW5nIGFmdGVyIHN1c3BlbmQuIFxuXG5BZGRlZCBGZWF0dXJlczpcbkJvcmRlciBSYWRpdXMgXG5Cb3JkZXIgTWFyZ2luc1xuRG9jayAmYW1wO2FtcDsgSWNvbiBBbGlnbm1lbnRcbkV0Yy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9kYXNoLXRvLWRvY2stcG9wL3RyZWUvdWJ1bnR1LWRvY2siLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay1jb3NtaWMtQGhhbGZtZXhpY2FuaGFsZmFtYXppbmdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "42": {"version": "23", "sha256": "1780c6zjfyl7ansicd370nf1l42xqsifp2qpyll26mhjnzyzmlqr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0cyB3aXRoIENvc21pYyBXb3Jrc3BhY2UuICBJdCBwcmV2ZW50cyBDb3NtaWMgV29ya3NwYWNlcyBmcm9tIGJyZWFraW5nIGFmdGVyIHN1c3BlbmQuIFxuXG5BZGRlZCBGZWF0dXJlczpcbkJvcmRlciBSYWRpdXMgXG5Cb3JkZXIgTWFyZ2luc1xuRG9jayAmYW1wO2FtcDsgSWNvbiBBbGlnbm1lbnRcbkV0Yy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9kYXNoLXRvLWRvY2stcG9wL3RyZWUvdWJ1bnR1LWRvY2siLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay1jb3NtaWMtQGhhbGZtZXhpY2FuaGFsZmFtYXppbmdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "43": {"version": "23", "sha256": "1780c6zjfyl7ansicd370nf1l42xqsifp2qpyll26mhjnzyzmlqr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0cyB3aXRoIENvc21pYyBXb3Jrc3BhY2UuICBJdCBwcmV2ZW50cyBDb3NtaWMgV29ya3NwYWNlcyBmcm9tIGJyZWFraW5nIGFmdGVyIHN1c3BlbmQuIFxuXG5BZGRlZCBGZWF0dXJlczpcbkJvcmRlciBSYWRpdXMgXG5Cb3JkZXIgTWFyZ2luc1xuRG9jayAmYW1wO2FtcDsgSWNvbiBBbGlnbm1lbnRcbkV0Yy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9kYXNoLXRvLWRvY2stcG9wL3RyZWUvdWJ1bnR1LWRvY2siLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay1jb3NtaWMtQGhhbGZtZXhpY2FuaGFsZmFtYXppbmdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}}} , {"uuid": "rclone-manager@germanztz.com", "name": "rclone-manager", "pname": "rclone-manager", "description": "Is like Dropbox sync client but for more than 30 services, adds an indicator to the top panel so you can manage the rclone profiles configured in your system, perform operations such as mount as remote, watch for file modifications, sync with remote storage, navigate it's main folder. Also, it shows the status of each profile so you can supervise the operations, and provides an easy access log of events. Backup and restore the rclone configuration file, so you won't have to configure all your devices one by one", "link": "https://extensions.gnome.org/extension/5006/rclone-manager/", "shell_version_map": {"40": {"version": "9", "sha256": "09qjmpk0k8r3g56ps26pdw22mwyrch2fjmf9fmdxwkxfxxr8sf1y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZXJtYW56dHovZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJjbG9uZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJyY2xvbmUtbWFuYWdlckBnZXJtYW56dHouY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "09qjmpk0k8r3g56ps26pdw22mwyrch2fjmf9fmdxwkxfxxr8sf1y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZXJtYW56dHovZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJjbG9uZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJyY2xvbmUtbWFuYWdlckBnZXJtYW56dHouY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "43": {"version": "9", "sha256": "09qjmpk0k8r3g56ps26pdw22mwyrch2fjmf9fmdxwkxfxxr8sf1y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZXJtYW56dHovZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJjbG9uZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJyY2xvbmUtbWFuYWdlckBnZXJtYW56dHouY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "GPU_profile_selector@lorenzo9904.gmail.com", "name": "GPU profile selector", "pname": "gpu-profile-selector", "description": "You need to install envycontrol(https://github.com/geminis3/envycontrol) for making this extension working. This is a simple gnome-shell extension which provides a simple way to switch between GPU profiles on Nvidia Optimus systems (i.e laptops with Intel + Nvidia or AMD + Nvidia configurations) in a few clicks.", "link": "https://extensions.gnome.org/extension/5009/gpu-profile-selector/", "shell_version_map": {"38": {"version": "11", "sha256": "0bid6qwwxfw862sb4qw027017c9ya3p26cg10kjx7p3dwc54ccwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIHRvIGluc3RhbGwgZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTG9yZW56b01vcmVsbGkvR1BVX3Byb2ZpbGVfc2VsZWN0b3IiLAogICJ1dWlkIjogIkdQVV9wcm9maWxlX3NlbGVjdG9yQGxvcmVuem85OTA0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "11", "sha256": "0bid6qwwxfw862sb4qw027017c9ya3p26cg10kjx7p3dwc54ccwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIHRvIGluc3RhbGwgZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTG9yZW56b01vcmVsbGkvR1BVX3Byb2ZpbGVfc2VsZWN0b3IiLAogICJ1dWlkIjogIkdQVV9wcm9maWxlX3NlbGVjdG9yQGxvcmVuem85OTA0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "0bid6qwwxfw862sb4qw027017c9ya3p26cg10kjx7p3dwc54ccwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIHRvIGluc3RhbGwgZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTG9yZW56b01vcmVsbGkvR1BVX3Byb2ZpbGVfc2VsZWN0b3IiLAogICJ1dWlkIjogIkdQVV9wcm9maWxlX3NlbGVjdG9yQGxvcmVuem85OTA0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}, "42": {"version": "11", "sha256": "0bid6qwwxfw862sb4qw027017c9ya3p26cg10kjx7p3dwc54ccwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIHRvIGluc3RhbGwgZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTG9yZW56b01vcmVsbGkvR1BVX3Byb2ZpbGVfc2VsZWN0b3IiLAogICJ1dWlkIjogIkdQVV9wcm9maWxlX3NlbGVjdG9yQGxvcmVuem85OTA0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}, "43": {"version": "14", "sha256": "1kj6wypjfa5clclvwnz4jym02sygknxbspmv8lv0piys1gw6n7h2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIHRvIGluc3RhbGwgZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} , {"uuid": "username-to-activities@deserts", "name": "Replace Activities text with username", "pname": "replce-activities-text-with-username", "description": "Replace Activities text with username.\nThis is a fork of Replace Activities Text by pratap@fastmail.fm", "link": "https://extensions.gnome.org/extension/5010/replce-activities-text-with-username/", "shell_version_map": {"38": {"version": "4", "sha256": "1maijvklrzknhxayg72gbrrx410vkbvc7na1gn3kx9yxm8ckikbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rlc2VydHN0c3VuZy91c2VybmFtZS10by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJ1c2VybmFtZS10by1hY3Rpdml0aWVzQGRlc2VydHMiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "1maijvklrzknhxayg72gbrrx410vkbvc7na1gn3kx9yxm8ckikbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rlc2VydHN0c3VuZy91c2VybmFtZS10by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJ1c2VybmFtZS10by1hY3Rpdml0aWVzQGRlc2VydHMiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "1maijvklrzknhxayg72gbrrx410vkbvc7na1gn3kx9yxm8ckikbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rlc2VydHN0c3VuZy91c2VybmFtZS10by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJ1c2VybmFtZS10by1hY3Rpdml0aWVzQGRlc2VydHMiLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "1maijvklrzknhxayg72gbrrx410vkbvc7na1gn3kx9yxm8ckikbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rlc2VydHN0c3VuZy91c2VybmFtZS10by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJ1c2VybmFtZS10by1hY3Rpdml0aWVzQGRlc2VydHMiLAogICJ2ZXJzaW9uIjogNAp9"}, "43": {"version": "4", "sha256": "1maijvklrzknhxayg72gbrrx410vkbvc7na1gn3kx9yxm8ckikbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rlc2VydHN0c3VuZy91c2VybmFtZS10by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJ1c2VybmFtZS10by1hY3Rpdml0aWVzQGRlc2VydHMiLAogICJ2ZXJzaW9uIjogNAp9"}}} @@ -783,7 +783,7 @@ , {"uuid": "dollar-to-brl", "name": "Dollar", "pname": "dollar", "description": "Convert Dollar USD to Real BRL using API AWESOMEAPI https://docs.awesomeapi.com.br.", "link": "https://extensions.gnome.org/extension/5159/dollar/", "shell_version_map": {"41": {"version": "4", "sha256": "1aqvgf1inrjz6m4x44dm5r3x0xmj8xmi8mjyr91kjh2n76h3afn6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlcnQgRG9sbGFyIFVTRCB0byBSZWFsIEJSTCB1c2luZyBBUEkgQVdFU09NRUFQSSBodHRwczovL2RvY3MuYXdlc29tZWFwaS5jb20uYnIuIiwKICAibmFtZSI6ICJEb2xsYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQyLjQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsRGVNYXR0b3MvZG9sbGFyLXRvLWJybCIsCiAgInV1aWQiOiAiZG9sbGFyLXRvLWJybCIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "1aqvgf1inrjz6m4x44dm5r3x0xmj8xmi8mjyr91kjh2n76h3afn6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlcnQgRG9sbGFyIFVTRCB0byBSZWFsIEJSTCB1c2luZyBBUEkgQVdFU09NRUFQSSBodHRwczovL2RvY3MuYXdlc29tZWFwaS5jb20uYnIuIiwKICAibmFtZSI6ICJEb2xsYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQyLjQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsRGVNYXR0b3MvZG9sbGFyLXRvLWJybCIsCiAgInV1aWQiOiAiZG9sbGFyLXRvLWJybCIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "1aqvgf1inrjz6m4x44dm5r3x0xmj8xmi8mjyr91kjh2n76h3afn6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlcnQgRG9sbGFyIFVTRCB0byBSZWFsIEJSTCB1c2luZyBBUEkgQVdFU09NRUFQSSBodHRwczovL2RvY3MuYXdlc29tZWFwaS5jb20uYnIuIiwKICAibmFtZSI6ICJEb2xsYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQyLjQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsRGVNYXR0b3MvZG9sbGFyLXRvLWJybCIsCiAgInV1aWQiOiAiZG9sbGFyLXRvLWJybCIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "noa11y@popov895.ukr.net", "name": "No a11y", "pname": "no-a11y", "description": "Hide the accessibility button on the top bar.", "link": "https://extensions.gnome.org/extension/5162/no-a11y/", "shell_version_map": {"42": {"version": "2", "sha256": "0bczyngw6zzprf7c6ih78j100wc9dvv3inxc8aqdmxqv291z7qwy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L25vYTExeSIsCiAgInV1aWQiOiAibm9hMTF5QHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "0bczyngw6zzprf7c6ih78j100wc9dvv3inxc8aqdmxqv291z7qwy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L25vYTExeSIsCiAgInV1aWQiOiAibm9hMTF5QHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "upower-battery@codilia.com", "name": "UPower Battery", "pname": "upower-battery", "description": "UPower Battery Indicator.", "link": "https://extensions.gnome.org/extension/5165/upower-battery/", "shell_version_map": {"42": {"version": "8", "sha256": "0wx1hjhn93ppb6dch3cc6zzh7va7jhkggg9xslxa8qyws7mshswp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVQb3dlciBCYXR0ZXJ5IEluZGljYXRvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cG93ZXJfYmF0dGVyeV9pbmRpY2F0b3IiLAogICJuYW1lIjogIlVQb3dlciBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb2RpbGlhL3Vwb3dlci1iYXR0ZXJ5IiwKICAidXVpZCI6ICJ1cG93ZXItYmF0dGVyeUBjb2RpbGlhLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "0wx1hjhn93ppb6dch3cc6zzh7va7jhkggg9xslxa8qyws7mshswp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVQb3dlciBCYXR0ZXJ5IEluZGljYXRvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cG93ZXJfYmF0dGVyeV9pbmRpY2F0b3IiLAogICJuYW1lIjogIlVQb3dlciBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb2RpbGlhL3Vwb3dlci1iYXR0ZXJ5IiwKICAidXVpZCI6ICJ1cG93ZXItYmF0dGVyeUBjb2RpbGlhLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}}} -, {"uuid": "vertical-workspaces@G-dH.github.com", "name": "V-Shell (Vertical Workspaces)", "pname": "vertical-workspaces", "description": "Vertical orientation of workspaces and options to customize Activities overview layout and content for GNOME 40+.\n\nIf you like vertically stacked workpsaces, this extension allows you to customize GNOME Activities to your needs. Layout, visibility and size of the dash and workspace thumbnails, dash orientation, static app grid, static workspace overview modes, static blurred background, workspace titles, window titles always visible, ...\n\nThe upcoming version (25) that is already available for testing in the GitHub repository offers even more control over Shell UI layout and behavior and works also with horizontally stacked workspaces. It now includes most functionality from the Overview Feature Pack extension, so disable it before activation of the new VW if you use it. I appreciate bug reports and suggestions (on the GitHub).", "link": "https://extensions.gnome.org/extension/5177/vertical-workspaces/", "shell_version_map": {"40": {"version": "23", "sha256": "1vs2b48y9dlng3dzxyf34zp9sf7afizypwyphrp11pn15svx67ny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBsaWtlIHZlcnRpY2FsbHkgc3RhY2tlZCB3b3JrcHNhY2VzLCB0aGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSBHTk9NRSBBY3Rpdml0aWVzIHRvIHlvdXIgbmVlZHMuIExheW91dCwgdmlzaWJpbGl0eSBhbmQgc2l6ZSBvZiB0aGUgZGFzaCBhbmQgd29ya3NwYWNlIHRodW1ibmFpbHMsIGRhc2ggb3JpZW50YXRpb24sIHN0YXRpYyBhcHAgZ3JpZCwgc3RhdGljIHdvcmtzcGFjZSBvdmVydmlldyBtb2Rlcywgc3RhdGljIGJsdXJyZWQgYmFja2dyb3VuZCwgd29ya3NwYWNlIHRpdGxlcywgIHdpbmRvdyB0aXRsZXMgYWx3YXlzIHZpc2libGUsIC4uLlxuXG5UaGUgdXBjb21pbmcgdmVyc2lvbiAoMjUpIHRoYXQgaXMgYWxyZWFkeSBhdmFpbGFibGUgZm9yIHRlc3RpbmcgaW4gdGhlIEdpdEh1YiByZXBvc2l0b3J5IG9mZmVycyBldmVuIG1vcmUgY29udHJvbCBvdmVyIFNoZWxsIFVJIGxheW91dCBhbmQgYmVoYXZpb3IgYW5kIHdvcmtzIGFsc28gd2l0aCBob3Jpem9udGFsbHkgc3RhY2tlZCB3b3Jrc3BhY2VzLiBJdCBub3cgaW5jbHVkZXMgbW9zdCBmdW5jdGlvbmFsaXR5IGZyb20gdGhlIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayBleHRlbnNpb24sIHNvIGRpc2FibGUgaXQgYmVmb3JlIGFjdGl2YXRpb24gb2YgdGhlIG5ldyBWVyBpZiB5b3UgdXNlIGl0LiAgSSBhcHByZWNpYXRlIGJ1ZyByZXBvcnRzIGFuZCBzdWdnZXN0aW9ucyAob24gdGhlIEdpdEh1YikuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidmVydGljYWwtd29ya3NwYWNlcyIsCiAgIm5hbWUiOiAiVi1TaGVsbCAoVmVydGljYWwgV29ya3NwYWNlcykiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmVydGljYWwtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "41": {"version": "23", "sha256": "1vs2b48y9dlng3dzxyf34zp9sf7afizypwyphrp11pn15svx67ny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBsaWtlIHZlcnRpY2FsbHkgc3RhY2tlZCB3b3JrcHNhY2VzLCB0aGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSBHTk9NRSBBY3Rpdml0aWVzIHRvIHlvdXIgbmVlZHMuIExheW91dCwgdmlzaWJpbGl0eSBhbmQgc2l6ZSBvZiB0aGUgZGFzaCBhbmQgd29ya3NwYWNlIHRodW1ibmFpbHMsIGRhc2ggb3JpZW50YXRpb24sIHN0YXRpYyBhcHAgZ3JpZCwgc3RhdGljIHdvcmtzcGFjZSBvdmVydmlldyBtb2Rlcywgc3RhdGljIGJsdXJyZWQgYmFja2dyb3VuZCwgd29ya3NwYWNlIHRpdGxlcywgIHdpbmRvdyB0aXRsZXMgYWx3YXlzIHZpc2libGUsIC4uLlxuXG5UaGUgdXBjb21pbmcgdmVyc2lvbiAoMjUpIHRoYXQgaXMgYWxyZWFkeSBhdmFpbGFibGUgZm9yIHRlc3RpbmcgaW4gdGhlIEdpdEh1YiByZXBvc2l0b3J5IG9mZmVycyBldmVuIG1vcmUgY29udHJvbCBvdmVyIFNoZWxsIFVJIGxheW91dCBhbmQgYmVoYXZpb3IgYW5kIHdvcmtzIGFsc28gd2l0aCBob3Jpem9udGFsbHkgc3RhY2tlZCB3b3Jrc3BhY2VzLiBJdCBub3cgaW5jbHVkZXMgbW9zdCBmdW5jdGlvbmFsaXR5IGZyb20gdGhlIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayBleHRlbnNpb24sIHNvIGRpc2FibGUgaXQgYmVmb3JlIGFjdGl2YXRpb24gb2YgdGhlIG5ldyBWVyBpZiB5b3UgdXNlIGl0LiAgSSBhcHByZWNpYXRlIGJ1ZyByZXBvcnRzIGFuZCBzdWdnZXN0aW9ucyAob24gdGhlIEdpdEh1YikuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidmVydGljYWwtd29ya3NwYWNlcyIsCiAgIm5hbWUiOiAiVi1TaGVsbCAoVmVydGljYWwgV29ya3NwYWNlcykiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmVydGljYWwtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "42": {"version": "23", "sha256": "1vs2b48y9dlng3dzxyf34zp9sf7afizypwyphrp11pn15svx67ny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBsaWtlIHZlcnRpY2FsbHkgc3RhY2tlZCB3b3JrcHNhY2VzLCB0aGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSBHTk9NRSBBY3Rpdml0aWVzIHRvIHlvdXIgbmVlZHMuIExheW91dCwgdmlzaWJpbGl0eSBhbmQgc2l6ZSBvZiB0aGUgZGFzaCBhbmQgd29ya3NwYWNlIHRodW1ibmFpbHMsIGRhc2ggb3JpZW50YXRpb24sIHN0YXRpYyBhcHAgZ3JpZCwgc3RhdGljIHdvcmtzcGFjZSBvdmVydmlldyBtb2Rlcywgc3RhdGljIGJsdXJyZWQgYmFja2dyb3VuZCwgd29ya3NwYWNlIHRpdGxlcywgIHdpbmRvdyB0aXRsZXMgYWx3YXlzIHZpc2libGUsIC4uLlxuXG5UaGUgdXBjb21pbmcgdmVyc2lvbiAoMjUpIHRoYXQgaXMgYWxyZWFkeSBhdmFpbGFibGUgZm9yIHRlc3RpbmcgaW4gdGhlIEdpdEh1YiByZXBvc2l0b3J5IG9mZmVycyBldmVuIG1vcmUgY29udHJvbCBvdmVyIFNoZWxsIFVJIGxheW91dCBhbmQgYmVoYXZpb3IgYW5kIHdvcmtzIGFsc28gd2l0aCBob3Jpem9udGFsbHkgc3RhY2tlZCB3b3Jrc3BhY2VzLiBJdCBub3cgaW5jbHVkZXMgbW9zdCBmdW5jdGlvbmFsaXR5IGZyb20gdGhlIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayBleHRlbnNpb24sIHNvIGRpc2FibGUgaXQgYmVmb3JlIGFjdGl2YXRpb24gb2YgdGhlIG5ldyBWVyBpZiB5b3UgdXNlIGl0LiAgSSBhcHByZWNpYXRlIGJ1ZyByZXBvcnRzIGFuZCBzdWdnZXN0aW9ucyAob24gdGhlIEdpdEh1YikuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidmVydGljYWwtd29ya3NwYWNlcyIsCiAgIm5hbWUiOiAiVi1TaGVsbCAoVmVydGljYWwgV29ya3NwYWNlcykiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmVydGljYWwtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "43": {"version": "23", "sha256": "1vs2b48y9dlng3dzxyf34zp9sf7afizypwyphrp11pn15svx67ny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBsaWtlIHZlcnRpY2FsbHkgc3RhY2tlZCB3b3JrcHNhY2VzLCB0aGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSBHTk9NRSBBY3Rpdml0aWVzIHRvIHlvdXIgbmVlZHMuIExheW91dCwgdmlzaWJpbGl0eSBhbmQgc2l6ZSBvZiB0aGUgZGFzaCBhbmQgd29ya3NwYWNlIHRodW1ibmFpbHMsIGRhc2ggb3JpZW50YXRpb24sIHN0YXRpYyBhcHAgZ3JpZCwgc3RhdGljIHdvcmtzcGFjZSBvdmVydmlldyBtb2Rlcywgc3RhdGljIGJsdXJyZWQgYmFja2dyb3VuZCwgd29ya3NwYWNlIHRpdGxlcywgIHdpbmRvdyB0aXRsZXMgYWx3YXlzIHZpc2libGUsIC4uLlxuXG5UaGUgdXBjb21pbmcgdmVyc2lvbiAoMjUpIHRoYXQgaXMgYWxyZWFkeSBhdmFpbGFibGUgZm9yIHRlc3RpbmcgaW4gdGhlIEdpdEh1YiByZXBvc2l0b3J5IG9mZmVycyBldmVuIG1vcmUgY29udHJvbCBvdmVyIFNoZWxsIFVJIGxheW91dCBhbmQgYmVoYXZpb3IgYW5kIHdvcmtzIGFsc28gd2l0aCBob3Jpem9udGFsbHkgc3RhY2tlZCB3b3Jrc3BhY2VzLiBJdCBub3cgaW5jbHVkZXMgbW9zdCBmdW5jdGlvbmFsaXR5IGZyb20gdGhlIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayBleHRlbnNpb24sIHNvIGRpc2FibGUgaXQgYmVmb3JlIGFjdGl2YXRpb24gb2YgdGhlIG5ldyBWVyBpZiB5b3UgdXNlIGl0LiAgSSBhcHByZWNpYXRlIGJ1ZyByZXBvcnRzIGFuZCBzdWdnZXN0aW9ucyAob24gdGhlIEdpdEh1YikuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidmVydGljYWwtd29ya3NwYWNlcyIsCiAgIm5hbWUiOiAiVi1TaGVsbCAoVmVydGljYWwgV29ya3NwYWNlcykiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmVydGljYWwtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}}} +, {"uuid": "vertical-workspaces@G-dH.github.com", "name": "V-Shell (Vertical Workspaces)", "pname": "vertical-workspaces", "description": "Customize your GNOME Shell UX to suit your workflow, whether you like horizontally or vertically stacked workspaces.\n\nV-Shell allows you to customize workspace orientation, Activities overview and its content and dimensions, including dash and its position and behavior, app grid and folders, panel visibility, workspace switcher, notifications, adds window search provider, recent files search provider, adds shortcuts for reordering workspaces, move applications, ...\n\nThis extension can replace many other extensions, disable all extensions that may be in conflict to avoid problems.\n\nV-Shell v26 adds control over its modules, so you can easily disable parts of the extension that might conflict with other extensions you like better than what V-Shell offers.\n\nBug reports and suggestions on the GitHub linked below.", "link": "https://extensions.gnome.org/extension/5177/vertical-workspaces/", "shell_version_map": {"40": {"version": "23", "sha256": "18h2769wzkf5ddjb28apcwpd20an9x7qvh23bry381ppqaq0zbh9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuXG5cblYtU2hlbGwgYWxsb3dzIHlvdSB0byBjdXN0b21pemUgd29ya3NwYWNlIG9yaWVudGF0aW9uLCBBY3Rpdml0aWVzIG92ZXJ2aWV3IGFuZCBpdHMgY29udGVudCBhbmQgZGltZW5zaW9ucywgaW5jbHVkaW5nIGRhc2ggYW5kIGl0cyBwb3NpdGlvbiBhbmQgYmVoYXZpb3IsIGFwcCBncmlkIGFuZCBmb2xkZXJzLCBwYW5lbCB2aXNpYmlsaXR5LCB3b3Jrc3BhY2Ugc3dpdGNoZXIsIG5vdGlmaWNhdGlvbnMsIGFkZHMgd2luZG93IHNlYXJjaCBwcm92aWRlciwgcmVjZW50IGZpbGVzIHNlYXJjaCBwcm92aWRlciwgYWRkcyBzaG9ydGN1dHMgZm9yIHJlb3JkZXJpbmcgd29ya3NwYWNlcywgbW92ZSBhcHBsaWNhdGlvbnMsIC4uLlxuXG5UaGlzIGV4dGVuc2lvbiBjYW4gcmVwbGFjZSBtYW55IG90aGVyIGV4dGVuc2lvbnMsIGRpc2FibGUgYWxsIGV4dGVuc2lvbnMgdGhhdCBtYXkgYmUgaW4gY29uZmxpY3QgdG8gYXZvaWQgcHJvYmxlbXMuXG5cblYtU2hlbGwgdjI2IGFkZHMgY29udHJvbCBvdmVyIGl0cyBtb2R1bGVzLCBzbyB5b3UgY2FuIGVhc2lseSBkaXNhYmxlIHBhcnRzIG9mIHRoZSBleHRlbnNpb24gdGhhdCBtaWdodCBjb25mbGljdCB3aXRoIG90aGVyIGV4dGVuc2lvbnMgeW91IGxpa2UgYmV0dGVyIHRoYW4gd2hhdCBWLVNoZWxsIG9mZmVycy5cblxuQnVnIHJlcG9ydHMgYW5kIHN1Z2dlc3Rpb25zIG9uIHRoZSBHaXRIdWIgbGlua2VkIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "41": {"version": "23", "sha256": "18h2769wzkf5ddjb28apcwpd20an9x7qvh23bry381ppqaq0zbh9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuXG5cblYtU2hlbGwgYWxsb3dzIHlvdSB0byBjdXN0b21pemUgd29ya3NwYWNlIG9yaWVudGF0aW9uLCBBY3Rpdml0aWVzIG92ZXJ2aWV3IGFuZCBpdHMgY29udGVudCBhbmQgZGltZW5zaW9ucywgaW5jbHVkaW5nIGRhc2ggYW5kIGl0cyBwb3NpdGlvbiBhbmQgYmVoYXZpb3IsIGFwcCBncmlkIGFuZCBmb2xkZXJzLCBwYW5lbCB2aXNpYmlsaXR5LCB3b3Jrc3BhY2Ugc3dpdGNoZXIsIG5vdGlmaWNhdGlvbnMsIGFkZHMgd2luZG93IHNlYXJjaCBwcm92aWRlciwgcmVjZW50IGZpbGVzIHNlYXJjaCBwcm92aWRlciwgYWRkcyBzaG9ydGN1dHMgZm9yIHJlb3JkZXJpbmcgd29ya3NwYWNlcywgbW92ZSBhcHBsaWNhdGlvbnMsIC4uLlxuXG5UaGlzIGV4dGVuc2lvbiBjYW4gcmVwbGFjZSBtYW55IG90aGVyIGV4dGVuc2lvbnMsIGRpc2FibGUgYWxsIGV4dGVuc2lvbnMgdGhhdCBtYXkgYmUgaW4gY29uZmxpY3QgdG8gYXZvaWQgcHJvYmxlbXMuXG5cblYtU2hlbGwgdjI2IGFkZHMgY29udHJvbCBvdmVyIGl0cyBtb2R1bGVzLCBzbyB5b3UgY2FuIGVhc2lseSBkaXNhYmxlIHBhcnRzIG9mIHRoZSBleHRlbnNpb24gdGhhdCBtaWdodCBjb25mbGljdCB3aXRoIG90aGVyIGV4dGVuc2lvbnMgeW91IGxpa2UgYmV0dGVyIHRoYW4gd2hhdCBWLVNoZWxsIG9mZmVycy5cblxuQnVnIHJlcG9ydHMgYW5kIHN1Z2dlc3Rpb25zIG9uIHRoZSBHaXRIdWIgbGlua2VkIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "42": {"version": "26", "sha256": "1lr73ai97qhcpcjc8nimak9wiir9kjqdqr934i8xaxh7xs2ivrch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuXG5cblYtU2hlbGwgYWxsb3dzIHlvdSB0byBjdXN0b21pemUgd29ya3NwYWNlIG9yaWVudGF0aW9uLCBBY3Rpdml0aWVzIG92ZXJ2aWV3IGFuZCBpdHMgY29udGVudCBhbmQgZGltZW5zaW9ucywgaW5jbHVkaW5nIGRhc2ggYW5kIGl0cyBwb3NpdGlvbiBhbmQgYmVoYXZpb3IsIGFwcCBncmlkIGFuZCBmb2xkZXJzLCBwYW5lbCB2aXNpYmlsaXR5LCB3b3Jrc3BhY2Ugc3dpdGNoZXIsIG5vdGlmaWNhdGlvbnMsIGFkZHMgd2luZG93IHNlYXJjaCBwcm92aWRlciwgcmVjZW50IGZpbGVzIHNlYXJjaCBwcm92aWRlciwgYWRkcyBzaG9ydGN1dHMgZm9yIHJlb3JkZXJpbmcgd29ya3NwYWNlcywgbW92ZSBhcHBsaWNhdGlvbnMsIC4uLlxuXG5UaGlzIGV4dGVuc2lvbiBjYW4gcmVwbGFjZSBtYW55IG90aGVyIGV4dGVuc2lvbnMsIGRpc2FibGUgYWxsIGV4dGVuc2lvbnMgdGhhdCBtYXkgYmUgaW4gY29uZmxpY3QgdG8gYXZvaWQgcHJvYmxlbXMuXG5cblYtU2hlbGwgdjI2IGFkZHMgY29udHJvbCBvdmVyIGl0cyBtb2R1bGVzLCBzbyB5b3UgY2FuIGVhc2lseSBkaXNhYmxlIHBhcnRzIG9mIHRoZSBleHRlbnNpb24gdGhhdCBtaWdodCBjb25mbGljdCB3aXRoIG90aGVyIGV4dGVuc2lvbnMgeW91IGxpa2UgYmV0dGVyIHRoYW4gd2hhdCBWLVNoZWxsIG9mZmVycy5cblxuQnVnIHJlcG9ydHMgYW5kIHN1Z2dlc3Rpb25zIG9uIHRoZSBHaXRIdWIgbGlua2VkIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI2Cn0="}, "43": {"version": "26", "sha256": "1lr73ai97qhcpcjc8nimak9wiir9kjqdqr934i8xaxh7xs2ivrch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuXG5cblYtU2hlbGwgYWxsb3dzIHlvdSB0byBjdXN0b21pemUgd29ya3NwYWNlIG9yaWVudGF0aW9uLCBBY3Rpdml0aWVzIG92ZXJ2aWV3IGFuZCBpdHMgY29udGVudCBhbmQgZGltZW5zaW9ucywgaW5jbHVkaW5nIGRhc2ggYW5kIGl0cyBwb3NpdGlvbiBhbmQgYmVoYXZpb3IsIGFwcCBncmlkIGFuZCBmb2xkZXJzLCBwYW5lbCB2aXNpYmlsaXR5LCB3b3Jrc3BhY2Ugc3dpdGNoZXIsIG5vdGlmaWNhdGlvbnMsIGFkZHMgd2luZG93IHNlYXJjaCBwcm92aWRlciwgcmVjZW50IGZpbGVzIHNlYXJjaCBwcm92aWRlciwgYWRkcyBzaG9ydGN1dHMgZm9yIHJlb3JkZXJpbmcgd29ya3NwYWNlcywgbW92ZSBhcHBsaWNhdGlvbnMsIC4uLlxuXG5UaGlzIGV4dGVuc2lvbiBjYW4gcmVwbGFjZSBtYW55IG90aGVyIGV4dGVuc2lvbnMsIGRpc2FibGUgYWxsIGV4dGVuc2lvbnMgdGhhdCBtYXkgYmUgaW4gY29uZmxpY3QgdG8gYXZvaWQgcHJvYmxlbXMuXG5cblYtU2hlbGwgdjI2IGFkZHMgY29udHJvbCBvdmVyIGl0cyBtb2R1bGVzLCBzbyB5b3UgY2FuIGVhc2lseSBkaXNhYmxlIHBhcnRzIG9mIHRoZSBleHRlbnNpb24gdGhhdCBtaWdodCBjb25mbGljdCB3aXRoIG90aGVyIGV4dGVuc2lvbnMgeW91IGxpa2UgYmV0dGVyIHRoYW4gd2hhdCBWLVNoZWxsIG9mZmVycy5cblxuQnVnIHJlcG9ydHMgYW5kIHN1Z2dlc3Rpb25zIG9uIHRoZSBHaXRIdWIgbGlua2VkIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI2Cn0="}}} , {"uuid": "rocketbar@chepkun.github.com", "name": "Rocketbar", "pname": "rocketbar", "description": "Taskbar and misc additions for the GNOME Shell.", "link": "https://extensions.gnome.org/extension/5180/rocketbar/", "shell_version_map": {"42": {"version": "6", "sha256": "1d7qqjw7absip9yg248kjw8vj07cxpcvy8pdpvwn6fvinmhp99y4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9saW51eC1pcy1hd2Vzb21lL2dub21lX2V4dGVuc2lvbl9yb2NrZXRiYXIiLAogICJ1dWlkIjogInJvY2tldGJhckBjaGVwa3VuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "43": {"version": "6", "sha256": "1d7qqjw7absip9yg248kjw8vj07cxpcvy8pdpvwn6fvinmhp99y4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9saW51eC1pcy1hd2Vzb21lL2dub21lX2V4dGVuc2lvbl9yb2NrZXRiYXIiLAogICJ1dWlkIjogInJvY2tldGJhckBjaGVwa3VuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "contestcountdown@raghav", "name": "Contest Countdown", "pname": "contest-countdown", "description": "Countdown to next codeforces contest. This extension uses the API of codeforces.com to get the list of all upcoming contests. A countdown to the closest upcoming contest (that you are participating in) is shown in the panel, which can be clicked on to view the list of all upcoming contests.", "link": "https://extensions.gnome.org/extension/5183/contest-countdown/", "shell_version_map": {"40": {"version": "3", "sha256": "096vwrc9b5lxg1zk7v8w6ynwnp7x3n3h9f3r5p02rdqy73ybsqia", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biB0byBuZXh0IGNvZGVmb3JjZXMgY29udGVzdC4gVGhpcyBleHRlbnNpb24gdXNlcyB0aGUgQVBJIG9mIGNvZGVmb3JjZXMuY29tIHRvIGdldCB0aGUgbGlzdCBvZiBhbGwgdXBjb21pbmcgY29udGVzdHMuIEEgY291bnRkb3duIHRvIHRoZSBjbG9zZXN0IHVwY29taW5nIGNvbnRlc3QgKHRoYXQgeW91IGFyZSBwYXJ0aWNpcGF0aW5nIGluKSBpcyBzaG93biBpbiB0aGUgcGFuZWwsIHdoaWNoIGNhbiBiZSBjbGlja2VkIG9uIHRvIHZpZXcgdGhlIGxpc3Qgb2YgYWxsIHVwY29taW5nIGNvbnRlc3RzLiIsCiAgIm5hbWUiOiAiQ29udGVzdCBDb3VudGRvd24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29udGVzdC1jb3VudGRvd24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JhZy1oYXYvY29udGVzdGNvdW50ZG93biIsCiAgInV1aWQiOiAiY29udGVzdGNvdW50ZG93bkByYWdoYXYiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "096vwrc9b5lxg1zk7v8w6ynwnp7x3n3h9f3r5p02rdqy73ybsqia", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biB0byBuZXh0IGNvZGVmb3JjZXMgY29udGVzdC4gVGhpcyBleHRlbnNpb24gdXNlcyB0aGUgQVBJIG9mIGNvZGVmb3JjZXMuY29tIHRvIGdldCB0aGUgbGlzdCBvZiBhbGwgdXBjb21pbmcgY29udGVzdHMuIEEgY291bnRkb3duIHRvIHRoZSBjbG9zZXN0IHVwY29taW5nIGNvbnRlc3QgKHRoYXQgeW91IGFyZSBwYXJ0aWNpcGF0aW5nIGluKSBpcyBzaG93biBpbiB0aGUgcGFuZWwsIHdoaWNoIGNhbiBiZSBjbGlja2VkIG9uIHRvIHZpZXcgdGhlIGxpc3Qgb2YgYWxsIHVwY29taW5nIGNvbnRlc3RzLiIsCiAgIm5hbWUiOiAiQ29udGVzdCBDb3VudGRvd24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29udGVzdC1jb3VudGRvd24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JhZy1oYXYvY29udGVzdGNvdW50ZG93biIsCiAgInV1aWQiOiAiY29udGVzdGNvdW50ZG93bkByYWdoYXYiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "toggle-window@togglewindow.com", "name": "Toggle Window", "pname": "toggle-window", "description": "For security reasons, since Gnome 41, cann't invoke '**org.gnome.Shell.Eval**' to control the behavior of window, we expose a D-Bus interface to activate/minimized a window by WMclass name.", "link": "https://extensions.gnome.org/extension/5185/toggle-window/", "shell_version_map": {"42": {"version": "3", "sha256": "03d53mf46jdypbqvw5720cc4ii39q87jscnnnwmqcd2x6sn6c0xs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBzZWN1cml0eSByZWFzb25zLCBzaW5jZSBHbm9tZSA0MSwgY2Fubid0IGludm9rZSAnKipvcmcuZ25vbWUuU2hlbGwuRXZhbCoqJyB0byBjb250cm9sIHRoZSBiZWhhdmlvciBvZiB3aW5kb3csIHdlIGV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZS9taW5pbWl6ZWQgYSB3aW5kb3cgYnkgV01jbGFzcyBuYW1lLiIsCiAgIm5hbWUiOiAiVG9nZ2xlIFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2ppYWtvdXpmL3RvZ2dsZV93aW5kb3ciLAogICJ1dWlkIjogInRvZ2dsZS13aW5kb3dAdG9nZ2xld2luZG93LmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} @@ -806,8 +806,8 @@ , {"uuid": "dock-reloaded@selfmade.pl", "name": "Dock: Reloaded", "pname": "dock-reloaded", "description": "Few tweaks to GNOME dock: top position, autohide - reveals under cursor pressure, only favorites apps", "link": "https://extensions.gnome.org/extension/5269/dock-reloaded/", "shell_version_map": {"42": {"version": "2", "sha256": "1cs766qr77i68s53dvaswlyv3jh1sv51d19jgigd7m71qndxwv70", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldyB0d2Vha3MgdG8gR05PTUUgZG9jazogdG9wIHBvc2l0aW9uLCBhdXRvaGlkZSAtIHJldmVhbHMgdW5kZXIgY3Vyc29yIHByZXNzdXJlLCBvbmx5IGZhdm9yaXRlcyBhcHBzIiwKICAibmFtZSI6ICJEb2NrOiBSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9Eb2NrLVJlbG9hZGVkIiwKICAidXVpZCI6ICJkb2NrLXJlbG9hZGVkQHNlbGZtYWRlLnBsIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "43": {"version": "3", "sha256": "1zs2imsp8jw6z1x5q4c7b6qnrih11d8j09xs1zvfj65dm5ag2nz9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldyB0d2Vha3MgdG8gR05PTUUgZG9jazogdG9wIHBvc2l0aW9uLCBhdXRvaGlkZSAtIHJldmVhbHMgdW5kZXIgY3Vyc29yIHByZXNzdXJlLCBvbmx5IGZhdm9yaXRlcyBhcHBzIiwKICAibmFtZSI6ICJEb2NrOiBSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9Eb2NrLVJlbG9hZGVkIiwKICAidXVpZCI6ICJkb2NrLXJlbG9hZGVkQHNlbGZtYWRlLnBsIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "shutdownbutton@asr-webdesign.fr", "name": "Add a Shutdown Button", "pname": "add-a-shutdown-button", "description": "Add power off button", "link": "https://extensions.gnome.org/extension/5272/add-a-shutdown-button/", "shell_version_map": {"40": {"version": "1", "sha256": "0kav86za1i9vkliwrbp86rnmvjn9pgvn1wdkqxbsxmmqhsn5awb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBwb3dlciBvZmYgYnV0dG9uIiwKICAibmFtZSI6ICJBZGQgYSBTaHV0ZG93biBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzaHV0ZG93bmJ1dHRvbkBhc3Itd2ViZGVzaWduLmZyIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "42": {"version": "1", "sha256": "0kav86za1i9vkliwrbp86rnmvjn9pgvn1wdkqxbsxmmqhsn5awb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBwb3dlciBvZmYgYnV0dG9uIiwKICAibmFtZSI6ICJBZGQgYSBTaHV0ZG93biBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzaHV0ZG93bmJ1dHRvbkBhc3Itd2ViZGVzaWduLmZyIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "moonphases@xynium.github.com", "name": "Moon Phases", "pname": "moon-phases", "description": "Moon and sun data", "link": "https://extensions.gnome.org/extension/5273/moon-phases/", "shell_version_map": {"42": {"version": "6", "sha256": "1d55siwhhdn54d9802jl7qqc87nvkdk52znqbmqxvxmyl7va7cax", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vb24gYW5kIHN1biBkYXRhIiwKICAibmFtZSI6ICJNb29uIFBoYXNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veHluaXVtL21vb25waGFzZXMiLAogICJ1dWlkIjogIm1vb25waGFzZXNAeHluaXVtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "43": {"version": "6", "sha256": "1d55siwhhdn54d9802jl7qqc87nvkdk52znqbmqxvxmyl7va7cax", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vb24gYW5kIHN1biBkYXRhIiwKICAibmFtZSI6ICJNb29uIFBoYXNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veHluaXVtL21vb25waGFzZXMiLAogICJ1dWlkIjogIm1vb25waGFzZXNAeHluaXVtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} -, {"uuid": "hide-workspace-thumbnails@dylanmc.ca", "name": "Hide Workspace Thumbnails", "pname": "hide-workspace-thumbnails", "description": "Hide workspace thumbnails from the overview", "link": "https://extensions.gnome.org/extension/5275/hide-workspace-thumbnails/", "shell_version_map": {"42": {"version": "3", "sha256": "0jd74aa30adm0md899x8i2rvzq8gm0c0h76nq4s2vm320x11x9fs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgd29ya3NwYWNlIHRodW1ibmFpbHMgZnJvbSB0aGUgb3ZlcnZpZXciLAogICJuYW1lIjogIkhpZGUgV29ya3NwYWNlIFRodW1ibmFpbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2R5bGFubWNjYWxsL2hpZGUtd29ya3NwYWNlLXRodW1ibmFpbHMtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJoaWRlLXdvcmtzcGFjZS10aHVtYm5haWxzQGR5bGFubWMuY2EiLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "0jd74aa30adm0md899x8i2rvzq8gm0c0h76nq4s2vm320x11x9fs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgd29ya3NwYWNlIHRodW1ibmFpbHMgZnJvbSB0aGUgb3ZlcnZpZXciLAogICJuYW1lIjogIkhpZGUgV29ya3NwYWNlIFRodW1ibmFpbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2R5bGFubWNjYWxsL2hpZGUtd29ya3NwYWNlLXRodW1ibmFpbHMtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJoaWRlLXdvcmtzcGFjZS10aHVtYm5haWxzQGR5bGFubWMuY2EiLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "pano@elhan.io", "name": "Pano - Clipboard Manager", "pname": "pano", "description": "Next-gen Clipboard manager for Gnome Shell\n\nYou need libgda and gsound for this extension to work.\n\nFedora: sudo dnf install libgda libgda-sqlite\nArch Linux: sudo pacman -S libgda (libgda6 for gnome-43)\nUbuntu/Debian: sudo apt install gir1.2-gda-5.0 gir1.2-gsound-1.0\nopenSUSE: sudo zypper install libgda-6_0-sqlite typelib-1_0-Gda-6_0 typelib-1_0-GSound-1_0", "link": "https://extensions.gnome.org/extension/5278/pano/", "shell_version_map": {"42": {"version": "10", "sha256": "09jx23f50n4iz77hcl0csgzpkyafxb2ani5xaanddc9cxyp5mkbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5leHQtZ2VuIENsaXBib2FyZCBtYW5hZ2VyIGZvciBHbm9tZSBTaGVsbFxuXG5Zb3UgbmVlZCBsaWJnZGEgYW5kIGdzb3VuZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay5cblxuRmVkb3JhOiBzdWRvIGRuZiBpbnN0YWxsIGxpYmdkYSBsaWJnZGEtc3FsaXRlXG5BcmNoIExpbnV4OiBzdWRvIHBhY21hbiAtUyBsaWJnZGEgKGxpYmdkYTYgZm9yIGdub21lLTQzKVxuVWJ1bnR1L0RlYmlhbjogc3VkbyBhcHQgaW5zdGFsbCBnaXIxLjItZ2RhLTUuMCBnaXIxLjItZ3NvdW5kLTEuMFxub3BlblNVU0U6IHN1ZG8genlwcGVyIGluc3RhbGwgbGliZ2RhLTZfMC1zcWxpdGUgdHlwZWxpYi0xXzAtR2RhLTZfMCB0eXBlbGliLTFfMC1HU291bmQtMV8wIiwKICAibmFtZSI6ICJQYW5vIC0gQ2xpcGJvYXJkIE1hbmFnZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFubyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2FlL2dub21lLXNoZWxsLXBhbm8iLAogICJ1dWlkIjogInBhbm9AZWxoYW4uaW8iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "43": {"version": "10", "sha256": "09jx23f50n4iz77hcl0csgzpkyafxb2ani5xaanddc9cxyp5mkbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5leHQtZ2VuIENsaXBib2FyZCBtYW5hZ2VyIGZvciBHbm9tZSBTaGVsbFxuXG5Zb3UgbmVlZCBsaWJnZGEgYW5kIGdzb3VuZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay5cblxuRmVkb3JhOiBzdWRvIGRuZiBpbnN0YWxsIGxpYmdkYSBsaWJnZGEtc3FsaXRlXG5BcmNoIExpbnV4OiBzdWRvIHBhY21hbiAtUyBsaWJnZGEgKGxpYmdkYTYgZm9yIGdub21lLTQzKVxuVWJ1bnR1L0RlYmlhbjogc3VkbyBhcHQgaW5zdGFsbCBnaXIxLjItZ2RhLTUuMCBnaXIxLjItZ3NvdW5kLTEuMFxub3BlblNVU0U6IHN1ZG8genlwcGVyIGluc3RhbGwgbGliZ2RhLTZfMC1zcWxpdGUgdHlwZWxpYi0xXzAtR2RhLTZfMCB0eXBlbGliLTFfMC1HU291bmQtMV8wIiwKICAibmFtZSI6ICJQYW5vIC0gQ2xpcGJvYXJkIE1hbmFnZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFubyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2FlL2dub21lLXNoZWxsLXBhbm8iLAogICJ1dWlkIjogInBhbm9AZWxoYW4uaW8iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} +, {"uuid": "hide-workspace-thumbnails@dylanmc.ca", "name": "Hide Workspace Thumbnails", "pname": "hide-workspace-thumbnails", "description": "Hide workspace thumbnails from the overview", "link": "https://extensions.gnome.org/extension/5275/hide-workspace-thumbnails/", "shell_version_map": {"42": {"version": "4", "sha256": "0v1b6sckw3b4hir7g0h62fb49jgfny9dhq8r3m4mk1dc6w9332yq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgd29ya3NwYWNlIHRodW1ibmFpbHMgZnJvbSB0aGUgb3ZlcnZpZXciLAogICJuYW1lIjogIkhpZGUgV29ya3NwYWNlIFRodW1ibmFpbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9keWxhbm1jY2FsbC9oaWRlLXdvcmtzcGFjZS10aHVtYm5haWxzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaGlkZS13b3Jrc3BhY2UtdGh1bWJuYWlsc0BkeWxhbm1jLmNhIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "0v1b6sckw3b4hir7g0h62fb49jgfny9dhq8r3m4mk1dc6w9332yq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgd29ya3NwYWNlIHRodW1ibmFpbHMgZnJvbSB0aGUgb3ZlcnZpZXciLAogICJuYW1lIjogIkhpZGUgV29ya3NwYWNlIFRodW1ibmFpbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9keWxhbm1jY2FsbC9oaWRlLXdvcmtzcGFjZS10aHVtYm5haWxzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaGlkZS13b3Jrc3BhY2UtdGh1bWJuYWlsc0BkeWxhbm1jLmNhIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} +, {"uuid": "pano@elhan.io", "name": "Pano - Clipboard Manager", "pname": "pano", "description": "Next-gen Clipboard manager for Gnome Shell\n\nYou need libgda and gsound for this extension to work.\n\nFedora: sudo dnf install libgda libgda-sqlite\nArch Linux: sudo pacman -S libgda (libgda6 for gnome-43 or later)\nUbuntu/Debian: sudo apt install gir1.2-gda-5.0 gir1.2-gsound-1.0\nopenSUSE: sudo zypper install libgda-6_0-sqlite typelib-1_0-Gda-6_0 typelib-1_0-GSound-1_0", "link": "https://extensions.gnome.org/extension/5278/pano/", "shell_version_map": {"42": {"version": "19", "sha256": "0s2vn7dnn12vsvyaw5gg0b8xflwx6f0jqkdj4lqf1mj2f93myg77", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5leHQtZ2VuIENsaXBib2FyZCBtYW5hZ2VyIGZvciBHbm9tZSBTaGVsbFxuXG5Zb3UgbmVlZCBsaWJnZGEgYW5kIGdzb3VuZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay5cblxuRmVkb3JhOiBzdWRvIGRuZiBpbnN0YWxsIGxpYmdkYSBsaWJnZGEtc3FsaXRlXG5BcmNoIExpbnV4OiBzdWRvIHBhY21hbiAtUyBsaWJnZGEgKGxpYmdkYTYgZm9yIGdub21lLTQzIG9yIGxhdGVyKVxuVWJ1bnR1L0RlYmlhbjogc3VkbyBhcHQgaW5zdGFsbCBnaXIxLjItZ2RhLTUuMCBnaXIxLjItZ3NvdW5kLTEuMFxub3BlblNVU0U6IHN1ZG8genlwcGVyIGluc3RhbGwgbGliZ2RhLTZfMC1zcWxpdGUgdHlwZWxpYi0xXzAtR2RhLTZfMCB0eXBlbGliLTFfMC1HU291bmQtMV8wIiwKICAibmFtZSI6ICJQYW5vIC0gQ2xpcGJvYXJkIE1hbmFnZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFubyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29hZS9nbm9tZS1zaGVsbC1wYW5vIiwKICAidXVpZCI6ICJwYW5vQGVsaGFuLmlvIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "43": {"version": "19", "sha256": "0s2vn7dnn12vsvyaw5gg0b8xflwx6f0jqkdj4lqf1mj2f93myg77", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5leHQtZ2VuIENsaXBib2FyZCBtYW5hZ2VyIGZvciBHbm9tZSBTaGVsbFxuXG5Zb3UgbmVlZCBsaWJnZGEgYW5kIGdzb3VuZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay5cblxuRmVkb3JhOiBzdWRvIGRuZiBpbnN0YWxsIGxpYmdkYSBsaWJnZGEtc3FsaXRlXG5BcmNoIExpbnV4OiBzdWRvIHBhY21hbiAtUyBsaWJnZGEgKGxpYmdkYTYgZm9yIGdub21lLTQzIG9yIGxhdGVyKVxuVWJ1bnR1L0RlYmlhbjogc3VkbyBhcHQgaW5zdGFsbCBnaXIxLjItZ2RhLTUuMCBnaXIxLjItZ3NvdW5kLTEuMFxub3BlblNVU0U6IHN1ZG8genlwcGVyIGluc3RhbGwgbGliZ2RhLTZfMC1zcWxpdGUgdHlwZWxpYi0xXzAtR2RhLTZfMCB0eXBlbGliLTFfMC1HU291bmQtMV8wIiwKICAibmFtZSI6ICJQYW5vIC0gQ2xpcGJvYXJkIE1hbmFnZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFubyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29hZS9nbm9tZS1zaGVsbC1wYW5vIiwKICAidXVpZCI6ICJwYW5vQGVsaGFuLmlvIiwKICAidmVyc2lvbiI6IDE5Cn0="}}} , {"uuid": "nauta-connect@jorgeajimenezl.com", "name": "Nauta Connect", "pname": "nauta-connect", "description": "Utility to authenticate in ETECSA network", "link": "https://extensions.gnome.org/extension/5279/nauta-connect/", "shell_version_map": {"41": {"version": "5", "sha256": "1hlrl5550015px3hvggsbaqfwr6rpn81yyx10cvz2jvancn2g7nj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlV0aWxpdHkgdG8gYXV0aGVudGljYXRlIGluIEVURUNTQSBuZXR3b3JrIiwKICAibmFtZSI6ICJOYXV0YSBDb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam9yZ2VhamltZW5lemwvbmF1dGEtY29ubmVjdC1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIm5hdXRhLWNvbm5lY3RAam9yZ2VhamltZW5lemwuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "42": {"version": "5", "sha256": "1hlrl5550015px3hvggsbaqfwr6rpn81yyx10cvz2jvancn2g7nj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlV0aWxpdHkgdG8gYXV0aGVudGljYXRlIGluIEVURUNTQSBuZXR3b3JrIiwKICAibmFtZSI6ICJOYXV0YSBDb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam9yZ2VhamltZW5lemwvbmF1dGEtY29ubmVjdC1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIm5hdXRhLWNvbm5lY3RAam9yZ2VhamltZW5lemwuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "43": {"version": "5", "sha256": "1hlrl5550015px3hvggsbaqfwr6rpn81yyx10cvz2jvancn2g7nj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlV0aWxpdHkgdG8gYXV0aGVudGljYXRlIGluIEVURUNTQSBuZXR3b3JrIiwKICAibmFtZSI6ICJOYXV0YSBDb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam9yZ2VhamltZW5lemwvbmF1dGEtY29ubmVjdC1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIm5hdXRhLWNvbm5lY3RAam9yZ2VhamltZW5lemwuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "addshutbutton@flioner@jerom@olika.ovh", "name": "Add Shutdown Menu (Gnome 42)", "pname": "add-shutdown-button-2204-lts", "description": "Add a button for the power off menu, you can now select options with the 'enter' key on Gnome 42 (fork of jerom's add shutdown button extension, added minor functionality)", "link": "https://extensions.gnome.org/extension/5281/add-shutdown-button-2204-lts/", "shell_version_map": {"40": {"version": "1", "sha256": "0jmb667zb89yjlk2gwla13ay46n72vh677r6vakv3czqz0fmlgha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJ1dHRvbiBmb3IgdGhlIHBvd2VyIG9mZiBtZW51LCB5b3UgY2FuIG5vdyBzZWxlY3Qgb3B0aW9ucyB3aXRoIHRoZSAnZW50ZXInIGtleSBvbiBHbm9tZSA0MiAoZm9yayBvZiBqZXJvbSdzIGFkZCBzaHV0ZG93biBidXR0b24gZXh0ZW5zaW9uLCBhZGRlZCBtaW5vciBmdW5jdGlvbmFsaXR5KSIsCiAgIm5hbWUiOiAiQWRkIFNodXRkb3duIE1lbnUgKEdub21lIDQyKSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFkZHNodXRidXR0b25AZmxpb25lckBqZXJvbUBvbGlrYS5vdmgiLAogICJ2ZXJzaW9uIjogMQp9"}, "42": {"version": "1", "sha256": "0jmb667zb89yjlk2gwla13ay46n72vh677r6vakv3czqz0fmlgha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJ1dHRvbiBmb3IgdGhlIHBvd2VyIG9mZiBtZW51LCB5b3UgY2FuIG5vdyBzZWxlY3Qgb3B0aW9ucyB3aXRoIHRoZSAnZW50ZXInIGtleSBvbiBHbm9tZSA0MiAoZm9yayBvZiBqZXJvbSdzIGFkZCBzaHV0ZG93biBidXR0b24gZXh0ZW5zaW9uLCBhZGRlZCBtaW5vciBmdW5jdGlvbmFsaXR5KSIsCiAgIm5hbWUiOiAiQWRkIFNodXRkb3duIE1lbnUgKEdub21lIDQyKSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFkZHNodXRidXR0b25AZmxpb25lckBqZXJvbUBvbGlrYS5vdmgiLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "alt-tab-scroll-workaround@lucasresck.github.io", "name": "Alt+Tab Scroll Workaround", "pname": "alttab-scroll-workaround", "description": "Temporary fix for a bug that buffers the scroll between different windows (e.g., Chrome and VS Code).", "link": "https://extensions.gnome.org/extension/5282/alttab-scroll-workaround/", "shell_version_map": {"42": {"version": "3", "sha256": "0grxkjvcj1z6mjms11k5m5fh1myxs8b18pn330kvfhxf7ymhlk2l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRlbXBvcmFyeSBmaXggZm9yIGEgYnVnIHRoYXQgYnVmZmVycyB0aGUgc2Nyb2xsIGJldHdlZW4gZGlmZmVyZW50IHdpbmRvd3MgKGUuZy4sIENocm9tZSBhbmQgVlMgQ29kZSkuIiwKICAibmFtZSI6ICJBbHQrVGFiIFNjcm9sbCBXb3JrYXJvdW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdWNhc3Jlc2NrL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHQtdGFiLXNjcm9sbC13b3JrYXJvdW5kIiwKICAidXVpZCI6ICJhbHQtdGFiLXNjcm9sbC13b3JrYXJvdW5kQGx1Y2FzcmVzY2suZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "0grxkjvcj1z6mjms11k5m5fh1myxs8b18pn330kvfhxf7ymhlk2l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRlbXBvcmFyeSBmaXggZm9yIGEgYnVnIHRoYXQgYnVmZmVycyB0aGUgc2Nyb2xsIGJldHdlZW4gZGlmZmVyZW50IHdpbmRvd3MgKGUuZy4sIENocm9tZSBhbmQgVlMgQ29kZSkuIiwKICAibmFtZSI6ICJBbHQrVGFiIFNjcm9sbCBXb3JrYXJvdW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdWNhc3Jlc2NrL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHQtdGFiLXNjcm9sbC13b3JrYXJvdW5kIiwKICAidXVpZCI6ICJhbHQtdGFiLXNjcm9sbC13b3JrYXJvdW5kQGx1Y2FzcmVzY2suZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} @@ -820,14 +820,14 @@ , {"uuid": "webfeed@xynium.github.com", "name": "WebFeed", "pname": "webfeed", "description": "RSS and Atom Feed reader for GNOME Shell", "link": "https://extensions.gnome.org/extension/5321/webfeed/", "shell_version_map": {"42": {"version": "6", "sha256": "0p6cv0hrpd52s215w3ilhkdyqb2x97j1kijcpw4byiajfkvqc1i6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJTUyBhbmQgQXRvbSBGZWVkIHJlYWRlciBmb3IgR05PTUUgU2hlbGwiLAogICJuYW1lIjogIldlYkZlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3h5bml1bS93ZWJmZWVkIiwKICAidXVpZCI6ICJ3ZWJmZWVkQHh5bml1bS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "43": {"version": "8", "sha256": "15nngcapwcf80fv6dqp8mxlbzxd1n4rv73blfyvvzxxwh0inbhg9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJTUyBhbmQgQXRvbSBGZWVkIHJlYWRlciBmb3IgR05PTUUgU2hlbGwiLAogICJuYW1lIjogIldlYkZlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veHluaXVtL3dlYmZlZWQiLAogICJ1dWlkIjogIndlYmZlZWRAeHluaXVtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "pingindic@xynium.github.com", "name": "PingIndic", "pname": "pingindic", "description": "show network ping delay", "link": "https://extensions.gnome.org/extension/5330/pingindic/", "shell_version_map": {"42": {"version": "3", "sha256": "0f4kgq5qagv39s98bdyncfs9jwcd6lm5bnjb1qcfhr3364rd0yab", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInNob3cgbmV0d29yayBwaW5nIGRlbGF5IiwKICAibmFtZSI6ICJQaW5nSW5kaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3h5bml1bS9waW5naW5kaWMiLAogICJ1dWlkIjogInBpbmdpbmRpY0B4eW5pdW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "0f4kgq5qagv39s98bdyncfs9jwcd6lm5bnjb1qcfhr3364rd0yab", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInNob3cgbmV0d29yayBwaW5nIGRlbGF5IiwKICAibmFtZSI6ICJQaW5nSW5kaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3h5bml1bS9waW5naW5kaWMiLAogICJ1dWlkIjogInBpbmdpbmRpY0B4eW5pdW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "power-profile-indicator@laux.wtf", "name": "Power Profiles Indicator", "pname": "power-profile-indicator", "description": "a simple indicator in the system icons area of the top panel that represent the current power profile", "link": "https://extensions.gnome.org/extension/5335/power-profile-indicator/", "shell_version_map": {"40": {"version": "9", "sha256": "0011yqa1v2ymfczzmd2vckmqdpk1wapdzhg6l7453fnd25v7xxa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJQb3dlciBQcm9maWxlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtaW5kaWNhdG9yQGxhdXgud3RmIiwKICAidXVpZC1kZXYiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3ItZGV2QGxhdXgud3RmIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "0011yqa1v2ymfczzmd2vckmqdpk1wapdzhg6l7453fnd25v7xxa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJQb3dlciBQcm9maWxlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtaW5kaWNhdG9yQGxhdXgud3RmIiwKICAidXVpZC1kZXYiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3ItZGV2QGxhdXgud3RmIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "0011yqa1v2ymfczzmd2vckmqdpk1wapdzhg6l7453fnd25v7xxa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJQb3dlciBQcm9maWxlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtaW5kaWNhdG9yQGxhdXgud3RmIiwKICAidXVpZC1kZXYiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3ItZGV2QGxhdXgud3RmIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "43": {"version": "9", "sha256": "0011yqa1v2ymfczzmd2vckmqdpk1wapdzhg6l7453fnd25v7xxa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJQb3dlciBQcm9maWxlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtaW5kaWNhdG9yQGxhdXgud3RmIiwKICAidXVpZC1kZXYiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3ItZGV2QGxhdXgud3RmIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} -, {"uuid": "widgets@aylur", "name": "Aylur's Widgets", "pname": "aylurs-widgets", "description": "My set of extensions: Battery Bar, Dash Board, DateMenu Mod, Media Player, Power Menu, Workspace Indicator, Notification Indicator, Modified Quick Settings, Background Clock.\n Disclaimer: this extension contains copyrighted icons.", "link": "https://extensions.gnome.org/extension/5338/aylurs-widgets/", "shell_version_map": {"42": {"version": "18", "sha256": "1772n3d3q601jkbhv4iwjfxgzy105iz4zr3mbp9zrhyha4xy390s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk15IHNldCBvZiBleHRlbnNpb25zOiBCYXR0ZXJ5IEJhciwgRGFzaCBCb2FyZCwgRGF0ZU1lbnUgTW9kLCBNZWRpYSBQbGF5ZXIsIFBvd2VyIE1lbnUsIFdvcmtzcGFjZSBJbmRpY2F0b3IsIE5vdGlmaWNhdGlvbiBJbmRpY2F0b3IsIE1vZGlmaWVkIFF1aWNrIFNldHRpbmdzLCBCYWNrZ3JvdW5kIENsb2NrLlxuIERpc2NsYWltZXI6IHRoaXMgZXh0ZW5zaW9uIGNvbnRhaW5zIGNvcHlyaWdodGVkIGljb25zLiIsCiAgIm5hbWUiOiAiQXlsdXIncyBXaWRnZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF5bHVycy13aWRnZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aWRnZXRzQGF5bHVyIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "43": {"version": "18", "sha256": "1772n3d3q601jkbhv4iwjfxgzy105iz4zr3mbp9zrhyha4xy390s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk15IHNldCBvZiBleHRlbnNpb25zOiBCYXR0ZXJ5IEJhciwgRGFzaCBCb2FyZCwgRGF0ZU1lbnUgTW9kLCBNZWRpYSBQbGF5ZXIsIFBvd2VyIE1lbnUsIFdvcmtzcGFjZSBJbmRpY2F0b3IsIE5vdGlmaWNhdGlvbiBJbmRpY2F0b3IsIE1vZGlmaWVkIFF1aWNrIFNldHRpbmdzLCBCYWNrZ3JvdW5kIENsb2NrLlxuIERpc2NsYWltZXI6IHRoaXMgZXh0ZW5zaW9uIGNvbnRhaW5zIGNvcHlyaWdodGVkIGljb25zLiIsCiAgIm5hbWUiOiAiQXlsdXIncyBXaWRnZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF5bHVycy13aWRnZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aWRnZXRzQGF5bHVyIiwKICAidmVyc2lvbiI6IDE4Cn0="}}} +, {"uuid": "widgets@aylur", "name": "Aylur's Widgets", "pname": "aylurs-widgets", "description": "My set of extensions: Battery Bar, Dash Board, DateMenu Mod, Media Player, Power Menu, Workspace Indicator, Notification Indicator, Modified Quick Settings, Background Clock.\n Disclaimer: this extension contains copyrighted icons.", "link": "https://extensions.gnome.org/extension/5338/aylurs-widgets/", "shell_version_map": {"42": {"version": "19", "sha256": "16rv4j57k8vwrp8nah14xd55hj5d8z1g4pwf4bbkhjjny1qs526w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk15IHNldCBvZiBleHRlbnNpb25zOiBCYXR0ZXJ5IEJhciwgRGFzaCBCb2FyZCwgRGF0ZU1lbnUgTW9kLCBNZWRpYSBQbGF5ZXIsIFBvd2VyIE1lbnUsIFdvcmtzcGFjZSBJbmRpY2F0b3IsIE5vdGlmaWNhdGlvbiBJbmRpY2F0b3IsIE1vZGlmaWVkIFF1aWNrIFNldHRpbmdzLCBCYWNrZ3JvdW5kIENsb2NrLlxuIERpc2NsYWltZXI6IHRoaXMgZXh0ZW5zaW9uIGNvbnRhaW5zIGNvcHlyaWdodGVkIGljb25zLiIsCiAgIm5hbWUiOiAiQXlsdXIncyBXaWRnZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF5bHVycy13aWRnZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aWRnZXRzQGF5bHVyIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "43": {"version": "19", "sha256": "16rv4j57k8vwrp8nah14xd55hj5d8z1g4pwf4bbkhjjny1qs526w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk15IHNldCBvZiBleHRlbnNpb25zOiBCYXR0ZXJ5IEJhciwgRGFzaCBCb2FyZCwgRGF0ZU1lbnUgTW9kLCBNZWRpYSBQbGF5ZXIsIFBvd2VyIE1lbnUsIFdvcmtzcGFjZSBJbmRpY2F0b3IsIE5vdGlmaWNhdGlvbiBJbmRpY2F0b3IsIE1vZGlmaWVkIFF1aWNrIFNldHRpbmdzLCBCYWNrZ3JvdW5kIENsb2NrLlxuIERpc2NsYWltZXI6IHRoaXMgZXh0ZW5zaW9uIGNvbnRhaW5zIGNvcHlyaWdodGVkIGljb25zLiIsCiAgIm5hbWUiOiAiQXlsdXIncyBXaWRnZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF5bHVycy13aWRnZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aWRnZXRzQGF5bHVyIiwKICAidmVyc2lvbiI6IDE5Cn0="}}} , {"uuid": "supergfxctl-gex@asus-linux.org", "name": "Super Graphics Control", "pname": "supergfxctl-gex", "description": "supergfxctl-gex is a frontend for supergfxctl that was born inside the asus-linux.org community. supergfxctl is required for this extension to work. It is tested on a variaty of laptops including Intel / Nvidia, AMD / Nvidia, Intel / AMD and AMD / AMD GPU combinations.\n\nIt is a platform agnostic tool for hybrid graphics laptops.\n\nsupergfxctl gets packages by the community for Fedora and Arch. But without much of a hastle can be compiled for every systemd based Linux distribution.\n\nTo learn more about it, please have a look at:\n\nhttps://gitlab.com/asus-linux/supergfxctl\nhttps://asus-linux.org/", "link": "https://extensions.gnome.org/extension/5344/supergfxctl-gex/", "shell_version_map": {"40": {"version": "22", "sha256": "04g3fjpdblxh25jlygzww79a6zzzrhgs113575jrnmwcrxq4vgmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJTdXBlciBHcmFwaGljcyBDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyZ2Z4Y3RsLWdleCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJzdXBlcmdmeGN0bCI6ICI1LjAuMSIsCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN1cGVyZ2Z4Y3RsLWdleEBhc3VzLWxpbnV4Lm9yZyIsCiAgInV1aWQtZGV2IjogInN1cGVyZ2Z4Y3RsLWdleC1kZXZAYXN1cy1saW51eC5vcmciLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "41": {"version": "22", "sha256": "04g3fjpdblxh25jlygzww79a6zzzrhgs113575jrnmwcrxq4vgmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJTdXBlciBHcmFwaGljcyBDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyZ2Z4Y3RsLWdleCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJzdXBlcmdmeGN0bCI6ICI1LjAuMSIsCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN1cGVyZ2Z4Y3RsLWdleEBhc3VzLWxpbnV4Lm9yZyIsCiAgInV1aWQtZGV2IjogInN1cGVyZ2Z4Y3RsLWdleC1kZXZAYXN1cy1saW51eC5vcmciLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "42": {"version": "22", "sha256": "04g3fjpdblxh25jlygzww79a6zzzrhgs113575jrnmwcrxq4vgmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJTdXBlciBHcmFwaGljcyBDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyZ2Z4Y3RsLWdleCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJzdXBlcmdmeGN0bCI6ICI1LjAuMSIsCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN1cGVyZ2Z4Y3RsLWdleEBhc3VzLWxpbnV4Lm9yZyIsCiAgInV1aWQtZGV2IjogInN1cGVyZ2Z4Y3RsLWdleC1kZXZAYXN1cy1saW51eC5vcmciLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "43": {"version": "24", "sha256": "1xd0mlbca2cg6nxysv8x4kiqkwsb3dw3qw3rv87i81b6n5v26y7q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJTdXBlciBHcmFwaGljcyBDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyZ2Z4Y3RsLWdleCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAic3VwZXJnZnhjdGwiOiAiNS4wLjEiLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzdXBlcmdmeGN0bC1nZXhAYXN1cy1saW51eC5vcmciLAogICJ1dWlkLWRldiI6ICJzdXBlcmdmeGN0bC1nZXgtZGV2QGFzdXMtbGludXgub3JnIiwKICAidmVyc2lvbiI6IDI0Cn0="}}} , {"uuid": "dotspaces@charlieqle", "name": "Dotspaces", "pname": "dotspaces", "description": "A simple workspace switcher", "link": "https://extensions.gnome.org/extension/5347/dotspaces/", "shell_version_map": {"42": {"version": "6", "sha256": "1drw6hyhc9cfwyz49xbspyh42k9pgwvwnlmqbkcxskn7ljjxw5lp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHdvcmtzcGFjZSBzd2l0Y2hlciIsCiAgIm5hbWUiOiAiRG90c3BhY2VzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRvdHNwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hhcmxpZVFMZS9nbm9tZS1leHRlbnNpb24tZG90c3BhY2VzIiwKICAidXVpZCI6ICJkb3RzcGFjZXNAY2hhcmxpZXFsZSIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "1drw6hyhc9cfwyz49xbspyh42k9pgwvwnlmqbkcxskn7ljjxw5lp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHdvcmtzcGFjZSBzd2l0Y2hlciIsCiAgIm5hbWUiOiAiRG90c3BhY2VzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRvdHNwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hhcmxpZVFMZS9nbm9tZS1leHRlbnNpb24tZG90c3BhY2VzIiwKICAidXVpZCI6ICJkb3RzcGFjZXNAY2hhcmxpZXFsZSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "window-state-manager@kishorv06.github.io", "name": "Window State Manager", "pname": "window-state-manager", "description": "Automatically remember and restore window state and positions. Useful when using Gnome with wayland in a multi-monitor setup. Some applications won't remember their location when monitors are connected or disconnected. This extension solves that problem by saving window state periodically and restoring it when screen arrangement is changed.", "link": "https://extensions.gnome.org/extension/5353/window-state-manager/", "shell_version_map": {"42": {"version": "3", "sha256": "0f6mcn8kkgkdhaa354jy1hhn474iw6f99wbq4pn5y8qdvc12wzsh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcmVtZW1iZXIgYW5kIHJlc3RvcmUgd2luZG93IHN0YXRlIGFuZCBwb3NpdGlvbnMuIFVzZWZ1bCB3aGVuIHVzaW5nIEdub21lIHdpdGggd2F5bGFuZCBpbiBhIG11bHRpLW1vbml0b3Igc2V0dXAuIFNvbWUgYXBwbGljYXRpb25zIHdvbid0IHJlbWVtYmVyIHRoZWlyIGxvY2F0aW9uIHdoZW4gbW9uaXRvcnMgYXJlIGNvbm5lY3RlZCBvciBkaXNjb25uZWN0ZWQuIFRoaXMgZXh0ZW5zaW9uIHNvbHZlcyB0aGF0IHByb2JsZW0gYnkgc2F2aW5nIHdpbmRvdyBzdGF0ZSBwZXJpb2RpY2FsbHkgYW5kIHJlc3RvcmluZyBpdCB3aGVuIHNjcmVlbiBhcnJhbmdlbWVudCBpcyBjaGFuZ2VkLiIsCiAgIm5hbWUiOiAiV2luZG93IFN0YXRlIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tpc2hvcnYwNi93aW5kb3ctc3RhdGUtbWFuYWdlciIsCiAgInV1aWQiOiAid2luZG93LXN0YXRlLW1hbmFnZXJAa2lzaG9ydjA2LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "0f6mcn8kkgkdhaa354jy1hhn474iw6f99wbq4pn5y8qdvc12wzsh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcmVtZW1iZXIgYW5kIHJlc3RvcmUgd2luZG93IHN0YXRlIGFuZCBwb3NpdGlvbnMuIFVzZWZ1bCB3aGVuIHVzaW5nIEdub21lIHdpdGggd2F5bGFuZCBpbiBhIG11bHRpLW1vbml0b3Igc2V0dXAuIFNvbWUgYXBwbGljYXRpb25zIHdvbid0IHJlbWVtYmVyIHRoZWlyIGxvY2F0aW9uIHdoZW4gbW9uaXRvcnMgYXJlIGNvbm5lY3RlZCBvciBkaXNjb25uZWN0ZWQuIFRoaXMgZXh0ZW5zaW9uIHNvbHZlcyB0aGF0IHByb2JsZW0gYnkgc2F2aW5nIHdpbmRvdyBzdGF0ZSBwZXJpb2RpY2FsbHkgYW5kIHJlc3RvcmluZyBpdCB3aGVuIHNjcmVlbiBhcnJhbmdlbWVudCBpcyBjaGFuZ2VkLiIsCiAgIm5hbWUiOiAiV2luZG93IFN0YXRlIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tpc2hvcnYwNi93aW5kb3ctc3RhdGUtbWFuYWdlciIsCiAgInV1aWQiOiAid2luZG93LXN0YXRlLW1hbmFnZXJAa2lzaG9ydjA2LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "vpn-status@peterroux.com", "name": "VPN Status", "pname": "vpn-status", "description": "A VPN Status indicator.", "link": "https://extensions.gnome.org/extension/5356/vpn-status/", "shell_version_map": {"38": {"version": "2", "sha256": "09qfrs7wi5sn8dgz7806x3wqfyq62f1gfl0jfwwnypkmcqc7rigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVlBOIFN0YXR1cyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJWUE4gU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidnBuLXN0YXR1c0BwZXRlcnJvdXguY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "09qfrs7wi5sn8dgz7806x3wqfyq62f1gfl0jfwwnypkmcqc7rigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVlBOIFN0YXR1cyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJWUE4gU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidnBuLXN0YXR1c0BwZXRlcnJvdXguY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "09qfrs7wi5sn8dgz7806x3wqfyq62f1gfl0jfwwnypkmcqc7rigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVlBOIFN0YXR1cyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJWUE4gU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidnBuLXN0YXR1c0BwZXRlcnJvdXguY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "smartlock@huy.im", "name": "Bluetooth Smart Lock", "pname": "bluetooth-smart-lock", "description": "Dynamic lock for GNOME. Use your smart phone/watch/band to lock your desktop automatically when you step away.\n\nWhen your device is out of bluetooth range or get disconnected, it will lock your desktop automatically.", "link": "https://extensions.gnome.org/extension/5359/bluetooth-smart-lock/", "shell_version_map": {"42": {"version": "13", "sha256": "1bajl6xmnv2lb7vh4wc8i02g9kqac9ljq31f035nshha4p324b6z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkR5bmFtaWMgbG9jayBmb3IgR05PTUUuIFVzZSB5b3VyIHNtYXJ0IHBob25lL3dhdGNoL2JhbmQgdG8gbG9jayB5b3VyIGRlc2t0b3AgYXV0b21hdGljYWxseSB3aGVuIHlvdSBzdGVwIGF3YXkuXG5cbldoZW4geW91ciBkZXZpY2UgaXMgb3V0IG9mIGJsdWV0b290aCByYW5nZSBvciBnZXQgZGlzY29ubmVjdGVkLCBpdCB3aWxsIGxvY2sgeW91ciBkZXNrdG9wIGF1dG9tYXRpY2FsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXNtYXJ0bG9jayIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIFNtYXJ0IExvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmx1ZXRvb3RoX3NtYXJ0bG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmEwZjMvZ25vbWUtYmx1ZXRvb3RoLXNtYXJ0bG9jayIsCiAgInV1aWQiOiAic21hcnRsb2NrQGh1eS5pbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "43": {"version": "13", "sha256": "1bajl6xmnv2lb7vh4wc8i02g9kqac9ljq31f035nshha4p324b6z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkR5bmFtaWMgbG9jayBmb3IgR05PTUUuIFVzZSB5b3VyIHNtYXJ0IHBob25lL3dhdGNoL2JhbmQgdG8gbG9jayB5b3VyIGRlc2t0b3AgYXV0b21hdGljYWxseSB3aGVuIHlvdSBzdGVwIGF3YXkuXG5cbldoZW4geW91ciBkZXZpY2UgaXMgb3V0IG9mIGJsdWV0b290aCByYW5nZSBvciBnZXQgZGlzY29ubmVjdGVkLCBpdCB3aWxsIGxvY2sgeW91ciBkZXNrdG9wIGF1dG9tYXRpY2FsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXNtYXJ0bG9jayIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIFNtYXJ0IExvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmx1ZXRvb3RoX3NtYXJ0bG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmEwZjMvZ25vbWUtYmx1ZXRvb3RoLXNtYXJ0bG9jayIsCiAgInV1aWQiOiAic21hcnRsb2NrQGh1eS5pbSIsCiAgInZlcnNpb24iOiAxMwp9"}}} , {"uuid": "gnome-wireguard-extension@SJBERTRAND.github.com", "name": "WireGuard-VPN-extension", "pname": "wireguard-vpn-extension", "description": "Enable/Disable Wireguard tunnels", "link": "https://extensions.gnome.org/extension/5362/wireguard-vpn-extension/", "shell_version_map": {"42": {"version": "6", "sha256": "19mdv9ngz73jnp1k55kg8d8nsn4yd4rfbxz3rnjsh3a85zh0hb6g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIFdpcmVndWFyZCB0dW5uZWxzIiwKICAibmFtZSI6ICJXaXJlR3VhcmQtVlBOLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU0pCRVJUUkFORC9nbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "19mdv9ngz73jnp1k55kg8d8nsn4yd4rfbxz3rnjsh3a85zh0hb6g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIFdpcmVndWFyZCB0dW5uZWxzIiwKICAibmFtZSI6ICJXaXJlR3VhcmQtVlBOLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU0pCRVJUUkFORC9nbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} -, {"uuid": "memento-mori@paveloom", "name": "Memento Mori", "pname": "memento-mori", "description": "Make every second of your life count. Literally!\n\nThis extension adds a counter to the panel which counts down the time you have left based on your birthday and life expectancy.", "link": "https://extensions.gnome.org/extension/5365/memento-mori/", "shell_version_map": {"42": {"version": "6", "sha256": "1psx0n9lzdyh36kh4i334hmpy61fbr8blmrz8qqlzgivj2abg022", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgZXZlcnkgc2Vjb25kIG9mIHlvdXIgbGlmZSBjb3VudC4gTGl0ZXJhbGx5IVxuXG5UaGlzIGV4dGVuc2lvbiBhZGRzIGEgY291bnRlciB0byB0aGUgcGFuZWwgd2hpY2ggY291bnRzIGRvd24gdGhlIHRpbWUgeW91IGhhdmUgbGVmdCBiYXNlZCBvbiB5b3VyIGJpcnRoZGF5IGFuZCBsaWZlIGV4cGVjdGFuY3kuIiwKICAibmFtZSI6ICJNZW1lbnRvIE1vcmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVtZW50by1tb3JpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXZlbG9vbS10L2dub21lLXNoZWxsLW1lbWVudG8tbW9yaSIsCiAgInV1aWQiOiAibWVtZW50by1tb3JpQHBhdmVsb29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "43": {"version": "6", "sha256": "1psx0n9lzdyh36kh4i334hmpy61fbr8blmrz8qqlzgivj2abg022", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgZXZlcnkgc2Vjb25kIG9mIHlvdXIgbGlmZSBjb3VudC4gTGl0ZXJhbGx5IVxuXG5UaGlzIGV4dGVuc2lvbiBhZGRzIGEgY291bnRlciB0byB0aGUgcGFuZWwgd2hpY2ggY291bnRzIGRvd24gdGhlIHRpbWUgeW91IGhhdmUgbGVmdCBiYXNlZCBvbiB5b3VyIGJpcnRoZGF5IGFuZCBsaWZlIGV4cGVjdGFuY3kuIiwKICAibmFtZSI6ICJNZW1lbnRvIE1vcmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVtZW50by1tb3JpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXZlbG9vbS10L2dub21lLXNoZWxsLW1lbWVudG8tbW9yaSIsCiAgInV1aWQiOiAibWVtZW50by1tb3JpQHBhdmVsb29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} +, {"uuid": "memento-mori@paveloom", "name": "Memento Mori", "pname": "memento-mori", "description": "Make every second of your life count. Literally!\n\nThis extension adds a counter to the panel which counts down the time you have left based on your birthday and life expectancy.", "link": "https://extensions.gnome.org/extension/5365/memento-mori/", "shell_version_map": {"42": {"version": "7", "sha256": "1h60dmipyc7xhryccal3rc0hhv872k1ikivzw1n792scksg89zjg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgZXZlcnkgc2Vjb25kIG9mIHlvdXIgbGlmZSBjb3VudC4gTGl0ZXJhbGx5IVxuXG5UaGlzIGV4dGVuc2lvbiBhZGRzIGEgY291bnRlciB0byB0aGUgcGFuZWwgd2hpY2ggY291bnRzIGRvd24gdGhlIHRpbWUgeW91IGhhdmUgbGVmdCBiYXNlZCBvbiB5b3VyIGJpcnRoZGF5IGFuZCBsaWZlIGV4cGVjdGFuY3kuIiwKICAibmFtZSI6ICJNZW1lbnRvIE1vcmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVtZW50by1tb3JpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGF2ZWxvb20tdC9nbm9tZS1zaGVsbC1tZW1lbnRvLW1vcmkiLAogICJ1dWlkIjogIm1lbWVudG8tbW9yaUBwYXZlbG9vbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "43": {"version": "7", "sha256": "1h60dmipyc7xhryccal3rc0hhv872k1ikivzw1n792scksg89zjg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgZXZlcnkgc2Vjb25kIG9mIHlvdXIgbGlmZSBjb3VudC4gTGl0ZXJhbGx5IVxuXG5UaGlzIGV4dGVuc2lvbiBhZGRzIGEgY291bnRlciB0byB0aGUgcGFuZWwgd2hpY2ggY291bnRzIGRvd24gdGhlIHRpbWUgeW91IGhhdmUgbGVmdCBiYXNlZCBvbiB5b3VyIGJpcnRoZGF5IGFuZCBsaWZlIGV4cGVjdGFuY3kuIiwKICAibmFtZSI6ICJNZW1lbnRvIE1vcmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVtZW50by1tb3JpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGF2ZWxvb20tdC9nbm9tZS1zaGVsbC1tZW1lbnRvLW1vcmkiLAogICJ1dWlkIjogIm1lbWVudG8tbW9yaUBwYXZlbG9vbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "external-ip-extension@ipcan.cyou", "name": "Show External IP", "pname": "show-external-ip-thisipcancyou", "description": "Displays your external IP in the Toolbar and sends a system notification if changed. \n\nThis extension is handy for those work at different locations or with different VPNs to quickly see your public IP and country. It uses the free thisipcan.cyou service to check at regular intervals and whenever computer network events occur (like switching networks or locations).", "link": "https://extensions.gnome.org/extension/5368/show-external-ip-thisipcancyou/", "shell_version_map": {"40": {"version": "15", "sha256": "0k4jlhdhfv46f12wa112yw81kp4fmz2g2mj772vjbqb7cid7gdf1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgZXh0ZXJuYWwgSVAgaW4gdGhlIFRvb2xiYXIgYW5kIHNlbmRzIGEgc3lzdGVtIG5vdGlmaWNhdGlvbiBpZiBjaGFuZ2VkLiBcblxuVGhpcyBleHRlbnNpb24gaXMgaGFuZHkgZm9yIHRob3NlIHdvcmsgYXQgZGlmZmVyZW50IGxvY2F0aW9ucyBvciB3aXRoIGRpZmZlcmVudCBWUE5zIHRvIHF1aWNrbHkgc2VlIHlvdXIgcHVibGljIElQIGFuZCBjb3VudHJ5LiBJdCB1c2VzIHRoZSBmcmVlIHRoaXNpcGNhbi5jeW91IHNlcnZpY2UgdG8gY2hlY2sgYXQgcmVndWxhciBpbnRlcnZhbHMgYW5kIHdoZW5ldmVyIGNvbXB1dGVyIG5ldHdvcmsgZXZlbnRzIG9jY3VyIChsaWtlIHN3aXRjaGluZyBuZXR3b3JrcyBvciBsb2NhdGlvbnMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVybmFsLWlwLW5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiU2hvdyBFeHRlcm5hbCBJUCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jd2l0dGVuYmVyZy90aGlzaXBjYW4uY3lvdSIsCiAgInV1aWQiOiAiZXh0ZXJuYWwtaXAtZXh0ZW5zaW9uQGlwY2FuLmN5b3UiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "41": {"version": "15", "sha256": "0k4jlhdhfv46f12wa112yw81kp4fmz2g2mj772vjbqb7cid7gdf1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgZXh0ZXJuYWwgSVAgaW4gdGhlIFRvb2xiYXIgYW5kIHNlbmRzIGEgc3lzdGVtIG5vdGlmaWNhdGlvbiBpZiBjaGFuZ2VkLiBcblxuVGhpcyBleHRlbnNpb24gaXMgaGFuZHkgZm9yIHRob3NlIHdvcmsgYXQgZGlmZmVyZW50IGxvY2F0aW9ucyBvciB3aXRoIGRpZmZlcmVudCBWUE5zIHRvIHF1aWNrbHkgc2VlIHlvdXIgcHVibGljIElQIGFuZCBjb3VudHJ5LiBJdCB1c2VzIHRoZSBmcmVlIHRoaXNpcGNhbi5jeW91IHNlcnZpY2UgdG8gY2hlY2sgYXQgcmVndWxhciBpbnRlcnZhbHMgYW5kIHdoZW5ldmVyIGNvbXB1dGVyIG5ldHdvcmsgZXZlbnRzIG9jY3VyIChsaWtlIHN3aXRjaGluZyBuZXR3b3JrcyBvciBsb2NhdGlvbnMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVybmFsLWlwLW5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiU2hvdyBFeHRlcm5hbCBJUCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jd2l0dGVuYmVyZy90aGlzaXBjYW4uY3lvdSIsCiAgInV1aWQiOiAiZXh0ZXJuYWwtaXAtZXh0ZW5zaW9uQGlwY2FuLmN5b3UiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "42": {"version": "15", "sha256": "0k4jlhdhfv46f12wa112yw81kp4fmz2g2mj772vjbqb7cid7gdf1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgZXh0ZXJuYWwgSVAgaW4gdGhlIFRvb2xiYXIgYW5kIHNlbmRzIGEgc3lzdGVtIG5vdGlmaWNhdGlvbiBpZiBjaGFuZ2VkLiBcblxuVGhpcyBleHRlbnNpb24gaXMgaGFuZHkgZm9yIHRob3NlIHdvcmsgYXQgZGlmZmVyZW50IGxvY2F0aW9ucyBvciB3aXRoIGRpZmZlcmVudCBWUE5zIHRvIHF1aWNrbHkgc2VlIHlvdXIgcHVibGljIElQIGFuZCBjb3VudHJ5LiBJdCB1c2VzIHRoZSBmcmVlIHRoaXNpcGNhbi5jeW91IHNlcnZpY2UgdG8gY2hlY2sgYXQgcmVndWxhciBpbnRlcnZhbHMgYW5kIHdoZW5ldmVyIGNvbXB1dGVyIG5ldHdvcmsgZXZlbnRzIG9jY3VyIChsaWtlIHN3aXRjaGluZyBuZXR3b3JrcyBvciBsb2NhdGlvbnMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVybmFsLWlwLW5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiU2hvdyBFeHRlcm5hbCBJUCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jd2l0dGVuYmVyZy90aGlzaXBjYW4uY3lvdSIsCiAgInV1aWQiOiAiZXh0ZXJuYWwtaXAtZXh0ZW5zaW9uQGlwY2FuLmN5b3UiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "43": {"version": "15", "sha256": "0k4jlhdhfv46f12wa112yw81kp4fmz2g2mj772vjbqb7cid7gdf1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgZXh0ZXJuYWwgSVAgaW4gdGhlIFRvb2xiYXIgYW5kIHNlbmRzIGEgc3lzdGVtIG5vdGlmaWNhdGlvbiBpZiBjaGFuZ2VkLiBcblxuVGhpcyBleHRlbnNpb24gaXMgaGFuZHkgZm9yIHRob3NlIHdvcmsgYXQgZGlmZmVyZW50IGxvY2F0aW9ucyBvciB3aXRoIGRpZmZlcmVudCBWUE5zIHRvIHF1aWNrbHkgc2VlIHlvdXIgcHVibGljIElQIGFuZCBjb3VudHJ5LiBJdCB1c2VzIHRoZSBmcmVlIHRoaXNpcGNhbi5jeW91IHNlcnZpY2UgdG8gY2hlY2sgYXQgcmVndWxhciBpbnRlcnZhbHMgYW5kIHdoZW5ldmVyIGNvbXB1dGVyIG5ldHdvcmsgZXZlbnRzIG9jY3VyIChsaWtlIHN3aXRjaGluZyBuZXR3b3JrcyBvciBsb2NhdGlvbnMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVybmFsLWlwLW5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiU2hvdyBFeHRlcm5hbCBJUCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jd2l0dGVuYmVyZy90aGlzaXBjYW4uY3lvdSIsCiAgInV1aWQiOiAiZXh0ZXJuYWwtaXAtZXh0ZW5zaW9uQGlwY2FuLmN5b3UiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} , {"uuid": "usd-bra@bramba.github.com", "name": "USD-BRA", "pname": "usd-bra", "description": "An easy and clean viewer of USD -> BRL currency. In which it is easy to understand if the currency is increasing or decreasing.", "link": "https://extensions.gnome.org/extension/5371/usd-bra/", "shell_version_map": {"42": {"version": "4", "sha256": "125ch4b675zddx46lj59f4jb8g5s6mq4aqv3vk21bbmnb05zzk5r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgYW5kIGNsZWFuIHZpZXdlciBvZiBVU0QgLT4gQlJMIGN1cnJlbmN5LiBJbiB3aGljaCBpdCBpcyBlYXN5IHRvIHVuZGVyc3RhbmQgaWYgdGhlIGN1cnJlbmN5IGlzIGluY3JlYXNpbmcgb3IgZGVjcmVhc2luZy4iLAogICJuYW1lIjogIlVTRC1CUkEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQnJhbWJhNy9VU0QtQlJBIiwKICAidXVpZCI6ICJ1c2QtYnJhQGJyYW1iYS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "gnome-pushover-messages-unofficial@iwont.cyou", "name": "Pushover Message Notifications", "pname": "pushover-message-notifications", "description": "Displays Pushover Notifications within GNOME and within your tray. Privacy respecting unofficial client.", "link": "https://extensions.gnome.org/extension/5377/pushover-message-notifications/", "shell_version_map": {"40": {"version": "8", "sha256": "0q6wzq2m0pjfcgf0jrbf2ygagikdmmgrkx561fw1fb23332v1f8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFB1c2hvdmVyIE5vdGlmaWNhdGlvbnMgd2l0aGluIEdOT01FIGFuZCB3aXRoaW4geW91ciB0cmF5LiBQcml2YWN5IHJlc3BlY3RpbmcgdW5vZmZpY2lhbCBjbGllbnQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgIm5hbWUiOiAiUHVzaG92ZXIgTWVzc2FnZSBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2N3aXR0ZW5iZXJnL2dub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWwiLAogICJ1dWlkIjogImdub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWxAaXdvbnQuY3lvdSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0q6wzq2m0pjfcgf0jrbf2ygagikdmmgrkx561fw1fb23332v1f8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFB1c2hvdmVyIE5vdGlmaWNhdGlvbnMgd2l0aGluIEdOT01FIGFuZCB3aXRoaW4geW91ciB0cmF5LiBQcml2YWN5IHJlc3BlY3RpbmcgdW5vZmZpY2lhbCBjbGllbnQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgIm5hbWUiOiAiUHVzaG92ZXIgTWVzc2FnZSBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2N3aXR0ZW5iZXJnL2dub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWwiLAogICJ1dWlkIjogImdub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWxAaXdvbnQuY3lvdSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "0q6wzq2m0pjfcgf0jrbf2ygagikdmmgrkx561fw1fb23332v1f8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFB1c2hvdmVyIE5vdGlmaWNhdGlvbnMgd2l0aGluIEdOT01FIGFuZCB3aXRoaW4geW91ciB0cmF5LiBQcml2YWN5IHJlc3BlY3RpbmcgdW5vZmZpY2lhbCBjbGllbnQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgIm5hbWUiOiAiUHVzaG92ZXIgTWVzc2FnZSBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2N3aXR0ZW5iZXJnL2dub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWwiLAogICJ1dWlkIjogImdub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWxAaXdvbnQuY3lvdSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "0q6wzq2m0pjfcgf0jrbf2ygagikdmmgrkx561fw1fb23332v1f8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFB1c2hvdmVyIE5vdGlmaWNhdGlvbnMgd2l0aGluIEdOT01FIGFuZCB3aXRoaW4geW91ciB0cmF5LiBQcml2YWN5IHJlc3BlY3RpbmcgdW5vZmZpY2lhbCBjbGllbnQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgIm5hbWUiOiAiUHVzaG92ZXIgTWVzc2FnZSBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2N3aXR0ZW5iZXJnL2dub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWwiLAogICJ1dWlkIjogImdub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWxAaXdvbnQuY3lvdSIsCiAgInZlcnNpb24iOiA4Cn0="}}} @@ -869,7 +869,7 @@ , {"uuid": "ziion@halborn.com", "name": "ZIIONext", "pname": "ziionext", "description": "GNOME extension for branding and customisation of Ziion\nThe smart contract auditing VM used by https://halborn.com.\n\nThis extension is a heavily modified fork of https://github.com/Aryan20/Logomenu and uses it as a base. Get more information on ZIION at https://ziion.org.", "link": "https://extensions.gnome.org/extension/5559/ziionext/", "shell_version_map": {"38": {"version": "2", "sha256": "17q31jyvgyv5sq6mjc9i07c28miswyza7hmr3wch5c6dl6s9hgrr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aWlvbi1vcy96aWlvbi1leHQiLAogICJ1dWlkIjogInppaW9uQGhhbGJvcm4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "17q31jyvgyv5sq6mjc9i07c28miswyza7hmr3wch5c6dl6s9hgrr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aWlvbi1vcy96aWlvbi1leHQiLAogICJ1dWlkIjogInppaW9uQGhhbGJvcm4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "17q31jyvgyv5sq6mjc9i07c28miswyza7hmr3wch5c6dl6s9hgrr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aWlvbi1vcy96aWlvbi1leHQiLAogICJ1dWlkIjogInppaW9uQGhhbGJvcm4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "17q31jyvgyv5sq6mjc9i07c28miswyza7hmr3wch5c6dl6s9hgrr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aWlvbi1vcy96aWlvbi1leHQiLAogICJ1dWlkIjogInppaW9uQGhhbGJvcm4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "43": {"version": "2", "sha256": "17q31jyvgyv5sq6mjc9i07c28miswyza7hmr3wch5c6dl6s9hgrr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aWlvbi1vcy96aWlvbi1leHQiLAogICJ1dWlkIjogInppaW9uQGhhbGJvcm4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "window-app-switcher-on-active-monitor@NiKnights.com", "name": "Window/App switcher on active monitor", "pname": "monitor-window-switcher-2", "description": "GNOME shell extension that puts the Window/App switcher on the active monitor (monitor with the cursor).\n\nThis extension is a fork of https://github.com/gedzeppelin/monitor-window-switcher.", "link": "https://extensions.gnome.org/extension/5568/monitor-window-switcher-2/", "shell_version_map": {"38": {"version": "3", "sha256": "1723ixhw6xksp8s9apx8s69pn85b45gf1v39q9gy5x8dagw2hz6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0aGF0IHB1dHMgdGhlIFdpbmRvdy9BcHAgc3dpdGNoZXIgb24gdGhlIGFjdGl2ZSBtb25pdG9yIChtb25pdG9yIHdpdGggdGhlIGN1cnNvcikuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vZ2VkemVwcGVsaW4vbW9uaXRvci13aW5kb3ctc3dpdGNoZXIuIiwKICAibmFtZSI6ICJXaW5kb3cvQXBwIHN3aXRjaGVyIG9uIGFjdGl2ZSBtb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlcGEyMi93aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJ3aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yQE5pS25pZ2h0cy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1723ixhw6xksp8s9apx8s69pn85b45gf1v39q9gy5x8dagw2hz6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0aGF0IHB1dHMgdGhlIFdpbmRvdy9BcHAgc3dpdGNoZXIgb24gdGhlIGFjdGl2ZSBtb25pdG9yIChtb25pdG9yIHdpdGggdGhlIGN1cnNvcikuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vZ2VkemVwcGVsaW4vbW9uaXRvci13aW5kb3ctc3dpdGNoZXIuIiwKICAibmFtZSI6ICJXaW5kb3cvQXBwIHN3aXRjaGVyIG9uIGFjdGl2ZSBtb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlcGEyMi93aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJ3aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yQE5pS25pZ2h0cy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1723ixhw6xksp8s9apx8s69pn85b45gf1v39q9gy5x8dagw2hz6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0aGF0IHB1dHMgdGhlIFdpbmRvdy9BcHAgc3dpdGNoZXIgb24gdGhlIGFjdGl2ZSBtb25pdG9yIChtb25pdG9yIHdpdGggdGhlIGN1cnNvcikuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vZ2VkemVwcGVsaW4vbW9uaXRvci13aW5kb3ctc3dpdGNoZXIuIiwKICAibmFtZSI6ICJXaW5kb3cvQXBwIHN3aXRjaGVyIG9uIGFjdGl2ZSBtb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlcGEyMi93aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJ3aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yQE5pS25pZ2h0cy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "1723ixhw6xksp8s9apx8s69pn85b45gf1v39q9gy5x8dagw2hz6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0aGF0IHB1dHMgdGhlIFdpbmRvdy9BcHAgc3dpdGNoZXIgb24gdGhlIGFjdGl2ZSBtb25pdG9yIChtb25pdG9yIHdpdGggdGhlIGN1cnNvcikuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vZ2VkemVwcGVsaW4vbW9uaXRvci13aW5kb3ctc3dpdGNoZXIuIiwKICAibmFtZSI6ICJXaW5kb3cvQXBwIHN3aXRjaGVyIG9uIGFjdGl2ZSBtb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlcGEyMi93aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJ3aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yQE5pS25pZ2h0cy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "1723ixhw6xksp8s9apx8s69pn85b45gf1v39q9gy5x8dagw2hz6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0aGF0IHB1dHMgdGhlIFdpbmRvdy9BcHAgc3dpdGNoZXIgb24gdGhlIGFjdGl2ZSBtb25pdG9yIChtb25pdG9yIHdpdGggdGhlIGN1cnNvcikuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vZ2VkemVwcGVsaW4vbW9uaXRvci13aW5kb3ctc3dpdGNoZXIuIiwKICAibmFtZSI6ICJXaW5kb3cvQXBwIHN3aXRjaGVyIG9uIGFjdGl2ZSBtb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlcGEyMi93aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJ3aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yQE5pS25pZ2h0cy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "focus-window@chris.al", "name": "Focus Window", "pname": "focus-window", "description": "Do you want a pulldown mode on your terminal without having to switch to tilda or guake? Do you want to focus your Spotify app or email client with a single shortcut key? Then this extension is for you!\n\nThis extension allows one to create various shortcuts for applications, enabling the ability to have one shortcut that triggers both the launch and focus of an application window.", "link": "https://extensions.gnome.org/extension/5571/focus-window/", "shell_version_map": {"42": {"version": "1", "sha256": "1lyz695wqn8zlcbdk9f0c94jmxq9czgnc71s9cndd6vw73pz7z4j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvIHlvdSB3YW50IGEgcHVsbGRvd24gbW9kZSBvbiB5b3VyIHRlcm1pbmFsIHdpdGhvdXQgaGF2aW5nIHRvIHN3aXRjaCB0byB0aWxkYSBvciBndWFrZT8gRG8geW91IHdhbnQgdG8gZm9jdXMgeW91ciBTcG90aWZ5IGFwcCBvciBlbWFpbCBjbGllbnQgd2l0aCBhIHNpbmdsZSBzaG9ydGN1dCBrZXk/IFRoZW4gdGhpcyBleHRlbnNpb24gaXMgZm9yIHlvdSFcblxuVGhpcyBleHRlbnNpb24gYWxsb3dzIG9uZSB0byBjcmVhdGUgdmFyaW91cyBzaG9ydGN1dHMgZm9yIGFwcGxpY2F0aW9ucywgZW5hYmxpbmcgdGhlIGFiaWxpdHkgdG8gaGF2ZSBvbmUgc2hvcnRjdXQgdGhhdCB0cmlnZ2VycyBib3RoIHRoZSBsYXVuY2ggYW5kIGZvY3VzIG9mIGFuIGFwcGxpY2F0aW9uIHdpbmRvdy4iLAogICJuYW1lIjogIkZvY3VzIFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wY2Jvd2Vycy9mb2N1cy13aW5kb3ciLAogICJ1dWlkIjogImZvY3VzLXdpbmRvd0BjaHJpcy5hbCIsCiAgInZlcnNpb24iOiAxCn0="}}} -, {"uuid": "power-profile-switcher@eliapasquali.github.io", "name": "Power Profile Switcher", "pname": "power-profile-switcher", "description": "Automatically switch between power profiles based on power supply and percentage.", "link": "https://extensions.gnome.org/extension/5575/power-profile-switcher/", "shell_version_map": {"42": {"version": "3", "sha256": "1ixv6vl03z8129mygf6hpcgfvyqh1ykjz648d589mpi1nkf32dww", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBwZXJjZW50YWdlLiIsCiAgIm5hbWUiOiAiUG93ZXIgUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWxpYXBhc3F1YWxpL3Bvd2VyLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtc3dpdGNoZXJAZWxpYXBhc3F1YWxpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "1ixv6vl03z8129mygf6hpcgfvyqh1ykjz648d589mpi1nkf32dww", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBwZXJjZW50YWdlLiIsCiAgIm5hbWUiOiAiUG93ZXIgUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWxpYXBhc3F1YWxpL3Bvd2VyLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtc3dpdGNoZXJAZWxpYXBhc3F1YWxpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}}} +, {"uuid": "power-profile-switcher@eliapasquali.github.io", "name": "Power Profile Switcher", "pname": "power-profile-switcher", "description": "Automatically switch between power profiles based on power supply and percentage.", "link": "https://extensions.gnome.org/extension/5575/power-profile-switcher/", "shell_version_map": {"42": {"version": "4", "sha256": "0dp9g2qrvg5fq5hci0x23dj4l53c9hxggwphgwagrkjdwjx57d3r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBwZXJjZW50YWdlLiIsCiAgIm5hbWUiOiAiUG93ZXIgUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWxpYXBhc3F1YWxpL3Bvd2VyLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtc3dpdGNoZXJAZWxpYXBhc3F1YWxpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "0dp9g2qrvg5fq5hci0x23dj4l53c9hxggwphgwagrkjdwjx57d3r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBwZXJjZW50YWdlLiIsCiAgIm5hbWUiOiAiUG93ZXIgUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWxpYXBhc3F1YWxpL3Bvd2VyLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtc3dpdGNoZXJAZWxpYXBhc3F1YWxpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "colorblind-filters@G-dH.github.com", "name": "Colorblind Filters", "pname": "colorblind-filters", "description": "Color filters that should help color-blind users and also developers.\nThe menu includes correction filters and also simulation filters that can show you what color-blind people see. Included are filters for Protanopia, Deuteranopia and Tritanopia, filter strength is adjustable. Available are also filters for desaturation, channel mix, and lightness and color inversions.\n\nPrimary mouse button click on the panel button toggles active filter, secondary click opens configuration menu, middle click toggles high-contrast correction if available and scroll switches filters.\n\nDiscussions and bug reports on the GitHub page linked below, please.", "link": "https://extensions.gnome.org/extension/5589/colorblind-filters/", "shell_version_map": {"38": {"version": "15", "sha256": "01i79afkn865g16ivd026x7j0fnk7v5yb4bz41lycpqwypbsrjk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}, "40": {"version": "15", "sha256": "01i79afkn865g16ivd026x7j0fnk7v5yb4bz41lycpqwypbsrjk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}, "41": {"version": "15", "sha256": "01i79afkn865g16ivd026x7j0fnk7v5yb4bz41lycpqwypbsrjk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}, "42": {"version": "15", "sha256": "01i79afkn865g16ivd026x7j0fnk7v5yb4bz41lycpqwypbsrjk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}, "43": {"version": "15", "sha256": "01i79afkn865g16ivd026x7j0fnk7v5yb4bz41lycpqwypbsrjk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}}} , {"uuid": "focused-window-dbus@flexagoon.com", "name": "Focused Window D-Bus", "pname": "focused-window-d-bus", "description": "Exposes a D-Bus method to get active window title and class", "link": "https://extensions.gnome.org/extension/5592/focused-window-d-bus/", "shell_version_map": {"43": {"version": "2", "sha256": "148xqala2fkjgvzn4nnq0nhq8vp6nc2yfrimg3cpwlgp2zi0g7cn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZXMgYSBELUJ1cyBtZXRob2QgdG8gZ2V0IGFjdGl2ZSB3aW5kb3cgdGl0bGUgYW5kIGNsYXNzIiwKICAibmFtZSI6ICJGb2N1c2VkIFdpbmRvdyBELUJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mbGV4YWdvb24vZm9jdXNlZC13aW5kb3ctZGJ1cyIsCiAgInV1aWQiOiAiZm9jdXNlZC13aW5kb3ctZGJ1c0BmbGV4YWdvb24uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "multimonitorswap@dvrlabs.tv", "name": "Multi Monitor Swap ", "pname": "multi-monitor-swap", "description": "Swap windows between monitors.", "link": "https://extensions.gnome.org/extension/5597/multi-monitor-swap/", "shell_version_map": {"40": {"version": "12", "sha256": "03izg1r7zszz2cs2q1qq92r7kqha9wkgbh1ggii011lpdyryarqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3YXAgd2luZG93cyBiZXR3ZWVuIG1vbml0b3JzLiIsCiAgIm5hbWUiOiAiTXVsdGkgTW9uaXRvciBTd2FwICIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdnJsYWJzL211bHRpbW9uaXRvcnN3YXAiLAogICJ1dWlkIjogIm11bHRpbW9uaXRvcnN3YXBAZHZybGFicy50diIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "03izg1r7zszz2cs2q1qq92r7kqha9wkgbh1ggii011lpdyryarqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3YXAgd2luZG93cyBiZXR3ZWVuIG1vbml0b3JzLiIsCiAgIm5hbWUiOiAiTXVsdGkgTW9uaXRvciBTd2FwICIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdnJsYWJzL211bHRpbW9uaXRvcnN3YXAiLAogICJ1dWlkIjogIm11bHRpbW9uaXRvcnN3YXBAZHZybGFicy50diIsCiAgInZlcnNpb24iOiAxMgp9"}, "42": {"version": "12", "sha256": "03izg1r7zszz2cs2q1qq92r7kqha9wkgbh1ggii011lpdyryarqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3YXAgd2luZG93cyBiZXR3ZWVuIG1vbml0b3JzLiIsCiAgIm5hbWUiOiAiTXVsdGkgTW9uaXRvciBTd2FwICIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdnJsYWJzL211bHRpbW9uaXRvcnN3YXAiLAogICJ1dWlkIjogIm11bHRpbW9uaXRvcnN3YXBAZHZybGFicy50diIsCiAgInZlcnNpb24iOiAxMgp9"}, "43": {"version": "12", "sha256": "03izg1r7zszz2cs2q1qq92r7kqha9wkgbh1ggii011lpdyryarqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3YXAgd2luZG93cyBiZXR3ZWVuIG1vbml0b3JzLiIsCiAgIm5hbWUiOiAiTXVsdGkgTW9uaXRvciBTd2FwICIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdnJsYWJzL211bHRpbW9uaXRvcnN3YXAiLAogICJ1dWlkIjogIm11bHRpbW9uaXRvcnN3YXBAZHZybGFicy50diIsCiAgInZlcnNpb24iOiAxMgp9"}}} @@ -895,7 +895,7 @@ , {"uuid": "pin-app-folders-to-dash@fcusr.github.com", "name": "Pin App Folders to Dash", "pname": "pin-app-folders-to-dash", "description": "Allow to pin app folders to dash.", "link": "https://extensions.gnome.org/extension/5709/pin-app-folders-to-dash/", "shell_version_map": {"43": {"version": "2", "sha256": "0wpcgr5mmh5h412an9l91xg2y0p679aa2civc3zygkvvw38zpm77", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIHBpbiBhcHAgZm9sZGVycyB0byBkYXNoLiIsCiAgIm5hbWUiOiAiUGluIEFwcCBGb2xkZXJzIHRvIERhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmN1c3IvcGluLWFwcC1mb2xkZXJzLXRvLWRhc2giLAogICJ1dWlkIjogInBpbi1hcHAtZm9sZGVycy10by1kYXNoQGZjdXNyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "downloads-indicator@Dieg0Js.github.io", "name": "Downloads Indicator", "pname": "downloads-indicator", "description": "A minimal Downloads manager for the gnome shell. Fork of Gnome Trash from Axel von Bertoldi.", "link": "https://extensions.gnome.org/extension/5712/downloads-indicator/", "shell_version_map": {"43": {"version": "2", "sha256": "08rqx7hmf12ib2s2i6dlww9m2rhvivb7b3vwdldgv7wjn4ibsj9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBEb3dubG9hZHMgbWFuYWdlciBmb3IgdGhlIGdub21lIHNoZWxsLiBGb3JrIG9mIEdub21lIFRyYXNoIGZyb20gQXhlbCB2b24gQmVydG9sZGkuIiwKICAibmFtZSI6ICJEb3dubG9hZHMgSW5kaWNhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJEaWVnMEpzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RpZWcwSnMvZ25vbWUtZG93bmxvYWRzLWluZGljYXRvciIsCiAgInV1aWQiOiAiZG93bmxvYWRzLWluZGljYXRvckBEaWVnMEpzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "trash-indicator@Dieg0Js.github.io", "name": "Trash Indicator", "pname": "trash-indicator", "description": "A minimal Trash manager for the gnome shell. Fork of Gnome Trash from Axel von Bertoldi.", "link": "https://extensions.gnome.org/extension/5715/trash-indicator/", "shell_version_map": {"43": {"version": "2", "sha256": "1lz8m11d1zbdkggm8zjnwi2fyalingy6nr4y2n2smxfpgfd2q9zv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBUcmFzaCBtYW5hZ2VyIGZvciB0aGUgZ25vbWUgc2hlbGwuIEZvcmsgb2YgR25vbWUgVHJhc2ggZnJvbSBBeGVsIHZvbiBCZXJ0b2xkaS4iLAogICJuYW1lIjogIlRyYXNoIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiRGllZzBKcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EaWVnMEpzL2dub21lLXRyYXNoLWluZGljYXRvciIsCiAgInV1aWQiOiAidHJhc2gtaW5kaWNhdG9yQERpZWcwSnMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} -, {"uuid": "battery-indicator-icon@Deminder", "name": "Battery Indicator Icon", "pname": "battery-indicator-icon", "description": "Replace the battery indicator icon with a circle or portrait.", "link": "https://extensions.gnome.org/extension/5718/battery-indicator-icon/", "shell_version_map": {"43": {"version": "5", "sha256": "1c08vk4rpy83nf9pv5k87d61iha371jd876rpqx42qklqy03ra83", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIGJhdHRlcnkgaW5kaWNhdG9yIGljb24gd2l0aCBhIGNpcmNsZSBvciBwb3J0cmFpdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEluZGljYXRvciBJY29uIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RlbWluZGVyL2JhdHRlcnktaW5kaWNhdG9yLWljb24iLAogICJ1dWlkIjogImJhdHRlcnktaW5kaWNhdG9yLWljb25ARGVtaW5kZXIiLAogICJ2ZXJzaW9uIjogNQp9"}}} +, {"uuid": "battery-indicator-icon@Deminder", "name": "Battery Indicator Icon", "pname": "battery-indicator-icon", "description": "Replace the battery indicator icon with a circle or portrait.", "link": "https://extensions.gnome.org/extension/5718/battery-indicator-icon/", "shell_version_map": {"43": {"version": "6", "sha256": "1p6r8x4mpn8fcldgrmhw03qk57579ww5d8zbnfpkwhf3p88pwjw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIGJhdHRlcnkgaW5kaWNhdG9yIGljb24gd2l0aCBhIGNpcmNsZSBvciBwb3J0cmFpdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEluZGljYXRvciBJY29uIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9iYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAidXVpZCI6ICJiYXR0ZXJ5LWluZGljYXRvci1pY29uQERlbWluZGVyIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "clipboard-indicator@Dieg0Js.github.io", "name": "Clipboard Indicator", "pname": "clipboard-indicator", "description": "A minimal clipboard indicator for the gnome shell. Fork of Clipman by popov895.", "link": "https://extensions.gnome.org/extension/5721/clipboard-indicator/", "shell_version_map": {"42": {"version": "1", "sha256": "1i9jsvf9lkf0r5fjhzp8mp8f1ndfgwcqid1dy37gggvz0ga209fm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBjbGlwYm9hcmQgaW5kaWNhdG9yIGZvciB0aGUgZ25vbWUgc2hlbGwuIEZvcmsgb2YgQ2xpcG1hbiBieSBwb3Bvdjg5NS4iLAogICJuYW1lIjogIkNsaXBib2FyZCBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkRpZWcwSnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RpZWcwSnMvZ25vbWUtY2xpcGJvYXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAiY2xpcGJvYXJkLWluZGljYXRvckBEaWVnMEpzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxCn0="}, "43": {"version": "1", "sha256": "1i9jsvf9lkf0r5fjhzp8mp8f1ndfgwcqid1dy37gggvz0ga209fm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBjbGlwYm9hcmQgaW5kaWNhdG9yIGZvciB0aGUgZ25vbWUgc2hlbGwuIEZvcmsgb2YgQ2xpcG1hbiBieSBwb3Bvdjg5NS4iLAogICJuYW1lIjogIkNsaXBib2FyZCBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkRpZWcwSnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RpZWcwSnMvZ25vbWUtY2xpcGJvYXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAiY2xpcGJvYXJkLWluZGljYXRvckBEaWVnMEpzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "Battery-Health-Charging@maniacx.github.com", "name": "Battery Health Charging", "pname": "battery-health-charging", "description": "Battery Health Charging: An extension to maximize the battery life of laptops by setting their charging threshold/modes.\n\nCompatible with Asus, Huwaei, LG, Lenovo, Samsung, Sony, Thinkpad, Toshiba, AppleIntelSMC, Acer.\n\nFor more information about modes, compatibility, translation, bugs/issues visit:\nhttps://github.com/maniacx/Battery-Health-Charging", "link": "https://extensions.gnome.org/extension/5724/battery-health-charging/", "shell_version_map": {"43": {"version": "7", "sha256": "0xm0190wd5a2rb5b1nvndp6pl1s3wjqjv27h8hh79z495jh0j5cs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJhdHRlcnkgSGVhbHRoIENoYXJnaW5nOiBBbiBleHRlbnNpb24gdG8gbWF4aW1pemUgdGhlIGJhdHRlcnkgbGlmZSBvZiBsYXB0b3BzIGJ5IHNldHRpbmcgdGhlaXIgY2hhcmdpbmcgdGhyZXNob2xkL21vZGVzLlxuXG5Db21wYXRpYmxlIHdpdGggQXN1cywgSHV3YWVpLCBMRywgTGVub3ZvLCBTYW1zdW5nLCBTb255LCBUaGlua3BhZCwgVG9zaGliYSwgQXBwbGVJbnRlbFNNQywgQWNlci5cblxuRm9yIG1vcmUgaW5mb3JtYXRpb24gYWJvdXQgbW9kZXMsIGNvbXBhdGliaWxpdHksIHRyYW5zbGF0aW9uLCBidWdzL2lzc3VlcyB2aXNpdDpcbmh0dHBzOi8vZ2l0aHViLmNvbS9tYW5pYWN4L0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEhlYWx0aCBDaGFyZ2luZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInV1aWQiOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "oneclickbios@sao.studio", "name": "One-Click BIOS", "pname": "one-click-bios", "description": "Restart into firmware settings directly from OS\n\nHold Shift and click the power menu button to trigger restart into firmware settings.\n\nAny suggestion is appreciated on GitHub!", "link": "https://extensions.gnome.org/extension/5733/one-click-bios/", "shell_version_map": {"43": {"version": "5", "sha256": "07r9vspq35s632j0pzywrhb8islb9fq49dv0a1s6yvp23d7bzni7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncyBkaXJlY3RseSBmcm9tIE9TXG5cbkhvbGQgU2hpZnQgYW5kIGNsaWNrIHRoZSBwb3dlciBtZW51IGJ1dHRvbiB0byB0cmlnZ2VyIHJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncy5cblxuQW55IHN1Z2dlc3Rpb24gaXMgYXBwcmVjaWF0ZWQgb24gR2l0SHViISIsCiAgIm5hbWUiOiAiT25lLUNsaWNrIEJJT1MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbTFuaWNydXNoZXIvb25lLWNsaWNrLWJpb3MiLAogICJ1dWlkIjogIm9uZWNsaWNrYmlvc0BzYW8uc3R1ZGlvIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} @@ -913,6 +913,9 @@ , {"uuid": "extension-poweroff-button@InkaAlicja", "name": "Poweroff and Suspend Buttons", "pname": "poweroff-and-suspend-buttons", "description": "Poweroff and suspend buttons for GNOME desktop environment", "link": "https://extensions.gnome.org/extension/5787/poweroff-and-suspend-buttons/", "shell_version_map": {"42": {"version": "2", "sha256": "039wpmsrzk75pc62fw2hfgjy5dv85f54fa2w76hxacc08qkqq4y1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvd2Vyb2ZmIGFuZCBzdXNwZW5kIGJ1dHRvbnMgZm9yIEdOT01FIGRlc2t0b3AgZW52aXJvbm1lbnQiLAogICJuYW1lIjogIlBvd2Vyb2ZmIGFuZCBTdXNwZW5kIEJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSW5rYUFsaWNqYS9nbm9tZS1leHRlbnNpb24tcG93ZXItYnV0dG9ucyIsCiAgInV1aWQiOiAiZXh0ZW5zaW9uLXBvd2Vyb2ZmLWJ1dHRvbkBJbmthQWxpY2phIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "smart-resize@garretpatti.github.com", "name": "Smart Resize", "pname": "smart-resize", "description": "Auto resize a window that is too large for your current screen", "link": "https://extensions.gnome.org/extension/5790/smart-resize/", "shell_version_map": {"43": {"version": "1", "sha256": "1n4bhfcz2m976xfdr2waw5l3m7p0cq8sxxmlc0bcklsqz0cnbx83", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG8gcmVzaXplIGEgd2luZG93IHRoYXQgaXMgdG9vIGxhcmdlIGZvciB5b3VyIGN1cnJlbnQgc2NyZWVuIiwKICAibmFtZSI6ICJTbWFydCBSZXNpemUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2FycmV0cGF0dGkvc21hcnQtcmVzaXplIiwKICAidXVpZCI6ICJzbWFydC1yZXNpemVAZ2FycmV0cGF0dGkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "stopwatch@aliakseiz.github.com", "name": "Stopwatch", "pname": "stopwatch", "description": "Simple extension to measure time. Primary button click starts/pauses the watch, secondary button resets it.", "link": "https://extensions.gnome.org/extension/5796/stopwatch/", "shell_version_map": {"40": {"version": "2", "sha256": "0rmlh3431g3qknpy6bhib6ksr6zgns697qy564wm7976m64glkgf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gbWVhc3VyZSB0aW1lLiBQcmltYXJ5IGJ1dHRvbiBjbGljayBzdGFydHMvcGF1c2VzIHRoZSB3YXRjaCwgc2Vjb25kYXJ5IGJ1dHRvbiByZXNldHMgaXQuIiwKICAibmFtZSI6ICJTdG9wd2F0Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxpYWtzZWl6L3N0b3B3YXRjaCIsCiAgInV1aWQiOiAic3RvcHdhdGNoQGFsaWFrc2Vpei5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "0rmlh3431g3qknpy6bhib6ksr6zgns697qy564wm7976m64glkgf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gbWVhc3VyZSB0aW1lLiBQcmltYXJ5IGJ1dHRvbiBjbGljayBzdGFydHMvcGF1c2VzIHRoZSB3YXRjaCwgc2Vjb25kYXJ5IGJ1dHRvbiByZXNldHMgaXQuIiwKICAibmFtZSI6ICJTdG9wd2F0Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxpYWtzZWl6L3N0b3B3YXRjaCIsCiAgInV1aWQiOiAic3RvcHdhdGNoQGFsaWFrc2Vpei5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "0rmlh3431g3qknpy6bhib6ksr6zgns697qy564wm7976m64glkgf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gbWVhc3VyZSB0aW1lLiBQcmltYXJ5IGJ1dHRvbiBjbGljayBzdGFydHMvcGF1c2VzIHRoZSB3YXRjaCwgc2Vjb25kYXJ5IGJ1dHRvbiByZXNldHMgaXQuIiwKICAibmFtZSI6ICJTdG9wd2F0Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxpYWtzZWl6L3N0b3B3YXRjaCIsCiAgInV1aWQiOiAic3RvcHdhdGNoQGFsaWFrc2Vpei5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "43": {"version": "2", "sha256": "0rmlh3431g3qknpy6bhib6ksr6zgns697qy564wm7976m64glkgf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gbWVhc3VyZSB0aW1lLiBQcmltYXJ5IGJ1dHRvbiBjbGljayBzdGFydHMvcGF1c2VzIHRoZSB3YXRjaCwgc2Vjb25kYXJ5IGJ1dHRvbiByZXNldHMgaXQuIiwKICAibmFtZSI6ICJTdG9wd2F0Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxpYWtzZWl6L3N0b3B3YXRjaCIsCiAgInV1aWQiOiAic3RvcHdhdGNoQGFsaWFrc2Vpei5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} -, {"uuid": "vbox-applet@buba98", "name": "VirtualBox applet", "pname": "virtualbox-applet", "description": "Provide menu to run VirtualBox machines and switch between running VMs", "link": "https://extensions.gnome.org/extension/5799/virtualbox-applet/", "shell_version_map": {"38": {"version": "1", "sha256": "0hzfy00k615ijpnr84s3dz55kzbf86vpx4z1ai8wbi8rvqrc1bp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0J1YmE5OC92Ym94LWFwcGxldCIsCiAgInV1aWQiOiAidmJveC1hcHBsZXRAYnViYTk4IiwKICAidmVyc2lvbiI6IDEKfQ=="}, "40": {"version": "1", "sha256": "0hzfy00k615ijpnr84s3dz55kzbf86vpx4z1ai8wbi8rvqrc1bp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0J1YmE5OC92Ym94LWFwcGxldCIsCiAgInV1aWQiOiAidmJveC1hcHBsZXRAYnViYTk4IiwKICAidmVyc2lvbiI6IDEKfQ=="}, "41": {"version": "1", "sha256": "0hzfy00k615ijpnr84s3dz55kzbf86vpx4z1ai8wbi8rvqrc1bp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0J1YmE5OC92Ym94LWFwcGxldCIsCiAgInV1aWQiOiAidmJveC1hcHBsZXRAYnViYTk4IiwKICAidmVyc2lvbiI6IDEKfQ=="}, "42": {"version": "1", "sha256": "0hzfy00k615ijpnr84s3dz55kzbf86vpx4z1ai8wbi8rvqrc1bp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0J1YmE5OC92Ym94LWFwcGxldCIsCiAgInV1aWQiOiAidmJveC1hcHBsZXRAYnViYTk4IiwKICAidmVyc2lvbiI6IDEKfQ=="}, "43": {"version": "1", "sha256": "0hzfy00k615ijpnr84s3dz55kzbf86vpx4z1ai8wbi8rvqrc1bp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0J1YmE5OC92Ym94LWFwcGxldCIsCiAgInV1aWQiOiAidmJveC1hcHBsZXRAYnViYTk4IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} +, {"uuid": "vbox-applet@buba98", "name": "VirtualBox applet", "pname": "virtualbox-applet", "description": "Provide a menu to run VirtualBox machines and switch between running VMs.\nAllows to run the VM in headless mode as well.\nThis is a fork of https://extensions.gnome.org/extension/1415/virtualbox-applet/", "link": "https://extensions.gnome.org/extension/5799/virtualbox-applet/", "shell_version_map": {"38": {"version": "1", "sha256": "1bk39jfa5pasj6bqrd7az67y8szzqdsc6rxnawd33hk59fxh8lc2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBtZW51IHRvIHJ1biBWaXJ0dWFsQm94IG1hY2hpbmVzIGFuZCBzd2l0Y2ggYmV0d2VlbiBydW5uaW5nIFZNcy5cbkFsbG93cyB0byBydW4gdGhlIFZNIGluIGhlYWRsZXNzIG1vZGUgYXMgd2VsbC5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzE0MTUvdmlydHVhbGJveC1hcHBsZXQvIiwKICAibmFtZSI6ICJWaXJ0dWFsQm94IGFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52Ym94LWFwcGxldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CdWJhOTgvdmJveC1hcHBsZXQiLAogICJ1dWlkIjogInZib3gtYXBwbGV0QGJ1YmE5OCIsCiAgInZlcnNpb24iOiAxCn0="}, "40": {"version": "1", "sha256": "1bk39jfa5pasj6bqrd7az67y8szzqdsc6rxnawd33hk59fxh8lc2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBtZW51IHRvIHJ1biBWaXJ0dWFsQm94IG1hY2hpbmVzIGFuZCBzd2l0Y2ggYmV0d2VlbiBydW5uaW5nIFZNcy5cbkFsbG93cyB0byBydW4gdGhlIFZNIGluIGhlYWRsZXNzIG1vZGUgYXMgd2VsbC5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzE0MTUvdmlydHVhbGJveC1hcHBsZXQvIiwKICAibmFtZSI6ICJWaXJ0dWFsQm94IGFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52Ym94LWFwcGxldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CdWJhOTgvdmJveC1hcHBsZXQiLAogICJ1dWlkIjogInZib3gtYXBwbGV0QGJ1YmE5OCIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "1bk39jfa5pasj6bqrd7az67y8szzqdsc6rxnawd33hk59fxh8lc2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBtZW51IHRvIHJ1biBWaXJ0dWFsQm94IG1hY2hpbmVzIGFuZCBzd2l0Y2ggYmV0d2VlbiBydW5uaW5nIFZNcy5cbkFsbG93cyB0byBydW4gdGhlIFZNIGluIGhlYWRsZXNzIG1vZGUgYXMgd2VsbC5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzE0MTUvdmlydHVhbGJveC1hcHBsZXQvIiwKICAibmFtZSI6ICJWaXJ0dWFsQm94IGFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52Ym94LWFwcGxldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CdWJhOTgvdmJveC1hcHBsZXQiLAogICJ1dWlkIjogInZib3gtYXBwbGV0QGJ1YmE5OCIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "1bk39jfa5pasj6bqrd7az67y8szzqdsc6rxnawd33hk59fxh8lc2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBtZW51IHRvIHJ1biBWaXJ0dWFsQm94IG1hY2hpbmVzIGFuZCBzd2l0Y2ggYmV0d2VlbiBydW5uaW5nIFZNcy5cbkFsbG93cyB0byBydW4gdGhlIFZNIGluIGhlYWRsZXNzIG1vZGUgYXMgd2VsbC5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzE0MTUvdmlydHVhbGJveC1hcHBsZXQvIiwKICAibmFtZSI6ICJWaXJ0dWFsQm94IGFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52Ym94LWFwcGxldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CdWJhOTgvdmJveC1hcHBsZXQiLAogICJ1dWlkIjogInZib3gtYXBwbGV0QGJ1YmE5OCIsCiAgInZlcnNpb24iOiAxCn0="}, "43": {"version": "1", "sha256": "1bk39jfa5pasj6bqrd7az67y8szzqdsc6rxnawd33hk59fxh8lc2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBtZW51IHRvIHJ1biBWaXJ0dWFsQm94IG1hY2hpbmVzIGFuZCBzd2l0Y2ggYmV0d2VlbiBydW5uaW5nIFZNcy5cbkFsbG93cyB0byBydW4gdGhlIFZNIGluIGhlYWRsZXNzIG1vZGUgYXMgd2VsbC5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzE0MTUvdmlydHVhbGJveC1hcHBsZXQvIiwKICAibmFtZSI6ICJWaXJ0dWFsQm94IGFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52Ym94LWFwcGxldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CdWJhOTgvdmJveC1hcHBsZXQiLAogICJ1dWlkIjogInZib3gtYXBwbGV0QGJ1YmE5OCIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "disable-take-screenshot@ali-akil.gmx.de", "name": "Hide ", "pname": "disable-take-screenshot", "description": "disables take screenshot from gnome-windows's context menu", "link": "https://extensions.gnome.org/extension/5802/disable-take-screenshot/", "shell_version_map": {"43": {"version": "1", "sha256": "0m8zc9s45g3xwjzsaacxkd0njni8plzgm8mpnhmfms1g931p2v9m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImRpc2FibGVzIHRha2Ugc2NyZWVuc2hvdCBmcm9tIGdub21lLXdpbmRvd3MncyBjb250ZXh0IG1lbnUiLAogICJuYW1lIjogIkhpZGUgIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJkaXNhYmxlLXRha2Utc2NyZWVuc2hvdEBhbGktYWtpbC5nbXguZGUiLAogICJ2ZXJzaW9uIjogMQp9"}}} +, {"uuid": "disk-usage@0ct0puce.com", "name": "Disk Usage", "pname": "disk-usage", "description": "Label in top panel that display the percentage of disk usage of the biggest disk installed on the system.", "link": "https://extensions.gnome.org/extension/5805/disk-usage/", "shell_version_map": {"42": {"version": "5", "sha256": "01p87bbngdpk9qq6a5jhnc6i1nqvrwd218m9mlk4hy652w7msr2v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhYmVsIGluIHRvcCBwYW5lbCB0aGF0IGRpc3BsYXkgdGhlIHBlcmNlbnRhZ2Ugb2YgZGlzayB1c2FnZSBvZiB0aGUgYmlnZ2VzdCBkaXNrIGluc3RhbGxlZCBvbiB0aGUgc3lzdGVtLiIsCiAgIm5hbWUiOiAiRGlzayBVc2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8wQ1QwUFVDRS1MT0cvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpc2stdXNhZ2UiLAogICJ1dWlkIjogImRpc2stdXNhZ2VAMGN0MHB1Y2UuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} +, {"uuid": "snx-vpn-indicator@diegodario88.github.io", "name": "SNX VPN Indicator", "pname": "snx-vpn-indicator", "description": "Adds an indicator to panel when there's a SNX(Check Point) VPN connection.", "link": "https://extensions.gnome.org/extension/5808/snx-vpn-indicator/", "shell_version_map": {"43": {"version": "3", "sha256": "1ychg8nansg95c7smizwplwan8balw7diix44lbsn9phgvrv0p7w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaW5kaWNhdG9yIHRvIHBhbmVsIHdoZW4gdGhlcmUncyBhIFNOWChDaGVjayBQb2ludCkgVlBOIGNvbm5lY3Rpb24uIiwKICAibmFtZSI6ICJTTlggVlBOIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGllZ29kYXJpbzg4L3NueC12cG4taW5kaWNhdG9yIiwKICAidXVpZCI6ICJzbngtdnBuLWluZGljYXRvckBkaWVnb2RhcmlvODguZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"uuid": "persian-calendar@iamrezamousavi.gmail.com", "name": "Persian Calendar", "pname": "persian-calendar", "description": "Fork of Gnome Calendar with Persian taste", "link": "https://extensions.gnome.org/extension/5814/persian-calendar/", "shell_version_map": {"43": {"version": "1", "sha256": "0zz1kdxb6pbm97d4xb8j1rsd93cx0rg9bdybl547rb5m6ga9xc6k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgR25vbWUgQ2FsZW5kYXIgd2l0aCBQZXJzaWFuIHRhc3RlIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJJYW1SZXphTW91c2F2aSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9JYW1SZXphTW91c2F2aS9wZXJzaWFuLWdub21lLWNhbGVuZGFyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAicGVyc2lhbi1jYWxlbmRhckBpYW1yZXphbW91c2F2aS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} ] diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix index efad1cc14d..dbf3dbd9be 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix @@ -22,7 +22,6 @@ python3Packages.buildPythonApplication rec { pname = "gnome-tweaks"; version = "42.beta"; format = "other"; - strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 31cf6d12eb..ddbfdbef5b 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -22,30 +21,15 @@ stdenv.mkDerivation rec { pname = "elementary-mail"; - version = "7.0.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "mail"; rev = version; - sha256 = "sha256-DO3nybH7tb/ISrSQ3+Oj612m64Ov6X0GAWePMbKjCc4="; + sha256 = "sha256-IY+ml/ftLSk0A3Emi0ZL2wxIDIngNU6QKbHErRAaaMA="; }; - patches = [ - # build: fix documentation build - # https://github.com/elementary/mail/pull/795 - (fetchpatch { - url = "https://github.com/elementary/mail/commit/52a422cb1c5f061d8a683005e44da0a1c2195096.patch"; - sha256 = "sha256-ndcIZXvmQbM/31Wtm6OSCnXdMYx+OlJrqV+baq6m+KY="; - }) - # build: support webkit2gtk-4.1 - # https://github.com/elementary/mail/pull/794 - (fetchpatch { - url = "https://github.com/elementary/mail/commit/9e6eb73a8420c9bf327e59c25e7e6d8fa87d480a.patch"; - sha256 = "sha256-idkVymePLa7vgfuou0HIrbWRCaWAgZliDcp4HyZBArs="; - }) - ]; - nativeBuildInputs = [ libxml2 meson diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix index f8fc60a540..f33688245b 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix @@ -110,7 +110,7 @@ let broken = meta.broken or broken; }; in - (args.stdenv or qtStdenv).mkDerivation (args // { + qtStdenv.mkDerivation (args // { inherit pname version meta outputs setupHook src nativeBuildInputs; }); }; diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh b/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh index feb1a5d3a8..9040a5d3bf 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.2/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.3/ -A '*.tar.xz' ) diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix index 6269dd4d0c..47ddcc9545 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix @@ -1,5 +1,4 @@ { mkDerivation -, stdenv , lib , extra-cmake-modules , kdoctools @@ -57,7 +56,6 @@ , plasma-framework , libqaccessibilityclient , python3 -, gcc12Stdenv }: # TODO (ttuegel): investigate qmlplugindump failure @@ -145,12 +143,9 @@ mkDerivation { }) ]; - stdenv = if stdenv.isAarch64 then gcc12Stdenv else stdenv; - CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' - ] - ++ lib.optional stdenv.isAarch64 "-mno-outline-atomics"; + ]; postInstall = '' # Some package(s) refer to these service types by the wrong name. diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix index caa9494e7d..b056b17667 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix @@ -4,483 +4,483 @@ { aura-browser = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/aura-browser-5.27.2.tar.xz"; - sha256 = "0ri1zv3xbd2wivnfi404zv8baf0h2a7wclmnbqjn0z5i898icmsr"; - name = "aura-browser-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/aura-browser-5.27.3.tar.xz"; + sha256 = "00ysfwf4r9x5csyxws7c7fazvcpr6240f8wshrg9dqsp5bwd86bl"; + name = "aura-browser-5.27.3.tar.xz"; }; }; bluedevil = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/bluedevil-5.27.2.tar.xz"; - sha256 = "0v3nq4yiqiyh3crizv3nilriqxvhajm5hghhqdrgabw9a7svp001"; - name = "bluedevil-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/bluedevil-5.27.3.tar.xz"; + sha256 = "1n8v2vdjp3mby2p9dpf53rjzsjwgw5z63s4lhm17090a152jwc1b"; + name = "bluedevil-5.27.3.tar.xz"; }; }; breeze = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/breeze-5.27.2.tar.xz"; - sha256 = "1ajr8ljn5nias0smjr3wlqwisgb59qzmmkmm4yc5il21ib20lp8l"; - name = "breeze-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/breeze-5.27.3.tar.xz"; + sha256 = "12krg073i08dly13zhy8jxpw6asdl7cc1dvafp48gr4irsygar3p"; + name = "breeze-5.27.3.tar.xz"; }; }; breeze-grub = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/breeze-grub-5.27.2.tar.xz"; - sha256 = "1fr84vylyvpba1z81sf6qj46ya7s853l7a2lflzrjrg41k84q7g4"; - name = "breeze-grub-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/breeze-grub-5.27.3.tar.xz"; + sha256 = "0mpjvll5ca0rg4nxsplqynrnc6bmlwg9m2xdvgbljpa7yiwymw06"; + name = "breeze-grub-5.27.3.tar.xz"; }; }; breeze-gtk = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/breeze-gtk-5.27.2.tar.xz"; - sha256 = "00k5b2cmz9b5l0mabj47pjaw5wn13laga2z3m5p2dz4y6m8gm3f1"; - name = "breeze-gtk-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/breeze-gtk-5.27.3.tar.xz"; + sha256 = "0ydz7xrmjfwq4nmdrazhyzm8n0jlqi3p8srydk2ivcjaq24v3f9p"; + name = "breeze-gtk-5.27.3.tar.xz"; }; }; breeze-plymouth = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/breeze-plymouth-5.27.2.tar.xz"; - sha256 = "1zbkj0mjpzkgbkl47zbrg9cxfk68245jm5i5p3194sqbw9l104mx"; - name = "breeze-plymouth-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/breeze-plymouth-5.27.3.tar.xz"; + sha256 = "0kqls4ss7m0dxzhqm747b2wig4nfbwcj1fi7qdwqy4lf1fw3r4sm"; + name = "breeze-plymouth-5.27.3.tar.xz"; }; }; discover = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/discover-5.27.2.tar.xz"; - sha256 = "0bcnm1ccvwhhvcdz8a44canrzfjl03hkrqfjwrr89y0mxiws46rc"; - name = "discover-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/discover-5.27.3.tar.xz"; + sha256 = "1nqav8zh6290c5jxjs1vfgxxbq5szzln7skhqvx0v0mkd1889i48"; + name = "discover-5.27.3.tar.xz"; }; }; drkonqi = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/drkonqi-5.27.2.tar.xz"; - sha256 = "0fwjz7qxal0dixrh1wjb17vpr6jx8fki91xxbbdfnr8ykixfsx56"; - name = "drkonqi-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/drkonqi-5.27.3.tar.xz"; + sha256 = "1p1mv0qbnbpj640sv4w965jry4w9179w0mvq1avv2hkpj6mx7jy3"; + name = "drkonqi-5.27.3.tar.xz"; }; }; flatpak-kcm = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/flatpak-kcm-5.27.2.tar.xz"; - sha256 = "0rrw6v8vwgxj78v16wwa3d4gamymjvgpi27lmcqmf9588chnn8xf"; - name = "flatpak-kcm-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/flatpak-kcm-5.27.3.tar.xz"; + sha256 = "1zjv7p8r3bic9jkla629n9a1g347d7mv22w0znpiah4xcdzci49n"; + name = "flatpak-kcm-5.27.3.tar.xz"; }; }; kactivitymanagerd = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/kactivitymanagerd-5.27.2.tar.xz"; - sha256 = "1ni2yqk51qf23ck6j4kbli6pqhbnlix2w51la4af45ma8wr2gvix"; - name = "kactivitymanagerd-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/kactivitymanagerd-5.27.3.tar.xz"; + sha256 = "097fx3rqilqihgs4miylgx7vwgmrrwac7c1g9l7ydc20ihx4l434"; + name = "kactivitymanagerd-5.27.3.tar.xz"; }; }; kde-cli-tools = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/kde-cli-tools-5.27.2.tar.xz"; - sha256 = "189n92i79yxj6v2rwawg3grav4k5kdazh9fgnhijkwg2s6m7pdfm"; - name = "kde-cli-tools-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/kde-cli-tools-5.27.3.tar.xz"; + sha256 = "191sz7v39fzhhpf81hjdxhw08p45fx83s1mfyyd3w39bfmv038m1"; + name = "kde-cli-tools-5.27.3.tar.xz"; }; }; kde-gtk-config = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/kde-gtk-config-5.27.2.tar.xz"; - sha256 = "1m4qzv6haa9vq8z0m9v6i2y05syagazpg6inrgf6bvyrwh0zwbfa"; - name = "kde-gtk-config-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/kde-gtk-config-5.27.3.tar.xz"; + sha256 = "04bix5d6n480qwfkhihss3nqpra3kcp939ppa4kws5ry1s759b5a"; + name = "kde-gtk-config-5.27.3.tar.xz"; }; }; kdecoration = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/kdecoration-5.27.2.tar.xz"; - sha256 = "0xds1xx6jj6qy7jrl9wsnpcm1w4qd4im1bl21b9g1gmz7m53zvdm"; - name = "kdecoration-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/kdecoration-5.27.3.tar.xz"; + sha256 = "1nzym6qf7pqsk03qs3583lisf9vzcy13mwwhcjpri0bng57ih3h7"; + name = "kdecoration-5.27.3.tar.xz"; }; }; kdeplasma-addons = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/kdeplasma-addons-5.27.2.tar.xz"; - sha256 = "1fr0fnw1k9jm55dhk22wxfxl4asyk7712gmyrmc8w93i1lnnwd19"; - name = "kdeplasma-addons-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/kdeplasma-addons-5.27.3.tar.xz"; + sha256 = "17rvsxg1fsbm5vyrm4sq4q0x720wj2y89i9n5w4v41fygarbia8w"; + name = "kdeplasma-addons-5.27.3.tar.xz"; }; }; kgamma5 = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/kgamma5-5.27.2.tar.xz"; - sha256 = "03drd26nmy4q1vdw4kyzj6dvyfydzjybbzffyjdnnfc3yflhc32g"; - name = "kgamma5-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/kgamma5-5.27.3.tar.xz"; + sha256 = "0z5ngivlg9zz844k55m2sxvzpjdivlggml38l0rzcqpzdqaab2fy"; + name = "kgamma5-5.27.3.tar.xz"; }; }; khotkeys = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/khotkeys-5.27.2.tar.xz"; - sha256 = "02fv67x68dlxk9q80qpfkyjrd4bgwqhzi6c6jari5f24ajl2kfqp"; - name = "khotkeys-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/khotkeys-5.27.3.tar.xz"; + sha256 = "1sq6p22bikjdxbb43l9s8rgzamyl83h00y5ksp281287k3swn6z6"; + name = "khotkeys-5.27.3.tar.xz"; }; }; kinfocenter = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/kinfocenter-5.27.2.tar.xz"; - sha256 = "1v10xfqcrj16ljasz8v0f0isjrc2brdmblfq6il4f4nckb23qmmw"; - name = "kinfocenter-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/kinfocenter-5.27.3.tar.xz"; + sha256 = "12wqryghhvs1a1l80k7zmwldyclvp3c2cdaaank7xwy3nyrnnzw4"; + name = "kinfocenter-5.27.3.tar.xz"; }; }; kmenuedit = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/kmenuedit-5.27.2.tar.xz"; - sha256 = "1v6147x23rbp9nfmznbwf550ycml8zh6xa85vjj8gw7dma0zfx97"; - name = "kmenuedit-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/kmenuedit-5.27.3.tar.xz"; + sha256 = "126wcw38abnwpfcapkbhk8xi2m5gp7qshvayzh23xdajg0lkh47p"; + name = "kmenuedit-5.27.3.tar.xz"; }; }; kpipewire = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/kpipewire-5.27.2.tar.xz"; - sha256 = "1w15w49ali3v8sf3ahcsbbaynd20an5jy5305diza0g5ivyz0xh9"; - name = "kpipewire-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/kpipewire-5.27.3.tar.xz"; + sha256 = "0b95jjkfpkvc2ld3x6p7nw6kn6fkqba9q7x95ywvgag2b00jdb56"; + name = "kpipewire-5.27.3.tar.xz"; }; }; kscreen = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/kscreen-5.27.2.tar.xz"; - sha256 = "0xfj57xszxyrfpn2wq9sbmy6psxk81zirwz5x85sdlbzdz9cz28w"; - name = "kscreen-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/kscreen-5.27.3.tar.xz"; + sha256 = "0ddxd0rmzq6bp00nw65z854pc8dsgiqdvwhkfrs9cprjdprnf3n1"; + name = "kscreen-5.27.3.tar.xz"; }; }; kscreenlocker = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/kscreenlocker-5.27.2.tar.xz"; - sha256 = "0683rr6jg6zf12h00hypwb2hsvbngfq3vpf08qms0lcl78r5c41s"; - name = "kscreenlocker-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/kscreenlocker-5.27.3.tar.xz"; + sha256 = "0m48bjrq95psmd11hny15nwqb4ypbfp7sik40hzzx216pqs9ma8s"; + name = "kscreenlocker-5.27.3.tar.xz"; }; }; ksshaskpass = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/ksshaskpass-5.27.2.tar.xz"; - sha256 = "1ianh4zqdym9a8r2rzffryyn1bwv6v8fbcha5ac2qi57mdkhk5fr"; - name = "ksshaskpass-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/ksshaskpass-5.27.3.tar.xz"; + sha256 = "0bgnxx0k62a26pkq2alvb8r9kqyd80wnxci3sxa7rppdx8z3ahd5"; + name = "ksshaskpass-5.27.3.tar.xz"; }; }; ksystemstats = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/ksystemstats-5.27.2.tar.xz"; - sha256 = "1wm3xf4h3y7cz8gpmyz3nm6lrdz31v7hf7cah9hzsk6i8ahc8bpr"; - name = "ksystemstats-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/ksystemstats-5.27.3.tar.xz"; + sha256 = "0rk34pav5zkw01h51m97i7jhq2wslhzap3wdp32v1xgsgmjlhs22"; + name = "ksystemstats-5.27.3.tar.xz"; }; }; kwallet-pam = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/kwallet-pam-5.27.2.tar.xz"; - sha256 = "04krmcvkbpm8m0yx7gr1n53w0j9ifi1yl4p3b9z5ammkbrw7xrb8"; - name = "kwallet-pam-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/kwallet-pam-5.27.3.tar.xz"; + sha256 = "1nqzx8pxk9yqqxpmra3mi8m61b7vl03vjpmnyrlh7krzynfjj672"; + name = "kwallet-pam-5.27.3.tar.xz"; }; }; kwayland-integration = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/kwayland-integration-5.27.2.tar.xz"; - sha256 = "00qwrihgy2xxjpcshkhygvq15wyclsn4s9hl0m29y6d34j1m4awn"; - name = "kwayland-integration-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/kwayland-integration-5.27.3.tar.xz"; + sha256 = "0jkgkzh9zp1yb72npzgfbhq79zmgwzf7vzw8xxbz3vsmk3rih0fd"; + name = "kwayland-integration-5.27.3.tar.xz"; }; }; kwin = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/kwin-5.27.2.tar.xz"; - sha256 = "1xanx9yx0gzn75mkns5dpp65hlvijr85lxapac0rj8nw1hkfrcnh"; - name = "kwin-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/kwin-5.27.3.tar.xz"; + sha256 = "1ry0mwah77ly1b4ywhiprjq5aqrb0njawqik11997q0k720i4b78"; + name = "kwin-5.27.3.tar.xz"; }; }; kwrited = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/kwrited-5.27.2.tar.xz"; - sha256 = "12sb6g4dj5188iq7yv37js65999api8r60vcqcap3gjzsrxn1ilw"; - name = "kwrited-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/kwrited-5.27.3.tar.xz"; + sha256 = "1m2qcqnsq3nbqa00y0fa0bnya8j7741pp3zgn58hjvhfbrh52262"; + name = "kwrited-5.27.3.tar.xz"; }; }; layer-shell-qt = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/layer-shell-qt-5.27.2.tar.xz"; - sha256 = "1zq82q035wf9dfs8imk2dbkxczjihlm23gc6pbnkpn1c3g7q1a1s"; - name = "layer-shell-qt-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/layer-shell-qt-5.27.3.tar.xz"; + sha256 = "1rvjkw11nxcj0fl9b45hfv20xaqq87jvfrxz72xkmixnsv3wv70f"; + name = "layer-shell-qt-5.27.3.tar.xz"; }; }; libkscreen = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/libkscreen-5.27.2.tar.xz"; - sha256 = "1kr9nkxsa3a3d4pdwlv89rw9c8rqhh9wcr3ii4hh791179v82wkb"; - name = "libkscreen-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/libkscreen-5.27.3.tar.xz"; + sha256 = "0py6x6l0bc64wakd3x6j4lmcnqzjxx0a4qr2p3i94rrx68b73mw5"; + name = "libkscreen-5.27.3.tar.xz"; }; }; libksysguard = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/libksysguard-5.27.2.tar.xz"; - sha256 = "01ksfg07a2q6f1jisfrfk3j4zvcvpspc8xakc9a14dpzkib7ifnn"; - name = "libksysguard-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/libksysguard-5.27.3.tar.xz"; + sha256 = "07xvs6pr605p9mjm6s8f5x53lyv2mscxvm4xfa0y056ngipvpwiz"; + name = "libksysguard-5.27.3.tar.xz"; }; }; milou = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/milou-5.27.2.tar.xz"; - sha256 = "1qxsnqdxw3y3jpdnx1wz0q17ll3gwqq4jrx2sddz887yf8kmbhsk"; - name = "milou-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/milou-5.27.3.tar.xz"; + sha256 = "07vf2mi6jnmw28r8bw5qj7f7467ja5mhsdp1k8hb32ivls92sv7b"; + name = "milou-5.27.3.tar.xz"; }; }; oxygen = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/oxygen-5.27.2.tar.xz"; - sha256 = "0gz03yskna0sjf4mpzpgh8s8xy9vxk2rp3w5d2vwvq798yqj4i36"; - name = "oxygen-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/oxygen-5.27.3.tar.xz"; + sha256 = "1drmjf8bgzm9gzpy887wbyi4zd71vlilhx7057qr8df6sbnzh4ch"; + name = "oxygen-5.27.3.tar.xz"; }; }; oxygen-sounds = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/oxygen-sounds-5.27.2.tar.xz"; - sha256 = "0v0rdcd08fhjbh5lhl7n77pady278lxb6sid4486ip050wzgmdhk"; - name = "oxygen-sounds-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/oxygen-sounds-5.27.3.tar.xz"; + sha256 = "1kppckhyll3v973jg2csp5z3ryxbipp9jpg6hfqrw1rqkv83rf8d"; + name = "oxygen-sounds-5.27.3.tar.xz"; }; }; plank-player = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/plank-player-5.27.2.tar.xz"; - sha256 = "1zksd833sm4khjm7qaaxf2zlg1lscf2mdcqqcgxa590kb6cdk4g7"; - name = "plank-player-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/plank-player-5.27.3.tar.xz"; + sha256 = "0iv26dics4w89j9xfms9bi4fs9b1cq4wnjgz1jv5w6834imvplrw"; + name = "plank-player-5.27.3.tar.xz"; }; }; plasma-bigscreen = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/plasma-bigscreen-5.27.2.tar.xz"; - sha256 = "1ap6w8s8lzsk4qlkjbig5vaq2kkghg4jc4rmmrmh55qb5805d29j"; - name = "plasma-bigscreen-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/plasma-bigscreen-5.27.3.tar.xz"; + sha256 = "0vp1n2048d9f15hnfiz2jkkk209n6zn6z45s9xa4a622xrqbvr3x"; + name = "plasma-bigscreen-5.27.3.tar.xz"; }; }; plasma-browser-integration = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/plasma-browser-integration-5.27.2.tar.xz"; - sha256 = "0cj46jsd8piy773qdamhpihywdl9qk2qpiigyyhbnsbwxcvl4fbw"; - name = "plasma-browser-integration-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/plasma-browser-integration-5.27.3.tar.xz"; + sha256 = "10ivly31xb2s1d2cizjppm805qxdh8lij8cry46fbgg51r5w1qnd"; + name = "plasma-browser-integration-5.27.3.tar.xz"; }; }; plasma-desktop = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/plasma-desktop-5.27.2.tar.xz"; - sha256 = "0dsic9had0nihw5k8a6vw5svdxsysa2kphk295kirf6k9qm2k2v5"; - name = "plasma-desktop-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/plasma-desktop-5.27.3.tar.xz"; + sha256 = "1q9lyc213fyvrjv816mhm0b0dzsjqy2m2hli9a70cy5i36id3pg2"; + name = "plasma-desktop-5.27.3.tar.xz"; }; }; plasma-disks = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/plasma-disks-5.27.2.tar.xz"; - sha256 = "0mapi9bclsnn6mv3gl5c87jxygm3pr3cc6ksvkpwqah46c76mmi3"; - name = "plasma-disks-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/plasma-disks-5.27.3.tar.xz"; + sha256 = "0m9wdqf1k346kbpc6c2d5z2xiqiyp598k1973g06jr1af0b2pi9f"; + name = "plasma-disks-5.27.3.tar.xz"; }; }; plasma-firewall = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/plasma-firewall-5.27.2.tar.xz"; - sha256 = "0vi64wkc9vxrfc2h1m4f8q8sqc2wl6s610ajs12r0sf8c4297fv1"; - name = "plasma-firewall-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/plasma-firewall-5.27.3.tar.xz"; + sha256 = "0qd40ihgd60znxmsr6s7vpr9af8r5dbasm4yjld4p7250pjvvn01"; + name = "plasma-firewall-5.27.3.tar.xz"; }; }; plasma-integration = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/plasma-integration-5.27.2.tar.xz"; - sha256 = "1220f4f2ykmrrxngmlc8xdjip63fidlhh42vslgy9bll6ag0qkys"; - name = "plasma-integration-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/plasma-integration-5.27.3.tar.xz"; + sha256 = "13lrg0r4zq71wvfah8brm53v9cbsn7zpknafi948nq3smbd1h196"; + name = "plasma-integration-5.27.3.tar.xz"; }; }; plasma-mobile = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/plasma-mobile-5.27.2.tar.xz"; - sha256 = "0v0cli1fyhzv80vhav4nablss0p9mzflll48f6lvx2sdqpiypcgq"; - name = "plasma-mobile-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/plasma-mobile-5.27.3.tar.xz"; + sha256 = "0rf09rqc2avcma61r6ngc6bc1lmrivrvi7rkv73mrw8klnh3vf9f"; + name = "plasma-mobile-5.27.3.tar.xz"; }; }; plasma-nano = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/plasma-nano-5.27.2.tar.xz"; - sha256 = "1lk7pg2j6fkvys849qfvd0crxkalrvmvqxl6ifw12d7kvdmz91nx"; - name = "plasma-nano-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/plasma-nano-5.27.3.tar.xz"; + sha256 = "11ivbr03dv75ryp0lcmj9iyw7y2x7pplybglpavmfz2ryq2vsy93"; + name = "plasma-nano-5.27.3.tar.xz"; }; }; plasma-nm = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/plasma-nm-5.27.2.tar.xz"; - sha256 = "15lh7nxryvv66hbf43bwarfw38jzr6405waf1z8dsvn5wckp093v"; - name = "plasma-nm-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/plasma-nm-5.27.3.tar.xz"; + sha256 = "02646jl8qq28b11hgxg73xycb2biy6girxkgpxnpdb1gxmfmfnvn"; + name = "plasma-nm-5.27.3.tar.xz"; }; }; plasma-pa = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/plasma-pa-5.27.2.tar.xz"; - sha256 = "0imwyv0w6xkbcyafhqsg4h3w56sclfaxnjfjkjbzn1hgmizx7n7k"; - name = "plasma-pa-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/plasma-pa-5.27.3.tar.xz"; + sha256 = "177hwsr75xif0r36hib1gh6bjyljnilb4s9zyzvr5z1lwiz10y91"; + name = "plasma-pa-5.27.3.tar.xz"; }; }; plasma-remotecontrollers = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/plasma-remotecontrollers-5.27.2.tar.xz"; - sha256 = "1ash4z6fi0kzdysnnlbh7vxpdwbfi0xyyyg845pmvhwhv6i82c7y"; - name = "plasma-remotecontrollers-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/plasma-remotecontrollers-5.27.3.tar.xz"; + sha256 = "04am5shh882k86yic1ca42j60l2rnqn9487i30k0332kzd0wir1w"; + name = "plasma-remotecontrollers-5.27.3.tar.xz"; }; }; plasma-sdk = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/plasma-sdk-5.27.2.tar.xz"; - sha256 = "1p68hfa884jym5mb22lrssxg5xwdnwsichdvmmqfy50szsv2n7mf"; - name = "plasma-sdk-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/plasma-sdk-5.27.3.tar.xz"; + sha256 = "0rsz846x3rldz950zm31aj8192b0h5d33fvizmgxnxjibxxf2q24"; + name = "plasma-sdk-5.27.3.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/plasma-systemmonitor-5.27.2.tar.xz"; - sha256 = "1kl9xjfkwy36nzva1hkq5pabczl174w29lxkzhim3q8laap6dql6"; - name = "plasma-systemmonitor-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/plasma-systemmonitor-5.27.3.tar.xz"; + sha256 = "122rw8nfzhk0808d1bk54ld41b45616fg3hca9jg4ib6k7nka367"; + name = "plasma-systemmonitor-5.27.3.tar.xz"; }; }; plasma-tests = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/plasma-tests-5.27.2.tar.xz"; - sha256 = "0q5qb4c1lbd7jpww382h86h74llvpm1zdnjb8a66x1nfnnws7db3"; - name = "plasma-tests-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/plasma-tests-5.27.3.tar.xz"; + sha256 = "1ijh1lfr81bwdw8nla55n6snxkmmz95qf3j8wbf61v64r9n3w2zp"; + name = "plasma-tests-5.27.3.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/plasma-thunderbolt-5.27.2.tar.xz"; - sha256 = "0aml4xx3bdnyx367lz3crnd21f08w239ps77wy41a0pdp47i5nfd"; - name = "plasma-thunderbolt-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/plasma-thunderbolt-5.27.3.tar.xz"; + sha256 = "17hs1mrr7lkd9nkxs9269bs3hs4c8qxg3ksirksrgnbz4zas1m55"; + name = "plasma-thunderbolt-5.27.3.tar.xz"; }; }; plasma-vault = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/plasma-vault-5.27.2.tar.xz"; - sha256 = "0hqxjmm236bivvlhivrzcypsa0kki4pc44l46jzvm5a0dsljv827"; - name = "plasma-vault-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/plasma-vault-5.27.3.tar.xz"; + sha256 = "0ilpkdd0nfg9z2klyf5s02npmqr1ypb0wgm584zi27q048hnicls"; + name = "plasma-vault-5.27.3.tar.xz"; }; }; plasma-welcome = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/plasma-welcome-5.27.2.tar.xz"; - sha256 = "06g8hnqnja2g17cx3vwx21zlrywmhiqb6zk0d72c02avr67px3gn"; - name = "plasma-welcome-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/plasma-welcome-5.27.3.tar.xz"; + sha256 = "1m6mpzbcyy7cimhcsbbmk1v86pibcrp86b22dh7pwgrg309ihsm4"; + name = "plasma-welcome-5.27.3.tar.xz"; }; }; plasma-workspace = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/plasma-workspace-5.27.2.tar.xz"; - sha256 = "19hlbp2ihblw5ynk44lasfgr4nk5z2mqm3gza5zvf08zpzwc437i"; - name = "plasma-workspace-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/plasma-workspace-5.27.3.tar.xz"; + sha256 = "0g710y1l2hpxnjg6r1k60dkvn6gf98fg5yhx72wa2y1in3nkglzl"; + name = "plasma-workspace-5.27.3.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/plasma-workspace-wallpapers-5.27.2.tar.xz"; - sha256 = "1x4mxs6b90z0rz3lacxr20ii8ihjq3z36vi2y9rllhcdzvpcbzy6"; - name = "plasma-workspace-wallpapers-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/plasma-workspace-wallpapers-5.27.3.tar.xz"; + sha256 = "1ppsi5ic6yp9wnqwmz37jsmjs3l5jxafjarxa0xasalg69k10k4c"; + name = "plasma-workspace-wallpapers-5.27.3.tar.xz"; }; }; plymouth-kcm = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/plymouth-kcm-5.27.2.tar.xz"; - sha256 = "1nkxz8jmqwm8js16j9pcbbhjns7vhs98k70lsj0mc7mgh3y5bdf6"; - name = "plymouth-kcm-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/plymouth-kcm-5.27.3.tar.xz"; + sha256 = "09p6ii29lq08h8999zb1ddbaa4l7piykcr5xmhwir75pi7gnnacg"; + name = "plymouth-kcm-5.27.3.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.27.2"; + version = "1-5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/polkit-kde-agent-1-5.27.2.tar.xz"; - sha256 = "0pz7dnrh10lzxlxnfsg06k012wb3qlqgvn0wwv7xb76yis75jmi4"; - name = "polkit-kde-agent-1-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/polkit-kde-agent-1-5.27.3.tar.xz"; + sha256 = "1axgqg07xm12qrrww8jvbh8yvhi7pf2x4ssq65qja0zz9kxiahcx"; + name = "polkit-kde-agent-1-5.27.3.tar.xz"; }; }; powerdevil = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/powerdevil-5.27.2.tar.xz"; - sha256 = "1awrfwki1ldmvwamdss4vkb5mlclw58zijpg6ip732ripiawhx1x"; - name = "powerdevil-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/powerdevil-5.27.3.tar.xz"; + sha256 = "16bcnm56g5amwygzkdz0sy396dfn47n6wiynnvr7nfhpzbfx81y8"; + name = "powerdevil-5.27.3.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/qqc2-breeze-style-5.27.2.tar.xz"; - sha256 = "0j2dy64sr0giagyi3yw9c40lnjmn1wsdi5vmj6cakvglhklnwl5w"; - name = "qqc2-breeze-style-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/qqc2-breeze-style-5.27.3.tar.xz"; + sha256 = "13hd2f08cb6gjdyns1qfszq7sn1ckr78l3lhl6g6yiab3jn1v6b4"; + name = "qqc2-breeze-style-5.27.3.tar.xz"; }; }; sddm-kcm = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/sddm-kcm-5.27.2.tar.xz"; - sha256 = "1lnciz566iz7alpz51j27cvdpkxnv88v5nnfjlql80d8a74gq3vs"; - name = "sddm-kcm-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/sddm-kcm-5.27.3.tar.xz"; + sha256 = "0hicpzsyym1r3amd6crz964gk19rhg5z9g87fr6i77r77iavb1ds"; + name = "sddm-kcm-5.27.3.tar.xz"; }; }; systemsettings = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/systemsettings-5.27.2.tar.xz"; - sha256 = "1qdj18plsi4l3z4hlm4c41gz3xmv9rkishs9a45kib2avd0sxvnd"; - name = "systemsettings-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/systemsettings-5.27.3.tar.xz"; + sha256 = "0gjh9hny0h2x5cqqsn5scm1k9hjfl3vgpmsjqqc66hb1ac8a9g04"; + name = "systemsettings-5.27.3.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.27.2"; + version = "5.27.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.2/xdg-desktop-portal-kde-5.27.2.tar.xz"; - sha256 = "05rjm8h375bmmsslpm6nl1m7zsd8f7n3vm15nq4771hnlv8dml4p"; - name = "xdg-desktop-portal-kde-5.27.2.tar.xz"; + url = "${mirror}/stable/plasma/5.27.3/xdg-desktop-portal-kde-5.27.3.tar.xz"; + sha256 = "0d47kx9y4bfylmn3q4s11vg6fzz1yjlcbxmpgpd9al8nils2ifnd"; + name = "xdg-desktop-portal-kde-5.27.3.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix index f78f420cab..2f16352f8c 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix @@ -41,7 +41,6 @@ python3Packages.buildPythonApplication rec { python3Packages.pyxdg python3Packages.ptyprocess python3Packages.pycairo - gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 ]; propagatedBuildInputs = [ 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 fdd4548c66..f5390e186c 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 @@ -30,10 +30,9 @@ rebar3Relx { releaseType = "escript"; beamDeps = builtins.attrValues deps; - # Skip "els_hover_SUITE" test for Erlang/OTP 25+ while upstream hasn't fixed it - # https://github.com/erlang-ls/erlang_ls/pull/1402 - postPatch = lib.optionalString (lib.versionOlder "25" erlang.version) '' - rm apps/els_lsp/test/els_hover_SUITE.erl + # https://github.com/erlang-ls/erlang_ls/issues/1429 + postPatch = '' + rm apps/els_lsp/test/els_diagnostics_SUITE.erl ''; buildPlugins = [ rebar3-proper ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix index 7bf6a64eeb..d868989470 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix @@ -13,12 +13,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.30.0"; + version = "1.34.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - sha256 = "sha256-VP1QwY/gA8wxjpzbAlEV5r2Q8sTt3K2sGdKmxr6ndB8="; + sha256 = "sha256-QrCli0nNlvOM4taqWZ6GzK5luvXmyxaCgfDlXSRLSQA="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix index fb3b50b981..894c0b8fb5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix @@ -151,6 +151,10 @@ backendStdenv.mkDerivation rec { # Refer to comments in the overrides for cuda_nvcc for explanation # CUDA_TOOLKIT_ROOT_DIR is legacy, # Cf. https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables + # NOTE: We unconditionally set -Xfatbin=-compress-all, which reduces the size of the compiled + # binaries. If binaries grow over 2GB, they will fail to link. This is a problem for us, as + # the default set of CUDA capabilities we build can regularly cause this to occur (for + # example, with Magma). '' mkdir -p $out/nix-support cat <> $out/nix-support/setup-hook @@ -160,7 +164,7 @@ backendStdenv.mkDerivation rec { if [ -z "\''${CUDAHOSTCXX-}" ]; then export CUDAHOSTCXX=${backendStdenv.cc}/bin; fi - export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${backendStdenv.cc}/bin' + export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${backendStdenv.cc}/bin -Xfatbin=-compress-all' EOF # Move some libraries to the lib output so that programs that diff --git a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/flags.nix b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/flags.nix index 989fdb06c5..28d5bda4da 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/flags.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/flags.nix @@ -4,12 +4,8 @@ }: # Type aliases -# Gpu = { -# archName: String, # e.g., "Hopper" -# computeCapability: String, # e.g., "9.0" -# minCudaVersion: String, # e.g., "11.8" -# maxCudaVersion: String, # e.g., "12.0" -# } +# Gpu :: AttrSet +# - See the documentation in ./gpus.nix. let inherit (lib) attrsets lists strings trivial versions; @@ -34,22 +30,40 @@ let # gpus :: List Gpu gpus = builtins.import ./gpus.nix; - # isVersionIn :: Gpu -> Bool + # isSupported :: Gpu -> Bool isSupported = gpu: let inherit (gpu) minCudaVersion maxCudaVersion; lowerBoundSatisfied = strings.versionAtLeast cudaVersion minCudaVersion; - upperBoundSatisfied = !(strings.versionOlder maxCudaVersion cudaVersion); + upperBoundSatisfied = (maxCudaVersion == null) + || !(strings.versionOlder maxCudaVersion cudaVersion); in lowerBoundSatisfied && upperBoundSatisfied; + # isDefault :: Gpu -> Bool + isDefault = gpu: + let + inherit (gpu) dontDefaultAfter; + newGpu = dontDefaultAfter == null; + recentGpu = newGpu || strings.versionAtLeast dontDefaultAfter cudaVersion; + in + recentGpu; + # supportedGpus :: List Gpu # GPUs which are supported by the provided CUDA version. supportedGpus = builtins.filter isSupported gpus; + # defaultGpus :: List Gpu + # GPUs which are supported by the provided CUDA version and we want to build for by default. + defaultGpus = builtins.filter isDefault supportedGpus; + # supportedCapabilities :: List Capability supportedCapabilities = lists.map (gpu: gpu.computeCapability) supportedGpus; + # defaultCapabilities :: List Capability + # The default capabilities to target, if not overridden by the user. + defaultCapabilities = lists.map (gpu: gpu.computeCapability) defaultGpus; + # cudaArchNameToVersions :: AttrSet String (List String) # Maps the name of a GPU architecture to different versions of that architecture. # For example, "Ampere" maps to [ "8.0" "8.6" "8.7" ]. @@ -151,6 +165,6 @@ assert (formatCapabilities { cudaCapabilities = [ "7.5" "8.6" ]; }) == { # dropDot :: String -> String inherit dropDot; } // formatCapabilities { - cudaCapabilities = config.cudaCapabilities or supportedCapabilities; + cudaCapabilities = config.cudaCapabilities or defaultCapabilities; enableForwardCompat = config.cudaForwardCompat or true; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/gpus.nix b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/gpus.nix index e938e91297..be157df896 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/gpus.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/gpus.nix @@ -1,110 +1,148 @@ [ + # Type alias + # Gpu = { + # archName: String + # - The name of the microarchitecture. + # computeCapability: String + # - The compute capability of the GPU. + # minCudaVersion: String + # - The minimum (inclusive) CUDA version that supports this GPU. + # dontDefaultAfter: null | String + # - The CUDA version after which to exclude this GPU from the list of default capabilities + # we build. null means we always include this GPU in the default capabilities if it is + # supported. + # maxCudaVersion: null | String + # - The maximum (exclusive) CUDA version that supports this GPU. null means there is no + # maximum. + # } { archName = "Kepler"; computeCapability = "3.0"; minCudaVersion = "10.0"; + dontDefaultAfter = "10.2"; maxCudaVersion = "10.2"; } { archName = "Kepler"; computeCapability = "3.2"; minCudaVersion = "10.0"; + dontDefaultAfter = "10.2"; maxCudaVersion = "10.2"; } { archName = "Kepler"; computeCapability = "3.5"; minCudaVersion = "10.0"; + dontDefaultAfter = "11.0"; maxCudaVersion = "11.8"; } { archName = "Kepler"; computeCapability = "3.7"; minCudaVersion = "10.0"; + dontDefaultAfter = "11.0"; maxCudaVersion = "11.8"; } { archName = "Maxwell"; computeCapability = "5.0"; minCudaVersion = "10.0"; - maxCudaVersion = "12.0"; + dontDefaultAfter = "11.0"; + maxCudaVersion = null; } { archName = "Maxwell"; computeCapability = "5.2"; minCudaVersion = "10.0"; - maxCudaVersion = "12.0"; + dontDefaultAfter = "11.0"; + maxCudaVersion = null; } { archName = "Maxwell"; computeCapability = "5.3"; minCudaVersion = "10.0"; - maxCudaVersion = "12.0"; + dontDefaultAfter = "11.0"; + maxCudaVersion = null; } { archName = "Pascal"; computeCapability = "6.0"; minCudaVersion = "10.0"; - maxCudaVersion = "12.0"; + dontDefaultAfter = null; + maxCudaVersion = null; } { archName = "Pascal"; computeCapability = "6.1"; minCudaVersion = "10.0"; - maxCudaVersion = "12.0"; + dontDefaultAfter = null; + maxCudaVersion = null; } { archName = "Pascal"; computeCapability = "6.2"; minCudaVersion = "10.0"; - maxCudaVersion = "12.0"; + dontDefaultAfter = null; + maxCudaVersion = null; } { archName = "Volta"; computeCapability = "7.0"; minCudaVersion = "10.0"; - maxCudaVersion = "12.0"; + dontDefaultAfter = null; + maxCudaVersion = null; } { archName = "Volta"; computeCapability = "7.2"; minCudaVersion = "10.0"; - maxCudaVersion = "12.0"; + dontDefaultAfter = null; + maxCudaVersion = null; } { archName = "Turing"; computeCapability = "7.5"; minCudaVersion = "10.0"; - maxCudaVersion = "12.0"; + dontDefaultAfter = null; + maxCudaVersion = null; } { archName = "Ampere"; computeCapability = "8.0"; minCudaVersion = "11.2"; - maxCudaVersion = "12.0"; + dontDefaultAfter = null; + maxCudaVersion = null; } { archName = "Ampere"; computeCapability = "8.6"; minCudaVersion = "11.2"; - maxCudaVersion = "12.0"; + dontDefaultAfter = null; + maxCudaVersion = null; } { archName = "Ampere"; computeCapability = "8.7"; minCudaVersion = "11.5"; - maxCudaVersion = "12.0"; + # NOTE: This is purposefully before 11.5 to ensure it is never a capability we target by + # default. 8.7 is the Jetson Orin series of devices which are a very specific platform. + # We keep this entry here in case we ever want to target it explicitly, but we don't + # want to target it by default. + dontDefaultAfter = "11.4"; + maxCudaVersion = null; } { archName = "Ada"; computeCapability = "8.9"; minCudaVersion = "11.8"; - maxCudaVersion = "12.0"; + dontDefaultAfter = null; + maxCudaVersion = null; } { archName = "Hopper"; computeCapability = "9.0"; minCudaVersion = "11.8"; - maxCudaVersion = "12.0"; + dontDefaultAfter = null; + maxCudaVersion = null; } ] diff --git a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/overrides.nix b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/overrides.nix index 96b782d8c9..7b8e02de24 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/overrides.nix @@ -41,6 +41,10 @@ in # uses the last --compiler-bindir it gets on the command line. # FIXME: this results in "incompatible redefinition" warnings. # https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#compiler-bindir-directory-ccbin + # NOTE: We unconditionally set -Xfatbin=-compress-all, which reduces the size of the + # compiled binaries. If binaries grow over 2GB, they will fail to link. This is a problem + # for us, as the default set of CUDA capabilities we build can regularly cause this to + # occur (for example, with Magma). postInstall = (oldAttrs.postInstall or "") + '' mkdir -p $out/nix-support cat <> $out/nix-support/setup-hook @@ -49,7 +53,7 @@ in if [ -z "\''${CUDAHOSTCXX-}" ]; then export CUDAHOSTCXX=${cc}/bin; fi - export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${cc}/bin' + export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${cc}/bin -Xfatbin=-compress-all' EOF ''; }); diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix index 1005bd2746..fe230c9391 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix @@ -106,7 +106,7 @@ let elm-format-markdown = self.callPackage ./packages/elm-format-markdown.nix {}; # elm-format requires text >= 2.0 - text = self.text_2_0_1; + text = self.text_2_0_2; # elm-format-lib requires hspec-golden < 0.2 hspec-golden = self.hspec-golden_0_1_0_3; # unorderd-container's tests indirectly depend on text < 2.0 diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix index 4df0872688..f470cb120d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix @@ -271,6 +271,7 @@ stdenv.mkDerivation ({ passthru = { inherit langC langCC langObjC langObjCpp langAda langFortran langGo langD version; isGNU = true; + hardeningUnsupportedFlags = [ "fortify3" ]; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix index 4b91e05983..3919fbe89f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix @@ -27,6 +27,7 @@ , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages , libxcrypt +, disableGdbPlugin ? !enablePlugin }: # Make sure we get GNU sed. @@ -48,6 +49,7 @@ with builtins; let majorVersion = "11"; version = "${majorVersion}.3.0"; + disableBootstrap = !(with stdenv; targetPlatform == hostPlatform && hostPlatform == buildPlatform); inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -114,7 +116,9 @@ let majorVersion = "11"; enableLTO enableMultilib enablePlugin + disableGdbPlugin enableShared + disableBootstrap fetchpatch fetchurl gettext @@ -280,6 +284,7 @@ stdenv.mkDerivation ({ passthru = { inherit langC langCC langObjC langObjCpp langAda langFortran langGo langD version; isGNU = true; + hardeningUnsupportedFlags = [ "fortify3" ]; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix index 375c098eec..baa8351830 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix @@ -28,6 +28,7 @@ , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages , libxcrypt +, disableGdbPlugin ? !enablePlugin }: # Make sure we get GNU sed. @@ -53,6 +54,7 @@ with builtins; let majorVersion = "12"; version = "${majorVersion}.2.0"; + disableBootstrap = !(with stdenv; targetPlatform == hostPlatform && hostPlatform == buildPlatform); inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -145,6 +147,8 @@ let majorVersion = "12"; buildPackages cloog crossStageStatic + disableBootstrap + disableGdbPlugin enableLTO enableMultilib enablePlugin diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix index 7e6d4eb122..99c8ef399b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix @@ -297,7 +297,7 @@ stdenv.mkDerivation ({ passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; - hardeningUnsupportedFlags = [ "stackprotector" ]; + hardeningUnsupportedFlags = [ "stackprotector" "fortify3" ]; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix index 4ea63d7c12..d966b75d37 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix @@ -317,6 +317,7 @@ stdenv.mkDerivation ({ passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; + hardeningUnsupportedFlags = [ "fortify3" ]; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix index 7e5e2c6b10..953f931fa8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix @@ -338,6 +338,7 @@ stdenv.mkDerivation ({ passthru = { inherit langC langCC langObjC langObjCpp langFortran langAda langGo version; isGNU = true; + hardeningUnsupportedFlags = [ "fortify3" ]; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix index ffe5b721b4..ab80d31893 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix @@ -278,6 +278,7 @@ stdenv.mkDerivation ({ passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; + hardeningUnsupportedFlags = [ "fortify3" ]; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix index e0b1a1e24a..a929663dca 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix @@ -254,6 +254,7 @@ stdenv.mkDerivation ({ passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; + hardeningUnsupportedFlags = [ "fortify3" ]; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix index bcfd1c7dd3..6da17fb094 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix @@ -268,6 +268,7 @@ stdenv.mkDerivation ({ passthru = { inherit langC langCC langObjC langObjCpp langAda langFortran langGo langD version; isGNU = true; + hardeningUnsupportedFlags = [ "fortify3" ]; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix index 78d13cb941..eadc6967ac 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -11,6 +11,7 @@ , enableLTO , enableMultilib , enablePlugin +, disableGdbPlugin ? !enablePlugin , enableShared , langC @@ -23,8 +24,10 @@ , langObjC , langObjCpp , langJit +, disableBootstrap ? stdenv.targetPlatform != stdenv.hostPlatform }: +assert !enablePlugin -> disableGdbPlugin; assert langJava -> lib.versionOlder version "7"; # Note [Windows Exception Handling] @@ -171,9 +174,9 @@ let then ["--enable-multilib" "--disable-libquadmath"] else ["--disable-multilib"]) ++ lib.optional (!enableShared) "--disable-shared" - ++ [ - (lib.enableFeature enablePlugin "plugin") - ] + ++ lib.singleton (lib.enableFeature enablePlugin "plugin") + # Libcc1 is the GCC cc1 plugin for the GDB debugger which is only used by gdb + ++ lib.optional disableGdbPlugin "--disable-libcc1" # Support -m32 on powerpc64le/be ++ lib.optional (targetPlatform.system == "powerpc64le-linux") @@ -214,7 +217,7 @@ let # TODO: aarch64-darwin has clang stdenv and its arch and cpu flag values are incompatible with gcc ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) (import ../common/platform-flags.nix { inherit (stdenv) targetPlatform; inherit lib; }) ++ lib.optionals (targetPlatform != hostPlatform) crossConfigureFlags - ++ lib.optional (targetPlatform != hostPlatform) "--disable-bootstrap" + ++ lib.optional disableBootstrap "--disable-bootstrap" # Platform-specific flags ++ lib.optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" 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 afc06e09ed..18568a4783 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 @@ -188,6 +188,14 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; patches = [ + # Fix docs build with sphinx >= 6.0 + # https://gitlab.haskell.org/ghc/ghc/-/issues/22766 + (fetchpatch { + name = "ghc-docs-sphinx-6.0.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; + sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; + }) + # See upstream patch at # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build # from source distributions, the auto-generated configure script needs to be @@ -226,14 +234,13 @@ stdenv.mkDerivation (rec { sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5"; }) ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.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 + ./Cabal-3.2-3.4-paths-fix-cycle-aarch64-darwin.patch ]; postPatch = "patchShebangs ."; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix index be4ca5edb8..21e8c5b13a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix @@ -175,6 +175,10 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; patches = [ + # Fix docs build with sphinx >= 6.0 + # https://gitlab.haskell.org/ghc/ghc/-/issues/22766 + ./ghc-8.8.4-sphinx-6.0.patch + # See upstream patch at # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build # from source distributions, the auto-generated configure script needs to be 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 f69e52701a..acbfe3bbcc 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 @@ -188,6 +188,13 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; patches = [ + # Fix docs build with sphinx >= 6.0 + # https://gitlab.haskell.org/ghc/ghc/-/issues/22766 + (fetchpatch { + name = "ghc-docs-sphinx-6.0.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; + sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; + }) # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; @@ -205,14 +212,13 @@ stdenv.mkDerivation (rec { sha256 = "sha256-b4feGZIaKDj/UKjWTNY6/jH4s2iate0wAgMxG3rAbZI="; }) ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.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 + ./Cabal-3.2-3.4-paths-fix-cycle-aarch64-darwin.patch ]; postPatch = "patchShebangs ."; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4.nix index 6b8efae06e..906f017df6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4.nix @@ -188,6 +188,13 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; patches = [ + # Fix docs build with sphinx >= 6.0 + # https://gitlab.haskell.org/ghc/ghc/-/issues/22766 + (fetchpatch { + name = "ghc-docs-sphinx-6.0.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; + sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; + }) # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; @@ -203,6 +210,14 @@ stdenv.mkDerivation (rec { extraPrefix = "libraries/Cabal/"; sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; }) + ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.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-3.6-paths-fix-cycle-aarch64-darwin.patch ]; postPatch = "patchShebangs ."; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.5.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.5.nix index e7c75fcacc..3e7819716e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.5.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.5.nix @@ -188,6 +188,13 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; patches = [ + # Fix docs build with sphinx >= 6.0 + # https://gitlab.haskell.org/ghc/ghc/-/issues/22766 + (fetchpatch { + name = "ghc-docs-sphinx-6.0.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; + sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; + }) # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; @@ -203,6 +210,14 @@ stdenv.mkDerivation (rec { extraPrefix = "libraries/Cabal/"; sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; }) + ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.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-3.6-paths-fix-cycle-aarch64-darwin.patch ]; postPatch = "patchShebangs ."; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.6.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.6.nix index a573e8855f..a252389534 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.6.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.6.nix @@ -188,6 +188,13 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; patches = [ + # Fix docs build with sphinx >= 6.0 + # https://gitlab.haskell.org/ghc/ghc/-/issues/22766 + (fetchpatch { + name = "ghc-docs-sphinx-6.0.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; + sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; + }) # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; @@ -203,6 +210,14 @@ stdenv.mkDerivation (rec { extraPrefix = "libraries/Cabal/"; sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; }) + ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.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-3.6-paths-fix-cycle-aarch64-darwin.patch ]; postPatch = "patchShebangs ."; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.7.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.7.nix index af5ba618c1..3cf3d80ef7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.7.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.7.nix @@ -210,6 +210,14 @@ stdenv.mkDerivation (rec { extraPrefix = "libraries/Cabal/"; sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; }) + ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.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-3.6-paths-fix-cycle-aarch64-darwin.patch ]; postPatch = "patchShebangs ."; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.2.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.2.nix index d3702f4e84..702128406d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.2.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.2.nix @@ -189,6 +189,15 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; + patches = [ + # Fix docs build with sphinx >= 6.0 + # https://gitlab.haskell.org/ghc/ghc/-/issues/22766 + (fetchpatch { + name = "ghc-docs-sphinx-6.0.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; + sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; + }) + ]; postPatch = "patchShebangs ."; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.3.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.3.nix index fea2d4c4c8..bb747ea910 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.3.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.3.nix @@ -189,6 +189,15 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; + patches = [ + # Fix docs build with sphinx >= 6.0 + # https://gitlab.haskell.org/ghc/ghc/-/issues/22766 + (fetchpatch { + name = "ghc-docs-sphinx-6.0.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; + sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; + }) + ]; postPatch = "patchShebangs ."; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.4.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.4.nix index 508316fc5e..1800bb635a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.4.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.4.nix @@ -198,6 +198,14 @@ stdenv.mkDerivation (rec { extraPrefix = "libraries/Cabal/"; sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; }) + + # Fix docs build with sphinx >= 6.0 + # https://gitlab.haskell.org/ghc/ghc/-/issues/22766 + (fetchpatch { + name = "ghc-docs-sphinx-6.0.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; + sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; + }) ]; postPatch = "patchShebangs ."; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.6.1.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.6.1.nix new file mode 100644 index 0000000000..7e8622f218 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.6.1.nix @@ -0,0 +1,4 @@ +import ./common-hadrian.nix rec { + version = "9.6.1"; + sha256 = "fe5ac909cb8bb087e235de97fa63aff47a8ae650efaa37a2140f4780e21f34cb"; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/cabal-paths.patch b/third_party/nixpkgs/pkgs/development/compilers/ghc/Cabal-3.2-3.4-paths-fix-cycle-aarch64-darwin.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/ghc/cabal-paths.patch rename to third_party/nixpkgs/pkgs/development/compilers/ghc/Cabal-3.2-3.4-paths-fix-cycle-aarch64-darwin.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/Cabal-3.6-paths-fix-cycle-aarch64-darwin.patch b/third_party/nixpkgs/pkgs/development/compilers/ghc/Cabal-3.6-paths-fix-cycle-aarch64-darwin.patch new file mode 100644 index 0000000000..1f7a79cc68 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/Cabal-3.6-paths-fix-cycle-aarch64-darwin.patch @@ -0,0 +1,602 @@ +This patch is based on https://github.com/sternenseemann/cabal/compare/982646d67b95b32813b89ab5d2d2f4d4dc03fb2b..7c49047f253e1f128e2df356400ec5da6f11066b +and has been postprocessed with `filterdiff --strip=1 --addoldprefix=a/libraries/Cabal/ --addnewprefix=b/libraries/Cabal/`. +Note that the base for the diff is not the Cabal 3.6.3.0 release tag, but +982646d67b95b32813b89ab5d2d2f4d4dc03fb2b which is obtained by applying +https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98 +on top of said release tag. That patch is applied to all our GHCs in the 9.2 series. + +Reasoning and explanation of the patch can be found in the comment in the diff for PathsModule.hs below. + +diffCabal/src/Distribution/Simple/Build/PathsModule.hs b/Cabal/src/Distribution/Simple/Build/PathsModule.hs +index b2be7e1a8..9b63e9850 100644 +--- a/libraries/Cabal/Cabal/src/Distribution/Simple/Build/PathsModule.hs ++++ b/libraries/Cabal/Cabal/src/Distribution/Simple/Build/PathsModule.hs +@@ -46,6 +46,7 @@ generatePathsModule pkg_descr lbi clbi = Z.render Z.Z + , Z.zIsWindows = isWindows + , Z.zIsI386 = buildArch == I386 + , Z.zIsX8664 = buildArch == X86_64 ++ , Z.zOr = (||) + , Z.zNot = not + , Z.zManglePkgName = showPkgName + +@@ -56,8 +57,112 @@ generatePathsModule pkg_descr lbi clbi = Z.render Z.Z + , Z.zDatadir = zDatadir + , Z.zLibexecdir = zLibexecdir + , Z.zSysconfdir = zSysconfdir ++ ++ -- Sadly we can't be cleverer about this – we can't have literals in the template ++ , Z.zShouldEmitDataDir = shouldEmit "DataDir" ++ , Z.zShouldEmitLibDir = shouldEmit "LibDir" ++ , Z.zShouldEmitDynLibDir = shouldEmit "DynLibDir" ++ , Z.zShouldEmitLibexecDir = shouldEmit "LibexecDir" ++ , Z.zShouldEmitSysconfDir = shouldEmit "SysconfDir" ++ ++ , Z.zWarning = zWarning ++ , Z.zShouldEmitWarning = zShouldEmitWarning + } + where ++ -- GHC's NCG backend for aarch64-darwin does not support link-time dead code ++ -- elimination to the extent that NCG does for other targets. Consequently, ++ -- we struggle with unnecessarily retained store path references due to the ++ -- use of `Paths_*` modules – even if `getLibDir` is not used, it'll end up ++ -- in the final library or executables we build. ++ -- ++ -- When using a different output for the executables and library, this ++ -- becomes more sinister: The library will contain a reference to the bin ++ -- output and itself due to `getLibDir` and `getBinDir`, but the executables ++ -- will do so, too. Either due to linking dynamically or because the library ++ -- is linked statically into the executable and retains those references. ++ -- Since Nix disallows cyclical references between two outputs, it becomes ++ -- impossible to use the `Paths_*` module and a separate `bin` output for ++ -- aarch64-darwin. ++ -- ++ -- The solution we have resorted to for now, is to trim the `Paths_*` module ++ -- dynamically depending on what references *could* be used without causing ++ -- a cyclical reference. That has the effect that any code that would not ++ -- cause a cyclical reference with dead code elimination will compile and ++ -- work for aarch64-darwin. If the code would use a `get*Dir` function that ++ -- has been omitted, this would indicate that the code would have caused a ++ -- cyclical reference anyways. ++ -- ++ -- The logic for this makes some pretty big assumptions about installation ++ -- prefixes that probably only hold fully in nixpkgs with ++ -- `haskellPackages.mkDerivation`. Simple uses outside nixpkgs that have ++ -- everything below the same prefix should continue to work as expected, ++ -- though. ++ -- ++ -- We assume the following: ++ -- ++ -- - flat_prefix is `$out`. ++ -- - flat_libdir etc. are always below `$out`. ++ -- ++ -- Since in the normal case due to static linking `$bin` and `$out` will ++ -- have the same references in libraries/executables, we need to either ++ -- prevent usage of `getBinDir` or `getLibDir` to break the cycle in case ++ -- `flat_bindir` is not below `$out`. We have decided to always allow usage ++ -- of `getBinDir`, so `getLibDir` gets dropped if a separate `bin` output is ++ -- used. This has the simple reason that `$out` which contains `flat_libdir` ++ -- tends to be quite big – we would like to have a `bin` output that doesn't ++ -- require keeping that around. ++ pathEmittable :: FilePath -> Bool ++ pathEmittable p ++ -- If the executable installation target is below `$out` the reference ++ -- cycle is within a single output (since libs are installed to `$out`) ++ -- and thus unproblematic. We can use any and all `get*Dir` functions. ++ | flat_prefix `isPrefixOf` flat_bindir = True ++ -- Otherwise, we need to disallow all `get*Dir` functions that would cause ++ -- a reference to `$out` which contains the libraries that would in turn ++ -- reference `$bin`. This always include `flat_libdir` and friends, but ++ -- can also include `flat_datadir` if no separate output for data files is ++ -- used. ++ | otherwise = not (flat_prefix `isPrefixOf` p) ++ ++ -- This list maps the "name" of the directory to whether we want to include ++ -- it in the `Paths_*` module or not. `shouldEmit` performs a lookup in this. ++ dirs :: [(String, Bool)] ++ dirs = ++ map ++ (\(name, path) -> (name, pathEmittable path)) ++ [ ("LibDir", flat_libdir) ++ , ("DynLibDir", flat_dynlibdir) ++ , ("DataDir", flat_datadir) ++ , ("LibexecDir", flat_libexecdir) ++ , ("SysconfDir", flat_sysconfdir) ++ ] ++ ++ shouldEmit :: String -> Bool ++ shouldEmit name = ++ case lookup name dirs of ++ Just b -> b ++ Nothing -> error "panic! BUG in Cabal Paths_ patch for aarch64-darwin, report this at https://github.com/nixos/nixpkgs/issues" ++ ++ -- This is a comma separated list of all functions that have been omitted. ++ -- This is included in a GHC warning which will be attached to the `Paths_*` ++ -- module in case we are dropping any `get*Dir` functions that would ++ -- normally exist. ++ -- ++ -- TODO: getDataFileName is not accounted for at the moment. ++ omittedFunctions :: String ++ omittedFunctions = ++ intercalate ", " ++ $ map (("get" ++) . fst) ++ $ filter (not . snd) dirs ++ ++ zWarning :: String ++ zWarning = ++ show $ ++ "The following functions have been omitted by a nixpkgs-specific patch to Cabal: " ++ ++ omittedFunctions ++ zShouldEmitWarning :: Bool ++ zShouldEmitWarning = any (not . snd) dirs ++ + supports_cpp = supports_language_pragma + supports_rebindable_syntax = ghc_newer_than (mkVersion [7,0,1]) + supports_language_pragma = ghc_newer_than (mkVersion [6,6,1]) +diffCabal/src/Distribution/Simple/Build/PathsModule/Z.hs b/Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs +index 6488ea061..a6cdc8e31 100644 +--- a/libraries/Cabal/Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs ++++ b/libraries/Cabal/Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs +@@ -18,6 +18,14 @@ data Z + zDatadir :: FilePath, + zLibexecdir :: FilePath, + zSysconfdir :: FilePath, ++ zShouldEmitLibDir :: Bool, ++ zShouldEmitDynLibDir :: Bool, ++ zShouldEmitLibexecDir :: Bool, ++ zShouldEmitDataDir :: Bool, ++ zShouldEmitSysconfDir :: Bool, ++ zShouldEmitWarning :: Bool, ++ zWarning :: String, ++ zOr :: (Bool -> Bool -> Bool), + zNot :: (Bool -> Bool), + zManglePkgName :: (PackageName -> String)} + deriving Generic +@@ -45,10 +53,51 @@ render z_root = execWriter $ do + tell "{-# OPTIONS_GHC -w #-}\n" + tell "module Paths_" + tell (zManglePkgName z_root (zPackageName z_root)) +- tell " (\n" ++ tell "\n" ++ tell " " ++ if (zShouldEmitWarning z_root) ++ then do ++ tell "{-# WARNING " ++ tell (zWarning z_root) ++ tell " #-}" ++ return () ++ else do ++ return () ++ tell "\n" ++ tell " (\n" + tell " version,\n" +- tell " getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir,\n" +- tell " getDataFileName, getSysconfDir\n" ++ tell " getBinDir,\n" ++ if (zOr z_root (zNot z_root (zAbsolute z_root)) (zShouldEmitLibDir z_root)) ++ then do ++ tell " getLibDir,\n" ++ return () ++ else do ++ return () ++ if (zOr z_root (zNot z_root (zAbsolute z_root)) (zShouldEmitDynLibDir z_root)) ++ then do ++ tell " getDynLibDir,\n" ++ return () ++ else do ++ return () ++ if (zOr z_root (zNot z_root (zAbsolute z_root)) (zShouldEmitLibexecDir z_root)) ++ then do ++ tell " getLibexecDir,\n" ++ return () ++ else do ++ return () ++ if (zOr z_root (zNot z_root (zAbsolute z_root)) (zShouldEmitDataDir z_root)) ++ then do ++ tell " getDataFileName,\n" ++ tell " getDataDir,\n" ++ return () ++ else do ++ return () ++ if (zOr z_root (zNot z_root (zAbsolute z_root)) (zShouldEmitSysconfDir z_root)) ++ then do ++ tell " getSysconfDir\n" ++ return () ++ else do ++ return () + tell " ) where\n" + tell "\n" + if (zNot z_root (zAbsolute z_root)) +@@ -97,12 +146,15 @@ render z_root = execWriter $ do + tell (zVersionDigits z_root) + tell " []\n" + tell "\n" +- tell "getDataFileName :: FilePath -> IO FilePath\n" +- tell "getDataFileName name = do\n" +- tell " dir <- getDataDir\n" +- tell " return (dir `joinFileName` name)\n" +- tell "\n" +- tell "getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir, getSysconfDir :: IO FilePath\n" ++ if (zOr z_root (zNot z_root (zAbsolute z_root)) (zShouldEmitDataDir z_root)) ++ then do ++ tell "getDataFileName :: FilePath -> IO FilePath\n" ++ tell "getDataFileName name = do\n" ++ tell " dir <- getDataDir\n" ++ tell " return (dir `joinFileName` name)\n" ++ return () ++ else do ++ return () + tell "\n" + let + z_var0_function_defs = do +@@ -130,6 +182,7 @@ render z_root = execWriter $ do + tell "\n" + if (zRelocatable z_root) + then do ++ tell "\n" + tell "\n" + tell "getPrefixDirReloc :: FilePath -> IO FilePath\n" + tell "getPrefixDirReloc dirRel = do\n" +@@ -139,31 +192,37 @@ render z_root = execWriter $ do + tell (zBindir z_root) + tell ") `joinFileName` dirRel)\n" + tell "\n" ++ tell "getBinDir :: IO FilePath\n" + tell "getBinDir = catchIO (getEnv \"" + tell (zManglePkgName z_root (zPackageName z_root)) + tell "_bindir\") (\\_ -> getPrefixDirReloc $ " + tell (zBindir z_root) + tell ")\n" ++ tell "getLibDir :: IO FilePath\n" + tell "getLibDir = catchIO (getEnv \"" + tell (zManglePkgName z_root (zPackageName z_root)) + tell "_libdir\") (\\_ -> getPrefixDirReloc $ " + tell (zLibdir z_root) + tell ")\n" ++ tell "getDynLibDir :: IO FilePath\n" + tell "getDynLibDir = catchIO (getEnv \"" + tell (zManglePkgName z_root (zPackageName z_root)) + tell "_dynlibdir\") (\\_ -> getPrefixDirReloc $ " + tell (zDynlibdir z_root) + tell ")\n" ++ tell "getDataDir :: IO FilePath\n" + tell "getDataDir = catchIO (getEnv \"" + tell (zManglePkgName z_root (zPackageName z_root)) + tell "_datadir\") (\\_ -> getPrefixDirReloc $ " + tell (zDatadir z_root) + tell ")\n" ++ tell "getLibexecDir :: IO FilePath\n" + tell "getLibexecDir = catchIO (getEnv \"" + tell (zManglePkgName z_root (zPackageName z_root)) + tell "_libexecdir\") (\\_ -> getPrefixDirReloc $ " + tell (zLibexecdir z_root) + tell ")\n" ++ tell "getSysconfDir :: IO FilePath\n" + tell "getSysconfDir = catchIO (getEnv \"" + tell (zManglePkgName z_root (zPackageName z_root)) + tell "_sysconfdir\") (\\_ -> getPrefixDirReloc $ " +@@ -177,72 +236,119 @@ render z_root = execWriter $ do + if (zAbsolute z_root) + then do + tell "\n" +- tell "bindir, libdir, dynlibdir, datadir, libexecdir, sysconfdir :: FilePath\n" ++ tell "bindir :: FilePath\n" + tell "bindir = " + tell (zBindir z_root) + tell "\n" +- tell "libdir = " +- tell (zLibdir z_root) +- tell "\n" +- tell "dynlibdir = " +- tell (zDynlibdir z_root) ++ tell "getBinDir :: IO FilePath\n" ++ tell "getBinDir = catchIO (getEnv \"" ++ tell (zManglePkgName z_root (zPackageName z_root)) ++ tell "_bindir\") (\\_ -> return bindir)\n" + tell "\n" +- tell "datadir = " +- tell (zDatadir z_root) ++ if (zShouldEmitLibDir z_root) ++ then do ++ tell "libdir :: FilePath\n" ++ tell "libdir = " ++ tell (zLibdir z_root) ++ tell "\n" ++ tell "getLibDir :: IO FilePath\n" ++ tell "getLibDir = catchIO (getEnv \"" ++ tell (zManglePkgName z_root (zPackageName z_root)) ++ tell "_libdir\") (\\_ -> return libdir)\n" ++ return () ++ else do ++ return () + tell "\n" +- tell "libexecdir = " +- tell (zLibexecdir z_root) ++ if (zShouldEmitDynLibDir z_root) ++ then do ++ tell "dynlibdir :: FilePath\n" ++ tell "dynlibdir = " ++ tell (zDynlibdir z_root) ++ tell "\n" ++ tell "getDynLibDir :: IO FilePath\n" ++ tell "getDynLibDir = catchIO (getEnv \"" ++ tell (zManglePkgName z_root (zPackageName z_root)) ++ tell "_dynlibdir\") (\\_ -> return dynlibdir)\n" ++ return () ++ else do ++ return () + tell "\n" +- tell "sysconfdir = " +- tell (zSysconfdir z_root) ++ if (zShouldEmitDataDir z_root) ++ then do ++ tell "datadir :: FilePath\n" ++ tell "datadir = " ++ tell (zDatadir z_root) ++ tell "\n" ++ tell "getDataDir :: IO FilePath\n" ++ tell "getDataDir = catchIO (getEnv \"" ++ tell (zManglePkgName z_root (zPackageName z_root)) ++ tell "_datadir\") (\\_ -> return datadir)\n" ++ return () ++ else do ++ return () + tell "\n" ++ if (zShouldEmitLibexecDir z_root) ++ then do ++ tell "libexecdir :: FilePath\n" ++ tell "libexecdir = " ++ tell (zLibexecdir z_root) ++ tell "\n" ++ tell "getLibexecDir :: IO FilePath\n" ++ tell "getLibexecDir = catchIO (getEnv \"" ++ tell (zManglePkgName z_root (zPackageName z_root)) ++ tell "_libexecdir\") (\\_ -> return libexecdir)\n" ++ return () ++ else do ++ return () + tell "\n" +- tell "getBinDir = catchIO (getEnv \"" +- tell (zManglePkgName z_root (zPackageName z_root)) +- tell "_bindir\") (\\_ -> return bindir)\n" +- tell "getLibDir = catchIO (getEnv \"" +- tell (zManglePkgName z_root (zPackageName z_root)) +- tell "_libdir\") (\\_ -> return libdir)\n" +- tell "getDynLibDir = catchIO (getEnv \"" +- tell (zManglePkgName z_root (zPackageName z_root)) +- tell "_dynlibdir\") (\\_ -> return dynlibdir)\n" +- tell "getDataDir = catchIO (getEnv \"" +- tell (zManglePkgName z_root (zPackageName z_root)) +- tell "_datadir\") (\\_ -> return datadir)\n" +- tell "getLibexecDir = catchIO (getEnv \"" +- tell (zManglePkgName z_root (zPackageName z_root)) +- tell "_libexecdir\") (\\_ -> return libexecdir)\n" +- tell "getSysconfDir = catchIO (getEnv \"" +- tell (zManglePkgName z_root (zPackageName z_root)) +- tell "_sysconfdir\") (\\_ -> return sysconfdir)\n" ++ if (zShouldEmitSysconfDir z_root) ++ then do ++ tell "sysconfdir :: FilePath\n" ++ tell "sysconfdir = " ++ tell (zSysconfdir z_root) ++ tell "\n" ++ tell "getSysconfDir :: IO FilePath\n" ++ tell "getSysconfDir = catchIO (getEnv \"" ++ tell (zManglePkgName z_root (zPackageName z_root)) ++ tell "_sysconfdir\") (\\_ -> return sysconfdir)\n" ++ return () ++ else do ++ return () + tell "\n" + return () + else do + if (zIsWindows z_root) + then do ++ tell "\n" + tell "\n" + tell "prefix :: FilePath\n" + tell "prefix = " + tell (zPrefix z_root) + tell "\n" + tell "\n" ++ tell "getBinDir :: IO FilePath\n" + tell "getBinDir = getPrefixDirRel $ " + tell (zBindir z_root) + tell "\n" ++ tell "getLibDir :: IO FilePath\n" + tell "getLibDir = " + tell (zLibdir z_root) + tell "\n" ++ tell "getDynLibDir :: IO FilePath\n" + tell "getDynLibDir = " + tell (zDynlibdir z_root) + tell "\n" ++ tell "getDataDir :: IO FilePath\n" + tell "getDataDir = catchIO (getEnv \"" + tell (zManglePkgName z_root (zPackageName z_root)) + tell "_datadir\") (\\_ -> " + tell (zDatadir z_root) + tell ")\n" ++ tell "getLibexecDir :: IO FilePath\n" + tell "getLibexecDir = " + tell (zLibexecdir z_root) + tell "\n" ++ tell "getSysconfDir :: IO FilePath\n" + tell "getSysconfDir = " + tell (zSysconfdir z_root) + tell "\n" +diffcabal-dev-scripts/src/GenPathsModule.hs b/cabal-dev-scripts/src/GenPathsModule.hs +index e4b930635..9b978f284 100644 +--- a/libraries/Cabal/cabal-dev-scripts/src/GenPathsModule.hs ++++ b/libraries/Cabal/cabal-dev-scripts/src/GenPathsModule.hs +@@ -41,6 +41,16 @@ $(capture "decls" [d| + , zLibexecdir :: FilePath + , zSysconfdir :: FilePath + ++ , zShouldEmitLibDir :: Bool ++ , zShouldEmitDynLibDir :: Bool ++ , zShouldEmitLibexecDir :: Bool ++ , zShouldEmitDataDir :: Bool ++ , zShouldEmitSysconfDir :: Bool ++ ++ , zShouldEmitWarning :: Bool ++ , zWarning :: String ++ ++ , zOr :: Bool -> Bool -> Bool + , zNot :: Bool -> Bool + , zManglePkgName :: PackageName -> String + } +difftemplates/Paths_pkg.template.hs b/templates/Paths_pkg.template.hs +index 6bc6b7875..aa90a9382 100644 +--- a/libraries/Cabal/templates/Paths_pkg.template.hs ++++ b/libraries/Cabal/templates/Paths_pkg.template.hs +@@ -9,10 +9,31 @@ + {% endif %} + {-# OPTIONS_GHC -fno-warn-missing-import-lists #-} + {-# OPTIONS_GHC -w #-} +-module Paths_{{ manglePkgName packageName }} ( ++module Paths_{{ manglePkgName packageName }} ++ {% if shouldEmitWarning %}{-# WARNING {{ warning }} #-}{% endif %} ++ ( + version, +- getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir, +- getDataFileName, getSysconfDir ++ getBinDir, ++{# We only care about the absolute case for our emit logic, since only in this ++ case references are incurred. We are not going to hit isWindows and relocatable ++ has no absolute references to begin with. ++#} ++{% if or (not absolute) shouldEmitLibDir %} ++ getLibDir, ++{% endif %} ++{% if or (not absolute) shouldEmitDynLibDir %} ++ getDynLibDir, ++{% endif %} ++{% if or (not absolute) shouldEmitLibexecDir %} ++ getLibexecDir, ++{% endif %} ++{% if or (not absolute) shouldEmitDataDir %} ++ getDataFileName, ++ getDataDir, ++{% endif %} ++{% if or (not absolute) shouldEmitSysconfDir %} ++ getSysconfDir ++{% endif %} + ) where + + {% if not absolute %} +@@ -51,12 +72,12 @@ catchIO = Exception.catch + version :: Version + version = Version {{ versionDigits }} [] + ++{% if or (not absolute) shouldEmitDataDir %} + getDataFileName :: FilePath -> IO FilePath + getDataFileName name = do + dir <- getDataDir + return (dir `joinFileName` name) +- +-getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir, getSysconfDir :: IO FilePath ++{% endif %} + + {% defblock function_defs %} + minusFileName :: FilePath -> String -> FilePath +@@ -85,48 +106,93 @@ splitFileName p = (reverse (path2++drive), reverse fname) + + {% if relocatable %} + ++{# Relocatable can not incur any absolute references, so we can ignore it. ++ Additionally, --enable-relocatable is virtually useless in Nix builds ++#} ++ + getPrefixDirReloc :: FilePath -> IO FilePath + getPrefixDirReloc dirRel = do + exePath <- getExecutablePath + let (dir,_) = splitFileName exePath + return ((dir `minusFileName` {{ bindir }}) `joinFileName` dirRel) + ++getBinDir :: IO FilePath + getBinDir = catchIO (getEnv "{{ manglePkgName packageName }}_bindir") (\_ -> getPrefixDirReloc $ {{ bindir }}) ++getLibDir :: IO FilePath + getLibDir = catchIO (getEnv "{{ manglePkgName packageName }}_libdir") (\_ -> getPrefixDirReloc $ {{ libdir }}) ++getDynLibDir :: IO FilePath + getDynLibDir = catchIO (getEnv "{{ manglePkgName packageName }}_dynlibdir") (\_ -> getPrefixDirReloc $ {{ dynlibdir }}) ++getDataDir :: IO FilePath + getDataDir = catchIO (getEnv "{{ manglePkgName packageName }}_datadir") (\_ -> getPrefixDirReloc $ {{ datadir }}) ++getLibexecDir :: IO FilePath + getLibexecDir = catchIO (getEnv "{{ manglePkgName packageName }}_libexecdir") (\_ -> getPrefixDirReloc $ {{ libexecdir }}) ++getSysconfDir :: IO FilePath + getSysconfDir = catchIO (getEnv "{{ manglePkgName packageName }}_sysconfdir") (\_ -> getPrefixDirReloc $ {{ sysconfdir }}) + + {% useblock function_defs %} + + {% elif absolute %} + +-bindir, libdir, dynlibdir, datadir, libexecdir, sysconfdir :: FilePath ++bindir :: FilePath + bindir = {{ bindir }} +-libdir = {{ libdir }} +-dynlibdir = {{ dynlibdir }} +-datadir = {{ datadir }} +-libexecdir = {{ libexecdir }} +-sysconfdir = {{ sysconfdir }} +- ++getBinDir :: IO FilePath + getBinDir = catchIO (getEnv "{{ manglePkgName packageName }}_bindir") (\_ -> return bindir) ++ ++{% if shouldEmitLibDir %} ++libdir :: FilePath ++libdir = {{ libdir }} ++getLibDir :: IO FilePath + getLibDir = catchIO (getEnv "{{ manglePkgName packageName }}_libdir") (\_ -> return libdir) ++{% endif %} ++ ++{% if shouldEmitDynLibDir %} ++dynlibdir :: FilePath ++dynlibdir = {{ dynlibdir }} ++getDynLibDir :: IO FilePath + getDynLibDir = catchIO (getEnv "{{ manglePkgName packageName }}_dynlibdir") (\_ -> return dynlibdir) ++{% endif %} ++ ++{% if shouldEmitDataDir %} ++datadir :: FilePath ++datadir = {{ datadir }} ++getDataDir :: IO FilePath + getDataDir = catchIO (getEnv "{{ manglePkgName packageName }}_datadir") (\_ -> return datadir) ++{% endif %} ++ ++{% if shouldEmitLibexecDir %} ++libexecdir :: FilePath ++libexecdir = {{ libexecdir }} ++getLibexecDir :: IO FilePath + getLibexecDir = catchIO (getEnv "{{ manglePkgName packageName }}_libexecdir") (\_ -> return libexecdir) ++{% endif %} ++ ++{% if shouldEmitSysconfDir %} ++sysconfdir :: FilePath ++sysconfdir = {{ sysconfdir }} ++getSysconfDir :: IO FilePath + getSysconfDir = catchIO (getEnv "{{ manglePkgName packageName }}_sysconfdir") (\_ -> return sysconfdir) ++{% endif %} + + {% elif isWindows %} + ++{# We are only trying to fix the problem for aarch64-darwin with this patch, ++ so let's ignore Windows which we can reach via pkgsCross, for example. ++#} ++ + prefix :: FilePath + prefix = {{ prefix }} + ++getBinDir :: IO FilePath + getBinDir = getPrefixDirRel $ {{ bindir }} ++getLibDir :: IO FilePath + getLibDir = {{ libdir }} ++getDynLibDir :: IO FilePath + getDynLibDir = {{ dynlibdir }} ++getDataDir :: IO FilePath + getDataDir = catchIO (getEnv "{{ manglePkgName packageName }}_datadir") (\_ -> {{ datadir }}) ++getLibexecDir :: IO FilePath + getLibexecDir = {{ libexecdir }} ++getSysconfDir :: IO FilePath + getSysconfDir = {{ sysconfdir }} + + getPrefixDirRel :: FilePath -> IO FilePath diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix index 5f0953b1bc..77e99ddf0d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix @@ -62,7 +62,7 @@ , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. - enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic + enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic && !isGhcjs , # Whether to build terminfo. enableTerminfo ? !(stdenv.targetPlatform.isWindows @@ -91,7 +91,7 @@ transformers = lib.optionals useLLVM [ "llvm" ] ++ lib.optionals (!enableShared) [ - "fully_static" + "no_dynamic_libs" "no_dynamic_ghc" ] ++ lib.optionals (!enableProfiledLibs) [ "no_profiled_libs" ] @@ -182,7 +182,6 @@ let # be needed for TemplateHaskell. This solution was described in # https://www.tweag.io/blog/2020-09-30-bazel-static-haskell lib.optionals enableRelocatedStaticLibs [ - "*.*.rts.*.opts += -fPIC -fexternal-dynamic-refs" "*.*.ghc.*.opts += -fPIC -fexternal-dynamic-refs" ] ++ lib.optionals targetPlatform.useAndroidPrebuilt [ @@ -396,16 +395,14 @@ stdenv.mkDerivation ({ nativeBuildInputs = [ perl ghc hadrian bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ] ++ lib.optionals (rev != null) [ - # We need to execute the boot script - autoconf automake m4 python3 + # autoconf and friends are necessary for hadrian to create the bindist + autoconf automake m4 + # Python is used in a few scripts invoked by hadrian to generate e.g. rts headers. + python3 ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ sphinx - ] ++ lib.optionals targetPlatform.isGhcjs [ - # emscripten itself is added via depBuildTarget / targetCC - python3 ]; # For building runtime libs @@ -426,10 +423,10 @@ stdenv.mkDerivation ({ runHook preBuild # hadrianFlagsArray is created in preConfigure - echo "hadrianFlags: $hadrianFlags ''${hadrianFlagsArray}" + echo "hadrianFlags: $hadrianFlags ''${hadrianFlagsArray[@]}" # We need to go via the bindist for installing - hadrian $hadrianFlags "''${hadrianFlagsArray}" binary-dist-dir + hadrian $hadrianFlags "''${hadrianFlagsArray[@]}" binary-dist-dir runHook postBuild ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/ghc-8.8.4-sphinx-6.0.patch b/third_party/nixpkgs/pkgs/development/compilers/ghc/ghc-8.8.4-sphinx-6.0.patch new file mode 100644 index 0000000000..c20c62f9cf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/ghc-8.8.4-sphinx-6.0.patch @@ -0,0 +1,13 @@ +diff --git a/docs/users_guide/ghc_config.py.in b/docs/users_guide/ghc_config.py.in +index 2670ad3cf1..d2f9d85c31 100644 +--- a/docs/users_guide/ghc_config.py.in ++++ b/docs/users_guide/ghc_config.py.in +@@ -1,6 +1,6 @@ + extlinks = { +- 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', 'Issue #'), +- 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', 'GHC Wiki'), ++ 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', 'Issue %s'), ++ 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', 'GHC Wiki %s'), + } + + libs_base_uri = '../libraries' diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix index 19739ecbd1..35d285ca2b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix @@ -1,5 +1,5 @@ import ./common-hadrian.nix { - version = "9.7.20221224"; - rev = "a5bd0eb8dd1d03c54e1b0b476ebbc4cc886d6f19"; - sha256 = "1rrds9alzpy4vyh2isan32h1zmf44nsr8552wbsn1y3fg6bnpbxi"; + version = "9.7.20230217"; + rev = "a203ad854ffee802e6bf0aca26e6c9a99bec3865"; + sha256 = "06q6l7svdynvdv90yz6dxbsk3j5c8gh5ghwfl02rdwamcrzw7zic"; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/gnatboot/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gnatboot/default.nix index 7ef2ce03df..957b21c22b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gnatboot/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gnatboot/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { sourceHighlight xz zlib - ] ++ lib.optional stdenv.buildPlatform.isLinux [ + ] ++ lib.optionals stdenv.buildPlatform.isLinux [ autoPatchelfHook elfutils glibc diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.19.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.19.nix index dda624c191..0ed55a7afc 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.19.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.19.nix @@ -47,11 +47,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.19.6"; + version = "1.19.7"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - hash = "sha256-1/ABP4Lm1/hizGy1yM20ju9fLiObNbqpfi8adGYEN2c="; + hash = "sha256-d1vfKFzqupQNqKL+IBIlAO/XoLZdvO6FJHhUqNdAJjM="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/halide/default.nix b/third_party/nixpkgs/pkgs/development/compilers/halide/default.nix index 78eca7e84d..2dff5b8bf7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/halide/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/halide/default.nix @@ -15,13 +15,13 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; llvmPackages.stdenv.mkDerivation rec { pname = "halide"; - version = "14.0.0"; + version = "15.0.0"; src = fetchFromGitHub { owner = "halide"; repo = "Halide"; rev = "v${version}"; - sha256 = "sha256-/7U2TBcpSAKeEyWncAbtW6Vk/cP+rp1CXtbIjvQMmZA="; + sha256 = "sha256-te9Yn/rmA0YSulnxXL/y5d8PFphjQPgZUDWHNn7oqMg="; }; cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" "-DWITH_PYTHON_BINDINGS=OFF" "-DTARGET_WEBASSEMBLY=OFF" ]; 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 143feeb98e..883b19bb4e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -29,8 +29,8 @@ openjdk17.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk-jcef"; - javaVersion = "17.0.5"; - build = "653.25"; + javaVersion = "17.0.6"; + build = "829.5"; # To get the new tag: # git clone https://github.com/jetbrains/jetbrainsruntime # cd jetbrainsruntime @@ -43,7 +43,7 @@ openjdk17.overrideAttrs (oldAttrs: rec { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${version}"; - hash = "sha256-/3NzluFpzKC8mFQxrKY9WlgBh9asbEE7lrGJy/ZJXRU="; + hash = "sha256-LTwmuoKKwkuel0a1qcYNnb0d3HBFoABvmqCcrsPyh2I="; }; BOOT_JDK = openjdk17-bootstrap.home; diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/1.9.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/1.9.nix index d13b078494..225c712422 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/1.9.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/1.9.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "julia"; - version = "1.9.0-beta4"; + version = "1.9.0-rc1"; src = fetchurl { url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; - hash = "sha256-Ipfps2wxPV30nbOxDZ0K39jFB1lNz16aXgFhIKBOquM="; + hash = "sha256-BjHuS1pP8S+iZndyGS8HiNzApr7xUYPRPRkX55DEy4Y="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix index 0f3c943b52..8a48436680 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix @@ -55,9 +55,6 @@ let sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ lib/Driver/ToolChains/*.cpp - - # Patch for standalone doc building - sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp '' + lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -91,8 +88,9 @@ let ''; passthru = { - isClang = true; inherit libllvm; + isClang = true; + hardeningUnsupportedFlags = [ "fortify3" ]; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/default.nix index 4d46863fea..75985e9624 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/default.nix @@ -32,7 +32,17 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # See llvm/cmake/config-ix.cmake. + platforms = + lib.platforms.aarch64 ++ + lib.platforms.arm ++ + lib.platforms.mips ++ + lib.platforms.power ++ + lib.platforms.riscv ++ + lib.platforms.s390x ++ + lib.platforms.wasi ++ + lib.platforms.x86; }; tools = lib.makeExtensible (tools: let diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lld/default.nix index 4b7d4eafcb..d4c686a0f4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lld/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" ]; + # Musl's default stack size is too small for lld to be able to link Firefox. + LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; + outputs = [ "out" "lib" "dev" ]; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix index fa8080c998..65554d0bfd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix @@ -60,9 +60,6 @@ let sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ lib/Driver/ToolChains/*.cpp - - # Patch for standalone doc building - sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp '' + lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -96,8 +93,9 @@ let ''; passthru = { - isClang = true; inherit libllvm; + isClang = true; + hardeningUnsupportedFlags = [ "fortify3" ]; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix index fdaba0ca2b..6f73f50e31 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix @@ -34,7 +34,17 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # See llvm/cmake/config-ix.cmake. + platforms = + lib.platforms.aarch64 ++ + lib.platforms.arm ++ + lib.platforms.mips ++ + lib.platforms.power ++ + lib.platforms.riscv ++ + lib.platforms.s390x ++ + lib.platforms.wasi ++ + lib.platforms.x86; }; tools = lib.makeExtensible (tools: let diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lld/default.nix index 8a9daf317c..dbcd96a3ed 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lld/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" ]; + # Musl's default stack size is too small for lld to be able to link Firefox. + LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; + outputs = [ "out" "lib" "dev" ]; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/clang/default.nix index ed99f4fe7b..a70da922d9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/clang/default.nix @@ -57,9 +57,6 @@ let sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ lib/Driver/ToolChains/*.cpp - - # Patch for standalone doc building - sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp ''; @@ -90,8 +87,9 @@ let ''; passthru = { - isClang = true; inherit libllvm; + isClang = true; + hardeningUnsupportedFlags = [ "fortify3" ]; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix index 73f5335020..b936b35b15 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix @@ -35,7 +35,17 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # See llvm/cmake/config-ix.cmake. + platforms = + lib.platforms.aarch64 ++ + lib.platforms.arm ++ + lib.platforms.mips ++ + lib.platforms.power ++ + lib.platforms.riscv ++ + lib.platforms.s390x ++ + lib.platforms.wasi ++ + lib.platforms.x86; }; tools = lib.makeExtensible (tools: let diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lld/default.nix index cc47625961..01b7e410aa 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lld/default.nix @@ -34,6 +34,9 @@ stdenv.mkDerivation rec { "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" ]; + # Musl's default stack size is too small for lld to be able to link Firefox. + LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; + outputs = [ "out" "lib" "dev" ]; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/clang/add-nostdlibinc-flag.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/clang/add-nostdlibinc-flag.patch deleted file mode 100644 index 8007ba05f6..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/clang/add-nostdlibinc-flag.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp -index 94a7553e273b..8a1d455950b2 100644 ---- a/lib/Driver/Driver.cpp -+++ b/lib/Driver/Driver.cpp -@@ -412,6 +412,13 @@ DerivedArgList *Driver::TranslateInputArgs(const InputArgList &Args) const { - } - #endif - -+ { -+ Arg *A = DAL->MakeFlagArg(/*BaseArg=*/nullptr, -+ Opts.getOption(options::OPT_nostdlibinc)); -+ A->claim(); -+ DAL->append(A); -+ } -+ - return DAL; - } - diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/clang/default.nix index 056a1b7e0f..783188c035 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/clang/default.nix @@ -42,7 +42,7 @@ let # mis-compilation in firefox. # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454 ./revert-malloc-alignment-assumption.patch - ./add-nostdlibinc-flag.patch + ../../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../../clang-11-12-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; @@ -51,9 +51,6 @@ let postPatch = '' (cd tools && ln -s ../../clang-tools-extra extra) - - # Patch for standalone doc building - sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp ''; @@ -84,8 +81,9 @@ let ''; passthru = { - isClang = true; inherit libllvm; + isClang = true; + hardeningUnsupportedFlags = [ "fortify3" ]; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix index 29dda832e4..0bc1711912 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix @@ -37,7 +37,17 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # See llvm/cmake/config-ix.cmake. + platforms = + lib.platforms.aarch64 ++ + lib.platforms.arm ++ + lib.platforms.mips ++ + lib.platforms.power ++ + lib.platforms.riscv ++ + lib.platforms.s390x ++ + lib.platforms.wasi ++ + lib.platforms.x86; }; tools = lib.makeExtensible (tools: let diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/lld/default.nix index d37a380c63..c8c3e0b448 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/lld/default.nix @@ -35,6 +35,9 @@ stdenv.mkDerivation rec { "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" ]; + # Musl's default stack size is too small for lld to be able to link Firefox. + LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; + outputs = [ "out" "lib" "dev" ]; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/clang/add-nostdlibinc-flag.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/clang/add-nostdlibinc-flag.patch deleted file mode 100644 index b73cd0185e..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/clang/add-nostdlibinc-flag.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp -index 3bfddeefc7b2..05b11d9e562d 100644 ---- a/lib/Driver/Driver.cpp -+++ b/lib/Driver/Driver.cpp -@@ -482,6 +482,13 @@ DerivedArgList *Driver::TranslateInputArgs(const InputArgList &Args) const { - } - #endif - -+ { -+ Arg *A = DAL->MakeFlagArg(/*BaseArg=*/nullptr, -+ Opts.getOption(options::OPT_nostdlibinc)); -+ A->claim(); -+ DAL->append(A); -+ } -+ - return DAL; - } - diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/clang/default.nix index 55d879fb76..f325a55a27 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/clang/default.nix @@ -45,7 +45,7 @@ let ./purity.patch # https://reviews.llvm.org/D51899 ./gnu-install-dirs.patch - ./add-nostdlibinc-flag.patch + ../../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../../clang-11-12-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; @@ -54,9 +54,6 @@ let postPatch = '' (cd tools && ln -s ../../clang-tools-extra extra) - - # Patch for standalone doc building - sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp ''; @@ -87,8 +84,9 @@ let ''; passthru = { - isClang = true; inherit libllvm; + isClang = true; + hardeningUnsupportedFlags = [ "fortify3" ]; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix index 314a882db8..abf9c533fa 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix @@ -37,7 +37,18 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # See llvm/cmake/config-ix.cmake. + platforms = + lib.platforms.aarch64 ++ + lib.platforms.arm ++ + lib.platforms.m68k ++ + lib.platforms.mips ++ + lib.platforms.power ++ + lib.platforms.riscv ++ + lib.platforms.s390x ++ + lib.platforms.wasi ++ + lib.platforms.x86; }; tools = lib.makeExtensible (tools: let diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lld/default.nix index 2e0d893c7f..02ca4c8024 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lld/default.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" ]; + + # Musl's default stack size is too small for lld to be able to link Firefox. LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; outputs = [ "out" "lib" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/clang/default.nix index b0671150a7..4963d0ecce 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/clang/default.nix @@ -45,6 +45,7 @@ let ./purity.patch # https://reviews.llvm.org/D51899 ./gnu-install-dirs.patch + ../../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../../clang-11-12-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; @@ -53,10 +54,6 @@ let postPatch = '' (cd tools && ln -s ../../clang-tools-extra extra) - - sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ - -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ - lib/Driver/ToolChains/*.cpp '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp ''; @@ -87,8 +84,9 @@ let ''; passthru = { - isClang = true; inherit libllvm; + isClang = true; + hardeningUnsupportedFlags = [ "fortify3" ]; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/default.nix index b1a3b09cb7..18ff90b6ff 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation { # See: https://github.com/NixOS/nixpkgs/pull/186575 ../../common/compiler-rt/darwin-plistbuddy-workaround.patch # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - ./armv7l.patch + ../../common/compiler-rt/armv7l-15.patch ]; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/default.nix index d12e705702..d4fd2d9bec 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/default.nix @@ -86,7 +86,18 @@ in let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # See llvm/cmake/config-ix.cmake. + platforms = + lib.platforms.aarch64 ++ + lib.platforms.arm ++ + lib.platforms.m68k ++ + lib.platforms.mips ++ + lib.platforms.power ++ + lib.platforms.riscv ++ + lib.platforms.s390x ++ + lib.platforms.wasi ++ + lib.platforms.x86; }; tools = lib.makeExtensible (tools: let diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lld/default.nix index e8bca769de..cc18aee76a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lld/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" ]; + + # Musl's default stack size is too small for lld to be able to link Firefox. LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; outputs = [ "out" "lib" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix index 57d6fe6ae7..0428e3a170 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix @@ -53,9 +53,6 @@ let sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ lib/Driver/ToolChains/*.cpp - - # Patch for standalone doc building - sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp ''; @@ -84,8 +81,9 @@ let ''; passthru = { - isClang = true; inherit libllvm; + isClang = true; + hardeningUnsupportedFlags = [ "fortify3" ]; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/default.nix index d446608d35..4a8c27471a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/default.nix @@ -20,7 +20,16 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # See llvm/cmake/config-ix.cmake. + platforms = + lib.platforms.aarch64 ++ + lib.platforms.arm ++ + lib.platforms.mips ++ + lib.platforms.power ++ + lib.platforms.s390x ++ + lib.platforms.wasi ++ + lib.platforms.x86; }; tools = lib.makeExtensible (tools: let diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lld/default.nix index ad0ba40bf9..d3cbede843 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lld/default.nix @@ -25,6 +25,9 @@ stdenv.mkDerivation rec { "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" ]; + # Musl's default stack size is too small for lld to be able to link Firefox. + LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; + outputs = [ "out" "lib" "dev" ]; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix index 1b37efe3f0..3efb3c02c7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix @@ -53,9 +53,6 @@ let sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ lib/Driver/ToolChains/*.cpp - - # Patch for standalone doc building - sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp ''; @@ -84,8 +81,9 @@ let ''; passthru = { - isClang = true; inherit libllvm; + isClang = true; + hardeningUnsupportedFlags = [ "fortify3" ]; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix index e5b5094f05..fef543e39d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix @@ -20,7 +20,16 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # See llvm/cmake/config-ix.cmake. + platforms = + lib.platforms.aarch64 ++ + lib.platforms.arm ++ + lib.platforms.mips ++ + lib.platforms.power ++ + lib.platforms.s390x ++ + lib.platforms.wasi ++ + lib.platforms.x86; }; tools = lib.makeExtensible (tools: let diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lld/default.nix index 81dd39c39e..a2a011c59b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lld/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" ]; + # Musl's default stack size is too small for lld to be able to link Firefox. + LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; + outputs = [ "out" "lib" "dev" ]; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix index d146e5b5f8..b044e16624 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix @@ -62,9 +62,6 @@ let sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ lib/Driver/ToolChains/*.cpp - - # Patch for standalone doc building - sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp '' + lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -96,8 +93,9 @@ let ''; passthru = { - isClang = true; inherit libllvm; + isClang = true; + hardeningUnsupportedFlags = [ "fortify3" ]; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/default.nix index 3fc0b359ad..9ae8358587 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/default.nix @@ -32,7 +32,17 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # See llvm/cmake/config-ix.cmake. + platforms = + lib.platforms.aarch64 ++ + lib.platforms.arm ++ + lib.platforms.mips ++ + lib.platforms.power ++ + lib.platforms.riscv ++ + lib.platforms.s390x ++ + lib.platforms.wasi ++ + lib.platforms.x86; }; tools = lib.makeExtensible (tools: let diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/lld/default.nix index 7858599990..2016e6321e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/lld/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" ]; + # Musl's default stack size is too small for lld to be able to link Firefox. + LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; + outputs = [ "out" "lib" "dev" ]; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix index bc2ed03eed..d03178d689 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix @@ -68,9 +68,6 @@ let sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ lib/Driver/ToolChains/*.cpp - - # Patch for standalone doc building - sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp '' + lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -102,8 +99,9 @@ let ''; passthru = { - isClang = true; inherit libllvm; + isClang = true; + hardeningUnsupportedFlags = [ "fortify3" ]; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/default.nix index d628eab465..9401bb3465 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/default.nix @@ -32,7 +32,17 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # See llvm/cmake/config-ix.cmake. + platforms = + lib.platforms.aarch64 ++ + lib.platforms.arm ++ + lib.platforms.mips ++ + lib.platforms.power ++ + lib.platforms.riscv ++ + lib.platforms.s390x ++ + lib.platforms.wasi ++ + lib.platforms.x86; }; tools = lib.makeExtensible (tools: let diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lld/default.nix index 30be084fa8..9a3a49db78 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lld/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" ]; + # Musl's default stack size is too small for lld to be able to link Firefox. + LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; + outputs = [ "out" "lib" "dev" ]; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix index 7819676e33..4a48cb94c4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix @@ -61,9 +61,6 @@ let sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ lib/Driver/ToolChains/*.cpp - - # Patch for standalone doc building - sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp '' + lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -97,8 +94,9 @@ let ''; passthru = { - isClang = true; inherit libllvm; + isClang = true; + hardeningUnsupportedFlags = [ "fortify3" ]; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/default.nix index 57187c5ecf..0a803e3c3d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/default.nix @@ -32,7 +32,17 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # See llvm/cmake/config-ix.cmake. + platforms = + lib.platforms.aarch64 ++ + lib.platforms.arm ++ + lib.platforms.mips ++ + lib.platforms.power ++ + lib.platforms.riscv ++ + lib.platforms.s390x ++ + lib.platforms.wasi ++ + lib.platforms.x86; }; tools = lib.makeExtensible (tools: let diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lld/default.nix index 73cfe630bb..bf79c75978 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lld/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" ]; + # Musl's default stack size is too small for lld to be able to link Firefox. + LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; + outputs = [ "out" "lib" "dev" ]; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/clang/add-nostdlibinc-flag.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/clang/add-nostdlibinc-flag.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/llvm/git/clang/add-nostdlibinc-flag.patch rename to third_party/nixpkgs/pkgs/development/compilers/llvm/common/clang/add-nostdlibinc-flag.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/armv7l.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/armv7l-15.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/armv7l.patch rename to third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/armv7l-15.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/clang/default.nix index 8f2663b7e8..1fbbf4cbd6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/clang/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, llvm_meta , monorepoSrc, runCommand -, substituteAll, cmake, libxml2, libllvm, version, python3 +, substituteAll, cmake, ninja, libxml2, libllvm, version, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false @@ -20,7 +20,7 @@ let sourceRoot = "${src.name}/${pname}"; - nativeBuildInputs = [ cmake python3 ] + nativeBuildInputs = [ cmake ninja python3 ] ++ lib.optional enableManpages python3.pkgs.sphinx ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; @@ -46,7 +46,7 @@ let ./purity.patch # https://reviews.llvm.org/D51899 ./gnu-install-dirs.patch - ./add-nostdlibinc-flag.patch + ../../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../../clang-11-12-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; @@ -55,9 +55,6 @@ let postPatch = '' (cd tools && ln -s ../../clang-tools-extra extra) - - # Patch for standalone doc building - sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp ''; @@ -88,8 +85,9 @@ let ''; passthru = { - isClang = true; inherit libllvm; + isClang = true; + hardeningUnsupportedFlags = [ "fortify3" ]; }; meta = llvm_meta // { @@ -111,9 +109,7 @@ let } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; - buildPhase = '' - make docs-clang-man - ''; + ninjaFlags = [ "docs-clang-man" ]; installPhase = '' mkdir -p $out/share/man/man1 diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/armv7l.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/armv7l.patch deleted file mode 100644 index 120cfe6feb..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/armv7l.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ur compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake ---- compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake 2020-03-24 00:01:02.000000000 +0900 -+++ compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:42:00.883450706 +0900 -@@ -24,7 +24,7 @@ - - - set(ARM64 aarch64) --set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) -+set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) - set(HEXAGON hexagon) - set(X86 i386) - set(X86_64 x86_64) -diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt ---- compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt 2020-03-24 00:01:02.000000000 +0900 -+++ compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:44:49.468579650 +0900 -@@ -474,6 +474,7 @@ - set(armv7_SOURCES ${arm_SOURCES}) - set(armv7s_SOURCES ${arm_SOURCES}) - set(armv7k_SOURCES ${arm_SOURCES}) -+set(armv7l_SOURCES ${arm_SOURCES}) - set(arm64_SOURCES ${aarch64_SOURCES}) - - # macho_embedded archs -@@ -595,7 +596,7 @@ - foreach (arch ${BUILTIN_SUPPORTED_ARCH}) - if (CAN_TARGET_${arch}) - # For ARM archs, exclude any VFP builtins if VFP is not supported -- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") -+ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") - string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") - check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) - if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix index 029f953c83..aee403d6a6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, llvm_meta, version , monorepoSrc, runCommand -, cmake, python3, xcbuild, libllvm, libcxxabi +, cmake, ninja, python3, xcbuild, libllvm, libcxxabi, libxcrypt , doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD }: @@ -27,7 +27,7 @@ stdenv.mkDerivation { inherit src; sourceRoot = "${src.name}/${baseName}"; - nativeBuildInputs = [ cmake python3 libllvm.dev ] + nativeBuildInputs = [ cmake ninja python3 libllvm.dev ] ++ lib.optional stdenv.isDarwin xcbuild.xcrun; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; @@ -39,6 +39,8 @@ stdenv.mkDerivation { "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" + ] ++ lib.optionals (haveLibc && stdenv.hostPlatform.libc == "glibc") [ + "-DSANITIZER_COMMON_CFLAGS=-I${libxcrypt}/include" ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" @@ -75,8 +77,10 @@ stdenv.mkDerivation { ./normalize-var.patch # Prevent a compilation error on darwin ./darwin-targetconditionals.patch + # See: https://github.com/NixOS/nixpkgs/pull/186575 ../../common/compiler-rt/darwin-plistbuddy-workaround.patch - ./armv7l.patch + # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 + ../../common/compiler-rt/armv7l-15.patch ]; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix index 67c6bcf443..a5ffc6a640 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, lib, stdenv, cmake +{ lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja , gccForLibs, preLibcCrossHeaders , libxml2, python3, isl, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross @@ -36,11 +36,22 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # See llvm/cmake/config-ix.cmake. + platforms = + lib.platforms.aarch64 ++ + lib.platforms.arm ++ + lib.platforms.m68k ++ + lib.platforms.mips ++ + lib.platforms.power ++ + lib.platforms.riscv ++ + lib.platforms.s390x ++ + lib.platforms.wasi ++ + lib.platforms.x86; }; tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version monorepoSrc buildLlvmTools; }); + callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 isl release_version version monorepoSrc buildLlvmTools; }); mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" @@ -220,7 +231,7 @@ let }); libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version monorepoSrc; }); + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake ninja libxml2 python3 isl release_version version monorepoSrc; }); in { compiler-rt-libc = callPackage ./compiler-rt { 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 a29edb0658..de4260540e 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 @@ -1,6 +1,6 @@ { lib, stdenv, llvm_meta , monorepoSrc, runCommand -, cmake, python3, fixDarwinDylibNames, version +, cmake, ninja, python3, fixDarwinDylibNames, version , cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi , libcxxabi, libcxxrt , enableShared ? !stdenv.hostPlatform.isStatic @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { patchShebangs utils/cat_files.py ''; - nativeBuildInputs = [ cmake python3 ] + nativeBuildInputs = [ cmake ninja python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = lib.optionals (!headersOnly) [ cxxabi ]; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; - buildFlags = lib.optional headersOnly "generate-cxx-headers"; + ninjaFlags = lib.optional headersOnly "generate-cxx-headers"; installTargets = lib.optional headersOnly "install-cxx-headers"; preInstall = lib.optionalString (stdenv.isDarwin && !headersOnly) '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index 3d5f875637..a36fb10b00 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, cmake, python3 +{ lib, stdenv, llvm_meta, cmake, ninja, python3 , monorepoSrc, runCommand, fetchpatch , cxx-headers, libunwind, version , enableShared ? !stdenv.hostPlatform.isStatic @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { cd ../runtimes ''; - nativeBuildInputs = [ cmake python3 ]; + nativeBuildInputs = [ cmake ninja python3 ]; buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.hostPlatform.isWasm) libunwind; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libunwind/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libunwind/default.nix index 0b59fff135..dd14e2acaf 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libunwind/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libunwind/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, llvm_meta, version , monorepoSrc, runCommand , cmake +, ninja , python3 , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake python3 ]; + nativeBuildInputs = [ cmake ninja python3 ]; cmakeFlags = [ "-DLLVM_ENABLE_RUNTIMES=libunwind" diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lld/default.nix index 9d17766436..cc18aee76a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lld/default.nix @@ -2,6 +2,7 @@ , buildLlvmTools , monorepoSrc, runCommand , cmake +, ninja , libxml2 , libllvm , version @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { ./gnu-install-dirs.patch ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ninja ]; buildInputs = [ libllvm libxml2 ]; cmakeFlags = [ @@ -36,6 +37,9 @@ stdenv.mkDerivation rec { "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" ]; + # Musl's default stack size is too small for lld to be able to link Firefox. + LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; + outputs = [ "out" "lib" "dev" ]; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lldb/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lldb/default.nix index 6e6fe5cf06..a02c5ca4b1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lldb/default.nix @@ -2,6 +2,7 @@ , runCommand , monorepoSrc , cmake +, ninja , zlib , ncurses , swig @@ -49,7 +50,7 @@ stdenv.mkDerivation (rec { outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ - cmake python3 which swig lit makeWrapper lua5_3 + cmake ninja python3 which swig lit makeWrapper lua5_3 ] ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; @@ -120,9 +121,7 @@ stdenv.mkDerivation (rec { } // lib.optionalAttrs enableManpages { pname = "lldb-manpages"; - buildPhase = '' - make docs-lldb-man - ''; + ninjaFlags = [ "docs-lldb-man" ]; propagatedBuildInputs = []; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix index 9a0d375df9..6651d6347e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -4,6 +4,7 @@ , runCommand , fetchpatch , cmake +, ninja , python3 , libffi , enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi) @@ -50,7 +51,7 @@ in stdenv.mkDerivation (rec { outputs = [ "out" "lib" "dev" "python" ]; - nativeBuildInputs = [ cmake python3 ] + nativeBuildInputs = [ cmake ninja python3 ] ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; buildInputs = [ libxml2 libffi ] @@ -103,7 +104,7 @@ in stdenv.mkDerivation (rec { preConfigure = '' # Workaround for configure flags that need to have spaces cmakeFlagsArray+=( - -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + -DLLVM_LIT_ARGS="-svj''${NIX_BUILD_CORES} --no-progress-bar" ) ''; @@ -245,15 +246,10 @@ in stdenv.mkDerivation (rec { } // lib.optionalAttrs enableManpages { pname = "llvm-manpages"; - buildPhase = '' - make docs-llvm-man - ''; - propagatedBuildInputs = []; - installPhase = '' - make -C docs install - ''; + ninjaFlags = [ "docs-llvm-man" ]; + installTargets = [ "install-docs-llvm-man" ]; postPatch = null; postInstall = null; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/openmp/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/openmp/default.nix index 9355fe667f..f22101e9ca 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/openmp/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/openmp/default.nix @@ -4,6 +4,7 @@ , monorepoSrc , runCommand , cmake +, ninja , llvm , lit , clang-unwrapped @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake perl pkg-config lit ]; + nativeBuildInputs = [ cmake ninja perl pkg-config lit ]; buildInputs = [ llvm ]; # Unsup:Pass:XFail:Fail diff --git a/third_party/nixpkgs/pkgs/development/compilers/marst/default.nix b/third_party/nixpkgs/pkgs/development/compilers/marst/default.nix index 8412c149c2..8644fcf7bf 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/marst/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/marst/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "2.7"; src = fetchurl { - url = "mirror://gnu/gnu/${pname}/${pname}-${version}.tar.gz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; hash = "sha256-Pue50cvjzZ+19iJxfae7VQbxpto7MPgS4jhLh7zk2lA="; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/minimacy/default.nix b/third_party/nixpkgs/pkgs/development/compilers/minimacy/default.nix index e58b8ad498..557be6880e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/minimacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/minimacy/default.nix @@ -1,21 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, makeBinaryWrapper -, alsaLib, libX11, libXext, libGL, libGLU +{ lib +, stdenv +, alsa-lib +, fetchFromGitHub +, libGL +, libGLU +, libX11 +, libXext +, makeBinaryWrapper }: stdenv.mkDerivation rec { pname = "minimacy"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "ambermind"; repo = pname; rev = version; - sha256 = "i0Z1UKApX+elHmFgujwjiF7k6OmtFF37HJim464OMfU="; + hash = "sha256-qIK7QnXZ9FmfarMZaHktZCHhvR8cctyKVpFS8PeOpLs="; }; nativeBuildInputs = [ makeBinaryWrapper ]; - buildInputs = [ libGL libGLU ] ++ lib.optionals stdenv.isLinux [ alsaLib libX11 libXext ]; + buildInputs = [ libGL libGLU ] ++ lib.optionals stdenv.isLinux [ alsa-lib libX11 libXext ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix b/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix index c2cc7bb40b..7797ec036d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix @@ -12,6 +12,7 @@ in , flambdaSupport ? false , spaceTimeSupport ? false , unsafeStringSupport ? false +, framePointerSupport ? false }: assert useX11 -> safeX11 stdenv; @@ -19,6 +20,7 @@ assert aflSupport -> lib.versionAtLeast version "4.05"; assert flambdaSupport -> lib.versionAtLeast version "4.03"; assert spaceTimeSupport -> lib.versionAtLeast version "4.04" && lib.versionOlder version "4.12"; assert unsafeStringSupport -> lib.versionAtLeast version "4.06" && lib.versionOlder version "5.0"; +assert framePointerSupport -> lib.versionAtLeast version "4.01"; let src = args.src or (fetchurl { @@ -28,9 +30,14 @@ let in let - useNativeCompilers = !stdenv.isMips; - inherit (lib) optional optionals optionalString; - pname = "ocaml${optionalString aflSupport "+afl"}${optionalString spaceTimeSupport "+spacetime"}${optionalString flambdaSupport "+flambda"}"; + useNativeCompilers = !stdenv.isMips; + inherit (lib) optional optionals optionalString strings concatStrings; + pname = concatStrings [ "ocaml" + (optionalString aflSupport "+afl") + (optionalString spaceTimeSupport "+spacetime") + (optionalString flambdaSupport "+flambda") + (optionalString framePointerSupport "+fp") + ]; in let @@ -61,6 +68,7 @@ stdenv.mkDerivation (args // { ++ optional aflSupport (flags "--with-afl" "-afl-instrument") ++ optional flambdaSupport (flags "--enable-flambda" "-flambda") ++ optional spaceTimeSupport (flags "--enable-spacetime" "-spacetime") + ++ optional framePointerSupport (flags "--enable-frame-pointers" "-with-frame-pointers") ++ optionals unsafeStringSupport [ "--disable-force-safe-string" "DEFAULT_STRING=unsafe" diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix index d350c93711..75e2d9c171 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix @@ -6,6 +6,9 @@ , headless ? false , enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf +# Hold back make-4.4 as 4.4.1 breaks the build: +# https://github.com/NixOS/nixpkgs/issues/219513 +, gnumake44 }: let @@ -25,7 +28,7 @@ let sha256 = "sha256-QGOpMIrWwOtIcUY/CLbTRDvcVTG2xioZu46v+n+IIQ4="; }; - nativeBuildInputs = [ pkg-config autoconf unzip ]; + nativeBuildInputs = [ gnumake44 pkg-config autoconf unzip ]; buildInputs = [ cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/17.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/17.nix index 4714bf11c5..c085d66997 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/17.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/17.nix @@ -6,6 +6,9 @@ , headless ? false , enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf +# Hold back make-4.4 as 4.4.1 breaks the build: +# https://github.com/NixOS/nixpkgs/issues/219513 +, gnumake44 }: let @@ -26,7 +29,7 @@ let sha256 = "sha256-zPpINi++3Ct0PCwlwlfhceh/ploMkclw+MgeI9dULdc="; }; - nativeBuildInputs = [ pkg-config autoconf unzip ]; + nativeBuildInputs = [ gnumake44 pkg-config autoconf unzip ]; buildInputs = [ cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/19.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/19.nix index 41a630425e..1ac3796cf9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/19.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/19.nix @@ -9,6 +9,9 @@ , headless ? stdenv.targetPlatform.isGhcjs , enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf +# Hold back make-4.4 as 4.4.1 breaks the build: +# https://github.com/NixOS/nixpkgs/issues/219513 +, gnumake44 }: let @@ -29,7 +32,7 @@ let hash = "sha256-pBEHmBtIgG4Czou4C/zpBBYZEDImvXiLoA5CjOzpeyI="; }; - nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; + nativeBuildInputs = [ gnumake44 pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; buildInputs = [ cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst diff --git a/third_party/nixpkgs/pkgs/development/compilers/p4c/default.nix b/third_party/nixpkgs/pkgs/development/compilers/p4c/default.nix index 08406a2773..c26aa44170 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/p4c/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/p4c/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "p4c"; - version = "1.2.3.6"; + version = "1.2.3.7"; src = fetchFromGitHub { owner = "p4lang"; repo = "p4c"; rev = "v${version}"; - sha256 = "sha256-3i2L1wORVN+X5sr4Hs+zGD/GgM1sAXt34R4kGMkd4qk="; + sha256 = "sha256-s9uUq86xbqU21jfAF42blbbIvHlkv7W75rotjSbMxHc="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix index 9311c3112c..67beaf6a0a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix @@ -1,24 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pcre2, coreutils, which, openssl, libxml2, cmake, z3, substituteAll, python3, - cc ? stdenv.cc, lto ? !stdenv.isDarwin }: +{ lib +, stdenv +, fetchFromGitHub +, callPackage +, cc ? stdenv.cc +, cmake +, coreutils +, libxml2 +, lto ? !stdenv.isDarwin +, makeWrapper +, openssl +, pcre2 +, pony-corral +, python3 +, substituteAll +, which +, z3 +}: stdenv.mkDerivation (rec { pname = "ponyc"; - version = "0.50.0"; + version = "0.54.0"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "sha256-FnzlFTiJrqoUfnys+q9is6OH9yit5ExDiRszQ679QbY="; - + hash = "sha256-qFPubqGfK0WCun6QA1OveyDJj7Wf6SQpky7pEb7qsf4="; fetchSubmodules = true; }; ponygbenchmark = fetchFromGitHub { owner = "google"; repo = "benchmark"; - rev = "v1.5.4"; - sha256 = "1dbjdjzkpbsq3jl9ksyg8mw759vkac8qzq1557m73ldnavbhz48x"; + rev = "v1.7.1"; + hash = "sha256-gg3g/0Ki29FnGqKv9lDTs5oA9NjH23qQ+hTdVtSU+zo="; }; nativeBuildInputs = [ cmake makeWrapper which python3 ]; @@ -32,15 +47,11 @@ stdenv.mkDerivation (rec { googletest = fetchFromGitHub { owner = "google"; repo = "googletest"; - rev = "release-1.10.0"; - sha256 = "1zbmab9295scgg4z2vclgfgjchfjailjnvzc6f5x9jvlsdi3dpwz"; + # GoogleTest follows Abseil Live at Head philosophy, use latest commit from main branch as often as possible. + rev = "1a727c27aa36c602b24bf170a301aec8686b88e8"; # unstable-2023-03-07 + hash = "sha256-/FWBSxZESwj/QvdNK5BI2EfonT64DP1eGBZR4O8uJww="; }; }) - (fetchpatch { - name = "remove-decnet-header.patch"; - url = "https://github.com/ponylang/ponyc/commit/e5b9b5daec5b19415d519b09954cbd3cf5f34220.patch"; - hash = "sha256-60cOhBBwQxWLwEx+svtFtJ7POQkHzJo2LDPRJ5L/bNk="; - }) ]; postUnpack = '' @@ -52,9 +63,6 @@ stdenv.mkDerivation (rec { dontConfigure = true; postPatch = '' - # Patching Vendor LLVM - patchShebangs --host build/build_libs/gbenchmark-prefix/src/benchmark/tools/*.py - patch -d lib/llvm/src/ -p1 < lib/llvm/patches/2020-07-28-01-c-exports.diff substituteInPlace packages/process/_test.pony \ --replace '"/bin/' '"${coreutils}/bin/' \ --replace '=/bin' "${coreutils}/bin" @@ -63,7 +71,6 @@ stdenv.mkDerivation (rec { --replace "/opt/local/lib" "" ''; - preBuild = '' make libs build_flags=-j$NIX_BUILD_CORES make configure build_flags=-j$NIX_BUILD_CORES @@ -72,17 +79,14 @@ stdenv.mkDerivation (rec { makeFlags = [ "PONYC_VERSION=${version}" "prefix=${placeholder "out"}" - ] - ++ lib.optionals stdenv.isDarwin [ "bits=64" ] - ++ lib.optionals (stdenv.isDarwin && (!lto)) [ "lto=no" ]; - - doCheck = true; + ] ++ lib.optionals stdenv.isDarwin ([ "bits=64" ] ++ lib.optional (!lto) "lto=no"); env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=redundant-move" "-Wno-error=implicit-fallthrough" ]; + doCheck = true; + installPhase = "make config=release prefix=$out " - + lib.optionalString stdenv.isDarwin "bits=64 " - + lib.optionalString (stdenv.isDarwin && (!lto)) "lto=no " + + lib.optionalString stdenv.isDarwin ("bits=64 " + (lib.optionalString (!lto) "lto=no ")) + '' install wrapProgram $out/bin/ponyc \ --prefix PATH ":" "${stdenv.cc}/bin" \ @@ -93,11 +97,13 @@ stdenv.mkDerivation (rec { # Stripping breaks linking for ponyc dontStrip = true; + passthru.tests.pony-corral = pony-corral; + meta = with lib; { description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language"; homepage = "https://www.ponylang.org"; license = licenses.bsd2; - maintainers = with maintainers; [ kamilchm patternspandemic redvers ]; + maintainers = with maintainers; [ kamilchm patternspandemic redvers superherointj ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; }; }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch b/third_party/nixpkgs/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch index 1c6c404762..098b61c188 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch @@ -1,18 +1,26 @@ +From e26ae067644ea780f050fb900bd850027bb86456 Mon Sep 17 00:00:00 2001 +From: superherointj <5861043+superherointj@users.noreply.github.com> +Date: Tue, 7 Mar 2023 14:59:31 -0300 +Subject: [PATCH] make-safe-for-sandbox.patch + +--- + lib/CMakeLists.txt | 80 ++-------------------------------------------- + 1 file changed, 2 insertions(+), 78 deletions(-) + diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index dab2aaef..26b587b1 100644 +index 129e26e6..d25bdf9d 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -36,7 +36,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") - endif() +@@ -32,14 +32,14 @@ endif() + set(PONYC_GBENCHMARK_URL https://github.com/google/benchmark/archive/v1.7.1.tar.gz) ExternalProject_Add(gbenchmark - URL ${PONYC_GBENCHMARK_URL} + SOURCE_DIR gbenchmark-prefix/src/benchmark - CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DCMAKE_CXX_FLAGS=${PONY_PIC_FLAG} --no-warn-unused-cli + CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DBENCHMARK_ENABLE_WERROR=OFF -DCMAKE_CXX_FLAGS=${PONY_PIC_FLAG} --no-warn-unused-cli ) -@@ -46,7 +46,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") - endif() + set(PONYC_GOOGLETEST_URL https://github.com/google/googletest/archive/release-1.12.1.tar.gz) ExternalProject_Add(googletest - URL ${PONYC_GOOGLETEST_URL} @@ -20,14 +28,14 @@ index dab2aaef..26b587b1 100644 CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_CXX_FLAGS=${PONY_PIC_FLAG} -Dgtest_force_shared_crt=ON --no-warn-unused-cli ) -@@ -59,82 +59,6 @@ install(TARGETS blake2 +@@ -52,82 +52,6 @@ install(TARGETS blake2 COMPONENT library ) -find_package(Git) - --set(LLVM_DESIRED_HASH "75e33f71c2dae584b13a7d1186ae0a038ba98838") --set(PATCHES_DESIRED_HASH "a16f299fbfced16a2bbc628746db341f2a5af9ae8cc9c9ef4b1e9ca26de3c292") +-set(LLVM_DESIRED_HASH "1f9140064dfbfb0bbda8e51306ea51080b2f7aac") +-set(PATCHES_DESIRED_HASH "3e16c097794cb669a8f6a0bd7600b440205ac5c29a6135750c2e83263eb16a95") - -if(GIT_FOUND) - if(EXISTS "${PROJECT_SOURCE_DIR}/../.git") @@ -102,4 +110,7 @@ index dab2aaef..26b587b1 100644 - message("Building targets: ${LLVM_TARGETS_TO_BUILD}") - set(LLVM_ENABLE_BINDINGS OFF) + set(LLVM_ENABLE_BINDINGS OFF CACHE BOOL "ponyc specific override of LLVM cache entry") +-- +2.39.2 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix b/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix index a399737334..e47bfd376c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation ( rec { pname = "corral"; - version = "0.6.1"; + version = "unstable-2023-02-11"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-Rv1K6kFRylWodm1uACBs8KqqEqQZh86NqAG50heNteE="; + rev = "f31353a9ec9cd7eab6ee89079ae6a782192fd4b5"; + hash = "sha256-jTx/7iFvmwOdjGVf/6NUy+FTkv6Mkv8DeotJ67pvmtc="; }; buildInputs = [ ponyc ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation ( rec { homepage = "https://www.ponylang.io"; changelog = "https://github.com/ponylang/corral/blob/${version}/CHANGELOG.md"; license = licenses.bsd2; - maintainers = with maintainers; [ redvers ]; + maintainers = with maintainers; [ redvers superherointj ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix b/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix index acd889ce85..348d296342 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,7 +18,7 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.15.7"; + version = "0.15.8"; # These hashes can be updated automatically by running the ./update.sh script. src = @@ -26,12 +26,12 @@ in stdenv.mkDerivation rec { then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "0aq5sr93z6c5l76sqbj3g48z6yrhxfqxri0x1ajmjwhcwjg79d6v"; + sha256 = "0aq6b8yw2ll3qgmc21ap2pxfnr7glqhrjx3ggc21q4gwq3zxrrrp"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "032jqrk46k9zbq058ms8rnrq0209rd8vkxwj73vqrlgqvpzlfl5k"; + sha256 = "192px9a4ja1iazhahc6ilgxk0x2bjp59qxd9zaww4pldj1b7z20y"; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix index 130cb83261..7cb6f22c94 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix @@ -54,9 +54,7 @@ in stdenv.mkDerivation rec { # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch' optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state" ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++" - ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib" - # https://github.com/NixOS/nixpkgs/issues/201254 - ++ optional (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"); + ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib"); # Increase codegen units to introduce parallelism within the compiler. RUSTFLAGS = "-Ccodegen-units=10"; @@ -195,9 +193,7 @@ in stdenv.mkDerivation rec { configurePlatforms = []; - # https://github.com/NixOS/nixpkgs/pull/21742#issuecomment-272305764 - # https://github.com/rust-lang/rust/issues/30181 - # enableParallelBuilding = false; + enableParallelBuilding = true; setupHooks = ./setup-hook.sh; diff --git a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix index 6db4b9c959..fd3007cc15 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -103,8 +103,8 @@ in rec { }; vala_0_56 = generic { - version = "0.56.3"; - sha256 = "4QZiIb97icsfpzJ6OIhkXLM7YE3jv0WqgRMv0EC2mb8="; + version = "0.56.4"; + sha256 = "hixB2ThUPtPY2GyCGaYQh3lxk97+6NoMUMr0mZPGa2o="; }; vala = vala_0_56; diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix index dfe5152993..538dd40db4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix @@ -71,13 +71,13 @@ let in stdenv.mkDerivation rec { pname = "yosys"; - version = "0.26"; + version = "0.27"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "${pname}-${version}"; - hash = "sha256-0xV+323YTK+VhnD05SmvGv8uT4TzqA9IZ/iKl1as1Kc="; + hash = "sha256-u6SeVlmQVCF3xCGajxsv0ZAgMKg6aa6WdN3DLKTPNYo="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/ITree/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/ITree/default.nix index e0a9e1f6bf..ae43722a5e 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/ITree/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/ITree/default.nix @@ -5,8 +5,10 @@ mkCoqDerivation rec { owner = "DeepSpec"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ + { case = range "8.13" "8.17"; out = "5.1.0"; } { case = range "8.10" "8.16"; out = "4.0.0"; } ] null; + release."5.1.0".sha256 = "sha256-ny7Mi1KgWADiFznkNJiRgD7Djc5SUclNgKOmWRxK+eo="; release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm"; releaseRev = v: "${v}"; propagatedBuildInputs = [ coq-ext-lib paco ]; 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 7e7ec784c3..8b932499ca 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 @@ -8,6 +8,7 @@ with builtins; with lib; let { case = "8.14"; out = { version = "1.13.7"; };} { case = "8.15"; out = { version = "1.15.0"; };} { case = "8.16"; out = { version = "1.16.5"; };} + { case = "8.17"; out = { version = "1.16.5"; };} ] {} ); in mkCoqDerivation { pname = "elpi"; @@ -15,6 +16,7 @@ in mkCoqDerivation { owner = "LPCIC"; inherit version; defaultVersion = lib.switch coq.coq-version [ + { case = "8.17"; out = "1.17.0"; } { case = "8.16"; out = "1.15.6"; } { case = "8.15"; out = "1.14.0"; } { case = "8.14"; out = "1.11.2"; } @@ -22,6 +24,7 @@ in mkCoqDerivation { { case = "8.12"; out = "1.8.3_8.12"; } { case = "8.11"; out = "1.6.3_8.11"; } ] null; + release."1.17.0".sha256 = "sha256-J8GatRKFU0ekNCG3V5dBI+FXypeHcLgC5QJYGYzFiEM="; release."1.15.6".sha256 = "sha256-qc0q01tW8NVm83801HHOBHe/7H1/F2WGDbKO6nCXfno="; release."1.15.1".sha256 = "sha256-NT2RlcIsFB9AvBhMxil4ZZIgx+KusMqDflj2HgQxsZg="; release."1.14.0".sha256 = "sha256:1v2p5dlpviwzky2i14cj7gcgf8cr0j54bdm9fl5iz1ckx60j6nvp"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix index d555e55389..8991787873 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation rec { owner = "coq-ext-lib"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.11" "8.16"; out = "0.11.7"; } + { case = range "8.11" "8.17"; out = "0.11.7"; } { case = range "8.8" "8.16"; out = "0.11.6"; } { case = range "8.8" "8.14"; out = "0.11.4"; } { case = range "8.8" "8.13"; out = "0.11.3"; } 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 1ccbf9e82a..65c516d302 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix @@ -8,7 +8,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.13" "8.16") (isGe "1.13.0") ]; out = "1.1.1"; } + { cases = [ (range "8.13" "8.17") (isGe "1.13.0") ]; out = "1.1.1"; } { 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"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix index 922a601584..526ba4985c 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix @@ -7,7 +7,7 @@ mkCoqDerivation { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.12" "8.16"; out = "3.3.0"; } + { case = range "8.12" "8.17"; out = "3.3.0"; } { case = range "8.8" "8.16"; out = "3.2.0"; } { case = range "8.8" "8.13"; out = "3.1.0"; } { case = range "8.5" "8.9"; out = "3.0.2"; } 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 cf39c8211b..3ad6f6d478 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/flocq/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/flocq/default.nix @@ -7,10 +7,12 @@ mkCoqDerivation { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.14" "8.17"; out = "4.1.1"; } { case = range "8.14" "8.16"; out = "4.1.0"; } { case = range "8.7" "8.15"; out = "3.4.3"; } { case = range "8.5" "8.8"; out = "2.6.1"; } ] null; + release."4.1.1".sha256 = "sha256-FbClxlV0ZaxITe7s9SlNbpeMNDJli+Dfh2TMrjaMtHo="; release."4.1.0".sha256 = "sha256:09rak9cha7q11yfqracbcq75mhmir84331h1218xcawza48rbjik"; release."3.4.3".sha256 = "sha256-YTdWlEmFJjCcHkl47jSOgrGqdXoApJY4u618ofCaCZE="; release."3.4.2".sha256 = "1s37hvxyffx8ccc8mg5aba7ivfc39p216iibvd7f2cb9lniqk1pw"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix index cbd919c7aa..2c9f4e4cf2 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix @@ -1,19 +1,21 @@ { lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-finmap, mathcomp-fingroup -, hierarchy-builder, version ? null }: +, fourcolor, hierarchy-builder, version ? null }: mkCoqDerivation { pname = "graph-theory"; release."0.9".sha256 = "sha256-Hl3JS9YERD8QQziXqZ9DqLHKp63RKI9HxoFYWSkJQZI="; + release."0.9.1".sha256 = "sha256-lRRY+501x+DqNeItBnbwYIqWLDksinWIY4x/iojRNYU="; releaseRev = v: "v${v}"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.13" "8.16"; out = "0.9"; } + { case = range "8.14" "8.16"; out = "0.9.1"; } + { case = range "8.12" "8.12"; out = "0.9"; } ] null; - propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup hierarchy-builder ]; + propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup fourcolor hierarchy-builder ]; meta = with lib; { description = "Library of formalized graph theory results in Coq"; 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 9bcc07387b..464ef4fc30 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,7 +5,7 @@ let hb = mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.15" "8.16"; out = "1.4.0"; } + { case = range "8.15" "8.17"; out = "1.4.0"; } { 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"; } 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 02a249549d..7e9ba5f838 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix @@ -7,12 +7,14 @@ mkCoqDerivation rec { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.12" "8.17"; out = "4.6.1"; } { case = range "8.12" "8.16"; out = "4.6.0"; } { case = range "8.8" "8.16"; out = "4.5.2"; } { case = range "8.8" "8.12"; out = "4.0.0"; } { case = range "8.7" "8.11"; out = "3.4.2"; } { case = range "8.5" "8.6"; out = "3.3.0"; } ] null; + release."4.6.1".sha256 = "sha256-ZZSxt8ksz0g6dl/LEido5qJXgsaxHrVLqkGUHu90+e0="; release."4.6.0".sha256 = "sha256-n9ECKnV0L6XYcIcbYyOJKwlbisz/RRbNW5YESHo07X0="; release."4.5.2".sha256 = "sha256-r0yE9pkC4EYlqsimxkdlCXevRcwKa3HGFZiUH+ueUY8="; release."4.5.1".sha256 = "sha256-5OxbSPdw/1FFENubulKSk6fEIEYSPCxfvMMgtgN6j6s="; 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 e4f198695f..27825c0564 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 @@ -26,10 +26,10 @@ let defaultVersion = with versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.14") (isGe "1.13.0") ]; out = "0.6.1"; } { cases = [ (isGe "8.14") (range "1.13" "1.15") ]; out = "0.5.2"; } - { cases = [ (isGe "8.13") (range "1.13" "1.14") ]; out = "0.5.1"; } + { cases = [ (range "8.13" "8.15") (range "1.13" "1.14") ]; out = "0.5.1"; } { cases = [ (range "8.13" "8.15") (range "1.12" "1.14") ]; 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.11" "8.14") (range "1.12" "1.13") ]; out = "0.3.10"; } + { cases = [ (range "8.11" "8.12") "1.11.0" ]; out = "0.3.4"; } { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "0.3.3"; } { cases = [ (range "8.10" "8.11") "1.11.0" ]; out = "0.3.1"; } { cases = [ (range "8.8" "8.11") (range "1.8" "1.10") ]; out = "0.2.3"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix index a4e4a1ecbb..97e6670599 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix @@ -12,7 +12,7 @@ mkCoqDerivation { }; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.10" "8.16"; out = "1.0.1"; } + { case = range "8.10" "8.17"; out = "1.0.1"; } { case = range "8.5" "8.14"; out = "1.0.0"; } ] null; 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 551d33c9fa..749fbb70b8 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 @@ mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.5.2"; } + { cases = [ (range "8.13" "8.17") (isGe "1.12") ]; out = "1.5.2"; } { 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"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index b114a3f290..cbc6b8cc71 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -8,6 +8,7 @@ mkCoqDerivation { owner = "math-comp"; inherit version; release = { + "1.1.4".sha256 = "sha256-8Hs6XfowbpeRD8RhMRf4ZJe2xf8kE0e8m7bPUzR/IM4="; "1.1.3".sha256 = "1vwmmnzy8i4f203i2s60dn9i0kr27lsmwlqlyyzdpsghvbr8h5b7"; "1.1.2".sha256 = "0907x4nf7nnvn764q3x9lx41g74rilvq5cki5ziwgpsdgb98pppn"; "1.1.1".sha256 = "0ksjscrgq1i79vys4zrmgvzy2y4ylxa8wdsf4kih63apw6v5ws6b"; @@ -18,6 +19,7 @@ mkCoqDerivation { }; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ + { cases = [ (isGe "8.13") (isGe "1.13.0") ]; out = "1.1.4"; } { cases = [ (isGe "8.13") (isGe "1.12.0") ]; out = "1.1.3"; } { cases = [ (isGe "8.10") (isGe "1.12.0") ]; out = "1.1.2"; } { cases = [ (isGe "8.7") "1.11.0" ]; out = "1.1.1"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix index 86dd239ebf..3ea7847146 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -9,11 +9,13 @@ mkCoqDerivation rec { defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp-algebra.version ] [ + { cases = [ (range "8.13" "8.17") (isGe "1.12") ]; out = "1.3.0+1.12+8.13"; } { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.1.0+1.12+8.13"; } ] null; release."1.0.0+1.12+8.13".sha256 = "1j533vx6lacr89bj1bf15l1a0s7rvrx4l00wyjv99aczkfbz6h6k"; release."1.1.0+1.12+8.13".sha256 = "1plf4v6q5j7wvmd5gsqlpiy0vwlw6hy5daq2x42gqny23w9mi2pr"; + release."1.3.0+1.12+8.13".sha256 = "sha256-ebfY8HatP4te44M6o84DSLpDCkMu4IroPCy+HqzOnTE="; propagatedBuildInputs = [ mathcomp-algebra mathcomp-ssreflect mathcomp-fingroup ]; 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 031536b7a6..ac94c3159b 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix @@ -19,6 +19,7 @@ let owner = "math-comp"; withDoc = single && (args.withDoc or false); defaultVersion = with versions; lib.switch coq.coq-version [ + { case = range "8.13" "8.17"; out = "1.16.0"; } { case = range "8.14" "8.16"; out = "1.15.0"; } { case = range "8.11" "8.15"; out = "1.14.0"; } { case = range "8.11" "8.15"; out = "1.13.0"; } @@ -31,6 +32,7 @@ let { case = range "8.5" "8.7"; out = "1.6.4"; } ] null; release = { + "1.16.0".sha256 = "sha256-gXTKhRgSGeRBUnwdDezMsMKbOvxdffT+kViZ9e1gEz0="; "1.15.0".sha256 = "1bp0jxl35ms54s0mdqky15w9af03f3i0n06qk12k4gw1xzvwqv21"; "1.14.0".sha256 = "07yamlp1c0g5nahkd2gpfhammcca74ga2s6qr7a3wm6y6j5pivk9"; "1.13.0".sha256 = "0j4cz2y1r1aw79snkcf1pmicgzf8swbaf9ippz0vg99a572zqzri"; 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 19c6015ce9..24ca5f77cf 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,8 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (isGe "8.10") (isGe "1.12.0") ]; out = "1.5.5"; } + { cases = [ (isGe "8.10") (isGe "1.13.0") ]; out = "1.5.6"; } + { cases = [ (range "8.10" "8.16") (range "1.12.0" "1.15.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 +18,7 @@ { cases = [ "8.6" (range "1.6" "1.7") ]; out = "1.1"; } ] null; release = { + "1.5.6".sha256 = "sha256-cMixgc34T9Ic6v+tYmL49QUNpZpPV5ofaNuHqblX6oY="; "1.5.5".sha256 = "sha256-VdXA51vr7DZl/wT/15YYMywdD7Gh91dMP9t7ij47qNQ="; "1.5.4".sha256 = "0s4sbh4y88l125hdxahr56325hdhxxdmqmrz7vv8524llyv3fciq"; "1.5.3".sha256 = "1462x40y2qydjd2wcg8r6qr8cx3xv4ixzh2h8vp9h7arylkja1qd"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix index e9163c1613..cbc947092a 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { owner = "snu-sf"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.12" "8.16"; out = "4.1.2"; } + { case = range "8.12" "8.17"; out = "4.1.2"; } { case = range "8.9" "8.13"; out = "4.1.1"; } { case = range "8.6" "8.13"; out = "4.0.2"; } { case = isEq "8.5"; out = "1.2.8"; } diff --git a/third_party/nixpkgs/pkgs/development/embedded/openocd/default.nix b/third_party/nixpkgs/pkgs/development/embedded/openocd/default.nix index dea8a56f38..4915b6df76 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/openocd/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/openocd/default.nix @@ -3,9 +3,13 @@ , fetchurl , pkg-config , hidapi -, libftdi1 , libusb1 , libgpiod + +, enableFtdi ? true, libftdi1 + +# Allow selection the hardware targets (SBCs, JTAG Programmers, JTAG Adapters) +, extraHardwareSupport ? [] }: stdenv.mkDerivation rec { @@ -24,17 +28,14 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-werror" "--enable-jtag_vpi" - "--enable-usb_blaster_libftdi" - (lib.enableFeature (! stdenv.isDarwin) "amtjtagaccel") - (lib.enableFeature (! stdenv.isDarwin) "gw16012") - "--enable-presto_libftdi" - "--enable-openjtag_ftdi" - (lib.enableFeature (! stdenv.isDarwin) "oocd_trace") "--enable-buspirate" - (lib.enableFeature stdenv.isLinux "sysfsgpio") - (lib.enableFeature stdenv.isLinux "linuxgpiod") "--enable-remote-bitbang" - ]; + (lib.enableFeature enableFtdi "ftdi") + (lib.enableFeature stdenv.isLinux "linuxgpiod") + (lib.enableFeature stdenv.isLinux "sysfsgpio") + ] ++ + map (hardware: "--enable-${hardware}") extraHardwareSupport + ; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ "-Wno-error=cpp" diff --git a/third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix b/third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix index 61a09e0473..00ee07a5fc 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix @@ -21,10 +21,11 @@ with python3.pkgs; buildPythonApplication rec { --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data.json}' substituteInPlace setup.py \ - --replace 'uvicorn==%s" % ("0.16.0" if PY36 else "0.19.*")' 'uvicorn>=0.16"' \ - --replace 'starlette==%s" % ("0.19.1" if PY36 else "0.21.*")' 'starlette>=0.19.1"' \ + --replace 'aiofiles==%s" % ("0.8.0" if PY36 else "22.1.*")' 'aiofiles"' \ + --replace 'starlette==%s" % ("0.19.1" if PY36 else "0.23.*")' 'starlette"' \ + --replace 'uvicorn==%s" % ("0.16.0" if PY36 else "0.20.*")' 'uvicorn"' \ --replace 'tabulate==%s" % ("0.8.10" if PY36 else "0.9.*")' 'tabulate>=0.8.10,<=0.9"' \ - --replace 'wsproto==' 'wsproto>=' + --replace 'wsproto==%s" % ("1.0.0" if PY36 else "1.2.*")' 'wsproto"' ''; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/gnuradio-modules/osmosdr/default.nix b/third_party/nixpkgs/pkgs/development/gnuradio-modules/osmosdr/default.nix index 20fe128266..a9a47e4d50 100644 --- a/third_party/nixpkgs/pkgs/development/gnuradio-modules/osmosdr/default.nix +++ b/third_party/nixpkgs/pkgs/development/gnuradio-modules/osmosdr/default.nix @@ -79,7 +79,7 @@ in mkDerivation { (if (gnuradio.versionAttr.major == "3.7") then python.pkgs.cheetah else - python.pkgs.Mako + python.pkgs.mako ) python ] 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 4884fa55cb..f598758f4a 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -132,7 +132,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 = "1g1m18l7cx2y5d43k0vy5bqn4znybq0p345399zf9nkwhwhb7s20"; + sha256 = "0ngvdcvskrhdq4m19h4b1cq3jhbzx0bqay6hvsppk6cb2y4wkfd9"; # 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 @@ -285,6 +285,11 @@ self: super: { opencv = dontCheck (appendPatch ./patches/opencv-fix-116.patch super.opencv); opencv-extra = dontCheck (appendPatch ./patches/opencv-fix-116.patch super.opencv-extra); + # Too strict lower bound on hspec + graphql = + assert lib.versionOlder self.hspec.version "2.10"; + doJailbreak super.graphql; + # https://github.com/ekmett/structures/issues/3 structures = dontCheck super.structures; @@ -1329,20 +1334,6 @@ self: super: { }) ] super.svgcairo; - # Espial is waiting for a hackage release to be compatible with GHC 9.X. - # [This issue](https://github.com/jonschoning/espial/issues/49) can be followed - # to track the status of the new release. - espial = - let ghc9-compat = fetchpatch { - url = "https://github.com/jonschoning/espial/commit/70177f9efb9666c3616e8a474681d3eb763d0e84.patch"; - sha256 = "sha256-aJtwZGp9DUpACBV0WYRL7k32m6qWf5vq6eKBFq/G23s="; - excludes = ["package.yaml" "stack.yaml" "stack.yaml.lock"]; - }; - in overrideCabal (drv: { - jailbreak = assert super.espial.version == "0.0.11"; true; - patches = [ ghc9-compat ]; - }) super.espial; - # Upstream PR: https://github.com/jkff/splot/pull/9 splot = appendPatch (fetchpatch { url = "https://github.com/jkff/splot/commit/a6710b05470d25cb5373481cf1cfc1febd686407.patch"; @@ -1352,7 +1343,7 @@ self: super: { # Fails with encoding problems, likely needs locale data. # Test can be executed by adding which to testToolDepends and # $PWD/dist/build/haskeline-examples-Test to $PATH. - haskeline_0_8_2 = dontCheck super.haskeline_0_8_2; + haskeline_0_8_2_1 = doDistribute (dontCheck super.haskeline_0_8_2_1); # Too strict upper bound on HTF # https://github.com/nikita-volkov/stm-containers/issues/29 @@ -1543,7 +1534,7 @@ self: super: { # 2022-03-19: strict upper bounds https://github.com/poscat0x04/hinit/issues/2 hinit = doJailbreak (self.generateOptparseApplicativeCompletions [ "hi" ] - (super.hinit.override { haskeline = self.haskeline_0_8_2; })); + (super.hinit.override { haskeline = self.haskeline_0_8_2_1; })); # 2020-11-23: https://github.com/Rufflewind/blas-hs/issues/8 blas-hs = dontCheck super.blas-hs; @@ -1800,10 +1791,11 @@ self: super: { # https://github.com/serokell/haskell-crypto/issues/25 crypto-sodium = dontCheck super.crypto-sodium; - # Too strict version bounds on a bunch of libraries: - # https://github.com/smallhadroncollider/taskell/issues/100 - # May be possible to remove at the next release (1.11.0) - taskell = doJailbreak super.taskell; + taskell = super.taskell.override { + # Does not support brick >= 1.0 + # https://github.com/smallhadroncollider/taskell/issues/125 + brick = self.brick_0_70_1; + }; # Polyfill for GHCs from the integer-simple days that don't bundle ghc-bignum ghc-bignum = super.ghc-bignum or self.mkDerivation { @@ -2125,6 +2117,7 @@ self: super: { "-p" "!/Test Rendering/" ] ++ drv.testFlags or []; }) super.morpheus-graphql; + drunken-bishop = doJailbreak super.drunken-bishop; # https://github.com/SupercedeTech/dropbox-client/issues/1 dropbox = overrideCabal (drv: { testFlags = [ @@ -2248,15 +2241,10 @@ self: super: { # Too strict bounds on chell: https://github.com/fpco/haskell-filesystem/issues/24 system-fileio = doJailbreak super.system-fileio; - # Temporarily upgrade haskell-gi until our hackage pin advances + # Temporarily upgrade haskell-gi until stackage advances # Fixes build of gi-harfbuzz with harfbuzz >= 7.0 # https://github.com/haskell-gi/haskell-gi/issues/396#issuecomment-1445181362 - haskell-gi = - assert super.haskell-gi.version == "0.26.2"; - overrideCabal { - version = "0.26.3"; - sha256 = "sha256-jsAb3JCSHCmi2dp9bpi/J3NRO/EQFB8ar4GpxAuBGOo="; - } super.haskell-gi; + haskell-gi = doDistribute self.haskell-gi_0_26_3; # Bounds too strict on base and ghc-prim: https://github.com/tibbe/ekg-core/pull/43 (merged); waiting on hackage release ekg-core = assert super.ekg-core.version == "0.1.1.7"; doJailbreak super.ekg-core; @@ -2503,4 +2491,7 @@ self: super: { # bytestring <0.11.0, optparse-applicative <0.13.0 # https://github.com/kseo/sfnt2woff/issues/1 sfnt2woff = doJailbreak super.sfnt2woff; + + # 2023-03-05: restrictive bounds on base https://github.com/diagrams/diagrams-gtk/issues/11 + diagrams-gtk = doJailbreak super.diagrams-gtk; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index db5e18beef..fac983969d 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -39,7 +39,7 @@ self: super: { stm = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; text = null; time = null; transformers = null; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 92278ebb0e..9b4abe3490 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -38,7 +38,7 @@ self: super: { stm = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; text = null; time = null; transformers = null; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 389bbd3081..82e221af6c 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -38,7 +38,7 @@ self: super: { stm = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; text = null; time = null; transformers = null; 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 6e347a76db..3ed8d155e8 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 @@ -40,7 +40,7 @@ self: super: { stm = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; text = null; time = null; transformers = null; 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 9fbeec03e4..3efd37a775 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 @@ -40,7 +40,7 @@ self: super: { stm = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; text = null; time = null; transformers = null; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index c95f0645b6..e063268f96 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -46,7 +46,7 @@ in { system-cxx-std-lib = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; text = null; time = null; transformers = null; @@ -71,7 +71,8 @@ in { # Jailbreaks & Version Updates - aeson = self.aeson_2_1_1_0; + # Jailbreak to allow quickcheck-instances-0.3.28 (too strict lower bound) + aeson = doDistribute (doJailbreak self.aeson_2_1_2_1); assoc = doJailbreak super.assoc; async = doJailbreak super.async; @@ -146,8 +147,7 @@ in { ] ++ drv.testFlags or []; }) (doJailbreak super.hpack); - # lens >= 5.1 supports 9.2.1 - lens = doDistribute self.lens_5_2; + lens = doDistribute self.lens_5_2_1; # Apply patches from head.hackage. language-haskell-extract = appendPatch (pkgs.fetchpatch { diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix new file mode 100644 index 0000000000..7ac21dd5f3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -0,0 +1,50 @@ +{ pkgs, haskellLib }: + +let + inherit (pkgs) lib; +in + +with haskellLib; + +self: super: { + llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages; + + # Disable GHC core libraries + array = null; + base = null; + binary = null; + bytestring = null; + Cabal = null; + Cabal-syntax = null; + containers = null; + deepseq = null; + directory = null; + exceptions = null; + filepath = null; + ghc-bignum = null; + ghc-boot = null; + ghc-boot-th = null; + ghc-compact = null; + ghc-heap = null; + ghc-prim = null; + ghci = null; + haskeline = null; + hpc = null; + integer-gmp = null; + libiserv = null; + mtl = null; + parsec = null; + pretty = null; + process = null; + rts = null; + stm = null; + system-cxx-std-lib = null; + template-haskell = null; + # terminfo is not built if GHC is a cross compiler + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; + text = null; + time = null; + transformers = null; + unix = null; + xhtml = null; +} diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index b96526640b..2ad093ab96 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -48,7 +48,7 @@ self: super: { stm = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; text = null; time = null; transformers = 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 6bcc4002cb..e224bfd4f5 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 @@ -296,6 +296,7 @@ broken-packages: - azure-email - azurify - b9 + - babl # wants pkg-config dependency `babl`, but pkgs.babl's pkg-config file is called babl-0.1.pc - backprop - backstop - backtracking-exceptions @@ -471,6 +472,7 @@ broken-packages: - brians-brain - brick-dropdownmenu - brick-filetree + - brick-list-search # failure in job https://hydra.nixos.org/build/211236614 at 2023-03-13 - bricks-internal - brick-tabular-list - brillig @@ -487,6 +489,7 @@ broken-packages: - bson-generics - bson-mapping - bsparse + - btree-concurrent # dependency missing in job https://hydra.nixos.org/build/211250233 at 2023-03-13 - btrfs - buffer - buffer-builder-aeson @@ -731,6 +734,7 @@ broken-packages: - clone-all - closure - cloudfront-signer + - clplug # failure in job https://hydra.nixos.org/build/211239834 at 2023-03-13 - clr-inline - clr-typed - cluss @@ -1129,7 +1133,6 @@ broken-packages: - dia-base - diagrams-boolean - diagrams-builder - - diagrams-gtk - diagrams-pdf - diagrams-qrcode - diagrams-rubiks-cube @@ -1237,7 +1240,6 @@ broken-packages: - drmaa - drone - dropbox - - drunken-bishop - dsc - ds-kanren - dsmc @@ -1460,6 +1462,7 @@ broken-packages: - fastedit - fastly - fast-nats + - fastparser # failure building library in job https://hydra.nixos.org/build/211240748 at 2023-03-13 - fastpbkdf2 - FastPush - fast-tagsoup-utf8-only @@ -2885,7 +2888,9 @@ broken-packages: - jvm-binary - jvm-parser - JYU-Utils + - k8s-wrapper # test failure in job https://hydra.nixos.org/build/211254982 at 2023-03-13 - kademlia + - kafka-client # dependency missing in job https://hydra.nixos.org/build/211238496 at 2023-03-13 - kafka-client-sync - kalman - Kalman @@ -3287,6 +3292,7 @@ broken-packages: - medium-sdk-haskell - meep - megalisp + - megastore # failure in job https://hydra.nixos.org/build/211239200 at 2023-03-13 - melf - mellon-core - melody @@ -3598,6 +3604,7 @@ broken-packages: - neural-network-hmatrix - newbase60 - newhope + - newline # dependency missing in job https://hydra.nixos.org/build/211250825 at 2023-03-13 - newports - newsletter - newt @@ -4283,6 +4290,7 @@ broken-packages: - quantification - quantum-arrow - quarantimer + - qudb # failure building executable 'qudb' in job https://hydra.nixos.org/build/211250260 at 2023-03-13 - quenya-verb - querystring-pickle - questioner @@ -4592,6 +4600,7 @@ broken-packages: - sandlib - sandman - sarasvati + - sasha # dependency missing in job https://hydra.nixos.org/build/211237944 at 2023-03-13 - sat - satchmo-backends - satchmo-minisat @@ -5210,7 +5219,6 @@ broken-packages: - tamarin-prover-utils - Tape - tapioca - - taskell - TaskMonad - tasty-auto - tasty-autocollect @@ -5799,6 +5807,7 @@ broken-packages: - whiskers - whois - why3 + - wide-word-instances # failure building library in job https://hydra.nixos.org/build/211245524 at 2023-03-13 - WikimediaParser - willow - windns 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 315a33baa0..f98916e76c 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 @@ -120,6 +120,7 @@ extra-packages: - ShellCheck == 0.8.0 # 2022-12-28: required by haskell-ci 0.14.3 - retrie < 1.2.0.0 # 2022-12-30: required for hls on ghc < 9.2 - ghc-tags == 1.5.* # 2023-02-18: preserve for ghc-lib == 9.2.* + - primitive == 0.7.4.0 # 2023-03-04: primitive 0.8 is not compatible with too many packages on ghc 9.4 as of now package-maintainers: abbradar: diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 169a3664f1..eb450fd1d6 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 20.11 +# Stackage LTS 20.12 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -11,7 +11,7 @@ default-package-overrides: - acid-state ==0.16.1.1 - action-permutations ==0.0.0.1 - active ==0.2.0.16 - - ad ==4.5.3 + - ad ==4.5.4 - ad-delcont ==0.3.0.0 - adjunctions ==4.4.2 - adler32 ==0.1.2.0 @@ -206,7 +206,7 @@ default-package-overrides: - Blammo ==1.1.1.1 - blank-canvas ==0.7.3 - blanks ==0.5.0 - - blas-carray ==0.1.0.1 + - blas-carray ==0.1.0.2 - blas-comfort-array ==0.0.0.3 - blas-ffi ==0.1 - blas-hs ==0.1.1.0 @@ -253,7 +253,7 @@ default-package-overrides: - bugsnag-wai ==1.0.0.1 - bugsnag-yesod ==1.0.0.1 - bugzilla-redhat ==1.0.1 - - burrito ==2.0.1.2 + - burrito ==2.0.1.3 - butcher ==1.3.3.2 - bv ==0.5 - byteable ==0.1.1 @@ -377,7 +377,7 @@ default-package-overrides: - colorize-haskell ==1.0.1 - colour ==2.3.6 - columnar ==1.0.0.0 - - combinatorial ==0.1.0.1 + - combinatorial ==0.1.1 - comfort-array ==0.5.2.1 - comfort-array-shape ==0.0 - comfort-fftw ==0.0 @@ -447,8 +447,8 @@ default-package-overrides: - cookie ==0.4.6 - copr-api ==0.1.0 - core-data ==0.3.9.0 - - core-program ==0.6.3.0 - - core-telemetry ==0.2.7.3 + - core-program ==0.6.5.0 + - core-telemetry ==0.2.8.0 - core-text ==0.3.8.0 - countable ==1.2 - country ==0.2.3 @@ -563,7 +563,7 @@ default-package-overrides: - Decimal ==0.5.2 - declarative ==0.5.4 - deepseq-generics ==0.2.0.0 - - deferred-folds ==0.9.18.2 + - deferred-folds ==0.9.18.3 - dejafu ==2.4.0.4 - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.4.0.0 @@ -603,7 +603,7 @@ default-package-overrides: - dimensional ==1.5 - di-monad ==1.3.1 - directory-tree ==0.12.1 - - direct-sqlite ==2.3.27 + - direct-sqlite ==2.3.28 - dirichlet ==0.1.0.7 - discount ==0.1.1 - discover-instances ==0.1.0.0 @@ -713,7 +713,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.13 - - esqueleto ==3.5.8.1 + - esqueleto ==3.5.8.2 - essence-of-live-coding ==0.2.7 - essence-of-live-coding-gloss ==0.2.7 - essence-of-live-coding-pulse ==0.2.7 @@ -801,7 +801,7 @@ default-package-overrides: - flexible-defaults ==0.0.3 - FloatingHex ==0.5 - floatshow ==0.2.4 - - flow ==2.0.0.1 + - flow ==2.0.0.2 - flush-queue ==1.0.0 - fmlist ==0.9.4 - fmt ==0.6.3.0 @@ -922,11 +922,11 @@ default-package-overrides: - ghc-prof ==1.4.1.12 - ghc-source-gen ==0.4.3.0 - ghc-syntax-highlighter ==0.0.8.0 - - ghc-tcplugins-extra ==0.4.3 + - ghc-tcplugins-extra ==0.4.4 - ghc-trace-events ==0.1.2.6 - - ghc-typelits-extra ==0.4.4 - - ghc-typelits-knownnat ==0.7.7 - - ghc-typelits-natnormalise ==0.7.7 + - ghc-typelits-extra ==0.4.5 + - ghc-typelits-knownnat ==0.7.8 + - ghc-typelits-natnormalise ==0.7.8 - ghc-typelits-presburger ==0.6.2.0 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.25 @@ -953,7 +953,7 @@ default-package-overrides: - gi-pango ==1.0.27 - githash ==0.1.6.3 - github ==0.28.0.1 - - github-release ==2.0.0.2 + - github-release ==2.0.0.3 - github-rest ==1.1.2 - github-types ==0.2.1 - github-webhooks ==0.16.0 @@ -1019,7 +1019,7 @@ default-package-overrides: - happstack-server ==7.7.2 - happstack-server-tls ==7.2.1.3 - happy ==1.20.1.1 - - happy-meta ==0.2.0.11 + - happy-meta ==0.2.1.0 - harp ==0.4.3.6 - HasBigDecimal ==0.2.0.0 - hasbolt ==0.1.6.2 @@ -1027,7 +1027,7 @@ default-package-overrides: - hashids ==1.0.2.7 - hashmap ==1.3.3 - hashtables ==1.3.1 - - haskeline ==0.8.2 + - haskeline ==0.8.2.1 - haskell-gi ==0.26.2 - haskell-gi-base ==0.26.3 - haskell-gi-overloading ==1.0 @@ -1063,7 +1063,7 @@ default-package-overrides: - hdaemonize ==0.5.6 - HDBC ==2.4.0.4 - HDBC-session ==0.1.2.0 - - headed-megaparsec ==0.2.1 + - headed-megaparsec ==0.2.1.1 - heap ==1.0.4 - heaps ==0.4 - heatshrink ==0.1.0.0 @@ -1143,7 +1143,7 @@ default-package-overrides: - hruby ==0.5.0.0 - hsass ==0.8.0 - hs-bibutils ==6.10.0.0 - - hsc2hs ==0.68.8 + - hsc2hs ==0.68.9 - hscolour ==1.24.4 - hsdns ==1.8 - hse-cpp ==0.2 @@ -1162,7 +1162,7 @@ default-package-overrides: - hslua-marshalling ==2.2.1 - hslua-module-doclayout ==1.0.4 - hslua-module-path ==1.0.3 - - hslua-module-system ==1.0.2 + - hslua-module-system ==1.0.3 - hslua-module-text ==1.0.3.1 - hslua-module-version ==1.0.3 - hslua-objectorientation ==2.2.1 @@ -1182,7 +1182,7 @@ default-package-overrides: - hspec-expectations-json ==1.0.0.7 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.6 - - hspec-golden ==0.2.0.0 + - hspec-golden ==0.2.0.1 - hspec-golden-aeson ==0.9.0.0 - hspec-hedgehog ==0.0.1.2 - hspec-junit-formatter ==1.1.0.2 @@ -1330,14 +1330,14 @@ default-package-overrides: - interpolatedstring-perl6 ==1.0.2 - interpolation ==0.1.1.2 - Interpolation ==0.3.0 - - IntervalMap ==0.6.1.2 + - IntervalMap ==0.6.2.0 - intervals ==0.9.2 - intset-imperative ==0.1.0.0 - invariant ==0.6 - invert ==1.0.0.2 - invertible-grammar ==0.1.3.3 - io-machine ==0.2.0.0 - - io-manager ==0.1.0.3 + - io-manager ==0.1.0.4 - io-memoize ==1.1.1.0 - io-region ==0.1.1 - io-storage ==0.3 @@ -1357,7 +1357,7 @@ default-package-overrides: - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - isocline ==1.0.9 - - isomorphism-class ==0.1.0.7 + - isomorphism-class ==0.1.0.9 - iterable ==3.0 - ixset ==1.1.1.2 - ixset-typed ==0.5.1.0 @@ -1377,11 +1377,11 @@ default-package-overrides: - js-flot ==0.8.3 - js-jquery ==3.3.1 - json ==0.10 - - json-feed ==2.0.0.4 + - json-feed ==2.0.0.5 - jsonifier ==0.2.1.2 - jsonpath ==0.3.0.0 - json-rpc ==1.0.4 - - json-stream ==0.4.4.2 + - json-stream ==0.4.5.2 - JuicyPixels ==3.3.7 - JuicyPixels-extra ==0.5.2 - JuicyPixels-scale-dct ==0.1.2 @@ -1410,7 +1410,7 @@ default-package-overrides: - koji ==0.0.2 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==2.0.0.3 + - lackey ==2.0.0.4 - LambdaHack ==0.11.0.0 - lame ==0.2.0 - language-avro ==0.1.4.0 @@ -1470,7 +1470,7 @@ default-package-overrides: - line ==4.0.1 - linear ==1.21.10 - linear-base ==0.3.0 - - linear-generics ==0.2 + - linear-generics ==0.2.1 - linebreak ==1.1.0.2 - linenoise ==0.3.2 - linux-capabilities ==0.1.1.0 @@ -1742,7 +1742,7 @@ default-package-overrides: - nonempty-containers ==0.3.4.4 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.4 - - nonempty-vector ==0.2.1.0 + - nonempty-vector ==0.2.2.0 - nonempty-zipper ==1.0.0.4 - non-negative ==0.1.2 - normaldistribution ==1.1.0.3 @@ -1794,7 +1794,7 @@ default-package-overrides: - opentelemetry-lightstep ==0.8.0 - opentelemetry-wai ==0.8.0 - open-witness ==0.6 - - operational ==0.2.4.1 + - operational ==0.2.4.2 - operational-class ==0.3.0.0 - opml-conduit ==0.9.0.0 - optics ==0.4.2 @@ -1844,10 +1844,9 @@ default-package-overrides: - partial-isomorphisms ==0.2.3.0 - partial-order ==0.2.0.0 - partial-semigroup ==0.6.0.1 - - password ==3.0.2.0 + - password ==3.0.2.1 - password-instances ==3.0.0.0 - password-types ==1.0.0.0 - - pasta-curves ==0.0.1.0 - path ==0.9.2 - path-binary-instance ==0.1.0.1 - path-dhall-instance ==0.2.1.0 @@ -1944,7 +1943,7 @@ default-package-overrides: - polysemy-webserver ==0.2.1.1 - polysemy-zoo ==0.8.1.0 - pontarius-xmpp ==0.5.6.5 - - pooled-io ==0.0.2.2 + - pooled-io ==0.0.2.3 - portable-lines ==0.1 - port-utils ==0.2.1.0 - posix-paths ==0.3.0.0 @@ -1987,13 +1986,13 @@ default-package-overrides: - primes ==0.2.1.0 - primitive ==0.7.3.0 - primitive-addr ==0.1.0.2 - - primitive-extras ==0.10.1.5 + - primitive-extras ==0.10.1.6 - primitive-offset ==0.2.0.0 - primitive-unaligned ==0.1.1.2 - primitive-unlifted ==0.1.3.1 - prim-uniq ==0.2 - print-console-colors ==0.1.0.0 - - probability ==0.2.7 + - probability ==0.2.8 - process-extras ==0.7.4 - product-profunctors ==0.11.0.3 - profiterole ==0.1 @@ -2019,7 +2018,7 @@ default-package-overrides: - proto-lens-protoc ==0.7.1.1 - proto-lens-runtime ==0.7.0.3 - proto-lens-setup ==0.4.0.6 - - protolude ==0.3.2 + - protolude ==0.3.3 - proxied ==0.3.1 - psql-helpers ==0.1.0.0 - psqueues ==0.2.7.3 @@ -2051,7 +2050,7 @@ default-package-overrides: - quickcheck-special ==0.1.0.6 - quickcheck-state-machine ==0.7.1 - quickcheck-text ==0.1.2.1 - - quickcheck-transformer ==0.3.1.1 + - quickcheck-transformer ==0.3.1.2 - quickcheck-unicode ==1.0.1.0 - quicklz ==1.5.0.11 - quiet ==0.2 @@ -2060,7 +2059,7 @@ default-package-overrides: - rainbow ==0.34.2.2 - rainbox ==0.26.0.0 - ral ==0.2.1 - - rampart ==2.0.0.3 + - rampart ==2.0.0.4 - ramus ==0.1.2 - rando ==0.0.0.4 - random ==1.2.1.1 @@ -2077,8 +2076,8 @@ default-package-overrides: - rank2classes ==1.4.6 - Rasterific ==0.7.5.4 - rasterific-svg ==0.3.3.2 - - ratel ==2.0.0.4 - - ratel-wai ==2.0.0.1 + - ratel ==2.0.0.5 + - ratel-wai ==2.0.0.2 - ratio-int ==0.1.2 - rattle ==0.2 - rattletrap ==11.2.14 @@ -2094,7 +2093,7 @@ default-package-overrides: - read-env-var ==1.0.0.0 - reanimate-svg ==0.13.0.1 - rebase ==1.16.1 - - rec-def ==0.2 + - rec-def ==0.2.1 - record-dot-preprocessor ==0.2.15 - record-hasfield ==1.0 - rec-smallarray ==0.1.0.0 @@ -2199,7 +2198,7 @@ default-package-overrides: - safe-json ==1.1.3.1 - safe-money ==0.9.1 - SafeSemaphore ==0.10.1 - - salve ==2.0.0.1 + - salve ==2.0.0.2 - sample-frame ==0.0.4 - sample-frame-np ==0.0.5 - sampling ==0.3.5 @@ -2268,7 +2267,7 @@ default-package-overrides: - servant-client-core ==0.19 - servant-conduit ==0.15.1 - servant-docs ==0.12 - - servant-elm ==0.7.2 + - servant-elm ==0.7.3 - servant-exceptions ==0.2.1 - servant-exceptions-server ==0.2.1 - servant-foreign ==0.15.4 @@ -2356,7 +2355,7 @@ default-package-overrides: - skylighting-core ==0.13.2.1 - skylighting-format-ansi ==0.1 - skylighting-format-blaze-html ==0.1.1 - - skylighting-format-context ==0.1.0.1 + - skylighting-format-context ==0.1.0.2 - skylighting-format-latex ==0.1 - slack-progressbar ==0.1.0.1 - slave-thread ==1.1.0.2 @@ -2404,12 +2403,12 @@ default-package-overrides: - srt-formatting ==0.1.0.0 - stache ==2.3.3 - stack ==2.9.1 - - stack-all ==0.4.0.1 + - stack-all ==0.4.1 - stack-clean-old ==0.4.6 - stack-templatizer ==0.1.0.2 - state-codes ==0.1.3 - stateref ==0.3 - - statestack ==0.3.1 + - statestack ==0.3.1.1 - StateVar ==1.2.2 - stateWriter ==0.3.0 - static-text ==0.2.0.7 @@ -2423,14 +2422,14 @@ default-package-overrides: - stm-containers ==1.2 - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 - - stm-hamt ==1.2.0.8 + - stm-hamt ==1.2.0.9 - stm-lifted ==2.5.0.0 - STMonadTrans ==0.4.6 - stm-split ==0.0.2.1 - stopwatch ==0.1.0.6 - storable-complex ==0.2.3.0 - storable-endian ==0.2.6.1 - - storable-record ==0.0.6 + - storable-record ==0.0.7 - storable-tuple ==0.0.3.3 - storablevector ==0.2.13.1 - store ==0.7.16 @@ -2470,9 +2469,9 @@ default-package-overrides: - stripe-scotty ==1.1.0.3 - stripe-signature ==1.0.0.15 - stripe-wreq ==1.0.1.15 - - strive ==6.0.0.4 + - strive ==6.0.0.5 - strongweak ==0.3.2 - - structs ==0.1.7 + - structs ==0.1.8 - structured ==0.1.1 - structured-cli ==2.7.0.1 - stylish-haskell ==0.14.3.0 @@ -2530,7 +2529,7 @@ default-package-overrides: - tasty ==1.4.3 - tasty-ant-xml ==1.1.8 - tasty-autocollect ==0.3.2.0 - - tasty-bench ==0.3.2 + - tasty-bench ==0.3.3 - tasty-dejafu ==2.1.0.0 - tasty-discover ==4.2.2 - tasty-expected-failure ==0.12.3 @@ -2763,7 +2762,7 @@ default-package-overrides: - universe-instances-extended ==1.1.3 - universe-reverse-instances ==1.1.1 - universe-some ==1.2.1 - - universum ==1.8.1 + - universum ==1.8.1.1 - unix-bytestring ==0.3.7.8 - unix-compat ==0.5.4 - unix-time ==0.4.8 @@ -2896,12 +2895,12 @@ default-package-overrides: - webrtc-vad ==0.1.0.3 - websockets ==0.12.7.3 - weigh ==0.0.16 - - wide-word ==0.1.4.0 + - wide-word ==0.1.5.0 - Win32 ==2.12.0.1 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==1.1.6.0 -with-compiler: ghc-9.2.5 + - witch ==1.1.6.1 +with-compiler: ghc-9.2.6 - withdependencies ==0.3.0 - witherable ==0.4.2 - within ==0.2.0.1 @@ -2925,7 +2924,7 @@ with-compiler: ghc-9.2.5 - writer-cps-mtl ==0.1.1.6 - writer-cps-transformers ==0.5.6.1 - wss-client ==0.3.0.0 - - wuss ==2.0.1.0 + - wuss ==2.0.1.1 - X11 ==1.10.3 - X11-xft ==0.3.4 - x11-xim ==0.0.9.0 @@ -2950,7 +2949,7 @@ with-compiler: ghc-9.2.5 - xmlgen ==0.6.2.2 - xml-hamlet ==0.5.0.2 - xml-helpers ==1.0.0 - - xmlhtml ==0.2.5.3 + - xmlhtml ==0.2.5.4 - xml-html-qq ==0.1.0.1 - xml-indexed-cursor ==0.1.1.0 - xml-lens ==0.3.1 @@ -2964,8 +2963,8 @@ with-compiler: ghc-9.2.5 - xor ==0.0.1.1 - xss-sanitize ==0.3.7.1 - xxhash-ffi ==0.2.0.0 - - yaml ==0.11.10.0 - - yaml-unscrambler ==0.1.0.12 + - yaml ==0.11.11.0 + - yaml-unscrambler ==0.1.0.13 - Yampa ==0.13.7 - yarn-lock ==0.6.5 - yeshql-core ==4.2.0.0 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 96818c6cce..9ca4158e82 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 @@ -676,10 +676,10 @@ dont-distribute-packages: - array-forth - arraylist - ascii-cows - - ascii-superset_1_2_7_0 + - ascii-superset_1_3_0_0 - ascii-table - ascii-th_1_2_0_0 - - ascii_1_5_4_0 + - ascii_1_6_0_0 - asic - asil - assert4hs-hspec @@ -1240,7 +1240,6 @@ dont-distribute-packages: - dingo-core - dingo-example - dingo-widgets - - diohsc - diplomacy-server - direct-rocksdb - directory-contents @@ -1398,6 +1397,7 @@ dont-distribute-packages: - eventuo11y-batteries - eventuo11y-json - eventuo11y-otel + - eventuo11y-prometheus - every-bit-counts - ewe - exference @@ -1578,6 +1578,7 @@ dont-distribute-packages: - geniconvert - geniserver - genvalidity-appendful + - genvalidity-dirforest - genvalidity-network-uri - genvalidity-sydtest - genvalidity-sydtest-aeson @@ -2200,6 +2201,8 @@ dont-distribute-packages: - hoppy-std - horizon-gen-nix - horizon-spec + - horizon-spec-lens + - horizon-spec-pretty - hotswap - hp2any-graph - hp2any-manager @@ -2472,6 +2475,7 @@ dont-distribute-packages: - kansas-lava-shake - karakuri - katip-rollbar + - keelung - keera-hails-mvc-environment-gtk - keera-hails-mvc-model-lightmodel - keera-hails-mvc-model-protectedmodel @@ -2555,6 +2559,7 @@ dont-distribute-packages: - latex-formulae-pandoc - latex-svg-hakyll - latex-svg-pandoc + - launchdarkly-server-sdk-redis-hedis - layered-state - layers-game - layouting @@ -2803,7 +2808,6 @@ dont-distribute-packages: - morley-upgradeable - morloc - morphisms-functors-inventory - - mosaico-lib - motor-diagrams - mp - mp3decoder @@ -3006,7 +3010,7 @@ dont-distribute-packages: - padKONTROL - pairing - panda - - pandoc-crossref_0_3_15_0 + - pandoc-crossref_0_3_15_1 - pandoc-highlighting-extensions - pandoc-japanese-filters - pandora-io @@ -3989,7 +3993,6 @@ dont-distribute-packages: - type-sub-th - typed-admin - typed-encoding-encoding - - typed-spreadsheet - typed-streams - typedflow - typelevel @@ -4148,6 +4151,7 @@ dont-distribute-packages: - websockets-rpc - websockets-simple - websockets-simple-extra + - weierstrass-functions - weighted - werewolf-slack - wgpu-hs 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 92dd0d665d..0642f04e36 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -879,17 +879,17 @@ self: super: builtins.intersectAttrs super { domaindriven-core = dontCheck super.domaindriven-core; cachix = overrideCabal (drv: { - version = "1.3"; + version = "1.3.1"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.3"; - sha256 = "sha256-y0CqfFIWd2nl1o2XvskHfaQRg8qqRZf16BYLAqJ+Q2Q="; + rev = "v1.3.1"; + sha256 = "sha256-fYQrAgxEMdtMAYadff9Hg4MAh0PSfGPiYw5Z4BrvgFU="; }; buildDepends = [ self.conduit-concurrent-map ]; postUnpack = "sourceRoot=$sourceRoot/cachix"; postPatch = '' - sed -i 's/1.2/1.3/' cachix.cabal + sed -i 's/1.3/1.3.1/' cachix.cabal ''; }) (super.cachix.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; @@ -897,12 +897,12 @@ self: super: builtins.intersectAttrs super { hnix-store-core = super.hnix-store-core_0_6_1_0; }); cachix-api = overrideCabal (drv: { - version = "1.3"; + version = "1.3.1"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.3"; - sha256 = "sha256-y0CqfFIWd2nl1o2XvskHfaQRg8qqRZf16BYLAqJ+Q2Q="; + rev = "v1.3.1"; + sha256 = "sha256-fYQrAgxEMdtMAYadff9Hg4MAh0PSfGPiYw5Z4BrvgFU="; }; postUnpack = "sourceRoot=$sourceRoot/cachix-api"; }) super.cachix-api; @@ -1076,15 +1076,12 @@ self: super: builtins.intersectAttrs super { hint = dontCheck super.hint; # Make sure that Cabal 3.8.* can be built as-is - Cabal_3_8_1_0 = doDistribute (overrideCabal (old: { - revision = assert old.revision == "1"; "2"; - editedCabalFile = "179y365wh9zgzkcn4n6m4vfsfy6vk4apajv8jpys057z3a71s4kp"; - }) (super.Cabal_3_8_1_0.override ({ + Cabal_3_8_1_0 = doDistribute (super.Cabal_3_8_1_0.override ({ Cabal-syntax = self.Cabal-syntax_3_8_1_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible process = self.process_1_6_17_0; - }))); + })); # cabal-install switched to build type simple in 3.2.0.0 # as a result, the cabal(1) man page is no longer installed 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 cd5575cd1b..bff5cd98c4 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -1340,8 +1340,8 @@ self: { pname = "BNFC-meta"; version = "0.6.1"; sha256 = "0snackflcjxza4iqbd85fdsmylwr3bj71nsfrs2s2idc3nlxc7ia"; - revision = "4"; - editedCabalFile = "1yjrkmzzpvsn6zpn2dy3fx0x4sf4q6w0ibxh6i1j3m7czmrbp30s"; + revision = "5"; + editedCabalFile = "1d0p524370r8jff7p3rnp6hrqlr85nhg8n2ydpfjwwmp4arp1il2"; libraryHaskellDepends = [ alex-meta array base fail happy-meta haskell-src-meta syb template-haskell @@ -2910,8 +2910,8 @@ self: { pname = "Cabal"; version = "3.8.1.0"; sha256 = "0236fddzhalsr2gjbjsk92rgh8866fks28r04g8fbmzkqbkcnr3l"; - revision = "1"; - editedCabalFile = "1bah5bdjy5zxpwnzsdqibf999nirm1np8j76vr34na5vg5knrlaq"; + revision = "2"; + editedCabalFile = "179y365wh9zgzkcn4n6m4vfsfy6vk4apajv8jpys057z3a71s4kp"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base bytestring Cabal-syntax containers deepseq directory @@ -6001,8 +6001,8 @@ self: { }: mkDerivation { pname = "FailT"; - version = "0.1.1.0"; - sha256 = "1hv9zycvsf696x9g73w9jhlipw826vl71gix09jmm02i9jpyr4q2"; + version = "0.1.2.0"; + sha256 = "1hvn1bzkaazzc6hdyq27kfd99jbvj9wbsfajahsf3rzp9mqxbqzi"; libraryHaskellDepends = [ base exceptions mtl text ]; testHaskellDepends = [ base doctest exceptions hspec mtl QuickCheck quickcheck-classes @@ -9719,6 +9719,8 @@ self: { pname = "HTF"; version = "0.15.0.0"; sha256 = "16sbz9rr1v8p3b0qi6b9rvzqgbd4rr05qp2wiiy0nc2gh1qca4nq"; + revision = "1"; + editedCabalFile = "1rd9iwchb4pg441hvqi7qn41v0ihd8sh2ma1h8incyswn527m1ml"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal process ]; @@ -9743,6 +9745,43 @@ self: { mainProgram = "htfpp"; }) {}; + "HTF_0_15_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base + , base64-bytestring, bytestring, Cabal, containers, cpphs, Diff + , directory, filepath, haskell-src, HUnit, lifted-base + , monad-control, mtl, old-time, pretty, process, QuickCheck, random + , regex-compat, template-haskell, temporary, text, time, unix + , unordered-containers, vector, xmlgen + }: + mkDerivation { + pname = "HTF"; + version = "0.15.0.1"; + sha256 = "0mlqsfc0b4gvinq7nrq42smdl0gagznhwiw86dkkzc1npmcaj5mw"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal process ]; + libraryHaskellDepends = [ + aeson array base base64-bytestring bytestring containers cpphs Diff + directory haskell-src HUnit lifted-base monad-control mtl old-time + pretty process QuickCheck random regex-compat text time unix vector + xmlgen + ]; + libraryToolDepends = [ cpphs ]; + executableHaskellDepends = [ + array base cpphs directory HUnit mtl old-time random text + ]; + executableToolDepends = [ cpphs ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring directory filepath HUnit mtl + process random regex-compat template-haskell temporary text + unordered-containers + ]; + description = "The Haskell Test Framework"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "htfpp"; + }) {}; + "HTTP" = callPackage ({ mkDerivation, array, base, bytestring, deepseq, httpd-shed , HUnit, mtl, network, network-uri, parsec, pureMD5, split @@ -11277,8 +11316,8 @@ self: { pname = "HsYAML"; version = "0.2.1.1"; sha256 = "0a7nbvpl4p8kwbbjfn1dj6s3fif5k8zhbckdvyz1k74pj3yb8ns6"; - revision = "1"; - editedCabalFile = "0jmbgrjywcblrd8k6zzv2b5givdz83f479y15v5gs0r93z25xpmv"; + revision = "2"; + editedCabalFile = "0r2yh96nhmlfy2vj2c7i5703brv4lp9cw5v044j7s8487jvv70d6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11300,8 +11339,8 @@ self: { pname = "HsYAML-aeson"; version = "0.2.0.1"; sha256 = "139hqd07hkr8ykvrgmcshh9f3vp9dnrj6ks5nl8hgrpi990jsy5r"; - revision = "5"; - editedCabalFile = "06v8vkn58d67yx4v59rhvxpc0sjrpi6k8krvjrvbyl0fn0v0jd14"; + revision = "6"; + editedCabalFile = "1c7v808i9wafx0z74skim7h96z7hdl4v7clawg9s1idzzwhihjcr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11754,24 +11793,6 @@ self: { }) {}; "IntervalMap" = callPackage - ({ mkDerivation, base, Cabal, containers, criterion, deepseq - , fingertree, QuickCheck, random, SegmentTree, weigh - }: - mkDerivation { - pname = "IntervalMap"; - version = "0.6.1.2"; - sha256 = "03smzhwk1zf5na544b0azp49j4gvafqsih9ggwf6yng38yhixwld"; - libraryHaskellDepends = [ base containers deepseq ]; - testHaskellDepends = [ base Cabal containers deepseq QuickCheck ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq fingertree random SegmentTree - weigh - ]; - description = "Containers for intervals, with efficient search"; - license = lib.licenses.bsd3; - }) {}; - - "IntervalMap_0_6_2_0" = callPackage ({ mkDerivation, base, Cabal, containers, criterion, deepseq , fingertree, QuickCheck, random, SegmentTree, weigh }: @@ -11787,7 +11808,6 @@ self: { ]; description = "Containers for intervals, with efficient search"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "Irc" = callPackage @@ -14346,8 +14366,8 @@ self: { pname = "MonadRandom"; version = "0.6"; sha256 = "0i6h9s2iqj71q06i9al3s2akmdjjx16h015qb81nhgjwi4q8cf69"; - revision = "2"; - editedCabalFile = "0pkfprfr4386s2a67dk0kazn2x3m2nfr3w5r32y75rb2aa25dbmy"; + revision = "3"; + editedCabalFile = "0v61hlrggnflb9cbpzs3nw8km12scsnvgz9a0gb8lwi26ksgqmnz"; libraryHaskellDepends = [ base mtl primitive random transformers transformers-compat ]; @@ -15695,6 +15715,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "OneTuple_0_4_1_1" = callPackage + ({ mkDerivation, base, foldable1-classes-compat, ghc-prim, hashable + , template-haskell + }: + mkDerivation { + pname = "OneTuple"; + version = "0.4.1.1"; + sha256 = "0axv63061gzjg6b31h9zg6v54fms6ggd1m8v6kcclmqyxva69ry9"; + libraryHaskellDepends = [ base ghc-prim template-haskell ]; + testHaskellDepends = [ + base foldable1-classes-compat hashable template-haskell + ]; + description = "Singleton Tuple"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Only" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -24994,8 +25031,8 @@ self: { }: mkDerivation { pname = "ad"; - version = "4.5.3"; - sha256 = "1p4r70s9xslza7ag3ifnf69ji37mkkj2gabfi1lj0fyssm0jyy5y"; + version = "4.5.4"; + sha256 = "034n4zabzbbxc8bbc6drc0pam0cn12ijad0z2i3gdcqqn93bcap1"; libraryHaskellDepends = [ adjunctions array base comonad containers data-reify erf free nats reflection semigroups transformers @@ -25525,24 +25562,27 @@ self: { license = lib.licenses.bsd3; }) {}; - "aeson_2_1_1_0" = callPackage + "aeson_2_1_2_1" = callPackage ({ mkDerivation, attoparsec, base, base-compat , base-compat-batteries, base-orphans, base16-bytestring , bytestring, containers, data-fix, deepseq, Diff, directory, dlist - , filepath, generic-deriving, generically, ghc-prim, hashable - , indexed-traversable, integer-logarithms, OneTuple, primitive - , QuickCheck, quickcheck-instances, scientific, semialign, strict - , tagged, tasty, tasty-golden, tasty-hunit, tasty-quickcheck - , template-haskell, text, text-short, th-abstraction, these, time - , time-compat, unordered-containers, uuid-types, vector, witherable + , exceptions, filepath, generic-deriving, generically, ghc-prim + , hashable, indexed-traversable, integer-logarithms, OneTuple + , primitive, QuickCheck, quickcheck-instances, scientific + , semialign, strict, tagged, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, text, text-short + , th-abstraction, these, time, time-compat, unordered-containers + , uuid-types, vector, witherable }: mkDerivation { pname = "aeson"; - version = "2.1.1.0"; - sha256 = "1bdn4j2jglpxhy3kl3y5pf8dr032qjjfbl8ivjk591fdcy6rgbm3"; + version = "2.1.2.1"; + sha256 = "1ii26lz9czxqhck11pzhqlhfhm9zgbrhiydv4gh1w66f0fwl4h2x"; + revision = "1"; + editedCabalFile = "1yiib3ay9961pzs1bb09waw40qkk8w74553bwjp5gkym3dk3q3zi"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers - data-fix deepseq dlist generically ghc-prim hashable + data-fix deepseq dlist exceptions generically ghc-prim hashable indexed-traversable OneTuple primitive QuickCheck scientific semialign strict tagged template-haskell text text-short th-abstraction these time time-compat unordered-containers @@ -25698,8 +25738,8 @@ self: { pname = "aeson-compat"; version = "0.3.10"; sha256 = "0ia3qfdpbrzhwwg4ywpdwca0z1m85k081pcz6jh1sx8qjsvcr71w"; - revision = "4"; - editedCabalFile = "001w7pck3q5k4cnx53npllil5cblkg1ssqza4s9v347dfih3zmss"; + revision = "5"; + editedCabalFile = "0h9ycmx7ad8m3iby8zgv33ql76zggnkiw8c8hnyrh98lm45jj1y0"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base base-compat bytestring containers exceptions hashable scientific tagged text time @@ -27389,8 +27429,8 @@ self: { pname = "alex-meta"; version = "0.3.0.13"; sha256 = "0lbralcid373p25m4qhrhrjak87p8wp4as3304sj6ba6xka89q3v"; - revision = "3"; - editedCabalFile = "1r84p34insanbsmmn529qc0ymna1v4mxm77j4m2l4iraj7qhvfnl"; + revision = "4"; + editedCabalFile = "0b9p2gndna2mk85pywilqwn3zm4yyn9s9ss6p3rlaax70218mlgg"; libraryHaskellDepends = [ array base containers haskell-src-meta QuickCheck template-haskell ]; @@ -31928,6 +31968,34 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "ansi-terminal-game_1_9_1_0" = callPackage + ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal + , clock, colour, containers, exceptions, hspec, hspec-discover + , linebreak, mintty, mtl, QuickCheck, random, split, terminal-size + , timers-tick, unidecode + }: + mkDerivation { + pname = "ansi-terminal-game"; + version = "1.9.1.0"; + sha256 = "07mafxlpwi4a92h9r4j01z2nksk4a143rcs3v6y0w1nd5vwcksf6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array base bytestring cereal clock colour containers + exceptions linebreak mintty mtl QuickCheck random split + terminal-size timers-tick unidecode + ]; + testHaskellDepends = [ + ansi-terminal array base bytestring cereal clock colour containers + exceptions hspec linebreak mintty mtl QuickCheck random split + terminal-size timers-tick unidecode + ]; + testToolDepends = [ hspec-discover ]; + description = "sdl-like functions for terminal applications, based on ansi-terminal"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "ansi-wl-pprint" = callPackage ({ mkDerivation, ansi-terminal, base }: mkDerivation { @@ -35265,15 +35333,15 @@ self: { license = lib.licenses.asl20; }) {}; - "ascii_1_5_4_0" = callPackage + "ascii_1_6_0_0" = callPackage ({ mkDerivation, ascii-case, ascii-caseless, ascii-char , ascii-group, ascii-numbers, ascii-predicates, ascii-superset , ascii-th, base, bytestring, hspec, text }: mkDerivation { pname = "ascii"; - version = "1.5.4.0"; - sha256 = "1lgmdhgby6kdvsl8xg2swqvw9vzlni7s53g42jidd13iappzkxkq"; + version = "1.6.0.0"; + sha256 = "0ax8gn1nbb9p6ai8rq48jf98vn952q4xl7h1mxi377rywcpfy9y5"; libraryHaskellDepends = [ ascii-case ascii-caseless ascii-char ascii-group ascii-numbers ascii-predicates ascii-superset ascii-th base bytestring text @@ -35419,8 +35487,8 @@ self: { pname = "ascii-numbers"; version = "1.1.0.2"; sha256 = "0dqqnqrn3hvmjgakm6vzbidlik4p483wcslcwr60qbxa1v5lmznv"; - revision = "2"; - editedCabalFile = "19x9mh11pb7j4ykf9vicprn6mlhcb9gwsk82gh5yk366k4r172d7"; + revision = "4"; + editedCabalFile = "1jam0pzzb678k5bfr6prdzg8v68md2rg39k7sqr4csh1lzkq86im"; libraryHaskellDepends = [ ascii-case ascii-char ascii-superset base bytestring hashable text ]; @@ -35432,6 +35500,26 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-numbers_1_2_0_0" = callPackage + ({ mkDerivation, ascii-case, ascii-char, ascii-superset, base + , bytestring, hashable, hedgehog, invert, text + }: + mkDerivation { + pname = "ascii-numbers"; + version = "1.2.0.0"; + sha256 = "0542g7whn8qhamgmpx32i875j16ksvjy42l5n7mkq717g86ngz2r"; + libraryHaskellDepends = [ + ascii-case ascii-char ascii-superset base bytestring hashable text + ]; + testHaskellDepends = [ + ascii-case ascii-char ascii-superset base bytestring hashable + hedgehog invert text + ]; + description = "ASCII representations of numbers"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-predicates" = callPackage ({ mkDerivation, ascii-char, base, hedgehog }: mkDerivation { @@ -35504,14 +35592,14 @@ self: { license = lib.licenses.asl20; }) {}; - "ascii-superset_1_2_7_0" = callPackage + "ascii-superset_1_3_0_0" = callPackage ({ mkDerivation, ascii-case, ascii-caseless, ascii-char, base , bytestring, hashable, hspec, text }: mkDerivation { pname = "ascii-superset"; - version = "1.2.7.0"; - sha256 = "140xdw3r9aj9yhjwbvhqyb4c4scad2rfdj9kf6yh1aqf4lqvh0kn"; + version = "1.3.0.0"; + sha256 = "0csfjkg5aqx2cs9n27rs4zbfrlzgf7c3ca8vfh8f0vpy4qy94f33"; libraryHaskellDepends = [ ascii-case ascii-caseless ascii-char base bytestring hashable text ]; @@ -35568,6 +35656,8 @@ self: { pname = "ascii-th"; version = "1.2.0.0"; sha256 = "07v6795rfwb8h4x31kc7vdmwg9z23jf4418dcv612c27dqhx4hbg"; + revision = "1"; + editedCabalFile = "1r6z6brkfahs9zifjhr7bpqblkiajcjknkgx2i57jrn5s3b97phk"; libraryHaskellDepends = [ ascii-case ascii-caseless ascii-char ascii-superset base template-haskell @@ -37326,6 +37416,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "attoparsec-framer" = callPackage + ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring + , exceptions, hspec, network, network-run, QuickCheck, text + }: + mkDerivation { + pname = "attoparsec-framer"; + version = "0.1.0.0"; + sha256 = "00vswlad9f5pqibfrch94vx6kxzswi7h47d64xqvmakasaahyn5m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring exceptions text + ]; + executableHaskellDepends = [ + attoparsec attoparsec-binary base bytestring exceptions network + network-run QuickCheck text + ]; + testHaskellDepends = [ + attoparsec attoparsec-binary base bytestring exceptions hspec + QuickCheck text + ]; + description = "Use Attoparsec to parse framed protocol bytestreams"; + license = lib.licenses.bsd3; + }) {}; + "attoparsec-ip" = callPackage ({ mkDerivation, attoparsec, base, ip, QuickCheck, tasty , tasty-quickcheck, text, vector @@ -38611,10 +38726,8 @@ self: { }: mkDerivation { pname = "aws-arn"; - version = "0.3.0.0"; - sha256 = "042lzvm1wpdqfrmgl1ygqgkdisvjyf9jfg9aqnibwhk2pw354dj3"; - revision = "1"; - editedCabalFile = "15l89gbz5lzc5v9v872cqdjkvpkiamx4qa6zpl6l4j8b24wkrcay"; + version = "0.3.1.0"; + sha256 = "09jd8lf6w76adkcq5kycj1nwhr7qpn5ivm6dap3zlkngp0z9sdqb"; libraryHaskellDepends = [ base deriving-compat hashable profunctors tagged text ]; @@ -39739,6 +39852,8 @@ self: { libraryPkgconfigDepends = [ babl ]; description = "Haskell bindings to BABL library"; license = lib.licenses.lgpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) babl;}; "babylon" = callPackage @@ -40188,6 +40303,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "bank-holidays-england_0_2_0_9" = callPackage + ({ mkDerivation, base, containers, hspec, QuickCheck, time }: + mkDerivation { + pname = "bank-holidays-england"; + version = "0.2.0.9"; + sha256 = "1iyyp76mfdiniszim6mi5ls5a2d3nm0fkrkz9v1y0r2gx1d1y3zx"; + libraryHaskellDepends = [ base containers time ]; + testHaskellDepends = [ base containers hspec QuickCheck time ]; + description = "Calculation of bank holidays in England and Wales"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "banwords" = callPackage ({ mkDerivation, attoparsec, base, bytestring, data-default, HUnit , test-framework, test-framework-hunit, text, vector @@ -40560,6 +40688,8 @@ self: { pname = "base16"; version = "0.3.2.1"; sha256 = "0ybmcik5nlly7s9bfwlaqqk8jpgwxp5ac4bhdiq4lckbfynvm0qf"; + revision = "1"; + editedCabalFile = "0qjaz2kkcmrfzbr6f44jkb1zdgbayh0yahp06j8gb281783ng6d8"; libraryHaskellDepends = [ base bytestring deepseq primitive text text-short ]; @@ -41843,6 +41973,27 @@ self: { license = lib.licenses.mit; }) {}; + "beam-migrate_0_5_2_0" = callPackage + ({ mkDerivation, aeson, base, beam-core, bytestring, containers + , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable + , haskell-src-exts, microlens, mtl, parallel, pqueue, pretty + , scientific, text, time, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "beam-migrate"; + version = "0.5.2.0"; + sha256 = "036awq66h8r8mn46kvzlc0si6vq6ajg69kv1xq0865v7arrlr296"; + libraryHaskellDepends = [ + aeson base beam-core bytestring containers deepseq dependent-map + dependent-sum free ghc-prim hashable haskell-src-exts microlens mtl + parallel pqueue pretty scientific text time unordered-containers + uuid-types vector + ]; + description = "SQL DDL support and migrations support library for Beam"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "beam-mysql" = callPackage ({ mkDerivation, aeson, attoparsec, base, beam-core, bytestring , case-insensitive, free, hashable, mtl, mysql, network-uri @@ -41906,6 +42057,34 @@ self: { license = lib.licenses.mit; }) {}; + "beam-postgres_0_5_3_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate + , bytestring, case-insensitive, conduit, free, hashable + , haskell-src-exts, hedgehog, lifted-base, monad-control, mtl + , network-uri, postgresql-libpq, postgresql-simple, scientific + , tagged, tasty, tasty-hunit, text, time, tmp-postgres + , transformers-base, unordered-containers, uuid, uuid-types, vector + }: + mkDerivation { + pname = "beam-postgres"; + version = "0.5.3.0"; + sha256 = "0y5pm0s83f2ijz0mslp98c07ywh25nx3g870hp8s89isjviwhdss"; + libraryHaskellDepends = [ + aeson attoparsec base beam-core beam-migrate bytestring + case-insensitive conduit free hashable haskell-src-exts lifted-base + monad-control mtl network-uri postgresql-libpq postgresql-simple + scientific tagged text time transformers-base unordered-containers + uuid-types vector + ]; + testHaskellDepends = [ + aeson base beam-core beam-migrate bytestring hedgehog + postgresql-simple tasty tasty-hunit text tmp-postgres uuid vector + ]; + description = "Connection layer between beam and postgres"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "beam-sqlite" = callPackage ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate , bytestring, dlist, free, hashable, monad-control, mtl @@ -41930,6 +42109,31 @@ self: { license = lib.licenses.mit; }) {}; + "beam-sqlite_0_5_2_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate + , bytestring, dlist, free, hashable, monad-control, mtl + , network-uri, scientific, sqlite-simple, tasty + , tasty-expected-failure, tasty-hunit, text, time + , transformers-base, unix + }: + mkDerivation { + pname = "beam-sqlite"; + version = "0.5.2.0"; + sha256 = "1cjf9jci0ykkvqry1yygfmjli73si6zgskgpym2n28r93g0c3znd"; + libraryHaskellDepends = [ + aeson attoparsec base beam-core beam-migrate bytestring dlist free + hashable monad-control mtl network-uri scientific sqlite-simple + text time transformers-base unix + ]; + testHaskellDepends = [ + base beam-core beam-migrate sqlite-simple tasty + tasty-expected-failure tasty-hunit text time + ]; + description = "Beam driver for SQLite"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "beam-th" = callPackage ({ mkDerivation, base, beam, doctest, doctest-discover, microlens , mtl, tasty, tasty-hunit, template-haskell, text, th-expand-syns @@ -41984,8 +42188,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.14"; - sha256 = "0iyymq8iagdaymivvfg1vvks76bzaiyysw5mj4ifqn2zc9pyb3wd"; + version = "0.14.1"; + sha256 = "0kq1dsyg1dcdyhlapa2zak51gb4ghfv2hnivzg7iv0x8i4sdsh2n"; libraryHaskellDepends = [ base deepseq dunai MonadRandom mtl simple-affine-space transformers ]; @@ -42800,6 +43004,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "bifunctors_5_5_15" = callPackage + ({ mkDerivation, base, base-orphans, comonad, containers, hspec + , hspec-discover, QuickCheck, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + }: + mkDerivation { + pname = "bifunctors"; + version = "5.5.15"; + sha256 = "1dz3v6qdilm6z9vl25xrma2if6i151v6rmgnvd461parsd89sdfn"; + libraryHaskellDepends = [ + base base-orphans comonad containers tagged template-haskell + th-abstraction transformers + ]; + testHaskellDepends = [ + base hspec QuickCheck template-haskell transformers + transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "Bifunctors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bighugethesaurus" = callPackage ({ mkDerivation, base, HTTP, split }: mkDerivation { @@ -43262,6 +43489,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "binary-instances_1_0_4" = callPackage + ({ mkDerivation, aeson, base, binary, binary-orphans, bytestring + , case-insensitive, data-array-byte, hashable, primitive + , QuickCheck, quickcheck-instances, scientific, tagged, tasty + , tasty-quickcheck, text, text-binary, time-compat + , unordered-containers, vector, vector-binary-instances + }: + mkDerivation { + pname = "binary-instances"; + version = "1.0.4"; + sha256 = "0pv4idgzl2wkm15ih594gbw6wihwrdspa91j5ajgwr4ikx6f3v3h"; + libraryHaskellDepends = [ + aeson base binary binary-orphans case-insensitive hashable + primitive scientific tagged text text-binary time-compat + unordered-containers vector vector-binary-instances + ]; + testHaskellDepends = [ + aeson base binary bytestring case-insensitive data-array-byte + hashable primitive QuickCheck quickcheck-instances scientific + tagged tasty tasty-quickcheck text time-compat unordered-containers + vector + ]; + description = "Orphan instances for binary"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "binary-io" = callPackage ({ mkDerivation, async, base, binary, bytestring, concurrency , deque, exceptions, hspec, process, stm, transformers @@ -43328,6 +43582,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "binary-orphans_1_0_4" = callPackage + ({ mkDerivation, base, binary, data-array-byte, OneTuple + , QuickCheck, quickcheck-instances, tagged, tasty, tasty-quickcheck + , transformers + }: + mkDerivation { + pname = "binary-orphans"; + version = "1.0.4"; + sha256 = "08999f7c9l3dck59k1p9jj2nbbdj99i3gwmrqj24la5rywgw8rd0"; + libraryHaskellDepends = [ + base binary data-array-byte transformers + ]; + testHaskellDepends = [ + base binary data-array-byte OneTuple QuickCheck + quickcheck-instances tagged tasty tasty-quickcheck + ]; + description = "Compatibility package for binary; provides instances"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "binary-parser" = callPackage ({ mkDerivation, base, base-prelude, bytestring, mtl, QuickCheck , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text @@ -46228,22 +46503,6 @@ self: { }) {}; "blas-carray" = callPackage - ({ mkDerivation, base, blas-ffi, carray, netlib-carray, netlib-ffi - , storable-complex, transformers - }: - mkDerivation { - pname = "blas-carray"; - version = "0.1.0.1"; - sha256 = "1aqphwgzcryzfzjzsv6ph4kcmswqd7mgs65dj8lsjzkhfc6izggl"; - libraryHaskellDepends = [ - base blas-ffi carray netlib-carray netlib-ffi storable-complex - transformers - ]; - description = "Auto-generated interface to Fortran BLAS via CArrays"; - license = lib.licenses.bsd3; - }) {}; - - "blas-carray_0_1_0_2" = callPackage ({ mkDerivation, base, blas-ffi, carray, netlib-carray, netlib-ffi , storable-complex, transformers }: @@ -46257,7 +46516,6 @@ self: { ]; description = "Auto-generated interface to Fortran BLAS via CArrays"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "blas-comfort-array" = callPackage @@ -48261,6 +48519,8 @@ self: { pname = "bound"; version = "2.0.6"; sha256 = "1mlnpc4x7gn97b8pqiwj3shv23slfylwplp7zr37ar5ff9isbm28"; + revision = "1"; + editedCabalFile = "104j2gindmyqs4hl56irvndz9s9j7s4yyjhlwz3s87r9053sr1p9"; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph profunctors template-haskell th-abstraction transformers @@ -48874,6 +49134,21 @@ self: { broken = true; }) {}; + "brick-list-search" = callPackage + ({ mkDerivation, base, brick, containers, microlens, vector }: + mkDerivation { + pname = "brick-list-search"; + version = "0.1.2.1"; + sha256 = "1kn5i8nhq8a5g62rnfpy1kzxfn7y2ffx4l4llfvm19nmvksr8vb3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base brick containers microlens vector ]; + description = "Search forward or backward for certain kinds of items in brick list"; + license = lib.licenses.bsd0; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "brick-panes" = callPackage ({ mkDerivation, aeson, base, brick, bytestring, containers , directory, microlens, text, text-zipper, time, vector, vty @@ -48936,13 +49211,14 @@ self: { }: mkDerivation { pname = "brick-tabular-list"; - version = "0.1.0.2"; - sha256 = "1ldzbl9wnk6ghckbxlmqs3vf1qivh7qndgy5iryasiy9bil8h9fk"; + version = "0.2.0.1"; + sha256 = "1rqmpk45fy9w6jqmaxdbg8giv3dv72qd522yz1wsj4zmkfjrhw41"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers generic-lens microlens optics-core vty ]; + doHaddock = false; description = "Tabular list widgets for brick"; license = lib.licenses.bsd0; hydraPlatforms = lib.platforms.none; @@ -49661,6 +49937,8 @@ self: { ]; description = "A backend agnostic, concurrent BTree"; license = "LGPL"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "btrfs" = callPackage @@ -50289,26 +50567,6 @@ self: { }) {}; "burrito" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec, parsec - , QuickCheck, template-haskell, text, transformers - }: - mkDerivation { - pname = "burrito"; - version = "2.0.1.2"; - sha256 = "1awfxllw4n1zg58q08ml25k0f3mvbrlsws17m40hwp3ddvv8nyfd"; - libraryHaskellDepends = [ - base bytestring containers parsec template-haskell text - transformers - ]; - testHaskellDepends = [ - base bytestring containers hspec parsec QuickCheck template-haskell - text transformers - ]; - description = "Parse and render URI templates"; - license = lib.licenses.mit; - }) {}; - - "burrito_2_0_1_3" = callPackage ({ mkDerivation, base, bytestring, containers, hspec, parsec , QuickCheck, template-haskell, text, transformers }: @@ -50326,7 +50584,6 @@ self: { ]; description = "Parse and render URI templates"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "burst-detection" = callPackage @@ -50714,6 +50971,8 @@ self: { pname = "byte-order"; version = "0.1.3.0"; sha256 = "0lr5ijhc165qhviabklnl0zpbk5400wb1fqd1xn7x0ga1vvclxhl"; + revision = "1"; + editedCabalFile = "0gkp45pasdg9k98yaw3fpsch4wy50q5n4wdmqlsffciimc0k11x1"; libraryHaskellDepends = [ base primitive primitive-unaligned wide-word ]; @@ -50759,6 +51018,8 @@ self: { pname = "bytebuild"; version = "0.3.12.0"; sha256 = "0n87jhn46yafnd3kjy07nxs2f36s99xk89x6cwkhiwhvz5hw6c2v"; + revision = "1"; + editedCabalFile = "0mwnhra1nharn5kmbf5k6zqpb2jhkybfc9xbi3wpnq2kp2l1l1al"; libraryHaskellDepends = [ base byteslice bytestring haskell-src-meta integer-logarithms natural-arithmetic primitive primitive-offset primitive-unlifted @@ -50801,8 +51062,8 @@ self: { pname = "bytehash"; version = "0.1.0.0"; sha256 = "1jc8fz8rv7072is0srcp730ff37xkb68xl6s6yssba4anxc8s5nm"; - revision = "1"; - editedCabalFile = "0wipnznxav1c0pfjv4r6nb44gidz9c6z8qi919yzg2xmwhdz631v"; + revision = "2"; + editedCabalFile = "0b840m5ykjgqzxd8sfzjgbs86qm87lzcf477xnl8zlmf11yhjyqg"; libraryHaskellDepends = [ base byte-order byteslice bytestring entropy primitive primitive-unlifted transformers @@ -50949,6 +51210,8 @@ self: { pname = "byteslice"; version = "0.2.9.0"; sha256 = "0rqlpqcnyfwl2m4jy8k7n062drdwpvd3j622f4z4fxyhd84dxv5y"; + revision = "1"; + editedCabalFile = "1gcc560gsyf87nvja7cdh6wsp631lv02qhci6r4fcmn2wasqx3mz"; libraryHaskellDepends = [ base bytestring primitive primitive-addr primitive-unlifted run-st text text-short tuples vector @@ -50972,6 +51235,8 @@ self: { pname = "bytesmith"; version = "0.3.9.1"; sha256 = "10d0wzinc30b2xc26cfadvpn29gf30gnppysyl3n35ym3p9lnhm2"; + revision = "1"; + editedCabalFile = "11pmza7qlk63lw6ns6jsnlmfl8wdazz5sc5b2spb0pk29k9yymp2"; libraryHaskellDepends = [ base byteslice bytestring contiguous primitive run-st text-short wide-word @@ -52568,8 +52833,8 @@ self: { pname = "cabal-install"; version = "3.8.1.0"; sha256 = "1rk7xb86c1vgarv1m16d2i82fiig6q119j51gvq2pq8l5rpl7kk1"; - revision = "2"; - editedCabalFile = "1l2lvljkr1ibnr3py7xfp2csxyb3rzlhy7jlpx8gkamq9cjmi6p2"; + revision = "3"; + editedCabalFile = "14l2jvyrzhgkmgkrkhmb6cb1vy4pgcg3q8dgyg8vszpm0mb1ws77"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52977,6 +53242,29 @@ self: { mainProgram = "cabal-rpm"; }) {}; + "cabal-rpm_2_1_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, extra + , filepath, http-client, http-client-tls, http-conduit + , optparse-applicative, process, simple-cabal, simple-cmd + , simple-cmd-args, time, unix + }: + mkDerivation { + pname = "cabal-rpm"; + version = "2.1.0"; + sha256 = "0qcnx23k4mc37bn5x6d8n459vlq8q6acqz9f0bvih07j68rmnfvm"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal directory extra filepath http-client + http-client-tls http-conduit optparse-applicative process + simple-cabal simple-cmd simple-cmd-args time unix + ]; + description = "RPM packaging tool for Haskell Cabal-based packages"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "cabal-rpm"; + }) {}; + "cabal-scripts" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -54677,8 +54965,8 @@ self: { pname = "capability"; version = "0.5.0.1"; sha256 = "0sksd42ywaq5av7a1h9y66pclsk1fd9qx46q38kgs3av88zhzqci"; - revision = "1"; - editedCabalFile = "1ilnax8c71xvj84a36c91l3ypcil1f6kbadssv0fz2n2c4m6r7g6"; + revision = "2"; + editedCabalFile = "1kap52pv98sgr2mqxcd66wgxxyjp94p8w1b7b3gqwvk9jcanfwxl"; libraryHaskellDepends = [ base constraints dlist exceptions generic-lens lens monad-control mtl mutable-containers primitive reflection safe-exceptions @@ -58568,6 +58856,8 @@ self: { pname = "chronos"; version = "1.1.5"; sha256 = "0q81i9zwhsmik3j0zlgf61y48s4zhqs4d77ad4yxwvqqm8312gqi"; + revision = "2"; + editedCabalFile = "10f7a2r5y71cycx8m74swpplvd68s736fi3b48a48f5vvdgvwdfa"; libraryHaskellDepends = [ aeson attoparsec base bytebuild byteslice bytesmith bytestring deepseq hashable natural-arithmetic primitive semigroups text @@ -60463,8 +60753,8 @@ self: { pname = "cleff"; version = "0.3.3.0"; sha256 = "0fnpk28nhafypp7p1ay1760sin9hh06dz23r68gmm93i879ayl9b"; - revision = "1"; - editedCabalFile = "1g3y1sh1rg7calrpr5l5rmm4hdyqbni59hm10dkb62xb23v5p6mq"; + revision = "3"; + editedCabalFile = "1dampx9zdpj14g6a7xhsyk9xg3zq2chpv0h43jb85pyyh6ig7rb4"; libraryHaskellDepends = [ atomic-primops base containers exceptions microlens monad-control primitive template-haskell th-abstraction transformers-base @@ -61300,6 +61590,33 @@ self: { mainProgram = "cloudyfs"; }) {}; + "clplug" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit + , containers, directory, fgl, fmt, format-numbers, lens, lens-aeson + , mtl, network, text, time + }: + mkDerivation { + pname = "clplug"; + version = "0.1.0.0"; + sha256 = "1p8mpk0bk657xcnjxgz9jyv6ihx9l5fykw082ja5i0qsa55xindp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit mtl network text + ]; + executableHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory fgl + fmt format-numbers lens lens-aeson mtl network text time + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring conduit mtl network text + ]; + description = "Create Core Lightning Plugins"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "clr-bindings" = callPackage ({ mkDerivation, base, clr-host, clr-marshal, clr-typed, pipes , template-haskell, text @@ -63507,24 +63824,6 @@ self: { }) {}; "combinatorial" = callPackage - ({ mkDerivation, array, base, containers, QuickCheck, transformers - , utility-ht - }: - mkDerivation { - pname = "combinatorial"; - version = "0.1.0.1"; - sha256 = "0w6vjs2pg2dffbq1dbs1dygnxk8nppzhkq3bgrg3ydfdzra7imn4"; - libraryHaskellDepends = [ - array base containers transformers utility-ht - ]; - testHaskellDepends = [ - array base containers QuickCheck transformers utility-ht - ]; - description = "Count, enumerate, rank and unrank combinatorial objects"; - license = lib.licenses.bsd3; - }) {}; - - "combinatorial_0_1_1" = callPackage ({ mkDerivation, array, base, containers, doctest-exitcode-stdio , doctest-lib, QuickCheck, transformers, utility-ht }: @@ -63541,7 +63840,6 @@ self: { ]; description = "Count, enumerate, rank and unrank combinatorial objects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "combinatorial-problems" = callPackage @@ -63599,6 +63897,8 @@ self: { pname = "comfort-array"; version = "0.5.2.1"; sha256 = "01vijksddhqmypikk0kgsw02fqdp3anvxvvmhimw11kg87n5dy7v"; + revision = "1"; + editedCabalFile = "1ly48lsdy806r323k7mxaz5wq5xhgiwlhvdmsg7qxa6jmb6iyx1n"; libraryHaskellDepends = [ base containers deepseq guarded-allocation non-empty prelude-compat primitive QuickCheck semigroups storable-record storablevector @@ -63663,10 +63963,8 @@ self: { }: mkDerivation { pname = "comfort-glpk"; - version = "0.0"; - sha256 = "16cg5bc1a04zz23bhgfai9bgllwdkl975j9l7r9im8l9qn7ah1xy"; - revision = "1"; - editedCabalFile = "12d7vmy8nas78gzq2s3a9gbpffbv4afjnkqzrdmgnzj3jkljzc7p"; + version = "0.0.0.1"; + sha256 = "005k3w37xxgwbdd5wby75jhqnvim7fixp82kkqazij7wzdmnlr5h"; libraryHaskellDepends = [ base comfort-array deepseq glpk-headers non-empty utility-ht ]; @@ -68145,6 +68443,8 @@ self: { pname = "contiguous"; version = "0.6.3.0"; sha256 = "1vqzv5xr6dkvw0789rz3z39b7ldm9xrk2sv8c9k2fk14yxl7qibx"; + revision = "1"; + editedCabalFile = "1q1yihx7caa639mfmk0a2n881qrj3g3gm9mb6m23bv5xkkbklrmp"; libraryHaskellDepends = [ base deepseq primitive primitive-unlifted run-st ]; @@ -69187,27 +69487,6 @@ self: { }) {}; "core-program" = callPackage - ({ mkDerivation, base, bytestring, core-data, core-text, directory - , exceptions, filepath, fsnotify, hashable, hourglass, mtl - , prettyprinter, safe-exceptions, stm, template-haskell - , terminal-size, text, text-short, transformers, typed-process - , unix, unliftio-core - }: - mkDerivation { - pname = "core-program"; - version = "0.6.3.0"; - sha256 = "1jd1733f2yn9bsbj5p4y62gqjlzdykpj5yaisd82s28lijqrqi02"; - libraryHaskellDepends = [ - base bytestring core-data core-text directory exceptions filepath - fsnotify hashable hourglass mtl prettyprinter safe-exceptions stm - template-haskell terminal-size text text-short transformers - typed-process unix unliftio-core - ]; - description = "Opinionated Haskell Interoperability"; - license = lib.licenses.mit; - }) {}; - - "core-program_0_6_5_0" = callPackage ({ mkDerivation, base, bytestring, core-data, core-text, directory , exceptions, filepath, fsnotify, hashable, hourglass, mtl , prettyprinter, safe-exceptions, stm, template-haskell @@ -69226,7 +69505,6 @@ self: { ]; description = "Opinionated Haskell Interoperability"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "core-telemetry" = callPackage @@ -69237,8 +69515,8 @@ self: { }: mkDerivation { pname = "core-telemetry"; - version = "0.2.7.3"; - sha256 = "1lini012vrpxn947l5aa7wjjqny9mxzvmhpzkmvpmc72cmqhfcjw"; + version = "0.2.8.0"; + sha256 = "0zmddy3br8c3ii6ddrcf7v742n050hh34wrfwc94jfbrq79m6k6p"; libraryHaskellDepends = [ base bytestring core-data core-program core-text exceptions http-streams io-streams mtl network-info random safe-exceptions @@ -69265,6 +69543,24 @@ self: { license = lib.licenses.mit; }) {}; + "core-text_0_3_8_1" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq + , fingertree, hashable, prettyprinter, template-haskell, text + , text-short + }: + mkDerivation { + pname = "core-text"; + version = "0.3.8.1"; + sha256 = "1c3icqjnwhy5xwbvl6lqz5hy8jqdzy4w1v3f70xgnvcgp3i01ph5"; + libraryHaskellDepends = [ + ansi-terminal base bytestring colour deepseq fingertree hashable + prettyprinter template-haskell text text-short + ]; + description = "A rope type based on a finger tree over UTF-8 fragments"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-warn" = callPackage ({ mkDerivation, base, containers, containers-good-graph, ghc, syb }: @@ -69645,6 +69941,8 @@ self: { pname = "country"; version = "0.2.3.1"; sha256 = "0c601fa2m6f5b9g7i1azh9aqhnsiqcrpqmngwnhrxf8gm4jh5yi5"; + revision = "1"; + editedCabalFile = "1l8ik38d92xrhfd9a6an4i5zcmvqpxicggdihy6hcj1yl1997qsc"; libraryHaskellDepends = [ aeson attoparsec base bytebuild bytehash byteslice bytestring contiguous deepseq entropy hashable primitive primitive-unlifted @@ -78064,8 +78362,8 @@ self: { }: mkDerivation { pname = "deferred-folds"; - version = "0.9.18.2"; - sha256 = "0amlxdgz1yfql1r7w6z9gy6gncihp5nm1fl2bxrk7027hc0wdp96"; + version = "0.9.18.3"; + sha256 = "0x27yqcmpcdfnpf7hn0v574wr641xg23k8fn18w9klc0l3m3089v"; libraryHaskellDepends = [ base bytestring containers foldl hashable primitive text transformers unordered-containers vector @@ -79162,6 +79460,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "deriving-compat_0_6_3" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged + , template-haskell, th-abstraction, transformers + , transformers-compat, void + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.6.3"; + sha256 = "0ak9csg3843wppjgdh2lvfhszdxgahscn4sbmxs2l0dr5l0rggxi"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghc-prim template-haskell + th-abstraction transformers transformers-compat + ]; + testHaskellDepends = [ + base base-compat base-orphans hspec QuickCheck tagged + template-haskell transformers transformers-compat void + ]; + testToolDepends = [ hspec-discover ]; + description = "Backports of GHC deriving extensions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "deriving-openapi3" = callPackage ({ mkDerivation, aeson, base, deriving-aeson, lens, openapi3, text }: @@ -79191,17 +79513,18 @@ self: { }) {}; "deriving-trans" = callPackage - ({ mkDerivation, base, exceptions, monad-control + ({ mkDerivation, base, exceptions, logict, monad-control , monad-control-identity, mtl, primitive, random, resourcet , transformers, transformers-base, unliftio-core }: mkDerivation { pname = "deriving-trans"; - version = "0.8.0.0"; - sha256 = "10i7lhpdpy68mi2ax5v445hy39m160jvvxqhz3hb4ixgzhibdi0h"; + version = "0.8.1.0"; + sha256 = "0h0hxsazvg9vbzm81za3qglqkxw6chxxcfcvf8cinhi3hfy41cir"; libraryHaskellDepends = [ - base exceptions monad-control monad-control-identity mtl primitive - random resourcet transformers transformers-base unliftio-core + base exceptions logict monad-control monad-control-identity mtl + primitive random resourcet transformers transformers-base + unliftio-core ]; description = "Derive instances for monad transformer stacks"; license = lib.licenses.bsd3; @@ -80794,8 +81117,6 @@ self: { ]; description = "Backend for rendering diagrams directly to GTK windows"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-haddock" = callPackage @@ -82145,7 +82466,6 @@ self: { ]; description = "Gemini client"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "diohsc"; }) {}; @@ -82332,8 +82652,8 @@ self: { }: mkDerivation { pname = "direct-sqlite"; - version = "2.3.27"; - sha256 = "0bnq7gkia713w1kc6zhwclxsyxlg100i93qbrz59z18j0xwds683"; + version = "2.3.28"; + sha256 = "0i4a7g8ffsryifv7abg50qcrgbi71sbyhdx4i2vvv0k4srngyi37"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base base16-bytestring bytestring directory HUnit temporary text @@ -82360,12 +82680,12 @@ self: { broken = true; }) {}; - "directory_1_3_8_0" = callPackage + "directory_1_3_8_1" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.8.0"; - sha256 = "0dxxq7ibslj0vks7bf5ckwsp37h6rni7aglsg4zw897520nvpxyv"; + version = "1.3.8.1"; + sha256 = "174fkmss6yxvnyd0wawkc1l1f5rqkpl2s387ad2jvlw7flcm70mx"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -82478,6 +82798,23 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "dirforest" = callPackage + ({ mkDerivation, aeson, autodocodec, base, containers, deepseq + , filepath, path, path-io, validity, validity-containers + , validity-path + }: + mkDerivation { + pname = "dirforest"; + version = "0.1.0.0"; + sha256 = "05rxvdl31gbsllj9h9yhv3vppq4l9kzg3p69rh5cy3bm218d888x"; + libraryHaskellDepends = [ + aeson autodocodec base containers deepseq filepath path path-io + validity validity-containers validity-path + ]; + description = "Typed directory forest"; + license = lib.licenses.mit; + }) {}; + "dirichlet" = callPackage ({ mkDerivation, base, hspec, log-domain, math-functions , mwc-random, random, vector @@ -85664,6 +86001,36 @@ self: { mainProgram = "dotenv"; }) {}; + "dotenv_0_10_0_1" = callPackage + ({ mkDerivation, base, base-compat, containers, directory + , exceptions, hspec, hspec-discover, hspec-megaparsec, megaparsec + , mtl, optparse-applicative, process, shellwords, text + }: + mkDerivation { + pname = "dotenv"; + version = "0.10.0.1"; + sha256 = "16as8ymd7n3fihgylr1fjwpn7s2pi6c81rba72rw47pm9c4s2ivs"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers directory exceptions megaparsec mtl process + shellwords text + ]; + executableHaskellDepends = [ + base base-compat megaparsec optparse-applicative process text + ]; + testHaskellDepends = [ + base base-compat containers directory exceptions hspec + hspec-megaparsec megaparsec mtl process shellwords text + ]; + testToolDepends = [ hspec-discover ]; + description = "Loads environment variables from dotenv files"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "dotenv"; + }) {}; + "dotfs" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , haskell-src, HFuse, HUnit, parsec, process, QuickCheck @@ -86580,8 +86947,6 @@ self: { libraryHaskellDepends = [ array base bytestring pureMD5 ]; description = "An implementation of the Drunken Bishop visual fingerprinting algorithm"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ds-kanren" = callPackage @@ -87097,6 +87462,24 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; + "dunai_0_10_1" = callPackage + ({ mkDerivation, base, MonadRandom, simple-affine-space, tasty + , tasty-hunit, transformers, transformers-base + }: + mkDerivation { + pname = "dunai"; + version = "0.10.1"; + sha256 = "10rp5hc0zafxp2zc2n1lz7j726hlshi8khry74x700474kdqgmx8"; + libraryHaskellDepends = [ + base MonadRandom simple-affine-space transformers transformers-base + ]; + testHaskellDepends = [ base tasty tasty-hunit transformers ]; + description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.turion ]; + }) {}; + "dunai-core" = callPackage ({ mkDerivation, base, MonadRandom, transformers, transformers-base }: @@ -87117,8 +87500,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.9.2"; - sha256 = "0ghc1sg1s31qg1z1sg1mzm9qad39ggrkr064mwbwsl2b5xlsnlr4"; + version = "0.10.1"; + sha256 = "0m8ajl03chy3qbyf1iii9rmfsyy9gpcm4i2njcbwpyi5m10zx34q"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -89004,6 +89387,8 @@ self: { pname = "effectful-th"; version = "1.0.0.1"; sha256 = "19xbvfsglm4gsji303zj4f1nhhl4gls78cdbl4yalxm8c4m8iqsf"; + revision = "1"; + editedCabalFile = "0vj46wzmc2diydx3cfn5sbv25bjcg6gw1cy0q1rqlxbhggm9zk94"; libraryHaskellDepends = [ base containers effectful-core exceptions template-haskell th-abstraction @@ -89949,15 +90334,15 @@ self: { broken = true; }) {}; - "eliminators_0_9_1" = callPackage + "eliminators_0_9_2" = callPackage ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats , singletons-base, template-haskell, text, th-abstraction , th-desugar }: mkDerivation { pname = "eliminators"; - version = "0.9.1"; - sha256 = "0qw6fd6mskwyj1mzz6a6vdxh80jqxn0dzmwp1vq8py1cgnzrpfda"; + version = "0.9.2"; + sha256 = "0j0k1lw6b5yqz7kxckb5s0phqcnzdis0b469nxryawsv12wvv335"; libraryHaskellDepends = [ base extra singleton-nats singletons-base template-haskell text th-abstraction th-desugar @@ -90017,8 +90402,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "elliptic-integrals"; - version = "0.1.0.0"; - sha256 = "15a3sx336d418gbkmdncqzrird8kv861yghf9kf8czn8wqk0ygm2"; + version = "0.1.0.1"; + sha256 = "0k74qvkxbcqqpgnp41vv7hnnjhbkqq53k11qzv20djpk7qxp5i26"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Carlson Elliptic Integrals and Incomplete Elliptic Integrals"; @@ -92842,15 +93227,15 @@ self: { , microlens, monad-logger, mtl, optparse-applicative , optparse-generic, parser-combinators, persistent , persistent-sqlite, persistent-template, pretty-show, safe - , shakespeare, template-haskell, text, time, transformers + , shakespeare, template-haskell, text, time, transformers, unix , unordered-containers, vector, wai, wai-extra, wai-logger, warp , yaml, yesod, yesod-auth, yesod-core, yesod-form, yesod-newsfeed , yesod-static, yesod-test }: mkDerivation { pname = "espial"; - version = "0.0.11"; - sha256 = "1y3hvrwb6sg2vgjrxakl27gh9i1kr8x4l64jc6sfxqx4gvrgi338"; + version = "0.0.16"; + sha256 = "102pfhl04rhrfxbq24wvbg6gz2dnsj3krskzlb8afmkn1n4wpc8m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92862,7 +93247,7 @@ self: { http-api-data http-client http-client-tls http-conduit http-types iso8601-time microlens monad-logger mtl parser-combinators persistent persistent-sqlite persistent-template pretty-show safe - shakespeare template-haskell text time transformers + shakespeare template-haskell text time transformers unix unordered-containers vector wai wai-extra wai-logger warp yaml yesod yesod-auth yesod-core yesod-form yesod-newsfeed yesod-static ]; @@ -92876,9 +93261,9 @@ self: { iso8601-time microlens monad-logger mtl optparse-applicative optparse-generic parser-combinators persistent persistent-sqlite persistent-template pretty-show safe shakespeare template-haskell - text time transformers unordered-containers vector wai wai-extra - wai-logger warp yaml yesod yesod-auth yesod-core yesod-form - yesod-newsfeed yesod-static + text time transformers unix unordered-containers vector wai + wai-extra wai-logger warp yaml yesod yesod-auth yesod-core + yesod-form yesod-newsfeed yesod-static ]; testHaskellDepends = [ aeson attoparsec base base64 bcrypt blaze-html bytestring @@ -92890,9 +93275,9 @@ self: { http-conduit http-types iso8601-time microlens monad-logger mtl parser-combinators persistent persistent-sqlite persistent-template pretty-show safe shakespeare template-haskell text time - transformers unordered-containers vector wai wai-extra wai-logger - warp yaml yesod yesod-auth yesod-core yesod-form yesod-newsfeed - yesod-static yesod-test + transformers unix unordered-containers vector wai wai-extra + wai-logger warp yaml yesod yesod-auth yesod-core yesod-form + yesod-newsfeed yesod-static yesod-test ]; description = "Espial is an open-source, web-based bookmarking server"; license = lib.licenses.agpl3Only; @@ -92909,8 +93294,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.5.8.1"; - sha256 = "0k7h2hbxv14x0kq9w2wi83h0swzlri99ic9rj76540l39yqwjc5v"; + version = "3.5.8.2"; + sha256 = "058f79z5sm6ifw54a3x0cm6k59cpj78z0p2lxrbcv754z60dms63"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged template-haskell text time @@ -94268,6 +94653,18 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "eventuo11y-prometheus" = callPackage + ({ mkDerivation, base, containers, eventuo11y, prometheus }: + mkDerivation { + pname = "eventuo11y-prometheus"; + version = "0.1.0.0"; + sha256 = "1yqwqvvzlnzph4x0l19nw5blnp85z2p0wjhhbvygl2dwiq6981li"; + libraryHaskellDepends = [ base containers eventuo11y prometheus ]; + description = "Prometheus backend for eventuo11y"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "every" = callPackage ({ mkDerivation, async, base, stm }: mkDerivation { @@ -97131,6 +97528,8 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "A fast, but bare bones, bytestring parser combinators library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fastpbkdf2" = callPackage @@ -97578,18 +97977,21 @@ self: { }) {}; "fcf-containers" = callPackage - ({ mkDerivation, base, doctest, first-class-families, ghc-prim, mtl + ({ mkDerivation, base, containers, doctest, first-class-families + , ghc-prim, mtl, text }: mkDerivation { pname = "fcf-containers"; - version = "0.7.2"; - sha256 = "0lw7zm5k4mkvzxxmhp2lbanlkgb3n6gp583g34r53rz576bhhhj9"; + version = "0.8.0"; + sha256 = "1j6xisy2xs5vfbl9ycmaqdzbys56k0nhwgzs8nx9qz6sik08r8s8"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base first-class-families ghc-prim mtl ]; + libraryHaskellDepends = [ + base containers first-class-families ghc-prim mtl text + ]; executableHaskellDepends = [ base first-class-families ]; testHaskellDepends = [ - base doctest first-class-families ghc-prim + base containers doctest first-class-families ghc-prim text ]; description = "Data structures and algorithms for first-class-families"; license = lib.licenses.bsd3; @@ -99197,14 +99599,14 @@ self: { broken = true; }) {}; - "filepath_1_4_100_1" = callPackage + "filepath_1_4_100_3" = callPackage ({ mkDerivation, base, bytestring, checkers, deepseq, exceptions , QuickCheck, template-haskell }: mkDerivation { pname = "filepath"; - version = "1.4.100.1"; - sha256 = "0i3a0bg1csjgkwnwzs80h62kp3gil06qgjxsb3nkjprnspzaf55w"; + version = "1.4.100.3"; + sha256 = "1qkx057ddixpvnkps8rbml1iiymv9bpvan6zs4f4cljh7wbi27gd"; libraryHaskellDepends = [ base bytestring deepseq exceptions template-haskell ]; @@ -100902,15 +101304,15 @@ self: { license = lib.licenses.mit; }) {}; - "flatparse_0_4_0_1" = callPackage + "flatparse_0_4_0_2" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, gauge , hspec, HUnit, integer-gmp, megaparsec, parsec, primitive , QuickCheck, quickcheck-instances, template-haskell, utf8-string }: mkDerivation { pname = "flatparse"; - version = "0.4.0.1"; - sha256 = "0cv9ip5vh6sw039acpghcanlnyrvfrmd3av1ihbf66w7y0qv1h40"; + version = "0.4.0.2"; + sha256 = "0h1vz0qai9zbr6mqfcidpabjxwcr900582sfmslx08bksssfssbf"; libraryHaskellDepends = [ base bytestring containers integer-gmp template-haskell utf8-string ]; @@ -101298,18 +101700,6 @@ self: { }) {}; "flow" = callPackage - ({ mkDerivation, base, HUnit }: - mkDerivation { - pname = "flow"; - version = "2.0.0.1"; - sha256 = "1drbw1lbglx30i48mq9a77f34jff6wxvgq1d4rk8axlfis6pnj4h"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base HUnit ]; - description = "Write more understandable Haskell"; - license = lib.licenses.mit; - }) {}; - - "flow_2_0_0_2" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { pname = "flow"; @@ -101319,7 +101709,6 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Write more understandable Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "flow-er" = callPackage @@ -102050,6 +102439,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "foldable1-classes-compat" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim + , QuickCheck, quickcheck-instances, tagged, test-framework + , test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "foldable1-classes-compat"; + version = "0.1"; + sha256 = "04pzjppmb195ffgxdzh8dh39z5dalr5wd6sifcnbg9p1b3rw6myh"; + libraryHaskellDepends = [ + base containers ghc-prim tagged transformers + ]; + testHaskellDepends = [ + base containers QuickCheck quickcheck-instances test-framework + test-framework-quickcheck2 transformers + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq transformers + ]; + description = "Compatibility package for the Foldable1 and Bifoldable1 type classes"; + license = lib.licenses.bsd3; + }) {}; + "foldl" = callPackage ({ mkDerivation, base, bytestring, comonad, containers , contravariant, criterion, doctest, hashable, primitive @@ -102060,6 +102472,8 @@ self: { pname = "foldl"; version = "1.4.14"; sha256 = "0ihfari2d8czfxfxv5svczpq1cvi3qi55mxphjjqlnabxa76y1cc"; + revision = "1"; + editedCabalFile = "0v055cj7sw5xa7v0lm2gryfhj8nxhnjrs1zm9nnxyzgv2aivb8vc"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable primitive profunctors random semigroupoids text transformers @@ -103773,6 +104187,8 @@ self: { pname = "free"; version = "5.1.10"; sha256 = "0whff0r0nvii5l9z9crw7v0rj0wwblwbnfp99515siyxjkzs9phj"; + revision = "1"; + editedCabalFile = "0kpb7vfhl29c15miln3wsgqwjd8bz43v500dyaprwsglmgprwbdw"; libraryHaskellDepends = [ base comonad containers distributive exceptions indexed-traversable mtl profunctors semigroupoids template-haskell th-abstraction @@ -106682,8 +107098,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "gambler"; - version = "0.0.0.1"; - sha256 = "0ndkfy0yisbmhh5zg5djafsh62km8fdrnzg3z1gia4mmmfkn44s9"; + version = "0.2.0.0"; + sha256 = "0hr3ig4cwlaq09z852lmfmr9sakxyrpfydkslps8zv95pbr15yhz"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Composable, streaming, and efficient left folds"; @@ -107708,8 +108124,8 @@ self: { }: mkDerivation { pname = "general-allocate"; - version = "0.2.1.1"; - sha256 = "0jcqknrlpcyl825y9r612mh8d7dcs68sxjm1j600nbdl4ksw8qmb"; + version = "0.2.1.2"; + sha256 = "0dnv96wnhp648ydhy883i13lsgmirqlrc62ijgisi66dpkwxmcm3"; libraryHaskellDepends = [ base containers mtl primitive resourcet safe-exceptions transformers @@ -107941,6 +108357,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "generic-deriving_1_14_3" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover + , template-haskell, th-abstraction + }: + mkDerivation { + pname = "generic-deriving"; + version = "1.14.3"; + sha256 = "0h5wiz9455q844z6f14v581sj2y36p4fnd4zwyr5ss1n5c4aakwy"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell th-abstraction + ]; + testHaskellDepends = [ base hspec template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Generic programming library for generalised deriving"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "generic-enum" = callPackage ({ mkDerivation, array, base, bytestring, hspec }: mkDerivation { @@ -108205,33 +108639,21 @@ self: { }) {}; "generic-persistence" = callPackage - ({ mkDerivation, base, bytestring, convertible, exceptions, ghc - , ghc-prim, HDBC, HDBC-sqlite3, hspec, hspec-discover, QuickCheck - , rio, syb, text, time, transformers + ({ mkDerivation, base, convertible, generic-deriving, HDBC + , HDBC-sqlite3, hspec, hspec-discover, QuickCheck }: mkDerivation { pname = "generic-persistence"; - version = "0.2.0.1"; - sha256 = "1i50bdywfrlfqz1by8x3ci2nap5c1hl2bvhw5h2ych7szrp9mmp7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring convertible exceptions ghc ghc-prim HDBC - HDBC-sqlite3 rio syb text time transformers - ]; - executableHaskellDepends = [ - base bytestring convertible exceptions ghc ghc-prim HDBC - HDBC-sqlite3 rio syb text time transformers - ]; + version = "0.3.0.1"; + sha256 = "01qpw1hf593f4hf7j9hhrpm6aclwi55gmqpmmjnpnz18f8ahwygp"; + libraryHaskellDepends = [ base convertible generic-deriving HDBC ]; testHaskellDepends = [ - base bytestring convertible exceptions ghc ghc-prim HDBC - HDBC-sqlite3 hspec hspec-discover QuickCheck rio syb text time - transformers + base convertible generic-deriving HDBC HDBC-sqlite3 hspec + hspec-discover QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Database persistence using generics"; license = lib.licenses.bsd3; - mainProgram = "generic-persistence-demo"; }) {}; "generic-pretty" = callPackage @@ -108884,6 +109306,36 @@ self: { license = lib.licenses.mit; }) {}; + "genvalidity-dirforest" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, dirforest + , filepath, genvalidity, genvalidity-bytestring + , genvalidity-containers, genvalidity-criterion, genvalidity-path + , genvalidity-sydtest, genvalidity-sydtest-aeson, genvalidity-text + , path, path-io, QuickCheck, sydtest, sydtest-discover + }: + mkDerivation { + pname = "genvalidity-dirforest"; + version = "0.1.0.1"; + sha256 = "0pmw9lbh0ssf02z8daiwwqiqnqcx34xy4jh0r2ipdfn2sfn20rwn"; + libraryHaskellDepends = [ + base containers dirforest filepath genvalidity + genvalidity-containers genvalidity-path path QuickCheck + ]; + testHaskellDepends = [ + base bytestring containers dirforest filepath + genvalidity-bytestring genvalidity-sydtest + genvalidity-sydtest-aeson path path-io QuickCheck sydtest + ]; + testToolDepends = [ sydtest-discover ]; + benchmarkHaskellDepends = [ + base criterion dirforest genvalidity genvalidity-criterion + genvalidity-text + ]; + description = "Generators for typed directory forests"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "genvalidity-hspec" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-property, hspec , hspec-core, QuickCheck, transformers, validity @@ -110691,6 +111143,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-lib_9_2_7_20230228" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-lib-parser + , ghc-prim, happy, hpc, parsec, pretty, process, rts, time + , transformers, unix + }: + mkDerivation { + pname = "ghc-lib"; + version = "9.2.7.20230228"; + sha256 = "0z9bgkrvr7v12444cq4mkms5f0p5g3jpm2ni1ra0iqcw014r3w78"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-lib-parser ghc-prim hpc parsec pretty + process rts time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib_9_4_4_20221225" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser @@ -110753,6 +111227,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-lib-parser_9_2_7_20230228" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec + , pretty, process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib-parser"; + version = "9.2.7.20230228"; + sha256 = "1bny37dny7jv37mpynp3zwdlp8993xikc1c4p6h5f2zwjb7nx2ny"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-prim parsec pretty process time + transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser_9_4_4_20221225" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec @@ -111460,12 +111955,12 @@ self: { }) {}; "ghc-tcplugin-api" = callPackage - ({ mkDerivation, base, ghc, transformers }: + ({ mkDerivation, base, containers, ghc, transformers }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.9.0.0"; - sha256 = "1z14z12lhdc1bfa3qnq2srx0cm14cbkg7af94cdfqpqmbxjgw5h3"; - libraryHaskellDepends = [ base ghc transformers ]; + version = "0.10.0.0"; + sha256 = "0ynn4acij7n3vfmsm02chdi6j4m3p3cyz9f7vhhi7z9aqzawxd0l"; + libraryHaskellDepends = [ base containers ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; }) {}; @@ -111474,8 +111969,8 @@ self: { ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-tcplugins-extra"; - version = "0.4.3"; - sha256 = "18c0fkbamaizrf91khayg0i59qjk28pfc6g378y70gwqzjkcv1g9"; + version = "0.4.4"; + sha256 = "0yfyxwjsg0r6biy8mskc0xpm32z6zldhzxlvy9dr22h8ds57089w"; libraryHaskellDepends = [ base ghc ]; description = "Utilities for writing GHC type-checker plugins"; license = lib.licenses.bsd2; @@ -111532,8 +112027,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-extra"; - version = "0.4.4"; - sha256 = "1pjai171y374569xzqnp6amf7dvj57pcfykh3g48m5jij2b8jbc6"; + version = "0.4.5"; + sha256 = "1asr1ykmqalvbyrhf91vsnx989vw3qp28w8sl3pgwns1azirsz7r"; libraryHaskellDepends = [ base containers ghc ghc-bignum ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat ghc-typelits-natnormalise transformers @@ -111553,8 +112048,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.7.7"; - sha256 = "0b7rhnij3i74baqm7ban92sfdiscbjvrypfi6wwipkc8graii467"; + version = "0.7.8"; + sha256 = "08pa3gbzxmz5iif9ggg7xvg0bz0h4h4bdnwkvy6lljh2r4fyw8r7"; libraryHaskellDepends = [ base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise template-haskell transformers @@ -111573,8 +112068,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.7.7"; - sha256 = "0pqpsy3j4brpg2hrq9qrnjzr1bishycny5gvsdncvhaq3m53gslh"; + version = "0.7.8"; + sha256 = "0hny036kinnn73byyhdwvmp2s5c27zs7krrz01kx5xk7mmhhx2nn"; libraryHaskellDepends = [ base containers ghc ghc-bignum ghc-tcplugins-extra transformers ]; @@ -112325,8 +112820,8 @@ self: { }: mkDerivation { pname = "ghcup"; - version = "0.1.19.0"; - sha256 = "00g91zavfd58y17q723izch9j0x3fhx7a14ng061am5h41i76mlq"; + version = "0.1.19.2"; + sha256 = "1230hs209w7j427pkibzw4x9skcji4fhsmhjxlks4c6amanianmj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114059,8 +114554,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20230214"; - sha256 = "10mlil7xlkfx7jcd65ndvrg1gb864dqfy2zyfck0z0rynll7s1d2"; + version = "10.20230227"; + sha256 = "03cnx63gcrza9sshk9fvwq8c2p7cb7hj8h81g5dc1x56syigdpgi"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -114698,30 +115193,6 @@ self: { }) {}; "github-release" = callPackage - ({ mkDerivation, aeson, base, burrito, bytestring, http-client - , http-client-tls, http-types, mime-types, optparse-generic, text - , unordered-containers - }: - mkDerivation { - pname = "github-release"; - version = "2.0.0.2"; - sha256 = "0xyh4nkrclpvy5i9v0yqlbzm6aq5gl4p3sairdi1abnyzn3ij04h"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base burrito bytestring http-client http-client-tls - http-types mime-types optparse-generic text unordered-containers - ]; - executableHaskellDepends = [ - aeson base burrito bytestring http-client http-client-tls - http-types mime-types optparse-generic text unordered-containers - ]; - description = "Upload files to GitHub releases"; - license = lib.licenses.mit; - mainProgram = "github-release"; - }) {}; - - "github-release_2_0_0_3" = callPackage ({ mkDerivation, aeson, base, burrito, bytestring, http-client , http-client-tls, http-types, mime-types, optparse-generic, text , unordered-containers @@ -114742,7 +115213,6 @@ self: { ]; description = "Upload files to GitHub releases"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "github-release"; }) {}; @@ -119026,6 +119496,29 @@ self: { mainProgram = "goldplate"; }) {}; + "goldplate_0_2_1_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring, Diff + , directory, filepath, Glob, optparse-applicative, process + , regex-pcre-builtin, text, unordered-containers + }: + mkDerivation { + pname = "goldplate"; + version = "0.2.1.1"; + sha256 = "1cisak5ng6v0iq24djyg4jp87diay02m0k2saac49saxmk29jsr6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson aeson-pretty async base bytestring Diff directory filepath + Glob optparse-applicative process regex-pcre-builtin text + unordered-containers + ]; + testHaskellDepends = [ base process ]; + description = "A lightweight golden test runner"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + mainProgram = "goldplate"; + }) {}; + "gooey" = callPackage ({ mkDerivation, base, renderable, transformers, varying }: mkDerivation { @@ -120667,8 +121160,8 @@ self: { }: mkDerivation { pname = "graphql"; - version = "1.1.0.0"; - sha256 = "07k87v5a9mbpap0n9lra5h4r45359831z7z0ihcibv8nzkkwy798"; + version = "1.2.0.0"; + sha256 = "1qngvwah69jb175shpy5n9qqyxck6687c20bqqlij4nj8amp4vfh"; libraryHaskellDepends = [ base conduit containers exceptions megaparsec parser-combinators template-haskell text transformers unordered-containers vector @@ -121188,8 +121681,8 @@ self: { }: mkDerivation { pname = "greskell"; - version = "2.0.2.0"; - sha256 = "1hlqy041d7qxvvhbv7lki852m9bvviml5b48vs0x299i4z9mhprx"; + version = "2.0.3.0"; + sha256 = "17njclgkdawnm7hyjv12f2bar93ak9nysfx82igvb6qdp0213a91"; libraryHaskellDepends = [ aeson base exceptions greskell-core hashable semigroups text transformers unordered-containers vector @@ -122950,16 +123443,16 @@ self: { }) {}; "h-raylib" = callPackage - ({ mkDerivation, base, c, libGL, libX11, libXcursor, libXext, libXi - , libXinerama, libXrandr + ({ mkDerivation, base, c, containers, libGL, libX11, libXcursor + , libXext, libXi, libXinerama, libXrandr }: mkDerivation { pname = "h-raylib"; - version = "4.5.1.1"; - sha256 = "0g1n4msjgxhgkdvjy44hd6hhg05iahin09ij5v6vyigdzbyx6hf9"; + version = "4.5.3.1"; + sha256 = "042milcmyimk5xirxhs0f5a8gmawp6d2a718zd0ccs162db4691g"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base ]; + libraryHaskellDepends = [ base containers ]; librarySystemDepends = [ c libGL libX11 libXcursor libXext libXi libXinerama libXrandr ]; @@ -124083,7 +124576,7 @@ self: { mainProgram = "hackage-cli"; }) {}; - "hackage-cli_0_1_0_0" = callPackage + "hackage-cli_0_1_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , deepseq, directory, filepath, http-io-streams, io-streams , microlens, microlens-mtl, microlens-th, mtl, netrc @@ -124093,10 +124586,8 @@ self: { }: mkDerivation { pname = "hackage-cli"; - version = "0.1.0.0"; - sha256 = "0wl2gpbcpdfmmmi99dkxy68gi3mn1aj8f2xrm5c8w1bs4sdxdzdq"; - revision = "1"; - editedCabalFile = "0v63w3v46n5jc3q7ywsih3wyqxg6f61psskpq1wkfwm9mnyxfwla"; + version = "0.1.0.1"; + sha256 = "023gnhdxwn36k3pd74j5jcykqbrj7nvp131mg761h8913h9ldw1r"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -124265,8 +124756,8 @@ self: { pname = "hackage-repo-tool"; version = "0.1.1.3"; sha256 = "13q81gi3xmkzwfrbyk5dwxws3c92vnrlslksi021iasmjwhw2h6l"; - revision = "1"; - editedCabalFile = "0c1hg72yxpkmcpl22rm40gf0xx3djdakscqll5g7hsgda4bkg2lr"; + revision = "2"; + editedCabalFile = "10zh1wwn3n0kbybdacd3sg0izvw6xa6aadxdc0bzm9mf0g8m9ff7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -124291,6 +124782,8 @@ self: { pname = "hackage-security"; version = "0.6.2.3"; sha256 = "0rm0avcc1k247qbrajhzi3vz92cgcc4nr3kbhhfmfm8rjxv0bvjj"; + revision = "2"; + editedCabalFile = "07i8f4sappqphh39jj9268a6ci7l972qi33p4zydsdrvh5s58h0q"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal Cabal-syntax containers cryptohash-sha256 directory ed25519 @@ -124314,8 +124807,8 @@ self: { pname = "hackage-security-HTTP"; version = "0.1.1.1"; sha256 = "14hp7gssf80b9937j7m56w8sxrv3hrzjf2s9kgfk76v6llgx79k2"; - revision = "4"; - editedCabalFile = "09hs3iidjlwdppm5q1vq58p70js11whhcl5nr73kv8zj1yh0ir3h"; + revision = "5"; + editedCabalFile = "0rbn1dp6vahxcjavksbwdw8v8mx31inhyn4mx3mx2x4f9rb7y6kw"; libraryHaskellDepends = [ base bytestring hackage-security HTTP mtl network network-uri zlib ]; @@ -127465,10 +127958,8 @@ self: { }: mkDerivation { pname = "happy-meta"; - version = "0.2.0.11"; - sha256 = "1vgv5fx1fya7wfh3zwdgy0hm0lyzp171gnpp6ymfd6kqmqkl3293"; - revision = "4"; - editedCabalFile = "1p50xyx6hl0iyqmqxacisfmpq702rm797fjhfaxjjw6733k5zmrc"; + version = "0.2.1.0"; + sha256 = "114i3bgks4i364v99fc5gvsg2zhh2p59j0y95r0zffxrci6r5cwl"; libraryHaskellDepends = [ array base containers fail haskell-src-meta mtl template-haskell ]; @@ -128128,6 +128619,8 @@ self: { pname = "hash-addressed"; version = "0.2.0.1"; sha256 = "1j4zr63if21g208zyhdk2mz8v3pfp23s33mrqzig0rryw3f0kby7"; + revision = "2"; + editedCabalFile = "0iaaby674182cxwdzpsaz52skzs3klgkid9c7sajz4pi6kh921xl"; libraryHaskellDepends = [ base base16-bytestring bytestring cryptohash-sha256 directory filepath gambler mtl pipes quaalude resourcet temporary @@ -128759,17 +129252,15 @@ self: { mainProgram = "haskeem"; }) {}; - "haskeline_0_8_2" = callPackage + "haskeline_0_8_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, directory , exceptions, filepath, HUnit, process, stm, terminfo, text , transformers, unix }: mkDerivation { pname = "haskeline"; - version = "0.8.2"; - sha256 = "1pr7zik1138cj0463867i1qqb2bgsq716mryap18jx7zb9f1b7gc"; - revision = "3"; - editedCabalFile = "101qavk0fmc4c6qa307kswz3345psskxqyxhk6hmykynjm05jjrv"; + version = "0.8.2.1"; + sha256 = "1zs0rlhd7lzp5g4kp7v5ca7cdwan7w4bx3jh5q2ri950svr2k1x0"; configureFlags = [ "-fterminfo" ]; isLibrary = true; isExecutable = true; @@ -129495,6 +129986,29 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi_0_26_3" = callPackage + ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, directory, doctest, filepath, glib + , gobject-introspection, haskell-gi-base, mtl, pretty-show, process + , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.26.3"; + sha256 = "1shqh45w9ac1mwd1y50hy4xm2wr7pyc6wzfsv6i2j74jj3f1ph4f"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + ansi-terminal attoparsec base bytestring Cabal containers directory + filepath haskell-gi-base mtl pretty-show process regex-tdfa safe + text transformers xdg-basedir xml-conduit + ]; + libraryPkgconfigDepends = [ glib gobject-introspection ]; + testHaskellDepends = [ base doctest process ]; + description = "Generate Haskell bindings for GObject Introspection capable libraries"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { @@ -133062,6 +133576,23 @@ self: { license = lib.licenses.mit; }) {}; + "hasql-implicits_0_1_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hasql + , network-ip, scientific, text, time, uuid, vector + }: + mkDerivation { + pname = "hasql-implicits"; + version = "0.1.1"; + sha256 = "1q9m227q56ykfbg9rza1p22hkiqss139h43nxvl8dq0cmxw3d0mf"; + libraryHaskellDepends = [ + aeson base bytestring containers hasql network-ip scientific text + time uuid vector + ]; + description = "Implicit definitions for Hasql, such as default codecs for standard types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-interpolate" = callPackage ({ mkDerivation, aeson, array, base, bytestring, containers , haskell-src-meta, hasql, megaparsec, mtl, scientific, tasty @@ -135341,8 +135872,8 @@ self: { }: mkDerivation { pname = "headed-megaparsec"; - version = "0.2.1"; - sha256 = "17k4zjvd4i47yz1izbrx98k2lxk5hh553wf94bjn1rdl06vlhc18"; + version = "0.2.1.1"; + sha256 = "1fzvzggw09kbd75rwdb5qfc2fc497yzwkxrmqa1xjwcdspnmrxrl"; libraryHaskellDepends = [ base case-insensitive megaparsec parser-combinators selective ]; @@ -139757,6 +140288,51 @@ self: { mainProgram = "hindent"; }) {}; + "hindent_6_0_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, criterion + , deepseq, Diff, directory, exceptions, filepath, ghc-lib-parser + , ghc-lib-parser-ex, hspec, monad-loops, mtl, optparse-applicative + , path, path-io, regex-tdfa, split, syb, text, transformers + , unicode-show, utf8-string, yaml + }: + mkDerivation { + pname = "hindent"; + version = "6.0.0"; + sha256 = "17pkbjb4zqnzv3bnw3zwisf9j2m9lw5irq7i12bgwrzpv15fpabz"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring Cabal containers deepseq directory exceptions + filepath ghc-lib-parser ghc-lib-parser-ex monad-loops mtl path + path-io regex-tdfa split syb text transformers unicode-show + utf8-string yaml + ]; + executableHaskellDepends = [ + base bytestring Cabal containers directory exceptions filepath + ghc-lib-parser ghc-lib-parser-ex monad-loops mtl + optparse-applicative path path-io regex-tdfa split syb text + transformers unicode-show utf8-string yaml + ]; + testHaskellDepends = [ + base bytestring Cabal containers Diff directory exceptions filepath + ghc-lib-parser ghc-lib-parser-ex hspec monad-loops mtl path path-io + regex-tdfa split syb text transformers unicode-show utf8-string + yaml + ]; + benchmarkHaskellDepends = [ + base bytestring Cabal containers criterion deepseq directory + exceptions filepath ghc-lib-parser ghc-lib-parser-ex monad-loops + mtl path path-io regex-tdfa split syb text transformers + unicode-show utf8-string yaml + ]; + doHaddock = false; + description = "Extensible Haskell pretty printer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hindent"; + }) {}; + "hindley-milner" = callPackage ({ mkDerivation, base, containers, data-fix, hspec, mtl , transformers @@ -142215,6 +142791,8 @@ self: { pname = "hls-fourmolu-plugin"; version = "1.1.1.0"; sha256 = "1gxsx1qskjgm0vgqw7cy33mlkczqr7b6whlykppbpnsfxa2il4jg"; + revision = "1"; + editedCabalFile = "0v65jd14rvfrw5bcn6asqr5sk1zwbvazv233gnw4ylkw0kspmww5"; libraryHaskellDepends = [ base filepath fourmolu ghc ghc-boot-th ghcide hls-plugin-api lens lsp process-extras text @@ -142478,6 +143056,8 @@ self: { pname = "hls-rename-plugin"; version = "1.0.2.0"; sha256 = "16hzr13k8dafdpsr23wz8kyjjyybdg2v41r10iy5csjggyqp9iq7"; + revision = "1"; + editedCabalFile = "13f1xi8cirismn746d8qxnhg3rkiz6zmsaymnhpv0hnhdg5ll6g4"; libraryHaskellDepends = [ base containers extra ghc ghc-exactprint ghcide hashable hiedb hls-plugin-api hls-refactor-plugin lsp lsp-types mod syb text @@ -145194,16 +145774,17 @@ self: { "horizon-spec" = callPackage ({ mkDerivation, base, containers, dhall, path, path-dhall-instance - , prettyprinter, sydtest, text + , prettyprinter, sydtest, template-haskell, text, th-lift }: mkDerivation { pname = "horizon-spec"; - version = "0.6"; - sha256 = "0p62f79p3bpjjrxfgvvd4i7p54y9xdjxxqg3qxji88m3mgvs4sfw"; + version = "0.6.4"; + sha256 = "0bxpgx1ybk4klhd193yzli3qqbhlbbx40kj18nz1scvd75yzyah9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers dhall path path-dhall-instance text + base containers dhall path path-dhall-instance template-haskell + text th-lift ]; executableHaskellDepends = [ base dhall prettyprinter sydtest text @@ -145214,6 +145795,34 @@ self: { mainProgram = "horizon-spec-tests"; }) {}; + "horizon-spec-lens" = callPackage + ({ mkDerivation, base, horizon-spec, lens }: + mkDerivation { + pname = "horizon-spec-lens"; + version = "0.1"; + sha256 = "10dl8dy3nfa87qqq1q7dbpfrcncgfp4mvkn6r6kgpsl0wkrh9nxp"; + libraryHaskellDepends = [ base horizon-spec lens ]; + description = "Horizon Stable Package Set Lenses"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "horizon-spec-pretty" = callPackage + ({ mkDerivation, base, bytestring, containers, dhall, horizon-spec + , lens, path, text + }: + mkDerivation { + pname = "horizon-spec-pretty"; + version = "0.0.1"; + sha256 = "0cznc9xgg4h0bcsih0gd87scv9qiccxj4z17xwkic4xbmq50ppwf"; + libraryHaskellDepends = [ + base bytestring containers dhall horizon-spec lens path text + ]; + description = "Horizon Stable Package Set Pretty Printer"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "horizontal-rule" = callPackage ({ mkDerivation, ansi-wl-pprint, base, HMock, optparse-applicative , tasty, tasty-hunit, terminal-size, text, time @@ -147433,6 +148042,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "hs-opentelemetry-awsxray" = callPackage + ({ mkDerivation, base, bytestring, errors, hs-opentelemetry-api + , hs-opentelemetry-sdk, hspec, http-types, memory, microlens + , random, text, time, unliftio, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "hs-opentelemetry-awsxray"; + version = "0.1.0.0"; + sha256 = "17qps8qhniq8nzldnhisv0i2d1gc5lfhbzrawhisadgjsbwlxryj"; + libraryHaskellDepends = [ + base bytestring errors hs-opentelemetry-api hs-opentelemetry-sdk + http-types memory microlens random text time unliftio unliftio-core + unordered-containers + ]; + testHaskellDepends = [ + base hs-opentelemetry-api hspec text unordered-containers + ]; + description = "[synopsis]"; + license = lib.licenses.mit; + }) {}; + "hs-opentelemetry-exporter-in-memory" = callPackage ({ mkDerivation, async, base, hs-opentelemetry-api, unagi-chan }: mkDerivation { @@ -148538,30 +149168,6 @@ self: { }) {}; "hsc2hs" = callPackage - ({ mkDerivation, base, containers, directory, filepath, HUnit - , process, test-framework, test-framework-hunit - }: - mkDerivation { - pname = "hsc2hs"; - version = "0.68.8"; - sha256 = "0lksyyfrvn3km8bmfjad0mr50mg20f9fwfqly83lma0pr7xiwd3q"; - revision = "1"; - editedCabalFile = "0s9s46zmm4g4hlwspi4jimggka87xki68lfg555g94sjnbwjk34q"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ - base containers directory filepath process - ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit - ]; - description = "A preprocessor that helps with writing Haskell bindings to C code"; - license = lib.licenses.bsd3; - mainProgram = "hsc2hs"; - }) {}; - - "hsc2hs_0_68_9" = callPackage ({ mkDerivation, base, containers, directory, filepath, HUnit , process, test-framework, test-framework-hunit }: @@ -148580,7 +149186,6 @@ self: { ]; description = "A preprocessor that helps with writing Haskell bindings to C code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hsc2hs"; }) {}; @@ -150097,6 +150702,30 @@ self: { license = lib.licenses.mit; }) {}; + "hslua-aeson_2_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hashable + , hslua-core, hslua-marshalling, mtl, QuickCheck + , quickcheck-instances, scientific, tasty, tasty-hunit + , tasty-quickcheck, text, unordered-containers, vector + }: + mkDerivation { + pname = "hslua-aeson"; + version = "2.3.0"; + sha256 = "18ivirgkn5yhkym2nfwx8x360q26hqxdjihzs3g1ggyybw6w9qwv"; + 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 mtl QuickCheck quickcheck-instances scientific + tasty tasty-hunit tasty-quickcheck text unordered-containers vector + ]; + description = "Allow aeson data types to be used with Lua"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hslua-classes" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions , hslua-core, hslua-marshalling, lua-arbitrary, QuickCheck @@ -150245,26 +150874,6 @@ self: { }) {}; "hslua-module-system" = 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.2"; - sha256 = "0lacf9jzd53r75dk5nvkx0nwgiakpkingjnz58bhjfnvi81r6ddn"; - libraryHaskellDepends = [ - base directory exceptions hslua-core hslua-marshalling - hslua-packaging temporary text - ]; - testHaskellDepends = [ - base hslua-core hslua-packaging tasty tasty-hunit tasty-lua text - ]; - description = "Lua module wrapper around Haskell's System module"; - license = lib.licenses.mit; - }) {}; - - "hslua-module-system_1_0_3" = callPackage ({ mkDerivation, base, directory, exceptions, hslua-core , hslua-marshalling, hslua-packaging, tasty, tasty-hunit, tasty-lua , temporary, text @@ -150282,7 +150891,6 @@ self: { ]; description = "Lua module wrapper around Haskell's System module"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hslua-module-text" = callPackage @@ -150712,8 +151320,8 @@ self: { }: mkDerivation { pname = "hsparql"; - version = "0.3.7"; - sha256 = "0n216ly2mn6v5n0aqi759d4lp4fa7mi63fwkvdbzmlmc0ndhi9q7"; + version = "0.3.8"; + sha256 = "0npj7ckscgx4y44vjdxz1x8k8y5czcwbz23x504ilrgjk8l77ddp"; libraryHaskellDepends = [ base bytestring connection HTTP http-client http-conduit http-types MissingH mtl network network-uri rdf4h text xml @@ -151163,17 +151771,18 @@ self: { "hspec-golden" = callPackage ({ mkDerivation, base, directory, filepath, hspec, hspec-core - , optparse-applicative, silently + , hspec-discover, optparse-applicative, silently }: mkDerivation { pname = "hspec-golden"; - version = "0.2.0.0"; - sha256 = "0sg9f73x2i1g6n1pjcvb1zx4nx17w5drdrrhzp2z3lsxc9yxs8nk"; + version = "0.2.0.1"; + sha256 = "09c7bpbvkrdp0fxhr0s1v9gm6hcsqb3fyhix5bckaqhniccdnr5w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath hspec-core ]; executableHaskellDepends = [ base directory optparse-applicative ]; testHaskellDepends = [ base directory hspec hspec-core silently ]; + testToolDepends = [ hspec-discover ]; description = "Golden tests for hspec"; license = lib.licenses.mit; mainProgram = "hgold"; @@ -151839,8 +152448,8 @@ self: { }: mkDerivation { pname = "hspray"; - version = "0.1.1.0"; - sha256 = "1x8vya93aqcbipw6m0rwza8xk59im49bms4w5525s24mw82cnsjq"; + version = "0.1.2.0"; + sha256 = "0x85ya24w47qh38w0rndnik2niy3mh0n2zamxfvzshbj3zqdip5d"; libraryHaskellDepends = [ base containers hashable numeric-prelude text unordered-containers ]; @@ -157601,6 +158210,8 @@ self: { pname = "hybrid-vectors"; version = "0.2.3"; sha256 = "0g3z482sd0j930ja3g9cyc4xnjby03d4cq8x56crsl61arr81r1c"; + revision = "1"; + editedCabalFile = "0w0kajygmrbwds5cmfkvk50x51msds61cia3kch3q8rfvdc0v9gl"; libraryHaskellDepends = [ base deepseq primitive semigroups vector ]; @@ -161064,6 +161675,29 @@ self: { license = lib.licenses.bsd2; }) {}; + "indexed-traversable-instances_0_1_1_2" = callPackage + ({ mkDerivation, base, containers, indexed-traversable, OneTuple + , QuickCheck, quickcheck-instances, tagged, tasty, tasty-quickcheck + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "indexed-traversable-instances"; + version = "0.1.1.2"; + sha256 = "0jippsyqg8ss61z5vc6vfjmlrirwc69kr4azs5s9z0fcbj4lx6qg"; + libraryHaskellDepends = [ + base indexed-traversable OneTuple tagged unordered-containers + vector + ]; + testHaskellDepends = [ + base containers indexed-traversable OneTuple QuickCheck + quickcheck-instances tasty tasty-quickcheck transformers + unordered-containers vector + ]; + description = "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "indextype" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -163230,6 +163864,29 @@ self: { license = lib.licenses.bsd2; }) {}; + "invariant_0_6_1" = callPackage + ({ mkDerivation, array, base, bifunctors, comonad, containers + , contravariant, ghc-prim, hspec, hspec-discover, profunctors + , QuickCheck, StateVar, stm, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + , unordered-containers + }: + mkDerivation { + pname = "invariant"; + version = "0.6.1"; + sha256 = "1w6ln343d72hx8q4i7h1ca7gfqyb79ghc3q2fxp9qkjmwsnr8wpv"; + libraryHaskellDepends = [ + array base bifunctors comonad containers contravariant ghc-prim + profunctors StateVar stm tagged template-haskell th-abstraction + transformers transformers-compat unordered-containers + ]; + testHaskellDepends = [ base hspec QuickCheck template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell98 invariant functors"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "inventory" = callPackage ({ mkDerivation, appendmap, array, base, bytestring, containers , directory, filepath, ghc, ghc-paths, mtl, tasty, tasty-hunit @@ -163458,8 +164115,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "io-manager"; - version = "0.1.0.3"; - sha256 = "04584flxw3qwzdnas8nbxp6riw6jfvhgy0kkkzjkxg53y1d8ri3s"; + version = "0.1.0.4"; + sha256 = "0qrpxb18yivzsyqnnri77yk20wl5s6c7x61s7k6ka5dr5l207bcw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -163530,6 +164187,8 @@ self: { pname = "io-streams"; version = "1.5.2.2"; sha256 = "1zn4iyd18g9jc1qdgixp6hi56nj7czy4jdz2xca59hcn2q2xarfk"; + revision = "1"; + editedCabalFile = "1fkjzk7s99sb7h1lvandw9p8r05ly4206y3aiah0jg39zjvbi5az"; configureFlags = [ "-fnointeractivetests" ]; libraryHaskellDepends = [ attoparsec base bytestring network primitive process text time @@ -163553,8 +164212,8 @@ self: { pname = "io-streams-haproxy"; version = "1.0.1.0"; sha256 = "1dcn5hd4fiwyq7m01r6fi93vfvygca5s6mz87c78m0zyj29clkmp"; - revision = "6"; - editedCabalFile = "024aw98q1x3fb1xq07qki3z446w6lk5gyjl13shy0dbrd5aafh92"; + revision = "7"; + editedCabalFile = "0wib2mz6ifnixrcp9s1pkd00v9q7dvyka1z7zqc3pgif47hr1dbw"; libraryHaskellDepends = [ attoparsec base bytestring io-streams network transformers ]; @@ -163707,6 +164366,8 @@ self: { pname = "ip"; version = "1.7.6"; sha256 = "11ckl62w9005pww467ydx38imadzwrn36ww21c535x3jhhbic3a9"; + revision = "1"; + editedCabalFile = "0j9zs161awzvcbnc72prs6byzcy65gqg3q2m3hsi70hxbvpkm0zk"; libraryHaskellDepends = [ aeson attoparsec base bytebuild byteslice bytesmith bytestring deepseq hashable natural-arithmetic primitive text text-short @@ -164748,8 +165409,8 @@ self: { }: mkDerivation { pname = "isomorphism-class"; - version = "0.1.0.7"; - sha256 = "0kngrwjj5m2pg4pkcvcxamsx82y03lfpj4hs7ifsxf64qm67bmgy"; + version = "0.1.0.9"; + sha256 = "1d0vgmabjyiqpkgrn1hq6a77nyf7imi50ki9gq8a528l2k7sifig"; libraryHaskellDepends = [ base bytestring containers hashable primitive text unordered-containers vector @@ -164763,29 +165424,6 @@ self: { license = lib.licenses.mit; }) {}; - "isomorphism-class_0_1_0_8" = callPackage - ({ mkDerivation, base, bytestring, containers, hashable, primitive - , QuickCheck, quickcheck-instances, rebase, tasty, tasty-hunit - , tasty-quickcheck, text, unordered-containers, vector - }: - mkDerivation { - pname = "isomorphism-class"; - version = "0.1.0.8"; - sha256 = "1yz3bj3lf805jc9f91y0j2r0xw2ramvqx8xig1xj71nj9idd7lr9"; - libraryHaskellDepends = [ - base bytestring containers hashable primitive text - unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring containers hashable primitive QuickCheck - quickcheck-instances rebase tasty tasty-hunit tasty-quickcheck text - unordered-containers vector - ]; - description = "Isomorphism typeclass solving the conversion problem"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - "isotope" = callPackage ({ mkDerivation, base, containers, hspec, megaparsec, QuickCheck , template-haskell, th-lift @@ -165772,6 +166410,20 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "jacobi-elliptic" = callPackage + ({ mkDerivation, base, elliptic-integrals, jacobi-theta, tasty + , tasty-hunit + }: + mkDerivation { + pname = "jacobi-elliptic"; + version = "0.1.1.0"; + sha256 = "1vwfs1br5p35zjw58zpziakda48lxmwsmvl554y10djkby25g71k"; + libraryHaskellDepends = [ base elliptic-integrals jacobi-theta ]; + testHaskellDepends = [ base elliptic-integrals tasty tasty-hunit ]; + description = "Neville Theta Functions and Jacobi Elliptic Functions"; + license = lib.licenses.bsd3; + }) {}; + "jacobi-roots" = callPackage ({ mkDerivation, base, binary, bytestring, doctest, vector }: mkDerivation { @@ -165790,8 +166442,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "jacobi-theta"; - version = "0.1.0.0"; - sha256 = "1k7hd17785qyh4k26j0hpaays6nn5751bh4ni132psmqvp8dw6am"; + version = "0.1.1.0"; + sha256 = "1qi494yn7krnrlq4g083zj1cw16qa9r1al9wqz4b42s33igiw2is"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Jacobi Theta Functions"; @@ -167657,25 +168309,6 @@ self: { }) {}; "json-feed" = callPackage - ({ mkDerivation, aeson, base, bytestring, filepath, hspec - , mime-types, network-uri, tagsoup, text, time - }: - mkDerivation { - pname = "json-feed"; - version = "2.0.0.4"; - sha256 = "022zdas84skhh9s17k6mx45axrzfv2c7jf7f2rhk324706b7wxfl"; - libraryHaskellDepends = [ - aeson base bytestring mime-types network-uri tagsoup text time - ]; - testHaskellDepends = [ - aeson base bytestring filepath hspec mime-types network-uri tagsoup - text time - ]; - description = "JSON Feed"; - license = lib.licenses.mit; - }) {}; - - "json-feed_2_0_0_5" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, hspec , mime-types, network-uri, tagsoup, text, time }: @@ -167692,7 +168325,6 @@ self: { ]; description = "JSON Feed"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "json-fu" = callPackage @@ -168032,10 +168664,8 @@ self: { }: mkDerivation { pname = "json-sop"; - version = "0.2.1"; - sha256 = "0kzl21669wh9vdxspliflciwrkn5wamwwyg96aqrm4ybdqscpcn4"; - revision = "2"; - editedCabalFile = "1izlsx427d3c485hlfi1agb2c7gmbnp43736694ia72y1vkcfvh0"; + version = "0.2.2"; + sha256 = "17smxridqmbj1ic2b25kv1byr07lw6phqa1jx98a5yccflwhvmq4"; libraryHaskellDepends = [ aeson base generics-sop lens-sop tagged text time transformers unordered-containers vector @@ -168063,46 +168693,25 @@ self: { }) {}; "json-stream" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, hspec - , primitive, QuickCheck, quickcheck-unicode, scientific, text - , unordered-containers, vector - }: - mkDerivation { - pname = "json-stream"; - version = "0.4.4.2"; - sha256 = "12xchk8dpkr971h5ncwxhh97i8af2fp2rvgxvkg0d3a2ksbfpkal"; - libraryHaskellDepends = [ - aeson base bytestring primitive scientific text - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring directory hspec primitive QuickCheck - quickcheck-unicode scientific text unordered-containers vector - ]; - description = "Incremental applicative JSON parser"; - license = lib.licenses.bsd3; - }) {}; - - "json-stream_0_4_5_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , hspec, primitive, QuickCheck, quickcheck-unicode, scientific , text, unordered-containers, vector }: mkDerivation { pname = "json-stream"; - version = "0.4.5.0"; - sha256 = "1363nn38g8jdbrrmsx4ia1spqlyf49rvwrhm0rfxx97srx7nc0wy"; + version = "0.4.5.2"; + sha256 = "1hhnv59zwphvnfi6wym4bmqkcnk3b2adni4hxxgslmmf8yqi98ih"; libraryHaskellDepends = [ aeson base bytestring containers primitive scientific text unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring directory hspec primitive QuickCheck - quickcheck-unicode scientific text unordered-containers vector + aeson base bytestring containers directory hspec primitive + QuickCheck quickcheck-unicode scientific text unordered-containers + vector ]; description = "Incremental applicative JSON parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "json-syntax" = callPackage @@ -169135,6 +169744,26 @@ self: { license = lib.licenses.mit; }) {}; + "k8s-wrapper" = callPackage + ({ mkDerivation, async, base, http-client, http-types, lens, stm + , tasty, tasty-hunit, text, wai, wai-middleware-prometheus, warp + }: + mkDerivation { + pname = "k8s-wrapper"; + version = "0.1.0.0"; + sha256 = "183sv3jj361wk0qm6wfzq42rbrkr4m99cqpd2z489xlsxwlqagn9"; + libraryHaskellDepends = [ + async base http-types stm text wai wai-middleware-prometheus warp + ]; + testHaskellDepends = [ + async base http-client http-types lens stm tasty tasty-hunit text + ]; + description = "Application wrapper for the k8s environment"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "kademlia" = callPackage ({ mkDerivation, base, bytestring, containers, HUnit, mtl, network , QuickCheck, stm, tasty, tasty-hunit, tasty-quickcheck @@ -169186,6 +169815,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Low-level Haskell client library for Apache Kafka 0.7."; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "kafka-client-sync" = callPackage @@ -170133,6 +170764,25 @@ self: { broken = true; }) {}; + "keelung" = callPackage + ({ mkDerivation, array, base, bytestring, cereal, containers + , deepseq, directory, galois-field, groups, mtl, process + , QuickCheck, random, semirings, vector, wl-pprint-text + }: + mkDerivation { + pname = "keelung"; + version = "0.9.2"; + sha256 = "1hafnl78mvjp6yfncnvymjdvh4m10wm3gca8xmw0ry0qpii6ljmx"; + libraryHaskellDepends = [ + array base bytestring cereal containers deepseq directory + galois-field groups mtl process QuickCheck random semirings vector + wl-pprint-text + ]; + description = "DSL for creating zero-knowledge proofs"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "keenser" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , fast-logger, hedis, hostname, lifted-base, monad-control @@ -172490,18 +173140,6 @@ self: { }) {}; "lackey" = callPackage - ({ mkDerivation, base, hspec, servant, servant-foreign, text }: - mkDerivation { - pname = "lackey"; - version = "2.0.0.3"; - sha256 = "0drcq03vsya11002wg7i3phbgyylcyx4zry3ixflffm8sz00smci"; - libraryHaskellDepends = [ base servant-foreign text ]; - testHaskellDepends = [ base hspec servant servant-foreign text ]; - description = "Generate Ruby clients from Servant APIs"; - license = lib.licenses.mit; - }) {}; - - "lackey_2_0_0_4" = callPackage ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; @@ -172511,7 +173149,6 @@ self: { testHaskellDepends = [ base hspec servant servant-foreign text ]; description = "Generate Ruby clients from Servant APIs"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "lacroix" = callPackage @@ -172611,24 +173248,24 @@ self: { "lambda-calculator" = callPackage ({ mkDerivation, base, bytestring, containers, hlint, hspec, HUnit - , mtl, optparse-applicative, parsec, prettyprinter, repline, rio - , text + , microlens, mtl, optparse-applicative, parsec, prettyprinter + , repline, rio, text }: mkDerivation { pname = "lambda-calculator"; - version = "3.0.0.1"; - sha256 = "1830xqgr7fy4bbdys27qcq6qa1r83ajx0dl0vjx46gmccdm5fjmq"; + version = "3.1.1.0"; + sha256 = "0cwpc9wqgcx1109g1c7949jknzrlvbkqc9n6851gmj03d74vkqc0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers mtl parsec prettyprinter rio + base containers microlens mtl parsec prettyprinter rio ]; executableHaskellDepends = [ - base bytestring containers mtl optparse-applicative prettyprinter - repline rio text + base bytestring containers microlens mtl optparse-applicative + prettyprinter repline rio text ]; testHaskellDepends = [ - base containers hlint hspec HUnit mtl prettyprinter rio + base containers hlint hspec HUnit microlens mtl prettyprinter rio ]; description = "A lambda calculus interpreter"; license = lib.licenses.mit; @@ -173520,23 +174157,32 @@ self: { }) {}; "landlock" = callPackage - ({ mkDerivation, async, base, exceptions, filepath, process, psx - , QuickCheck, tasty, tasty-expected-failure, tasty-hunit - , tasty-quickcheck, unix + ({ mkDerivation, async, base, directory, exceptions, filepath + , markdown-unlit, optparse-applicative, process, psx, QuickCheck + , quickcheck-classes-base, tasty, tasty-hunit, tasty-quickcheck + , temporary, unix }: mkDerivation { pname = "landlock"; - version = "0.2.0.1"; - sha256 = "1xn517if819v7qrazq0dx7mmgn9i996j1lmxrkb68rmflbg2wic1"; + version = "0.2.1.1"; + sha256 = "1ijwa0nd2fli7mjv7p0586j7hmgb1v0zv7nqjvygqqdl6qc9qidl"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base exceptions psx unix ]; - testHaskellDepends = [ - async base filepath process QuickCheck tasty tasty-expected-failure - tasty-hunit tasty-quickcheck + executableHaskellDepends = [ + base exceptions optparse-applicative unix ]; + testHaskellDepends = [ + async base directory filepath process QuickCheck + quickcheck-classes-base tasty tasty-hunit tasty-quickcheck + temporary + ]; + testToolDepends = [ markdown-unlit ]; doHaddock = false; description = "Haskell bindings for the Linux Landlock API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + mainProgram = "landlocked"; }) {}; "lang" = callPackage @@ -175553,27 +176199,27 @@ self: { "launchdarkly-server-sdk" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, clock, containers, cryptohash, exceptions, extra - , generic-lens, hashtables, hedis, http-client, http-client-tls - , http-types, HUnit, iso8601-time, lens, lrucache, monad-logger - , mtl, pcre-light, random, retry, scientific, semver, text, time - , unordered-containers, uuid, vector, yaml + , generic-lens, hashtables, http-client, http-client-tls + , http-types, HUnit, iso8601-time, lens, lrucache, memory + , monad-logger, monad-loops, mtl, pcre-light, random, scientific + , semver, text, time, unordered-containers, uuid, vector, yaml }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "3.1.1"; - sha256 = "0yvj44a8h4gg5wsyypcfyjy1aanw3bdiv5hpx0wlz4ahp6s7s84w"; + version = "4.0.0"; + sha256 = "1sq5sl0m2nnzh23rvwknmkbxmrvyiik0rlqh4fhzbirm8h0si44b"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers - cryptohash exceptions extra generic-lens hashtables hedis - http-client http-client-tls http-types iso8601-time lens lrucache - monad-logger mtl pcre-light random retry scientific semver text - time unordered-containers uuid vector yaml + cryptohash exceptions extra generic-lens hashtables http-client + http-client-tls http-types iso8601-time lens lrucache memory + monad-logger monad-loops mtl pcre-light random scientific semver + text time unordered-containers uuid vector yaml ]; testHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers - cryptohash exceptions extra generic-lens hashtables hedis - http-client http-client-tls http-types HUnit iso8601-time lens - lrucache monad-logger mtl pcre-light random retry scientific semver + cryptohash exceptions extra generic-lens hashtables http-client + http-client-tls http-types HUnit iso8601-time lens lrucache memory + monad-logger monad-loops mtl pcre-light random scientific semver text time unordered-containers uuid vector yaml ]; description = "Server-side SDK for integrating with LaunchDarkly"; @@ -175582,6 +176228,27 @@ self: { broken = true; }) {}; + "launchdarkly-server-sdk-redis-hedis" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, generic-lens + , hedis, HUnit, launchdarkly-server-sdk, text + }: + mkDerivation { + pname = "launchdarkly-server-sdk-redis-hedis"; + version = "1.0.0"; + sha256 = "1417pxkpgd0ayz25zclp2r3yza6qy74f1y7ffwqqlaqh07blpgqm"; + libraryHaskellDepends = [ + aeson base bytestring exceptions generic-lens hedis + launchdarkly-server-sdk text + ]; + testHaskellDepends = [ + aeson base bytestring exceptions generic-lens hedis HUnit + launchdarkly-server-sdk text + ]; + description = "LaunchDarkly Server-Side SDK - Redis Integration"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "launchpad-control" = callPackage ({ mkDerivation, array, base, containers, hmidi, mtl, transformers }: @@ -176843,7 +177510,7 @@ self: { license = lib.licenses.bsd2; }) {}; - "lens_5_2" = callPackage + "lens_5_2_1" = callPackage ({ mkDerivation, array, assoc, base, base-compat, base-orphans , bifunctors, bytestring, call-stack, comonad, containers , contravariant, criterion, deepseq, distributive, exceptions @@ -176857,8 +177524,8 @@ self: { }: mkDerivation { pname = "lens"; - version = "5.2"; - sha256 = "126ivkkcacd15899phrwq6zc6zwllnshplkrrf59x3a6vsz2wgmk"; + version = "5.2.1"; + sha256 = "0vr6wpq6g8cc24dqi5qzslhkkq1l99pzk8yd7vl3r2i5wyfw3l82"; libraryHaskellDepends = [ array assoc base base-orphans bifunctors bytestring call-stack comonad containers contravariant distributive exceptions filepath @@ -177200,13 +177867,13 @@ self: { }) {}; "lens-sop" = callPackage - ({ mkDerivation, base, fclabels, generics-sop, transformers }: + ({ mkDerivation, base, generics-sop, optics-core, transformers }: mkDerivation { pname = "lens-sop"; - version = "0.2.0.3"; - sha256 = "0vgh6bj43qmhca6ij4b0bxqirhhfvxqd7xx5pryfs79fjghc47vv"; + version = "0.3.0"; + sha256 = "145yplksxyk15fyhjssjy5f4z18h1d8bgf25pb1vqdfr10rnffi1"; libraryHaskellDepends = [ - base fclabels generics-sop transformers + base generics-sop optics-core transformers ]; description = "Computing lenses generically using generics-sop"; license = lib.licenses.bsd3; @@ -179271,8 +179938,8 @@ self: { }: mkDerivation { pname = "lifx-lan"; - version = "0.7.1"; - sha256 = "1apzp7pkd2vl7nxmdcmdnpa89wrs1fmaii8gd01bjcmjkk7qxgli"; + version = "0.8.0"; + sha256 = "0zkc0575i87ii8izz0fsvd959wkxfacz36ng7msb25ld8byhsh1g"; libraryHaskellDepends = [ ansi-terminal base binary bytestring colour composition containers extra monad-loops mtl network random safe text time transformers @@ -179430,12 +180097,12 @@ self: { "lima" = callPackage ({ mkDerivation, aeson, base, data-default, optparse-applicative - , yaml + , string-interpolate, yaml }: mkDerivation { pname = "lima"; - version = "0.1.0.5"; - sha256 = "10hanr88zbrx57c52rmzmvqqn35yhylpzms0j60j195zwxmaliq6"; + version = "0.1.0.6"; + sha256 = "1hwpfdf9a9bdj0ya5mgi4mql9d6cyx06vhl0039lvx6nhzm6xlkp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179445,7 +180112,8 @@ self: { aeson base data-default optparse-applicative yaml ]; testHaskellDepends = [ - aeson base data-default optparse-applicative yaml + aeson base data-default optparse-applicative string-interpolate + yaml ]; description = "(Haskell or Literate Haskell) <-> Markdown converter"; license = lib.licenses.mit; @@ -179838,23 +180506,6 @@ self: { }) {}; "linear-generics" = callPackage - ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover - , template-haskell, th-abstraction - }: - mkDerivation { - pname = "linear-generics"; - version = "0.2"; - sha256 = "16l117m3zblla1cn5866mknvhc1s9737qhld6bym4xsyqsgvh2sz"; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell th-abstraction - ]; - testHaskellDepends = [ base hspec template-haskell ]; - testToolDepends = [ hspec-discover ]; - description = "Generic programming library for generalised deriving"; - license = lib.licenses.bsd3; - }) {}; - - "linear-generics_0_2_1" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover , template-haskell, th-abstraction }: @@ -179869,7 +180520,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generic programming library for generalised deriving"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "linear-grammar" = callPackage @@ -187155,6 +187805,36 @@ self: { license = lib.licenses.mit; }) {}; + "marching-cubes" = callPackage + ({ mkDerivation, array, base, containers, extra, linear, matrix + , split, vector + }: + mkDerivation { + pname = "marching-cubes"; + version = "0.1.0.0"; + sha256 = "08147kvsw6g2kkbbicax26y06bjrsiar1cffapwnqd8fwcg99gxs"; + libraryHaskellDepends = [ + array base containers extra linear matrix split vector + ]; + description = "Marching Cubes"; + license = lib.licenses.bsd3; + }) {}; + + "marching-cubes2" = callPackage + ({ mkDerivation, base, containers, extra, linear, matrix, split + , vector + }: + mkDerivation { + pname = "marching-cubes2"; + version = "0.1.0.0"; + sha256 = "0p2dcaivxrvvm0jpw7rqlinmhyivkyc6v1wxk8fn9xj155y9djm2"; + libraryHaskellDepends = [ + base containers extra linear matrix split vector + ]; + description = "Marching Cubes"; + license = lib.licenses.bsd3; + }) {}; + "marihana" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -189457,6 +190137,32 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "megastore" = callPackage + ({ mkDerivation, adjunctions, base, binary, bytestring, containers + , directory, ghc, hashable, JuicyPixels, lens, mtl, random, text + , text-show, vector, zlib + }: + mkDerivation { + pname = "megastore"; + version = "0.1.1.1"; + sha256 = "0i34jla7v5fsqcnpy8h7iqy413p6qcqnc1z1yi933kdwsh6srdyj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + adjunctions base binary bytestring containers directory ghc + hashable JuicyPixels lens mtl random text text-show vector zlib + ]; + executableHaskellDepends = [ + adjunctions base binary bytestring containers directory ghc + hashable JuicyPixels lens mtl random text text-show vector zlib + ]; + description = "Bulk image or strict bytestring storage"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "megastore"; + broken = true; + }) {}; + "meldable-heap" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -196069,8 +196775,8 @@ self: { }: mkDerivation { pname = "monomer-flatpak-example"; - version = "0.0.2.1"; - sha256 = "04qm3zzj880d89dk36pd5n9hll5a2m15zvmvr7j8wgi30hrp2691"; + version = "0.0.2.6"; + sha256 = "048zic4pkgdcrawg9npj8jdbd38d3qal45gdb6abxmcjqi5zapsg"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -196085,21 +196791,17 @@ self: { "monomer-hagrid" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , data-default-class, hspec, hspec-discover, ilist, lens, monomer - , mtl, random, stm, text, time + , mtl, stm, text }: mkDerivation { pname = "monomer-hagrid"; - version = "0.2.1.0"; - sha256 = "1hgw5p8nfw12jklrd2blli0wc4z9b60bk9gf3j0l8jxpivzwakqd"; + version = "0.2.1.1"; + sha256 = "0b5xr7pzppv3lds28l5gzh56lw4s6v7qlx624ma076vg61rxxkl2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers data-default-class ilist lens monomer text ]; - executableHaskellDepends = [ - base containers data-default-class ilist lens monomer random text - time - ]; testHaskellDepends = [ base bytestring containers data-default data-default-class hspec ilist lens monomer mtl stm text @@ -196984,7 +197686,6 @@ self: { ]; description = "Generación interactiva de mosaicos"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "mosquitto-hs" = callPackage @@ -199319,10 +200020,8 @@ self: { ({ mkDerivation, base, containers, transformers }: mkDerivation { pname = "multiset-comb"; - version = "0.2.4.1"; - sha256 = "1nih0101d6z2m4wi22804vjxrd5nr35mmqk31lm7bhanmwnl7qwa"; - revision = "1"; - editedCabalFile = "1amjahzg4lpgmhf4v456waa216afjpq3gcb45pqid5km9z1ycjdg"; + version = "0.2.4.2"; + sha256 = "0vgwahb6v1hm2vrlma3qv25xz2h2gq6dv4xwbngbkmvihx18r4rd"; libraryHaskellDepends = [ base containers transformers ]; description = "Combinatorial algorithms over multisets"; license = lib.licenses.bsd3; @@ -204347,6 +205046,19 @@ self: { broken = true; }) {}; + "newline" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "newline"; + version = "0.0.1.0"; + sha256 = "1lnrcpbj5sqgqxg41hf3ppj4dz77jh978acni7ni1wqd3yycgh68"; + libraryHaskellDepends = [ base text ]; + description = "newline specifications as values"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "newports" = callPackage ({ mkDerivation, base, directory, old-time }: mkDerivation { @@ -206081,18 +206793,17 @@ self: { }) {}; "nonempty-vector" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest - , primitive, vector + ({ mkDerivation, base, deepseq, primitive, QuickCheck, tasty + , tasty-quickcheck, vector }: mkDerivation { pname = "nonempty-vector"; - version = "0.2.1.0"; - sha256 = "0w6fn8dinf8lcbhr5797i5kyixpasylpwn97ljmkjc6n3ad1b21y"; - revision = "1"; - editedCabalFile = "18w57f8sdix71a27gwbifw7hmg34lms22c99gp7i7j7g154f3cn3"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.2.2.0"; + sha256 = "0nfvqp59jk8j0r4mj1v8q87hfznhkrscbgz2z7i7cva8fgqjrivg"; libraryHaskellDepends = [ base deepseq primitive vector ]; - testHaskellDepends = [ base doctest ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck vector + ]; description = "Non-empty vectors"; license = lib.licenses.bsd3; }) {}; @@ -211126,14 +211837,14 @@ self: { }) {}; "operational" = callPackage - ({ mkDerivation, base, mtl, random }: + ({ mkDerivation, base, mtl, random, transformers }: mkDerivation { pname = "operational"; - version = "0.2.4.1"; - sha256 = "0aa1pxymvkhbs0x03ikfiap2skzyf2z7307kz5adkmb3qmykcqa2"; + version = "0.2.4.2"; + sha256 = "1dx6vpmg21fskxyz12ba26hffk25b2qk9sznqfczgaamn6rahzc5"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base mtl ]; + libraryHaskellDepends = [ base mtl transformers ]; executableHaskellDepends = [ base mtl random ]; description = "Implementation of difficult monads made easy with operational semantics"; license = lib.licenses.bsd3; @@ -211338,8 +212049,8 @@ self: { pname = "optics-th"; version = "0.4.1"; sha256 = "05zxljfqmhr5if7l8gld5s864nql6kqjfizsf1z7r3ydknvmff6p"; - revision = "2"; - editedCabalFile = "1fl217q7s0g8a46p2smanhhdj0jqvc9n3lagcnpphkv3fzfgrcbz"; + revision = "3"; + editedCabalFile = "0hfx1ms0nmy57ik71r6bwlj3c5wwp48xf0mlr0pfi2c0wjl49azr"; libraryHaskellDepends = [ base containers mtl optics-core template-haskell th-abstraction transformers @@ -213774,7 +214485,7 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "pandoc-crossref_0_3_15_0" = callPackage + "pandoc-crossref_0_3_15_1" = callPackage ({ mkDerivation, base, containers, criterion, data-default, deepseq , directory, filepath, gitrev, hspec, microlens, microlens-mtl , microlens-th, mtl, open-browser, optparse-applicative, pandoc @@ -213783,8 +214494,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.15.0"; - sha256 = "0kzxdpqkhm09vizsyb7ck0mnic32kci8plqlbsawdjkg4knvdn5r"; + version = "0.3.15.1"; + sha256 = "0a0qfqfcajidkwv8zbk8h0lhnzcwzvkbcynh6y5hs4b5k07gdl9y"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -216646,32 +217357,6 @@ self: { }) {}; "password" = callPackage - ({ mkDerivation, base, base-compat, base64, bytestring, Cabal - , cabal-doctest, cryptonite, doctest, memory, password-types - , QuickCheck, quickcheck-instances, scrypt, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text - }: - mkDerivation { - pname = "password"; - version = "3.0.2.0"; - sha256 = "092cryk5xsmq86l9i7yyjxrq83mi9q61grwdkw2n8c1dxijbdi8l"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base base64 bytestring cryptonite memory password-types - template-haskell text - ]; - testHaskellDepends = [ - base base-compat bytestring cryptonite doctest memory - password-types QuickCheck quickcheck-instances scrypt tasty - tasty-hunit tasty-quickcheck template-haskell text - ]; - description = "Hashing and checking of passwords"; - license = lib.licenses.bsd3; - platforms = lib.platforms.x86; - maintainers = [ lib.maintainers.cdepillabout ]; - }) {}; - - "password_3_0_2_1" = callPackage ({ mkDerivation, base, base-compat, base64, bytestring, Cabal , cabal-doctest, cryptonite, doctest, memory, password-types , QuickCheck, quickcheck-instances, scrypt, tasty, tasty-hunit @@ -216694,7 +217379,6 @@ self: { description = "Hashing and checking of passwords"; license = lib.licenses.bsd3; platforms = lib.platforms.x86; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.cdepillabout ]; }) {}; @@ -219500,8 +220184,8 @@ self: { pname = "persistent-mtl"; version = "0.5.0.1"; sha256 = "17sxwa8p95nrkacjr1wnpihwfq121z1pkyh1nvlfjy76b4aalqhi"; - revision = "1"; - editedCabalFile = "1qhazc2jqrhz6bkhn55nsikgf8kdvajb2ai6826nwrq657glzqa4"; + revision = "2"; + editedCabalFile = "1aq30hqpdcsf7llmfwnn061qa2id4b8fncd9k0f53kmgvys2xivd"; testHaskellDepends = [ base bytestring conduit containers esqueleto explainable-predicates monad-logger persistent persistent-postgresql persistent-sqlite @@ -221106,19 +221790,21 @@ self: { }) {}; "phonetic-languages-simplified-properties-array" = callPackage - ({ mkDerivation, base, lists-flines, mmsyn2-array - , phonetic-languages-basis, phonetic-languages-rhythmicity + ({ mkDerivation, base, lists-flines, logical-constraints + , mmsyn2-array, phonetic-languages-basis + , phonetic-languages-rhythmicity , phonetic-languages-simplified-base , phonetic-languages-simplified-properties-array-common , ukrainian-phonetics-basic-array }: mkDerivation { pname = "phonetic-languages-simplified-properties-array"; - version = "0.16.0.0"; - sha256 = "05zbdafl2hga04sy5vcq121n8aigbrhfb4xynvafbyxsmsahflkz"; + version = "0.17.1.0"; + sha256 = "1qnrb811wfhv9d6l0vkfzjwgp8zbxlbgkzv28if2g0za6j20b8d2"; libraryHaskellDepends = [ - base lists-flines mmsyn2-array phonetic-languages-basis - phonetic-languages-rhythmicity phonetic-languages-simplified-base + base lists-flines logical-constraints mmsyn2-array + phonetic-languages-basis phonetic-languages-rhythmicity + phonetic-languages-simplified-base phonetic-languages-simplified-properties-array-common ukrainian-phonetics-basic-array ]; @@ -226232,24 +226918,6 @@ self: { }) {}; "pooled-io" = callPackage - ({ mkDerivation, base, concurrent-split, containers, deepseq - , transformers, unsafe, utility-ht - }: - mkDerivation { - pname = "pooled-io"; - version = "0.0.2.2"; - sha256 = "1g8zppj2s1wfzg5rpdgz15m44ihxhmrx16jx12n4821cdhsm2nrs"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base concurrent-split containers deepseq transformers unsafe - utility-ht - ]; - description = "Run jobs on a limited number of threads and support data dependencies"; - license = lib.licenses.bsd3; - }) {}; - - "pooled-io_0_0_2_3" = callPackage ({ mkDerivation, base, concurrent-split, containers, deepseq , transformers, unsafe, utility-ht }: @@ -226265,7 +226933,6 @@ self: { ]; description = "Run jobs on a limited number of threads and support data dependencies"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pop3-client" = callPackage @@ -230011,12 +230678,39 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "primitive_0_8_0_0" = callPackage + ({ mkDerivation, base, base-orphans, data-array-byte, deepseq + , ghc-prim, QuickCheck, quickcheck-classes-base, tagged, tasty + , tasty-bench, tasty-quickcheck, template-haskell, transformers + , transformers-compat + }: + mkDerivation { + pname = "primitive"; + version = "0.8.0.0"; + sha256 = "0pwr5g3bra5m2zjm14pj98klqj2qrjcfasgd3rcrp7vq98dw4lsm"; + libraryHaskellDepends = [ + base data-array-byte deepseq template-haskell transformers + ]; + testHaskellDepends = [ + base base-orphans ghc-prim QuickCheck quickcheck-classes-base + tagged tasty tasty-quickcheck transformers transformers-compat + ]; + benchmarkHaskellDepends = [ + base deepseq tasty-bench transformers + ]; + description = "Primitive memory-related operations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "primitive-addr" = callPackage ({ mkDerivation, base, primitive }: mkDerivation { pname = "primitive-addr"; version = "0.1.0.2"; sha256 = "06r1p56wm8rbjxnlaqbmc3rbsj1rsv5scwnh80lsn0xw56jc70a2"; + revision = "1"; + editedCabalFile = "14pawzzip9528qizhrpai00h27z9dfin4kw8vqkb6576pi8g1y2f"; libraryHaskellDepends = [ base primitive ]; description = "Addresses to unmanaged memory"; license = lib.licenses.bsd3; @@ -230094,8 +230788,8 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.10.1.5"; - sha256 = "0xmigva8lss9h18q0a63mc9sridny40nyzkizr2vmgm5d9qniqjs"; + version = "0.10.1.6"; + sha256 = "1lxb5yfpxj038fs7l5jjj3i4k9frjnlbki5kjgf0mbpcyfv6s0rr"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl list-t primitive primitive-unlifted profunctors vector @@ -230245,6 +230939,8 @@ self: { pname = "primitive-unaligned"; version = "0.1.1.2"; sha256 = "1ksl2gib15inbd80rf0bl3baj8fmk740liv4fdg9493dlhr3a4pa"; + revision = "1"; + editedCabalFile = "1kndcxl120bl0wzjjd8s2nxcw4qw5y3q6vzdqxn8p4xblk1vxajk"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive ]; description = "Unaligned access to primitive arrays"; @@ -230257,6 +230953,8 @@ self: { pname = "primitive-unlifted"; version = "0.1.3.1"; sha256 = "1gilzgclpvz200sybw86nmdm7084nrklscq48cs36qqlgcd0wcwb"; + revision = "1"; + editedCabalFile = "0y3zdwbs1fdzspj1k95jyjrhm7za38gb6ada031bp02ifxbvsvsf"; libraryHaskellDepends = [ base bytestring primitive text-short ]; testHaskellDepends = [ base primitive stm ]; description = "Primitive GHC types with unlifted types inside"; @@ -230626,20 +231324,6 @@ self: { }) {}; "probability" = callPackage - ({ mkDerivation, base, containers, random, transformers, utility-ht - }: - mkDerivation { - pname = "probability"; - version = "0.2.7"; - sha256 = "1m494ya9yv25jdi9wm90zz8c16vq1kv73sgc6w3950020hsbfqj9"; - libraryHaskellDepends = [ - base containers random transformers utility-ht - ]; - description = "Probabilistic Functional Programming"; - license = lib.licenses.bsd3; - }) {}; - - "probability_0_2_8" = callPackage ({ mkDerivation, base, containers, random, transformers, utility-ht }: mkDerivation { @@ -230651,7 +231335,6 @@ self: { ]; description = "Probabilistic Functional Programming"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "probable" = callPackage @@ -232642,23 +233325,6 @@ self: { }) {}; "protolude" = callPackage - ({ mkDerivation, array, async, base, bytestring, containers - , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text - , transformers, transformers-compat - }: - mkDerivation { - pname = "protolude"; - version = "0.3.2"; - sha256 = "0i53yxg44nrz0czwr8cqhw1fdapz9db8kfnqz9a3lmj5skrikh3y"; - libraryHaskellDepends = [ - array async base bytestring containers deepseq ghc-prim hashable - mtl mtl-compat stm text transformers transformers-compat - ]; - description = "A small prelude"; - license = lib.licenses.mit; - }) {}; - - "protolude_0_3_3" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text , transformers, transformers-compat @@ -232673,7 +233339,6 @@ self: { ]; description = "A small prelude"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "protolude-lifted" = callPackage @@ -233059,11 +233724,11 @@ self: { ({ mkDerivation, async, base, tasty, tasty-hunit }: mkDerivation { pname = "psx"; - version = "0.1.0.0"; - sha256 = "1clxvv9qazq02307ay7acy17614407zhjm9p1139dfiqri1218ar"; + version = "0.1.1.1"; + sha256 = "0g46yjak9j49075gpinc6012vc2pdz0hix67gvz1daqz69wg7x1z"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ async base tasty tasty-hunit ]; - description = "Integrate @libpsx@ with the GHC RTS"; + description = "Integrate libpsx with the GHC RTS"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -233194,14 +233859,14 @@ self: { license = lib.licenses.mit; }) {}; - "ptr-poker_0_1_2_12" = callPackage + "ptr-poker_0_1_2_13" = callPackage ({ mkDerivation, base, bytestring, criterion, hedgehog , isomorphism-class, numeric-limits, rerebase, scientific, text }: mkDerivation { pname = "ptr-poker"; - version = "0.1.2.12"; - sha256 = "07mhsg8xr2xyxg7bzmv4cb41c3919my3j70q3bjplqvfxsan9n0y"; + version = "0.1.2.13"; + sha256 = "07j9iszxv3c0yw3lm8zlf1wl34imr3r828fc8jg047rr28yxy2kg"; libraryHaskellDepends = [ base bytestring scientific text ]; testHaskellDepends = [ hedgehog isomorphism-class numeric-limits rerebase @@ -235352,7 +236017,9 @@ self: { executableToolDepends = [ alex happy ]; description = "Quite Useless DB"; license = lib.licenses.lgpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "qudb"; + broken = true; }) {}; "quenya-verb" = callPackage @@ -235744,6 +236411,8 @@ self: { pname = "quickcheck-classes"; version = "0.6.5.0"; sha256 = "19iw15mvb7gws3ljdxqwsbb4pmfc0sfflf8szgmrhiqr3k82mqv2"; + revision = "1"; + editedCabalFile = "1p52n2padxppj4wy3s4v8shs7zsd9hy9r4rdk21wg7l9dwbqss5a"; libraryHaskellDepends = [ aeson base containers primitive primitive-addr QuickCheck quickcheck-classes-base semigroupoids semirings transformers vector @@ -235865,6 +236534,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "quickcheck-instances_0_3_29_1" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive + , containers, data-array-byte, data-fix, hashable + , integer-logarithms, old-time, OneTuple, primitive, QuickCheck + , scientific, splitmix, strict, tagged, text, text-short, these + , time, time-compat, transformers, transformers-compat + , unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "quickcheck-instances"; + version = "0.3.29.1"; + sha256 = "0jx2wfy7y5dr14s9i457g2aah4isjxry4mlbqhj7vlav6ib84gdj"; + libraryHaskellDepends = [ + array base bytestring case-insensitive containers data-array-byte + data-fix hashable integer-logarithms old-time OneTuple primitive + QuickCheck scientific splitmix strict tagged text text-short these + time time-compat transformers transformers-compat + unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + base containers data-array-byte primitive QuickCheck tagged + uuid-types + ]; + benchmarkHaskellDepends = [ base bytestring QuickCheck ]; + description = "Common quickcheck instances"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "quickcheck-io" = callPackage ({ mkDerivation, base, HUnit, QuickCheck }: mkDerivation { @@ -236193,17 +236891,6 @@ self: { }) {}; "quickcheck-transformer" = callPackage - ({ mkDerivation, base, QuickCheck, random, transformers }: - mkDerivation { - pname = "quickcheck-transformer"; - version = "0.3.1.1"; - sha256 = "0al0p44qi9j829zcnv43kqf4pxaxr6fb48vkq1an15hdk6svx11j"; - libraryHaskellDepends = [ base QuickCheck random transformers ]; - description = "A GenT monad transformer for QuickCheck library"; - license = lib.licenses.mit; - }) {}; - - "quickcheck-transformer_0_3_1_2" = callPackage ({ mkDerivation, base, QuickCheck, random, transformers }: mkDerivation { pname = "quickcheck-transformer"; @@ -236212,7 +236899,6 @@ self: { libraryHaskellDepends = [ base QuickCheck random transformers ]; description = "A GenT monad transformer for QuickCheck library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "quickcheck-unicode" = callPackage @@ -237477,19 +238163,6 @@ self: { }) {}; "rampart" = callPackage - ({ mkDerivation, base, criterion, hspec }: - mkDerivation { - pname = "rampart"; - version = "2.0.0.3"; - sha256 = "1g6297vfsa61ygywsc906p5449nzljldl3bbf2jags79b6qwa15n"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "Determine how intervals relate to each other"; - license = lib.licenses.mit; - }) {}; - - "rampart_2_0_0_4" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { pname = "rampart"; @@ -237499,7 +238172,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Determine how intervals relate to each other"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ramus" = callPackage @@ -238413,27 +239085,6 @@ self: { }) {}; "ratel" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, filepath, hspec, http-client, http-client-tls - , http-types, uuid - }: - mkDerivation { - pname = "ratel"; - version = "2.0.0.4"; - sha256 = "0iwdj9bmv3k7ppq51z66z1h8rrsi6jcc6xpdf5b8c869fazy6nd4"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers http-client - http-client-tls http-types uuid - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive containers filepath hspec - http-client http-client-tls http-types uuid - ]; - description = "Notify Honeybadger about exceptions"; - license = lib.licenses.mit; - }) {}; - - "ratel_2_0_0_5" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , containers, filepath, hspec, http-client, http-client-tls , http-types, uuid @@ -238452,25 +239103,9 @@ self: { ]; description = "Notify Honeybadger about exceptions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ratel-wai" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , http-client, ratel, wai - }: - mkDerivation { - pname = "ratel-wai"; - version = "2.0.0.1"; - sha256 = "0hh99f7dwl5gihgqjn627s6sn4p68h1lifl2m8qqlhhdnnbwy4lr"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers http-client ratel wai - ]; - description = "Notify Honeybadger about exceptions via a WAI middleware"; - license = lib.licenses.mit; - }) {}; - - "ratel-wai_2_0_0_2" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai }: @@ -238483,7 +239118,6 @@ self: { ]; description = "Notify Honeybadger about exceptions via a WAI middleware"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ratelimiter" = callPackage @@ -239924,6 +240558,28 @@ self: { license = lib.licenses.mit; }) {}; + "rebase_1_18" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, comonad, containers + , contravariant, deepseq, dlist, either, groups, hashable + , invariant, mtl, profunctors, scientific, selective, semigroupoids + , stm, text, time, time-compat, transformers, unordered-containers + , uuid-types, vector, vector-instances, void + }: + mkDerivation { + pname = "rebase"; + version = "1.18"; + sha256 = "07i5kkzwlgbdz1xikhn9smmv3ac65z3xzs1wflxrbf6v9fa77s5y"; + libraryHaskellDepends = [ + base bifunctors bytestring comonad containers contravariant deepseq + dlist either groups hashable invariant mtl profunctors scientific + selective semigroupoids stm text time time-compat transformers + unordered-containers uuid-types vector vector-instances void + ]; + description = "A more progressive alternative to the \"base\" package"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "rebindable" = callPackage ({ mkDerivation, base, data-default-class, indexed }: mkDerivation { @@ -239936,26 +240592,6 @@ self: { }) {}; "rec-def" = callPackage - ({ mkDerivation, base, concurrency, containers, dejafu, doctest - , QuickCheck, random, tasty, tasty-dejafu, template-haskell - }: - mkDerivation { - pname = "rec-def"; - version = "0.2"; - sha256 = "0dfw86ws00gsdnzb238pmr4i2lyfp405lp70nbak45qq2cbz0zj8"; - revision = "1"; - editedCabalFile = "0kg2m81b4q73m8rysnqkmviiph1vf68f2dhyzawi9b2mj22q45fz"; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ - base concurrency containers dejafu doctest QuickCheck random tasty - tasty-dejafu template-haskell - ]; - description = "Recursively defined values"; - license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.nomeata ]; - }) {}; - - "rec-def_0_2_1" = callPackage ({ mkDerivation, base, concurrency, containers, dejafu, doctest , QuickCheck, random, tasty, tasty-dejafu, template-haskell }: @@ -239970,7 +240606,6 @@ self: { ]; description = "Recursively defined values"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.nomeata ]; }) {}; @@ -240305,6 +240940,24 @@ self: { license = lib.licenses.bsd2; }) {}; + "recursion-schemes_5_2_2_4" = callPackage + ({ mkDerivation, base, base-orphans, comonad, containers, data-fix + , free, HUnit, template-haskell, th-abstraction, transformers + }: + mkDerivation { + pname = "recursion-schemes"; + version = "5.2.2.4"; + sha256 = "0hyvqh8kp2pw4kwvisyz9msjy41y218f9l6fpsrbla4s1b4in58c"; + libraryHaskellDepends = [ + base base-orphans comonad containers data-fix free template-haskell + th-abstraction transformers + ]; + testHaskellDepends = [ base HUnit template-haskell transformers ]; + description = "Representing common recursion patterns as higher-order functions"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "recursion-schemes-ext" = callPackage ({ mkDerivation, base, composition-prelude, criterion, deepseq , hspec, lens, recursion-schemes @@ -241053,6 +241706,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "reflection_2_1_7" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "reflection"; + version = "2.1.7"; + sha256 = "1z8mwkqb0ljxpc45hkj0jiyhjfl1frpxqhdnp0xm6w98n2l1ifvc"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Reifies arbitrary terms into types that can be reflected back into terms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "reflection-extras" = callPackage ({ mkDerivation, aeson, base, constraints, lens, reflection, tagged }: @@ -243784,6 +244453,30 @@ self: { license = lib.licenses.mit; }) {}; + "relude_1_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty-bench, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "relude"; + version = "1.2.0.0"; + sha256 = "0wqj5ipsm3wwl401q5c5w6q6q07qd825y2d10j3q9gqsvyrpgqfb"; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim hashable mtl stm text + transformers unordered-containers + ]; + testHaskellDepends = [ + base bytestring containers doctest Glob hedgehog text + ]; + benchmarkHaskellDepends = [ + base tasty-bench unordered-containers + ]; + description = "Safe, performant, user-friendly and lightweight Haskell Standard Library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "remark" = callPackage ({ mkDerivation, base, GenericPretty, tasty, tasty-golden , tasty-hunit @@ -244870,6 +245563,18 @@ self: { license = lib.licenses.mit; }) {}; + "rerebase_1_18" = callPackage + ({ mkDerivation, rebase }: + mkDerivation { + pname = "rerebase"; + version = "1.18"; + sha256 = "1y5xklpm2l92wfa1h4h5s78hks36n79b1ncvr46ljf545gywmp4m"; + libraryHaskellDepends = [ rebase ]; + description = "Reexports from \"base\" with a bunch of other standard libraries"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "reroute" = callPackage ({ mkDerivation, base, criterion, deepseq, graph-core, hashable , hspec, http-api-data, hvect, mtl, random, regex-compat, text @@ -245770,6 +246475,8 @@ self: { pname = "retrie"; version = "1.2.1.1"; sha256 = "1axz2kdp6ljwiy8zvj33r6dbhgcglf0qlcq4s5f4bx4djsqwgavl"; + revision = "1"; + editedCabalFile = "1j5ppfzdcqbnik6cccqlwb62496z473y26r2ad763q0l5v6lhqfq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -245952,8 +246659,8 @@ self: { ({ mkDerivation, base, containers, contiguous, deepseq }: mkDerivation { pname = "reverse-list"; - version = "0.2.0"; - sha256 = "0r4bjrc1vksx3j61qb0g1a7nngkzvsybr0v0admls3ffqf3y4zgh"; + version = "0.3.0.0"; + sha256 = "0q3fjgbc6r0v7zdcs577jilqc0py6vmr4iyvnngdlwhrcvyv4mjs"; libraryHaskellDepends = [ base containers contiguous deepseq ]; description = "reversed lists/snoc lists"; license = lib.licenses.bsd3; @@ -246426,6 +247133,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "rhythmic-sequences" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "rhythmic-sequences"; + version = "0.1.3.0"; + sha256 = "1m74z445zjfimc8b7ga9y1jyp8v2hrirpd2ynh89dz6iwxbbkq5k"; + libraryHaskellDepends = [ base ]; + description = "Library to deal with rhythmicity of short sequences"; + license = lib.licenses.mit; + }) {}; + "riak" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bifunctors, binary , blaze-builder, bytestring, containers, criterion @@ -248843,6 +249561,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "rrb-vector_0_2_0_0" = callPackage + ({ mkDerivation, base, deepseq, indexed-traversable, nothunks + , primitive, quickcheck-classes-base, tasty, tasty-bench + , tasty-quickcheck + }: + mkDerivation { + pname = "rrb-vector"; + version = "0.2.0.0"; + sha256 = "17lmf79dzynpw43ibs7xzq31bvim5wj7a91k5h3bdzwjwwh1sy0x"; + libraryHaskellDepends = [ + base deepseq indexed-traversable primitive + ]; + testHaskellDepends = [ + base deepseq nothunks quickcheck-classes-base tasty + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base tasty-bench ]; + description = "Efficient RRB-Vectors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "rrule" = callPackage ({ mkDerivation, base, hspec, megaparsec, parser-combinators, text , time @@ -249311,6 +250051,8 @@ self: { pname = "run-st"; version = "0.1.1.0"; sha256 = "11if8xwv22ry0mxrglg3pcx3cx8ljnq56f3m9vjkr9jcj2881dvf"; + revision = "1"; + editedCabalFile = "15cm4zv9848sa2a2ipb66lv791pdnkx7j3pwksmjvkhkzr3bkl51"; libraryHaskellDepends = [ base primitive primitive-unlifted ]; description = "runST without boxing penalty"; license = lib.licenses.bsd3; @@ -250503,8 +251245,8 @@ self: { }: mkDerivation { pname = "saltine"; - version = "0.2.0.1"; - sha256 = "181fxlp8p0zhz58h23fxavhcbxkwhd3a3idlbhawb2rhiah6fs6f"; + version = "0.2.1.0"; + sha256 = "1n9wjqgmb0rdk3fp5mva413646qi2cj7i21k80797xycyrx3v2xa"; libraryHaskellDepends = [ base bytestring deepseq hashable profunctors text ]; @@ -250542,18 +251284,6 @@ self: { }) {inherit (pkgs) libsodium;}; "salve" = callPackage - ({ mkDerivation, base, HUnit }: - mkDerivation { - pname = "salve"; - version = "2.0.0.1"; - sha256 = "0g2y0ng0s3hp9scp080m933yixhl3zd8bsjvyf2k0pn9b9cg0p79"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base HUnit ]; - description = "Semantic version numbers and constraints"; - license = lib.licenses.mit; - }) {}; - - "salve_2_0_0_2" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { pname = "salve"; @@ -250563,7 +251293,6 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Semantic version numbers and constraints"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "salvia" = callPackage @@ -251065,6 +251794,30 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sasha" = callPackage + ({ mkDerivation, aeson, alex, array, base, bytestring, containers + , deepseq, lattices, QuickCheck, tasty, tasty-bench, tasty-hunit + , tasty-quickcheck, template-haskell, text, th-letrec, wide-word + }: + mkDerivation { + pname = "sasha"; + version = "0"; + sha256 = "0c7wvrw5139d4n9vj5na7j3l4ayk5651w7qf962hd0cb1ah77518"; + libraryHaskellDepends = [ + base bytestring containers lattices QuickCheck template-haskell + th-letrec wide-word + ]; + testHaskellDepends = [ + aeson array base bytestring deepseq lattices tasty tasty-bench + tasty-hunit tasty-quickcheck text + ]; + testToolDepends = [ alex ]; + description = "A staged lexer generator"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "sasl" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash , monads-tf, papillon, simple-pipe @@ -251373,7 +252126,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_4_11_0" = callPackage + "sbp_4_12_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -251382,8 +252135,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "4.11.0"; - sha256 = "0flwy85dvdmaqpl8b652as8zhdypq0a513v1pvp0hrnp1z0ylg1p"; + version = "4.12.0"; + sha256 = "16y2bi153d1gbsznai75dli5fww3ysyfp39d7srkffvmwjal3ckd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -252397,8 +253150,8 @@ self: { pname = "scientific"; version = "0.3.7.0"; sha256 = "1aa3ngb71l2sh1x2829napnr1w285q0sn2f7z2wvi3ynng2238d3"; - revision = "3"; - editedCabalFile = "1n67w1b64q59nn4845z3kr8rm0x0p7bi3cyp6n1dpnfs8k4l8x2i"; + revision = "4"; + editedCabalFile = "0667wh94s1sibpp7i7gkcys4b2lc6mwyza11ijaqbbv2gw51liap"; libraryHaskellDepends = [ base binary bytestring containers deepseq hashable integer-logarithms primitive template-haskell text @@ -256263,8 +257016,8 @@ self: { pname = "servant-docs"; version = "0.12"; sha256 = "0531jldq35sl1qlna0s1n8bakbsplg15611305dk48z80vcpa933"; - revision = "3"; - editedCabalFile = "1brli8m3gvfji9b88xww5aifl1gq9lxacn3nhxbwndlnwznx7anz"; + revision = "4"; + editedCabalFile = "1yb9axh316dnlqhyxafyl6d3yh1x5skh94mpm8z534xji6n2kpqq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -256357,30 +257110,6 @@ self: { }) {}; "servant-elm" = callPackage - ({ mkDerivation, aeson, base, Diff, directory, elm-bridge, hspec - , HUnit, lens, servant, servant-client, servant-foreign, text - , wl-pprint-text - }: - mkDerivation { - pname = "servant-elm"; - version = "0.7.2"; - sha256 = "1hn7qkz4aw5snc4lbprbshzr3dagfry1bms0fx9bfif61312swqy"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base directory elm-bridge lens servant servant-foreign text - wl-pprint-text - ]; - testHaskellDepends = [ - aeson base Diff elm-bridge hspec HUnit servant servant-client text - ]; - description = "Automatically derive Elm functions to query servant webservices"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "servant-elm_0_7_3" = callPackage ({ mkDerivation, aeson, base, Diff, directory, elm-bridge, hspec , HUnit, lens, servant, servant-client, servant-foreign, text , wl-pprint-text @@ -260699,7 +261428,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "shelly_1_11_0" = callPackage + "shelly_1_12_0" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib , HUnit, lifted-async, lifted-base, monad-control, mtl, process @@ -260707,8 +261436,8 @@ self: { }: mkDerivation { pname = "shelly"; - version = "1.11.0"; - sha256 = "0vmi8qbp1w9ir25k2p05p4jx9r7v67kkyygygl660ji6l6a89h50"; + version = "1.12.0"; + sha256 = "17mxarrz2jhrj7vf5nappxixkn8dqsnz6fgrxfzbg9z0gk95hrig"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -264148,17 +264877,6 @@ self: { }) {}; "skylighting-format-context" = callPackage - ({ mkDerivation, base, containers, skylighting-core, text }: - mkDerivation { - pname = "skylighting-format-context"; - version = "0.1.0.1"; - sha256 = "1d4nf16wl2l4r627qnph09x21xwcq03r7bznqm08d4di1z241xv0"; - libraryHaskellDepends = [ base containers skylighting-core text ]; - description = "ConTeXt formatter for skylighting syntax highlighting library"; - license = lib.licenses.bsd3; - }) {}; - - "skylighting-format-context_0_1_0_2" = callPackage ({ mkDerivation, base, containers, skylighting-core, text }: mkDerivation { pname = "skylighting-format-context"; @@ -264167,7 +264885,6 @@ self: { libraryHaskellDepends = [ base containers skylighting-core text ]; description = "ConTeXt formatter for skylighting syntax highlighting library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "skylighting-format-latex" = callPackage @@ -268038,6 +268755,21 @@ self: { broken = true; }) {}; + "sorting-network" = callPackage + ({ mkDerivation, base, criterion, hspec, mwc-random, QuickCheck + , template-haskell, vector + }: + mkDerivation { + pname = "sorting-network"; + version = "0.1.0.0"; + sha256 = "1rrihqjrj4jnh3950illxb6yva092cz86xkhmr5p34wzpbz1vrpx"; + libraryHaskellDepends = [ base template-haskell vector ]; + testHaskellDepends = [ base hspec QuickCheck ]; + benchmarkHaskellDepends = [ base criterion mwc-random ]; + description = "Sort small lists with sorting network"; + license = lib.licenses.asl20; + }) {}; + "sorty" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -271026,8 +271758,8 @@ self: { }: mkDerivation { pname = "stack-all"; - version = "0.4.0.1"; - sha256 = "0aw5bx737cg0isdnnrhlwba0ddjki57p4ygav4piv5d3ffzhrfzm"; + version = "0.4.1"; + sha256 = "11s886069z75abp7x0iqvbjfn4hhkzjj5d0mxbljwcfw6v8mq8c4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -272199,19 +272931,6 @@ self: { }) {}; "statestack" = callPackage - ({ mkDerivation, base, mtl, transformers }: - mkDerivation { - pname = "statestack"; - version = "0.3.1"; - sha256 = "0h8kwzf117zb2ffc5phbvlxpgza8h59bjg93ndp7r1ks0jvs5lpr"; - revision = "1"; - editedCabalFile = "1bvx9s7zssczqpwwgqw4cgmfdw1wjy0mwqlndjgnkjjn4nm31ml8"; - libraryHaskellDepends = [ base mtl transformers ]; - description = "Simple State-like monad transformer with saveable and restorable state"; - license = lib.licenses.bsd3; - }) {}; - - "statestack_0_3_1_1" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "statestack"; @@ -272220,7 +272939,6 @@ self: { libraryHaskellDepends = [ base mtl transformers ]; description = "Simple State-like monad transformer with saveable and restorable state"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "statethread" = callPackage @@ -273191,8 +273909,8 @@ self: { }: mkDerivation { pname = "stm-hamt"; - version = "1.2.0.8"; - sha256 = "1p3njvg5sixsgk12rldmvgcj8flmh00w968mzaavxl4j4axd8x3c"; + version = "1.2.0.9"; + sha256 = "0dd06dzsap4bhc4h1il3cwsd5hcb23lrvq03pwxvd32wp6a4x98r"; libraryHaskellDepends = [ base deferred-folds focus hashable list-t primitive primitive-extras transformers @@ -273575,10 +274293,8 @@ self: { }: mkDerivation { pname = "storable-record"; - version = "0.0.6"; - sha256 = "1d4c1ccbrpq8rnacsjib9nmxhgxk9yb1zxx1nvfavhqhv8nwq2fd"; - revision = "1"; - editedCabalFile = "0gmyc50r9nzfwr5iyiixascgkv2lvk7xccvimqv2ix4zyi2fwdad"; + version = "0.0.7"; + sha256 = "1c1f58v13nxpq2ix30d2kpvsamk44apl6ms1a2pq54fkjk44didy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -273614,6 +274330,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "storable-tuple_0_1" = callPackage + ({ mkDerivation, base, base-orphans, storable-record, utility-ht }: + mkDerivation { + pname = "storable-tuple"; + version = "0.1"; + sha256 = "0g2rhqxrl1yjvvqwxmfgflgyyrds0kkcvzjjmwk07mir8aj4yjq3"; + libraryHaskellDepends = [ + base base-orphans storable-record utility-ht + ]; + description = "Storable instance for pairs and triples"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "storablevector" = callPackage ({ mkDerivation, base, bytestring, deepseq, non-negative , QuickCheck, random, sample-frame, semigroups, syb, transformers @@ -274583,6 +275313,8 @@ self: { pname = "streamly"; version = "0.8.3"; sha256 = "0xjvrkyh8i6hkfr3vsi3n56z85qd56nyjiwi1abzhhdshvxw92xg"; + revision = "1"; + editedCabalFile = "1m8lhaabscgk0mj8hp0s8b7zb72padgqr39ky01cj0lxm7byxwf8"; libraryHaskellDepends = [ atomic-primops base containers deepseq directory exceptions filepath fusion-plugin-types ghc-prim heaps lockfree-queue @@ -274645,8 +275377,8 @@ self: { pname = "streamly-bytestring"; version = "0.1.4"; sha256 = "1qwgrxm2x46951si18sbmqhq4fik26l07kmspv23m9q3drn0mklc"; - revision = "4"; - editedCabalFile = "1mzrj7bkmvz27svxjaknrgvxwvz9zpw0ifvpvdbi7idlfmh01mqa"; + revision = "5"; + editedCabalFile = "018v61bdrzbn3hgpyvzk1frs1pbj7i18w7ix1cij6r06qfgphsy8"; libraryHaskellDepends = [ base bytestring streamly ]; testHaskellDepends = [ base bytestring directory filepath hspec hspec-discover @@ -275925,23 +276657,6 @@ self: { }) {}; "strive" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline - , http-client, http-client-tls, http-types, template-haskell, text - , time, transformers - }: - mkDerivation { - pname = "strive"; - version = "6.0.0.4"; - sha256 = "1vvv1cc88niciqly68wddpkkly796jyl6hypahyd0rkif53q789l"; - libraryHaskellDepends = [ - aeson base bytestring data-default gpolyline http-client - http-client-tls http-types template-haskell text time transformers - ]; - description = "A client for the Strava V3 API"; - license = lib.licenses.mit; - }) {}; - - "strive_6_0_0_5" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline , http-client, http-client-tls, http-types, template-haskell, text , time, transformers @@ -275956,7 +276671,6 @@ self: { ]; description = "A client for the Strava V3 API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "strong-path" = callPackage @@ -276037,6 +276751,29 @@ self: { maintainers = [ lib.maintainers.raehik ]; }) {}; + "strongweak_0_4_1" = callPackage + ({ mkDerivation, base, either, generic-random, hspec + , hspec-discover, prettyprinter, QuickCheck, quickcheck-instances + , refined, vector, vector-sized + }: + mkDerivation { + pname = "strongweak"; + version = "0.4.1"; + sha256 = "0xns5l09h5sxz4sm2pgsgmrllccgp1lfp6v2mkfgbrfq2hgdgr0v"; + libraryHaskellDepends = [ + base either prettyprinter refined vector vector-sized + ]; + testHaskellDepends = [ + base either generic-random hspec prettyprinter QuickCheck + quickcheck-instances refined vector vector-sized + ]; + testToolDepends = [ hspec-discover ]; + description = "Convert between strong and weak representations of types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.raehik ]; + }) {}; + "strptime" = callPackage ({ mkDerivation, base, bytestring, text, time }: mkDerivation { @@ -276075,8 +276812,10 @@ self: { }: mkDerivation { pname = "structs"; - version = "0.1.7"; - sha256 = "072gbzxh0cnrdmbwmksqfrdvv7xhsamjrmgd6vya17md76mqndab"; + version = "0.1.8"; + sha256 = "07y8mahvvi2d3iggzxgrh8dbhg8zrjcamnf0x73ymrwxh0qhyryx"; + revision = "1"; + editedCabalFile = "1k4k41322zvmqw0812kip09gm6dhk441w3q0m59z2b5mlvmqr5qq"; libraryHaskellDepends = [ base deepseq ghc-prim primitive template-haskell th-abstraction ]; @@ -277512,6 +278251,8 @@ self: { pname = "supply-next"; version = "0.0.1.2"; sha256 = "110j4ppkw155hdlz00wbzc9z3m0mqf4dl6pqcaigcqg624m0ppqk"; + revision = "2"; + editedCabalFile = "1amw867flf8260zmrr0wyd50mri60641smqdb1blmc0knwdydlqd"; libraryHaskellDepends = [ base gambler integer-types quaalude supply-chain transformers ]; @@ -279727,8 +280468,8 @@ self: { pname = "synthesizer-core"; version = "0.8.3"; sha256 = "0a12qmr7fdlz5mbrki9nd1fl07670hll3wrdpp1apvf6zd36h7mn"; - revision = "1"; - editedCabalFile = "0ig8ysmw2hnbxgdv1p4h4vpyq782anw1g8wsqjrj6b0n4kazk5i8"; + revision = "2"; + editedCabalFile = "064a3xlqwl8v6q29djjcm0wx13wy1qw3p44v546amjbprk93kh1r"; libraryHaskellDepends = [ array base binary bytestring containers deepseq event-list explicit-exception filepath non-empty non-negative numeric-prelude @@ -280254,15 +280995,15 @@ self: { }) {}; "systemd-socket-activation" = callPackage - ({ mkDerivation, base, containers, network, text, transformers - , unix + ({ mkDerivation, base, containers, network, quaalude, text + , transformers, unix }: mkDerivation { pname = "systemd-socket-activation"; - version = "1.0.0.2"; - sha256 = "1shqkxa8wgnx3bndy3qgykb4l0jsrp4qpwahgy9r6n98a1idbx0v"; + version = "1.1.0.1"; + sha256 = "0cmpwklq2jdn8ax8b27zlcf40wzrvnjghfzbkqfaq2711ln47w6q"; libraryHaskellDepends = [ - base containers network text transformers unix + base containers network quaalude text transformers unix ]; description = "Let systemd bind the server's socket for you"; license = lib.licenses.mit; @@ -281726,9 +282467,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "A command-line kanban board/task manager"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "taskell"; - broken = true; }) {}; "taskpool" = callPackage @@ -281914,18 +282653,6 @@ self: { }) {}; "tasty-bench" = callPackage - ({ mkDerivation, base, containers, deepseq, tasty }: - mkDerivation { - pname = "tasty-bench"; - version = "0.3.2"; - sha256 = "0j92ggsg3fqwkq9zgx94wqqi11yim4b7d1b2s1s24rdv6wy3sfn8"; - libraryHaskellDepends = [ base containers deepseq tasty ]; - benchmarkHaskellDepends = [ base ]; - description = "Featherlight benchmark framework"; - license = lib.licenses.mit; - }) {}; - - "tasty-bench_0_3_3" = callPackage ({ mkDerivation, base, containers, deepseq, ghc-prim, tasty }: mkDerivation { pname = "tasty-bench"; @@ -281935,7 +282662,6 @@ self: { benchmarkHaskellDepends = [ base ]; description = "Featherlight benchmark framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-checklist" = callPackage @@ -283733,6 +284459,8 @@ self: { pname = "template-haskell-optics"; version = "0.2"; sha256 = "13jjycd2yirslab7j6gd1hfl9bn5srid4b2apdz36janxx8np4mm"; + revision = "1"; + editedCabalFile = "1asqpnrkwqgvjyc70hicfdjrf90d5h4yh9n2fljsmkjvay3w46r6"; libraryHaskellDepends = [ base containers optics-core template-haskell th-abstraction ]; @@ -284606,14 +285334,12 @@ self: { broken = true; }) {}; - "terminfo_0_4_1_5" = callPackage + "terminfo_0_4_1_6" = callPackage ({ mkDerivation, base, ncurses }: mkDerivation { pname = "terminfo"; - version = "0.4.1.5"; - sha256 = "0s0x5knl4hsmzlklabcd7c0m468gisg5cnf842wi1vfg8q922q5i"; - revision = "1"; - editedCabalFile = "0l731kh6dmf9q58kmr64kh6nmxl0r8sp1dhwr9apjyalnfp905sd"; + version = "0.4.1.6"; + sha256 = "0kx0q2ihnhk461hnkvy9g2nmdskqhik9vwqji8z741zy0az4mmb3"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ ncurses ]; description = "Haskell bindings to the terminfo library"; @@ -285349,18 +286075,22 @@ self: { }) {}; "testcontainers" = callPackage - ({ mkDerivation, aeson, aeson-optics, base, bytestring, exceptions - , hspec, hspec-discover, mtl, network, optics-core, process - , resourcet, tasty, tasty-discover, tasty-hspec, tasty-hunit, text + ({ mkDerivation, aeson, aeson-optics, async, base, bytestring + , directory, exceptions, hspec, hspec-discover, http-client + , http-types, mtl, network, optics-core, process, random, resourcet + , tasty, tasty-discover, tasty-hspec, tasty-hunit, text , unliftio-core }: mkDerivation { pname = "testcontainers"; - version = "0.3.1.0"; - sha256 = "0gkspiz9vzaa02f6fnp6xv8xqgxnv73j50gh90z4hcbprcqgayk8"; + version = "0.5.0.0"; + sha256 = "06n02inh5ihbbpmlf7fjvq8idk4lrr8wsjbwarklh229azq99h7n"; + revision = "1"; + editedCabalFile = "19lxdf3hyhraf7ykx3cdv70j8rc9jx1ynfkjqpczm4pmp72pw06p"; libraryHaskellDepends = [ - aeson aeson-optics base bytestring exceptions mtl network - optics-core process resourcet tasty text unliftio-core + aeson aeson-optics async base bytestring directory exceptions + http-client http-types mtl network optics-core process random + resourcet tasty text unliftio-core ]; testHaskellDepends = [ base hspec tasty tasty-discover tasty-hspec tasty-hunit text @@ -285612,7 +286342,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "text_2_0_1" = callPackage + "text_2_0_2" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-prim, QuickCheck, tasty , tasty-bench, tasty-hunit, tasty-inspection-testing @@ -285620,8 +286350,8 @@ self: { }: mkDerivation { pname = "text"; - version = "2.0.1"; - sha256 = "1nl7l15qn2rh7p8hfrzs5djm3ms0gsb28r77hl530b0fqmk282mh"; + version = "2.0.2"; + sha256 = "1bggb4gq15r7z685w7c7hbm3w4n6day451ickz70d1l919jvwdf7"; libraryHaskellDepends = [ array base binary bytestring deepseq ghc-prim template-haskell ]; @@ -286411,6 +287141,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-show_3_10_1" = callPackage + ({ mkDerivation, array, base, base-compat-batteries, base-orphans + , bifunctors, bytestring, bytestring-builder, containers, criterion + , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim + , hspec, hspec-discover, QuickCheck, quickcheck-instances + , template-haskell, text, th-abstraction, th-lift, transformers + , transformers-compat + }: + mkDerivation { + pname = "text-show"; + version = "3.10.1"; + sha256 = "1big5iflll2zijzfvnlyni91ir157iwyq08kpmk96qsgwdmxdkca"; + libraryHaskellDepends = [ + array base base-compat-batteries bifunctors bytestring + bytestring-builder containers generic-deriving ghc-boot-th ghc-prim + template-haskell text th-abstraction th-lift transformers + transformers-compat + ]; + testHaskellDepends = [ + array base base-compat-batteries base-orphans bytestring + bytestring-builder deriving-compat generic-deriving ghc-prim hspec + QuickCheck quickcheck-instances template-haskell text transformers + transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; + description = "Efficient conversion of values into Text"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-show-instances" = callPackage ({ mkDerivation, aeson, base, base-compat, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim @@ -286815,6 +287576,8 @@ self: { pname = "th-abstraction"; version = "0.4.5.0"; sha256 = "09hm0famyqsq09lal2ylnhsb31hybj8zanldi7cqncky4i7y5m80"; + revision = "1"; + editedCabalFile = "1hyjz6v788yiazhpkgcgipsvg52ik3w8jdpnajg0ayl1x5m1i3y2"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -286823,6 +287586,21 @@ self: { license = lib.licenses.isc; }) {}; + "th-abstraction_0_5_0_0" = callPackage + ({ mkDerivation, base, containers, ghc-prim, template-haskell }: + mkDerivation { + pname = "th-abstraction"; + version = "0.5.0.0"; + sha256 = "0r4ri85283i1jjhd94wa9nps6cd9a8mh6rr4ds1gb2hqnwxdqn42"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + testHaskellDepends = [ base containers template-haskell ]; + description = "Nicer interface for reified information about data types"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-alpha" = callPackage ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar @@ -286987,6 +287765,8 @@ self: { pname = "th-desugar"; version = "1.14"; sha256 = "1b57v15xx0z0xjlijv61dh07p6rvfkdpxnxiaaa1iv7zyg2x7cnz"; + revision = "2"; + editedCabalFile = "16i6x4w286mhhkxzjid5pfbnn51dzyxq6brawlppqb15qbnvs744"; libraryHaskellDepends = [ base containers ghc-prim mtl ordered-containers syb template-haskell th-abstraction th-lift th-orphans @@ -287036,6 +287816,8 @@ self: { pname = "th-expand-syns"; version = "0.4.11.0"; sha256 = "1l7pkc16vnjgiam31745av14j7ngnr5mqmgp77xwd3h7fg75kkca"; + revision = "1"; + editedCabalFile = "0kc4czr7bz5wl88fj11h02gn8fwr2azhw5z7ykil6lx7v1b42rg8"; libraryHaskellDepends = [ base containers syb template-haskell th-abstraction ]; @@ -287235,6 +288017,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-lift_0_8_3" = callPackage + ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction + }: + mkDerivation { + pname = "th-lift"; + version = "0.8.3"; + sha256 = "0xbbii04c60l6v6fnd50lldhpsg1ba03j1ff9bmyzpp7z3sppm95"; + libraryHaskellDepends = [ + base ghc-prim template-haskell th-abstraction + ]; + testHaskellDepends = [ base ghc-prim template-haskell ]; + description = "Derive Template Haskell's Lift class for datatypes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-lift-instances" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck , template-haskell, text, th-lift, transformers, vector @@ -288296,26 +289094,24 @@ self: { }) {}; "thyme" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal - , containers, cpphs, criterion, deepseq, directory, filepath, mtl - , old-locale, profunctors, QuickCheck, random - , system-posix-redirect, text, time, vector, vector-space - , vector-th-unbox + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , cpphs, criterion, deepseq, hashable, mtl, old-locale, profunctors + , QuickCheck, random, template-haskell, text, time, vector + , vector-space, vector-th-unbox }: mkDerivation { pname = "thyme"; - version = "0.3.5.5"; - sha256 = "0v3rbjl92bqggsdra72zdq6rxzb2qf1268424p94225lnwgp1il4"; + version = "0.3.6"; + sha256 = "14qy25r4xascrsq497pzarcw5vhjyxvs1xmqwk2049dmnx6hwaw3"; libraryHaskellDepends = [ - aeson attoparsec base bytestring containers deepseq mtl old-locale - profunctors QuickCheck random text time vector vector-space - vector-th-unbox + aeson attoparsec base bytestring containers deepseq hashable mtl + old-locale profunctors QuickCheck random template-haskell text time + vector vector-space vector-th-unbox ]; libraryToolDepends = [ cpphs ]; testHaskellDepends = [ - attoparsec base bytestring Cabal containers directory filepath mtl - old-locale profunctors QuickCheck random system-posix-redirect text - time vector-space + attoparsec base bytestring containers mtl old-locale profunctors + QuickCheck random text time vector-space ]; benchmarkHaskellDepends = [ base criterion mtl old-locale profunctors QuickCheck random time @@ -288503,6 +289299,8 @@ self: { pname = "tidal"; version = "1.9.3"; sha256 = "1p3k65rgxjv701nk30jqf614bk1zmblyq0vlishzza2cdld5rhbc"; + revision = "1"; + editedCabalFile = "0lxx3zb26winf19wl44bs4bqrac1r4yf1j5i77bhnqgwrap426j1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring clock colour containers deepseq exceptions hosc mtl @@ -294455,6 +295253,8 @@ self: { pname = "tuples"; version = "0.1.0.0"; sha256 = "0kq12l0q7d9mdkmcp2sm7pjgfh00vqkhi0id32sny1lqcnavp415"; + revision = "1"; + editedCabalFile = "06ns2npjh487pbzq6f5iwqvl0n9a6d5fywlm032nj3mxdmaynj2j"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive QuickCheck quickcheck-classes tasty tasty-quickcheck @@ -294608,8 +295408,8 @@ self: { pname = "turtle"; version = "1.6.1"; sha256 = "171viripwn8hg3afkkswr243bv7q0r0bz3mn0bflddm4jdf49597"; - revision = "2"; - editedCabalFile = "0zkw1mn9z09gkc0yjx6pfqyvrda076qi7ya12vfd1j3b7yljhpdn"; + revision = "3"; + editedCabalFile = "00jxvvpffllwcaw2sg0rymj66963ihifpjn4m94mgscqwl25cfqs"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions filepath foldl hostname managed optional-args @@ -296413,6 +297213,26 @@ self: { license = lib.licenses.mit; }) {}; + "typed-process_0_2_11_0" = callPackage + ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec + , process, stm, temporary, transformers, unliftio-core + }: + mkDerivation { + pname = "typed-process"; + version = "0.2.11.0"; + sha256 = "09gnj7m3jcl145fhslwzd30kwwc6hvdmqa4yr4smzn3m0ra5k34l"; + libraryHaskellDepends = [ + async base bytestring process stm transformers unliftio-core + ]; + testHaskellDepends = [ + async base base64-bytestring bytestring hspec process stm temporary + transformers unliftio-core + ]; + description = "Run external processes, with strong typing of streams"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "typed-spreadsheet" = callPackage ({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk , diagrams-lib, foldl, gtk, microlens, stm, text, transformers @@ -296432,7 +297252,6 @@ self: { executableHaskellDepends = [ base diagrams-lib text ]; description = "Typed and composable spreadsheets"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; @@ -299342,8 +300161,8 @@ self: { pname = "universe-some"; version = "1.2.1"; sha256 = "0pdvk5qi39d0wg8ac936c1fxs7v7qld2ggpqc9v7xc4pk3xq24bp"; - revision = "3"; - editedCabalFile = "1caqfajnhja7cz3bbz9pg2m9l3yc128hvsp7d3rpjw86g3wx2x0j"; + revision = "4"; + editedCabalFile = "1nay61awkq8w8v0bvqg7d187wzmylkj515q6glpw5n8nclp0imvk"; libraryHaskellDepends = [ base some template-haskell th-abstraction transformers universe-base @@ -299386,8 +300205,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "1.8.1"; - sha256 = "1193xyz1n8ma4l2p07g764zd87yzr3qv8lnfxhih7zh9r0lywd6y"; + version = "1.8.1.1"; + sha256 = "1cfz4h66jw0jh19vms4smga33hj9sc5s3xdaigi01wnaza7wl2di"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text transformers @@ -299404,14 +300223,14 @@ self: { license = lib.licenses.mit; }) {}; - "unix_2_8_0_0" = callPackage + "unix_2_8_1_0" = callPackage ({ mkDerivation, base, bytestring, filepath, tasty, tasty-hunit , time }: mkDerivation { pname = "unix"; - version = "2.8.0.0"; - sha256 = "152b4ppl86s611m620bi16d24ymfm1xykakgdvw6xfqajgflhac8"; + version = "2.8.1.0"; + sha256 = "0zcsszs0vs2rvp5qzvflphgn4xbjqqbvlzdg0ci5sl4f1z5djnay"; libraryHaskellDepends = [ base bytestring filepath time ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "POSIX functionality"; @@ -299707,6 +300526,33 @@ self: { license = lib.licenses.mit; }) {}; + "unliftio_0_2_24_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, gauge, hspec, process, QuickCheck + , safe-exceptions, stm, time, transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.2.24.0"; + sha256 = "16r2a26ig4j8crmvzbkbavszfaxghg7qhgm5z9q4aygc9jwbk2px"; + libraryHaskellDepends = [ + async base bytestring deepseq directory filepath process + safe-exceptions stm time transformers unix unliftio-core + ]; + testHaskellDepends = [ + async base bytestring containers deepseq directory filepath hspec + process QuickCheck safe-exceptions stm time transformers unix + unliftio-core + ]; + benchmarkHaskellDepends = [ + async base bytestring deepseq directory filepath gauge process + safe-exceptions 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 { @@ -303047,8 +303893,8 @@ self: { pname = "vector"; version = "0.12.3.1"; sha256 = "0dczbcisxhhix859dng5zhxkn3xvlnllsq60apqzvmyl5g056jpv"; - revision = "2"; - editedCabalFile = "0gkzrqcx5fymkxm92gy47qj0spj79ygv1vn7kfzdg7nn284x1yzz"; + revision = "3"; + editedCabalFile = "0n8w54d931k5s46ls4n7w40bs0gb839ijli9w6b9am0k1s1yigxb"; libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; testHaskellDepends = [ base base-orphans doctest HUnit primitive QuickCheck random tasty @@ -303068,8 +303914,8 @@ self: { pname = "vector"; version = "0.13.0.0"; sha256 = "0ksvs6ldb8bzbjy4gk39wds2lrwill2g7pbr13h54bz12myidly5"; - revision = "2"; - editedCabalFile = "19d6c1gp5d6v5wlg386aphn7893axba0zicpi7n5s4a55bqazs51"; + revision = "3"; + editedCabalFile = "0k14l1r84gxjv385crq8f1kvdcr4kjwyi4k7f64g6nksl60sqp7s"; libraryHaskellDepends = [ base deepseq primitive vector-stream ]; testHaskellDepends = [ base base-orphans doctest HUnit primitive QuickCheck random tasty @@ -309678,6 +310524,23 @@ self: { broken = true; }) {}; + "weierstrass-functions" = callPackage + ({ mkDerivation, base, elliptic-integrals, gamma, jacobi-theta + , tasty, tasty-hunit + }: + mkDerivation { + pname = "weierstrass-functions"; + version = "0.1.0.0"; + sha256 = "03xh01zj60hhpq90amv1yml1cch38gni1zvgaji20wrhm17mjmpk"; + libraryHaskellDepends = [ + base elliptic-integrals gamma jacobi-theta + ]; + testHaskellDepends = [ base gamma tasty tasty-hunit ]; + description = "Weierstrass Elliptic Functions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "weigh" = callPackage ({ mkDerivation, base, deepseq, ghc, mtl, process, split, temporary }: @@ -310088,25 +310951,6 @@ self: { }) {}; "wide-word" = callPackage - ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hashable - , hedgehog, primitive, QuickCheck, quickcheck-classes, semirings - }: - mkDerivation { - pname = "wide-word"; - version = "0.1.4.0"; - sha256 = "1jajlkcbymf0jqmcbn46x3yxqxjslzdcnp1v582jjpa2glibsnf0"; - libraryHaskellDepends = [ - base deepseq ghc-prim hashable primitive - ]; - testHaskellDepends = [ - base bytestring ghc-prim hedgehog primitive QuickCheck - quickcheck-classes semirings - ]; - description = "Data types for large but fixed width signed and unsigned integers"; - license = lib.licenses.bsd2; - }) {}; - - "wide-word_0_1_5_0" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, ghc-prim , hashable, hedgehog, primitive, QuickCheck, quickcheck-classes , semirings @@ -310115,6 +310959,8 @@ self: { pname = "wide-word"; version = "0.1.5.0"; sha256 = "1h21bcxh4j3bbrx13lm2iialzvkf284cjl129rs2ridjdvzfjcm7"; + revision = "1"; + editedCabalFile = "0l2rhhj907fa4ydzd03li7g66fkmhk5iyzks1chc9d7wf4ddgplv"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable primitive ]; @@ -310124,7 +310970,6 @@ self: { ]; description = "Data types for large but fixed width signed and unsigned integers"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "wide-word-instances" = callPackage @@ -310136,6 +310981,8 @@ self: { libraryHaskellDepends = [ base binary serialise wide-word ]; description = "Instances for wide-word"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "wigner-symbols" = callPackage @@ -310538,8 +311385,8 @@ self: { }: mkDerivation { pname = "witch"; - version = "1.1.6.0"; - sha256 = "0bhrf3c3djchi2y0rcz015g34a4g8f1pfc8r89kpqbf2pfd8gw73"; + version = "1.1.6.1"; + sha256 = "1n4kckgk5v63bpjgky3dfgyayl82hlnxzwaa99pzyxrcjkpql5ay"; libraryHaskellDepends = [ base bytestring containers tagged template-haskell text time ]; @@ -315597,8 +316444,8 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.11.10.0"; - sha256 = "01zylkpfrbwfbqxan9qywcjq6j6nks0pd6hjkah4lvr6vs9x4n38"; + version = "0.11.11.0"; + sha256 = "08q0b0qq98ip2v34lygdp2i0yc5cmny34w4w59fcsd71s85w15ac"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -315618,20 +316465,20 @@ self: { }) {}; "yaml-combinators" = callPackage - ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop - , scientific, tasty, tasty-hunit, text, transformers - , unordered-containers, vector, yaml + ({ mkDerivation, aeson, base, bytestring, generics-sop, scientific + , tasty, tasty-hunit, text, transformers, unordered-containers + , vector, yaml }: mkDerivation { pname = "yaml-combinators"; - version = "1.1.2"; - sha256 = "0435m79lqah778g95ds628j5bilfggzyn9hzc309xh47h4mxl92m"; + version = "1.1.2.1"; + sha256 = "02ms9302p3jyvhina4f9sbndl9i4592xd4z1jsx9mbr9qpg6is4x"; libraryHaskellDepends = [ aeson base bytestring generics-sop scientific text transformers unordered-containers vector yaml ]; testHaskellDepends = [ - aeson base doctest tasty tasty-hunit text unordered-containers + aeson base tasty tasty-hunit text unordered-containers ]; description = "YAML parsing combinators for improved validation and error reporting"; license = lib.licenses.mit; @@ -315769,10 +316616,8 @@ self: { }: mkDerivation { pname = "yaml-streamly"; - version = "0.12.1"; - sha256 = "1rcv4y9f2p1biiaxh4j1wdq79ba1mi33yn5v6kds20am574ia1hq"; - revision = "1"; - editedCabalFile = "18gv1h6h9n8bmysdfb0h9kgifhi3rj9zf055l2dibaw0jixqqs2c"; + version = "0.12.2"; + sha256 = "0bjagj6bg884xchx8dkrhqikjmwqzpb8hkjlxvbxnsmsmwnc22cx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -315833,8 +316678,8 @@ self: { }: mkDerivation { pname = "yaml-unscrambler"; - version = "0.1.0.12"; - sha256 = "0wca4xqww3y1cvf6jshdk13nblg7byzyw7120yy8b2bgd3d0l42z"; + version = "0.1.0.13"; + sha256 = "0c7cnxlx01xjr992z0150dl1lnlyj2gwrqza7yhgmn4m7wg6r5z1"; libraryHaskellDepends = [ acc attoparsec attoparsec-data attoparsec-time base base64-bytestring bytestring conduit containers foldl hashable @@ -316660,8 +317505,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.6.11"; - sha256 = "0fdahk5mc63g0zsafk8axry01qaxahmclpmmwygp2lhfsjy8mby2"; + version = "1.6.11.1"; + sha256 = "01ljcqmn0s79a77ry25q4333ni4w5swacah3rwhnhhrd5xnv1jxx"; libraryHaskellDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup bytestring conduit @@ -317338,8 +318183,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.24.1"; - sha256 = "1jbalzr3m92sfqladcpnvm6394qda0arhyzx7dychknssvbd2j3d"; + version = "1.6.24.2"; + sha256 = "0cql4gk83ya0lyv0nyrp387nljpab4dwwy288rzp8klq9z5r2a7j"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra diff --git a/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix index 00aada3965..97a209f208 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix @@ -22,13 +22,13 @@ resholve.mkDerivation rec { pname = "bats"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "bats-core"; repo = "bats-core"; rev = "v${version}"; - sha256 = "sha256-Kitlx26cK2RiAC+PdRIdDLF5crorg6UB6uSzbKCrDHE="; + sha256 = "sha256-nKBNbqJYRd/3tO85E6KrOh32yOaNKpLXxz5gQ5Uvmcc="; }; patchPhase = '' @@ -91,6 +91,8 @@ resholve.mkDerivation rec { "$pre_command" = true; "$BATS_TEST_NAME" = true; "${placeholder "out"}/libexec/bats-core/bats-exec-test" = true; + "$BATS_LINE_REFERENCE_FORMAT" = "comma_line"; + "$BATS_LOCKING_IMPLEMENTATION" = "${flock}/bin/flock"; }; execer = [ /* @@ -136,8 +138,15 @@ resholve.mkDerivation rec { setup() { bats_load_library bats-support bats_load_library bats-assert + bats_load_library bats-file bats_require_minimum_version 1.5.0 + + TEST_TEMP_DIR="$(temp_make --prefix 'nixpkgs-bats-test')" + } + + teardown() { + temp_del "$TEST_TEMP_DIR" } @test echo_hi { @@ -150,10 +159,17 @@ resholve.mkDerivation rec { assert_line --index 0 "cp: missing file operand" assert_line --index 1 "Try 'cp --help' for more information." } + + @test file_exists { + echo "hi" > "$TEST_TEMP_DIR/hello.txt" + assert_file_exist "$TEST_TEMP_DIR/hello.txt" + run cat "$TEST_TEMP_DIR/hello.txt" + assert_output "hi" + } ''; passAsFile = [ "testScript" ]; } '' - ${bats.withLibraries (p: [ p.bats-support p.bats-assert ])}/bin/bats "$testScriptPath" + ${bats.withLibraries (p: [ p.bats-support p.bats-assert p.bats-file ])}/bin/bats "$testScriptPath" touch "$out" ''; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/bats/libraries.nix b/third_party/nixpkgs/pkgs/development/interpreters/bats/libraries.nix index ef0b40c31b..9e60a4dc99 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/bats/libraries.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/bats/libraries.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub }: { - bats-assert = stdenv.mkDerivation { + bats-assert = stdenv.mkDerivation rec { pname = "bats-assert"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "bats-core"; repo = "bats-assert"; - rev = "v2.0.0"; - sha256 = "sha256-whSbAj8Xmnqclf78dYcjf1oq099ePtn4XX9TUJ9AlyQ="; + rev = "v${version}"; + sha256 = "sha256-opgyrkqTwtnn/lUjMebbLfS/3sbI2axSusWd5i/5wm4="; }; dontBuild = true; installPhase = '' @@ -23,13 +23,13 @@ }; }; - bats-file = stdenv.mkDerivation { + bats-file = stdenv.mkDerivation rec { pname = "bats-file"; version = "0.3.0"; src = fetchFromGitHub { owner = "bats-core"; repo = "bats-file"; - rev = "v0.3.0"; + rev = "v${version}"; sha256 = "sha256-3xevy0QpwNZrEe+2IJq58tKyxQzYx8cz6dD2nz7fYUM="; }; dontBuild = true; @@ -47,13 +47,13 @@ }; }; - bats-support = stdenv.mkDerivation { + bats-support = stdenv.mkDerivation rec { pname = "bats-support"; version = "0.3.0"; src = fetchFromGitHub { owner = "bats-core"; repo = "bats-support"; - rev = "v0.3.0"; + rev = "v${version}"; sha256 = "sha256-4N7XJS5XOKxMCXNC7ef9halhRpg79kUqDuRnKcrxoeo="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R25.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R25.nix index 991880bc31..16481441cc 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R25.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.2.3"; - sha256 = "peTH8hDOEuMq18exbFhtEMrQQEqg2FPkapfNnnEfTYE="; + version = "25.3"; + sha256 = "UOBrDaXpvpeM79VN0PxVQ1XsYI+OYWBbaBfYE5lZXgE="; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix index caeef615ff..ad45dd299f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.563"; + version = "0.567"; src = fetchFromGitHub { owner = "Roblox"; repo = "luau"; rev = version; - hash = "sha256-aGduwwguzIg3kFspIa/5nDFAC836J3B10Pg63psuWto="; + hash = "sha256-x1P9/TZUU/XITH1/8NtPXzM46fwk0VxHNphlWqzhoog="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix index c4b95af92f..70fd5c240d 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -197,9 +197,9 @@ in { major = "3"; minor = "12"; patch = "0"; - suffix = "a5"; + suffix = "a6"; }; - hash = "sha256-1m73o0L+OjVvnO47uXrcHl+0hA9rbP994P991JX4Mjs="; + hash = "sha256-KYRAJSxLa04SDgFMFdcp6vird5MA3Mph1CLFN+ToXso="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix index 2bab78ecd4..05184cd7d7 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix @@ -3,7 +3,7 @@ , zlib, gdbm, ncurses, readline, groff, libyaml, libffi, jemalloc, autoreconfHook, bison , autoconf, libiconv, libobjc, libunwind, Foundation , buildEnv, bundler, bundix -, makeWrapper, buildRubyGem, defaultGemConfig, removeReferencesTo +, makeBinaryWrapper, buildRubyGem, defaultGemConfig, removeReferencesTo , openssl, openssl_1_1 } @ args: @@ -47,7 +47,7 @@ let , autoreconfHook, bison, autoconf , buildEnv, bundler, bundix , libiconv, libobjc, libunwind, Foundation - , makeWrapper, buildRubyGem, defaultGemConfig + , makeBinaryWrapper, buildRubyGem, defaultGemConfig , baseRuby ? buildPackages.ruby_3_1.override { useRailsExpress = false; docSupport = false; @@ -272,7 +272,7 @@ let }; inherit (import ../../ruby-modules/with-packages { - inherit lib stdenv makeWrapper buildRubyGem buildEnv; + inherit lib stdenv makeBinaryWrapper buildRubyGem buildEnv; gemConfig = defaultGemConfig; ruby = self; }) withPackages buildGems gems; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix index a6b0282ce5..244a699fd5 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix @@ -136,9 +136,6 @@ stdenv.mkDerivation (finalAttrs: rec { # while we have a double-float toolchain env.NIX_CFLAGS_COMPILE = lib.optionalString (with stdenv.hostPlatform; isRiscV && is64bit && lib.versionOlder version "91") "-mabi=lp64d"; - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null; - postPatch = lib.optionalString (lib.versionOlder version "102") '' # This patch is a manually applied fix of # https://bugzilla.mozilla.org/show_bug.cgi?id=1644600 diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index ecc8788ca7..f07ddfb0e6 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-wCM+axQy5gOHUAThmwPYMt9/HWuIpGcQjMT9TSLqWbk="; + hash = "sha256-vVdvj3Q3weK+yohSaEDaagqWWZkA+KV4gRRbcE3UiPQ="; fetchSubmodules = true; }; - cargoHash = "sha256-0RsTE6pcbbUFn7PWg1tNOlvix6TIB5DZxiJQVKU+lKg="; + cargoHash = "sha256-7FYXKEN17I7sLQid2JGTxFHMhGPka2coEMS6y4HvwPU="; cargoBuildFlags = [ "--package wasmtime-cli" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/yabasic/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/yabasic/default.nix index 9266ec0122..87e2f22993 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/yabasic/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/yabasic/default.nix @@ -8,13 +8,13 @@ , ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "yabasic"; - version = "2.90.2"; + version = "2.90.3"; src = fetchurl { - url = "http://www.yabasic.de/download/${pname}-${version}.tar.gz"; - hash = "sha256-ff5j0cJ1i2HWIsYjwzx5FFtZfchWsGRF2AZtbDXrNJw="; + url = "http://www.yabasic.de/download/yabasic-${self.version}.tar.gz"; + hash = "sha256-ItmlkraNUE0qlq1RghUJcDq4MHb6HRKNoIRylugjboA="; }; buildInputs = [ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ncurses ]; - meta = with lib; { + meta = { homepage = "http://2484.de/yabasic/"; description = "Yet another BASIC"; longDescription = '' @@ -36,8 +36,9 @@ stdenv.mkDerivation rec { and has a comprehensive documentation; it is small, simple, open-source and free. ''; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; + changelog = "https://2484.de/yabasic/whatsnew.html"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix index f601e10166..2688d6037e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix @@ -33,8 +33,6 @@ , udev , ibusSupport ? false , ibus -, fcitxSupport ? false -, fcitx , libdecorSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid , libdecor , pipewireSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid @@ -57,11 +55,11 @@ stdenv.mkDerivation rec { pname = "SDL2"; - version = "2.24.2"; + version = "2.26.3"; src = fetchurl { url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; - sha256 = "sha256-s17wqAKwnZDtOt0NysDpWCCAQgKRT1u3sP63EPGhMp8="; + sha256 = "sha256-xmEgWlU7fSUkJfS3Uf8TIJ5eAguHa7+hWYSUr2F5AFc="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ "out" "dev" ]; @@ -109,7 +107,6 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv ] ++ dlopenBuildInputs ++ lib.optional ibusSupport ibus - ++ lib.optional fcitxSupport fcitx ++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix index dab76bdab7..b412e22b8f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { "--disable-music-mp3-mpg123-shared" "--disable-music-opus-shared" "--disable-music-midi-fluidsynth-shared" + + # override default path to allow MIDI files to be played + "--with-timidity-cfg=${timidity}/share/timidity/timidity.cfg" ] ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" diff --git a/third_party/nixpkgs/pkgs/development/libraries/acl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/acl/default.nix index 1ac577e19c..5b31ba3a1c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/acl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/acl/default.nix @@ -19,6 +19,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext ]; buildInputs = [ attr ]; + # causes failures in coreutils test suite + hardeningDisable = [ "fortify3" ]; + # Upstream use C++-style comments in C code. Remove them. # This comment breaks compilation if too strict gcc flags are used. patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix b/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix index c7bc4894e1..bff46622d4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5-threadsafe }: +{ lib, stdenv, fetchFromGitHub, cmake, openexr, hdf5-threadsafe, ilmbase }: stdenv.mkDerivation rec { @@ -12,26 +12,50 @@ stdenv.mkDerivation rec sha256 = "sha256-8dQhOQN0t2Y2kC2wOpQUqbu6Woy4DUmiLqXjf1D+mxE="; }; + # note: out is unused (but required for outputDoc anyway) outputs = [ "bin" "dev" "out" "lib" ]; - nativeBuildInputs = [ unzip cmake ]; - buildInputs = [ openexr hdf5-threadsafe ]; + # Prevent cycle between bin and dev (only occurs on Darwin for some reason) + propagatedBuildOutputs = [ "lib" ]; - buildPhase = '' - cmake -DUSE_HDF5=ON -DCMAKE_INSTALL_PREFIX=$out/ -DUSE_TESTS=OFF . + nativeBuildInputs = [ cmake ]; - mkdir $out - mkdir -p $bin/bin - mkdir -p $dev/include - mkdir -p $lib/lib + # NOTE: Alembic also support imath instead of ilmbase, but some users of Alembic (e.g. Blender) + # are incompatible with the imath version of Alembic + buildInputs = [ openexr hdf5-threadsafe ilmbase ]; + + # Downstream packages trying to use Alembic via CMake need ilmbase as well + # For some reason this won't be picked up correctly otherwise + propagatedBuildInputs = [ ilmbase ]; + + # These flags along with the postPatch step ensure that all artifacts end up + # in the correct output without needing to move anything + # + # - bin: Uses CMAKE_INSTALL_BINDIR (set via CMake setup hooK) + # - lib (contains shared libraries): Uses ALEMBIC_LIB_INSTALL_DIR + # - dev (headers): Uses CMAKE_INSTALL_PREFIX + # (this works because every other install rule uses an absolute DESTINATION) + # - dev (CMake files): Uses ConfigPackageLocation + + cmakeFlags = [ + "-DUSE_HDF5=ON" + "-DUSE_TESTS=ON" + "-DALEMBIC_LIB_INSTALL_DIR=${placeholder "lib"}/lib" + "-DConfigPackageLocation=${placeholder "dev"}/lib/cmake/Alembic" + "-DCMAKE_INSTALL_PREFIX=${placeholder "dev"}" + "-DQUIET=ON" + ]; + + postPatch = '' + find bin/ -type f -name CMakeLists.txt -print -exec \ + sed -i 's/INSTALL(TARGETS \([a-zA-Z ]*\) DESTINATION bin)/INSTALL(TARGETS \1)/' {} \; ''; - installPhase = '' - make install - - mv $out/bin $bin/ - mv $out/lib $lib/ - mv $out/include $dev/ + doCheck = true; + checkPhase = '' + runHook preCheck + ctest -j 1 + runHook postCheck ''; meta = with lib; { @@ -39,6 +63,6 @@ stdenv.mkDerivation rec homepage = "http://alembic.io/"; license = licenses.bsd3; platforms = platforms.all; - maintainers = [ maintainers.guibou ]; + maintainers = with maintainers; [ guibou tmarkus ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/allegro/5.nix b/third_party/nixpkgs/pkgs/development/libraries/allegro/5.nix index 0ff8f0ea7f..b3346be1bb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/allegro/5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/allegro/5.nix @@ -20,17 +20,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - texinfo libXext xorgproto libX11 libXpm libXt libXcursor - alsa-lib zlib libpng libvorbis libXxf86dga libXxf86misc - libXxf86vm openal libGLU libGL - libjpeg flac - libXi libXfixes - enet libtheora freetype physfs libopus gtk3 pcre libXdmcp - libpulseaudio libpthreadstubs + texinfo zlib libpng libvorbis openal libGLU libGL + libjpeg flac enet libtheora freetype physfs libopus + gtk3 pcre + ] ++ lib.optionals stdenv.isLinux [ + libXext xorgproto libX11 libXpm libXt libXcursor alsa-lib + libXxf86dga libXxf86misc libXxf86vm libXi libXfixes + libXdmcp libpulseaudio libpthreadstubs ]; postPatch = '' sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c + sed -e 's@Kernel/IOKit/hidsystem/IOHIDUsageTables.h@IOKit/hid/IOHIDUsageTables.h@g' -i include/allegro5/platform/alosx.h + sed -e 's@OpenAL/@AL/@g' -i addons/audio/openal.c ''; cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ]; @@ -40,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://liballeg.org/"; license = licenses.zlib; maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/amf-headers/default.nix b/third_party/nixpkgs/pkgs/development/libraries/amf-headers/default.nix new file mode 100644 index 0000000000..2d3d11ad5e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/amf-headers/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "amf-headers"; + version = "1.4.29"; + + src = fetchFromGitHub { + owner = "GPUOpen-LibrariesAndSDKs"; + repo = "AMF"; + rev = "v${version}"; + sha256 = "sha256-gu8plGUUVE/De2bRjTUN8JKsmj/0r/IsqhMpln1DZGU="; + }; + + installPhase = '' + mkdir -p $out/include/AMF + cp -r amf/public/include/* $out/include/AMF + ''; + + meta = with lib; { + description = "Headers for The Advanced Media Framework (AMF)"; + homepage = "https://github.com/GPUOpen-LibrariesAndSDKs/AMF"; + license = licenses.mit; + maintainers = with maintainers; [ devusb ]; + platforms = platforms.unix; + }; +} 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 0796dce793..95f94b3713 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix @@ -268,7 +268,6 @@ stdenv.mkDerivation rec { description = "A cross-language development platform for in-memory data"; homepage = "https://arrow.apache.org/docs/cpp/"; license = licenses.asl20; - broken = stdenv.isLinux && stdenv.isAarch64; # waiting on gtest changes in staging platforms = platforms.unix; maintainers = with maintainers; [ tobim veprbl cpcloud ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/asmjit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/asmjit/default.nix index 9f4bd193b8..5335363c9b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/asmjit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/asmjit/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation { - name = "asmjit"; + pname = "asmjit"; version = "unstable-2022-11-10"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix index 3a2f446cf8..f34262b03f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix @@ -5,6 +5,8 @@ , ninja , pkg-config , gobject-introspection +, buildPackages +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages , gsettings-desktop-schemas , makeWrapper , dbus @@ -30,11 +32,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + glib meson ninja pkg-config - gobject-introspection makeWrapper + ] ++ lib.optionals withIntrospection [ + gobject-introspection ]; buildInputs = [ @@ -58,7 +62,6 @@ stdenv.mkDerivation rec { doCheck = false; mesonFlags = [ - "-Dintrospection=yes" # Provide dbus-daemon fallback when it is not already running when # at-spi2-bus-launcher is executed. This allows us to avoid # including the entire dbus closure in libraries linked with diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/zix/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/zix/default.nix new file mode 100644 index 0000000000..dcd0b328a0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/zix/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "zix"; + version = "unstable-2023-02-13"; + + src = fetchFromGitLab { + owner = "drobilla"; + repo = pname; + rev = "262d4a1522c38be0588746e874159da5c7bb457d"; + hash = "sha256-3vuefgnirM4ksK3j9sjBHgOmx0JpL+6tCPb69/7jI00="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + mesonFlags = [ + "-Dbenchmarks=disabled" + "-Ddocs=disabled" + ]; + + meta = with lib; { + description = "A lightweight C99 portability and data structure library"; + homepage = "https://gitlab.com/drobilla/zix"; + changelog = "https://gitlab.com/drobilla/zix/-/blob/${src.rev}/NEWS"; + license = licenses.isc; + platforms = platforms.unix; + maintainers = with maintainers; [ + yuu + zseri + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix index 7e38053dab..3abca93780 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-cal"; - version = "0.5.20"; + version = "0.5.21"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YBZrOyianmD0E5WcklLkud1WGF/t08XIbfu5qbEo+g4="; + sha256 = "sha256-WMCLVwRrgwFsaqoKtbQNt0bHVYi1LUZt5r0i3oAfWFE="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/babl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/babl/default.nix index 61bba841ea..8273553a14 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/babl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/babl/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.100"; + version = "0.1.102"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "pebhk2diFdZdfN/q8RWKBgtCoUKjbxqwdtGDMhL50tQ="; + sha256 = "a88bb28506575f95158c8c89df6e23686e50c8b9fea412bf49fe8b80002d84f0"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/bc-decaf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bc-decaf/default.nix index acfd0e85d4..c73f28e4e9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bc-decaf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bc-decaf/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bc-decaf"; - version = "linphone-4.4.1"; + version = "unstable-2022-07-20"; nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { group = "BC"; owner = "public/external"; repo = "decaf"; - rev = "6e78a9beb24d1e3d7050dd52a65e4f88b101a1fc"; - sha256 = "sha256-D2SzkinloL0Ya9p25YUsc+7lKvoTMUsdkKrkv/5AEeY="; + rev = "876ddb4d465c94f97beba1be450e8538d866cc5d"; + sha256 = "sha256-QFOAgLiPbG2ZdwKoCOrVD5/sPq9IH4rtAWnnk/rZWcs="; }; # Do not build static libraries and do not enable -Werror diff --git a/third_party/nixpkgs/pkgs/development/libraries/bobcat/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bobcat/default.nix index 47fc87af14..3047cf539c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bobcat/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bobcat/default.nix @@ -26,10 +26,6 @@ stdenv.mkDerivation rec { patchShebangs . ''; - # have to link to static gcc lib on aarch64-linux explicitly - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = lib.optionalString (with stdenv.targetPlatform; isAarch64 && isLinux) "-lgcc"; - buildPhase = '' ./build libraries all ./build man diff --git a/third_party/nixpkgs/pkgs/development/libraries/boca/default.nix b/third_party/nixpkgs/pkgs/development/libraries/boca/default.nix index 2c86bf981b..50023491d3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/boca/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/boca/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "BoCA"; - version = "1.0.6a"; + version = "1.0.7"; src = fetchFromGitHub { owner = "enzo1982"; repo = "boca"; rev = "v${version}"; - sha256 = "sha256-LndlwdM5NlTv73Z1lMkHuIZkVfn48P/LssBnE4X9Sgc="; + sha256 = "sha256-HIYUMFj5yiEC+liZLMXD9otPyoEb1sxHlECTYtYXc2I="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/c-ares/default.nix b/third_party/nixpkgs/pkgs/development/libraries/c-ares/default.nix index 20ec00f4a8..9c024211a7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/c-ares/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/c-ares/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchurl, writeTextDir -, fetchpatch , withCMake ? true, cmake # sensitive downstream packages @@ -14,23 +13,14 @@ stdenv.mkDerivation rec { pname = "c-ares"; - version = "1.18.1"; + version = "1.19.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://c-ares.haxx.se/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-Gn1SqKhKn7/7G+kTPA9uFyF9kepab6Yfa0cpzaeOu88="; + sha256 = "sha256-v866N+I/1TEpOCkALKwEAe9JptxVkj9/kiNlhbetHdM="; }; - # c-ares is used for fetchpatch, so avoid using it for c-aresMinimal - patches = lib.optionals withCMake [ - # fix .pc paths created by cmake build - (fetchpatch { - url = "https://github.com/jonringer/c-ares/commit/9806a8a2f999a8a3efa3c893f2854dce6919d5bb.patch"; - sha256 = "sha256-nh/ZKdan2/FTrouApRQA7O8KGZrLEUuWhxGOktiiGwU="; - }) - ]; - nativeBuildInputs = lib.optionals withCMake [ cmake ]; cmakeFlags = [] ++ lib.optionals stdenv.hostPlatform.isStatic [ @@ -47,6 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A C library for asynchronous DNS requests"; homepage = "https://c-ares.haxx.se"; + changelog = "https://c-ares.org/changelog.html#${lib.replaceStrings [ "." ] [ "_" ] version}"; license = licenses.mit; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cgreen/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cgreen/default.nix index 5702b4e8f0..cfe309a3de 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cgreen/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cgreen/default.nix @@ -1,13 +1,17 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "cgreen"; version = "1.6.2"; src = fetchFromGitHub { owner = "cgreen-devs"; repo = "cgreen"; - rev = version; + rev = self.version; sha256 = "sha256-beaCoyDCERb/bdKcKS7dRQHlI0auLOStu3cZr1dhubg="; }; @@ -19,11 +23,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with lib; { + meta = { homepage = "https://github.com/cgreen-devs/cgreen"; description = "The Modern Unit Test and Mocking Framework for C and C++"; - license = licenses.isc; - maintainers = [ maintainers.nichtsfrei ]; - platforms = platforms.unix; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.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 5b8cc369ee..413692439a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ffmpeg_4 ] ++ lib.optionals stdenv.isDarwin + buildInputs = [ 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/cmocka/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cmocka/default.nix index 718377a7ca..5eefba8eb4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cmocka/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cmocka/default.nix @@ -1,26 +1,17 @@ { fetchurl, fetchpatch, lib, stdenv, cmake }: -let - # Temporary split to save rebuilds; see PR #217469 - isUpdated = with stdenv; isDarwin && isAarch64; -in + stdenv.mkDerivation rec { pname = "cmocka"; majorVersion = "1.1"; - version = "${majorVersion}." + (if isUpdated then "6" else "5"); + version = "${majorVersion}.6"; src = fetchurl { url = "https://cmocka.org/files/${majorVersion}/cmocka-${version}.tar.xz"; - sha256 = if isUpdated - then "0xksffx1w3pzm18ynf28cx8scrhylcbz43s1rgkkdqnyil1q6cjv" - else "1dm8pdvkyfa8dsbz9bpq7wwgixjij4sii9bbn5sgvqjm5ljdik7h"; + sha256 = "0xksffx1w3pzm18ynf28cx8scrhylcbz43s1rgkkdqnyil1q6cjv"; }; - patches = lib.optionals (!isUpdated) [ - (fetchpatch { - name = "musl-uintptr.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/cmocka/musl_uintptr.patch?id=6a15dd0d0ba9cc354a621fb359ca5e315ff2eabd"; - sha256 = "sha256-fhb2Tax30kRTGuaKvzSzglSd/ntxiNeGFJt5I8poa24="; - }) + patches = [ + ./uintptr_t.patch ]; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cmocka/uintptr_t.patch b/third_party/nixpkgs/pkgs/development/libraries/cmocka/uintptr_t.patch new file mode 100644 index 0000000000..ac69560d1c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/cmocka/uintptr_t.patch @@ -0,0 +1,16 @@ +Resolve messy situation with uintptr_t and stdint.h + +Platforms common in nixpkgs will have stdint.h - thereby we avoid problems +that seem complicated to avoid. References: +https://gitlab.com/cmocka/cmocka/-/issues/38#note_1286565655 +https://git.alpinelinux.org/aports/plain/main/cmocka/musl_uintptr.patch?id=6a15dd0d0ba9cc354a621fb359ca5e315ff2eabd + +It isn't easy, as 1.1.6 codebase is missing stdint.h includes on many places, +and HAVE_UINTPTR_T from cmake also wouldn't get on all places it needs to. +--- a/include/cmocka.h ++++ b/include/cmocka.h +@@ -18,2 +18,4 @@ + #define CMOCKA_H_ ++#include ++#define HAVE_UINTPTR_T 1 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/cracklib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cracklib/default.nix index 13029f7739..484af3337a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cracklib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cracklib/default.nix @@ -1,8 +1,8 @@ -let version = "2.9.7"; in +let version = "2.9.8"; in { stdenv, lib, buildPackages, fetchurl, zlib, gettext , wordlists ? [ (fetchurl { url = "https://github.com/cracklib/cracklib/releases/download/v${version}/cracklib-words-${version}.gz"; - sha256 = "12fk8w06q628v754l357cf8kfjna98wj09qybpqr892az3x4a33z"; + hash = "sha256-WLOCTIDdO6kIsMytUdbhZx4woj/u1gf7jmORR2i8T4U="; }) ] }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "1rimpjsdnmw8f5b7k558cic41p2qy2n2yrlqp5vh7mp4162hk0py"; + hash = "sha256-H500OF6jqnzXwH+jiNwlgQrqnTwz4mDHE6Olhz1w44Y="; }; nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.cracklib; diff --git a/third_party/nixpkgs/pkgs/development/libraries/dav1d/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dav1d/default.nix index 180480985a..54bd9a1095 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dav1d/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dav1d/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab +{ lib, stdenv, fetchFromGitHub , meson, ninja, nasm, pkg-config , xxHash , withTools ? false # "dav1d" binary @@ -10,14 +10,13 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "1.0.0"; + version = "1.1.0"; - src = fetchFromGitLab { - domain = "code.videolan.org"; + src = fetchFromGitHub { owner = "videolan"; repo = pname; rev = version; - sha256 = "sha256-RVr7NFVxY+6MBD8NV7eMW8TEWuCgcfqpula1o1VZe0o="; + hash = "sha256-1k6TsaXI9nwrBXTj3hncblkQuN/bvDudWDCsx4E4iwY="; }; nativeBuildInputs = [ meson ninja nasm pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/embree/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/embree/2.x.nix index 12d4e2a87c..45f4236591 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/embree/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/embree/2.x.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { homepage = "https://embree.github.io/"; maintainers = with maintainers; [ hodapp ]; license = licenses.asl20; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix b/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix index 5cab69db67..552859cd4a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ hodapp gebner ]; license = licenses.asl20; platforms = platforms.unix; + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index 5b08f03793..de78e8b75c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -34,7 +34,7 @@ , withCaca ? withFullDeps # Textual display (ASCII art) , withCelt ? withFullDeps # CELT decoder , withCrystalhd ? withFullDeps -, withCuda ? withFullDeps && (with stdenv; (!isDarwin && !isAarch64)) +, withCuda ? withFullDeps && (with stdenv; (!isDarwin && !hostPlatform.isAarch)) , withCudaLLVM ? withFullDeps , withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness) , withDc1394 ? withFullDeps && !stdenv.isDarwin # IIDC-1394 grabbing (ieee 1394) @@ -57,8 +57,8 @@ , withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support , withMp3lame ? withHeadlessDeps # LAME MP3 encoder , withMysofa ? withFullDeps # HRTF support via SOFAlizer -, withNvdec ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform -, withNvenc ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform +, withNvdec ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isAarch32 +, withNvenc ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isAarch32 , withOgg ? withHeadlessDeps # Ogg container used by vorbis & theora , withOpenal ? withFullDeps # OpenAL 1.1 capture support , withOpencl ? withFullDeps @@ -657,9 +657,9 @@ stdenv.mkDerivation (finalAttrs: { # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found. # See the explanation in addOpenGLRunpath. - postFixup = optionalString stdenv.isLinux '' - addOpenGLRunpath $out/lib/libavcodec.so - addOpenGLRunpath $out/lib/libavutil.so + postFixup = optionalString (stdenv.isLinux && withLib) '' + addOpenGLRunpath ${placeholder "lib"}/lib/libavcodec.so + addOpenGLRunpath ${placeholder "lib"}/lib/libavutil.so ''; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix index 48048e4a91..ed847cb3ff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "freetype"; - version = "2.12.1"; + version = "2.13.0"; src = let inherit (finalAttrs) pname version; in fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-R2byAVfMTPDNKS+Av5F/ktHEObJDrDAY3r9rkUDEGn8="; + sha256 = "sha256-XuI6vQR2NsJLLUPGYl3K/GZmHRrKZN7J4NBd8pWSYkw="; }; propagatedBuildInputs = [ zlib bzip2 brotli libpng ]; # needed when linking against freetype diff --git a/third_party/nixpkgs/pkgs/development/libraries/g2o/default.nix b/third_party/nixpkgs/pkgs/development/libraries/g2o/default.nix index 0536ec95c6..1140565eef 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/g2o/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/g2o/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "g2o"; - version = "20201223"; + version = "20230223"; src = fetchFromGitHub { owner = "RainerKuemmerle"; repo = pname; rev = "${version}_git"; - sha256 = "sha256-Ik6uBz4Z4rc5+mPNdT8vlNZSBom4Tvt8Y6myBC/s0m8="; + sha256 = "sha256-J2Z3oRkyiinIfywBQvnq1Q8Z5WuzQXOVTZTwN8oivf0="; }; # Removes a reference to gcc that is only used in a debug message @@ -20,9 +20,6 @@ mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ eigen suitesparse blas lapack libGLU qtbase libqglviewer ]; - # Silence noisy warning - CXXFLAGS = "-Wno-deprecated-copy"; - dontWrapQtApps = true; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix index fdd5fc951e..955b459f4a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -183,6 +183,8 @@ stdenv.mkDerivation rec { "test_osr_ct_options_area_of_interest" # ZIP does not support timestamps before 1980 " test_sentinel2_zipped" + # tries to call unwrapped executable + "test_SetPROJAuxDbPaths" ] ++ lib.optionals (!stdenv.isx86_64) [ # likely precision-related expecting x87 behaviour "test_jp2openjpeg_22" diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix index ca0e8f81c4..bece2287c0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -14,19 +14,21 @@ , libjpeg , libpng , gnome -, gobject-introspection -, buildPackages , doCheck ? false , makeWrapper , lib , testers +, buildPackages +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, gobject-introspection }: stdenv.mkDerivation (finalAttrs: { pname = "gdk-pixbuf"; version = "2.42.10"; - outputs = [ "out" "dev" "man" "devdoc" ] + outputs = [ "out" "dev" "man" ] + ++ lib.optional withIntrospection "devdoc" ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "installedTests"; src = let @@ -56,13 +58,14 @@ stdenv.mkDerivation (finalAttrs: { python3 makeWrapper glib - gi-docgen - gobject-introspection # for man pages docutils ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames + ] ++ lib.optionals withIntrospection [ + gi-docgen + gobject-introspection ]; propagatedBuildInputs = [ @@ -74,7 +77,8 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dgio_sniffing=false" - "-Dgtk_doc=true" + (lib.mesonBool "gtk_doc" withIntrospection) + (lib.mesonEnable "introspection" withIntrospection) ]; postPatch = '' @@ -104,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f mv $f ''${f%.dylib}.so done - '' + '' + '' + lib.optionalString withIntrospection '' # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/ ${stdenv.hostPlatform.emulator buildPackages} $dev/bin/gdk-pixbuf-query-loaders --update-cache ''; @@ -116,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: { done ''; - postFixup = '' + postFixup = lib.optionalString withIntrospection '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. moveToOutput "share/doc" "$devdoc" ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/geographiclib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/geographiclib/default.nix index d6a8879f67..1d48ebf8ff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/geographiclib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/geographiclib/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "geographiclib"; - version = "2.1.2"; + version = "2.2"; src = fetchFromGitHub { owner = "geographiclib"; repo = "geographiclib"; rev = "v${version}"; - hash = "sha256-DVJi6EosJOPoVJEgZYsro5C/lrHrXEfbjLWiQVJk4+U="; + hash = "sha256-W2YbeUYr6rjzdufVGzJ1k56uHHMzq8eidDZbRxTyzAU="; }; nativeBuildInputs = [ cmake doxygen ]; 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 f83b7c1081..02d2dbb6a5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix @@ -30,7 +30,7 @@ let pythonModules = pp: [ - pp.Mako + pp.mako pp.markdown ]; in diff --git a/third_party/nixpkgs/pkgs/development/libraries/gpgme/python-find-version-string-above-310.patch b/third_party/nixpkgs/pkgs/development/libraries/gpgme/python-find-version-string-above-310.patch index 3d8191c992..ef2f563e45 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gpgme/python-find-version-string-above-310.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/gpgme/python-find-version-string-above-310.patch @@ -6,7 +6,7 @@ diff --git a/configure.ac b/configure.ac # Reset everything, so that we can look for another Python. m4_foreach([mym4pythonver], - [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[all]], -+ [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[3.10],[all]], ++ [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[3.10],[3.11],[all]], [unset PYTHON unset PYTHON_VERSION unset PYTHON_CPPFLAGS @@ -45,7 +45,7 @@ diff --git a/m4/python.m4 b/m4/python.m4 [python2 python2.7 dnl python dnl - python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 -+ python3 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 ++ python3 python3.10 python3.11, python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 ]) AC_ARG_VAR([PYTHON], [the Python interpreter]) diff --git a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix index 08de2cdf91..0d0a66973d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "grpc"; - version = "1.51.1"; # N.B: if you change this, please update: + version = "1.52.1"; # N.B: if you change this, please update: # pythonPackages.grpcio-tools # pythonPackages.grpcio-status @@ -29,22 +29,16 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-o1C35mtA2lTGgugCKAQyRDNlCnutoJ1ol/DInJNobnc="; + hash = "sha256-TE4Q2L4TF0bhgQyPcfgYolb5VXDWjOIyt5mv/HNIfTk="; fetchSubmodules = true; }; patches = [ - # Fix build on armv6l (https://github.com/grpc/grpc/pull/21341) (fetchpatch { - url = "https://github.com/grpc/grpc/commit/2f4cf1d9265c8e10fb834f0794d0e4f3ec5ae10e.patch"; - sha256 = "0ams3jmgh9yzwmxcg4ifb34znamr7pb4qm0609kvil9xqvkqz963"; - }) - - # Revert gRPC C++ Mutex to be an alias of Abseil, because it breaks dependent packages - (fetchpatch { - url = "https://github.com/grpc/grpc/commit/931f91b745cd5b2864a0d1787815871d0bd844ae.patch"; - sha256 = "0vc93g2i4982ys4gzyaxdv9ni25yk10sxq3n7fkz8dypy8sylck7"; - revert = true; + # armv6l support, https://github.com/grpc/grpc/pull/21341 + name = "grpc-link-libatomic.patch"; + url = "https://github.com/lopsided98/grpc/commit/164f55260262c816e19cd2c41b564486097d62fe.patch"; + hash = "sha256-d6kMyjL5ZnEnEz4XZfRgXJBH53gp1r7q1tlwh+HM6+Y="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index 7fc9dc086f..df677194da 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -3,6 +3,8 @@ , pkg-config , glib , gobject-introspection +, buildPackages +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages , meson , ninja , python3 @@ -27,9 +29,14 @@ stdenv.mkDerivation rec { ninja pkg-config python3 + ] ++ lib.optionals withIntrospection [ gobject-introspection ]; + mesonFlags = [ + (lib.mesonBool "introspection" withIntrospection) + ]; + postPatch = '' chmod +x build-aux/meson/post-install.py patchShebangs build-aux/meson/post-install.py diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsm/default.nix index ff2217b6e3..ae2c489fe8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsm/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "gsm"; - version = "1.0.20"; + version = "1.0.22"; src = fetchurl { url = "https://www.quut.com/gsm/${pname}-${version}.tar.gz"; - sha256 = "sha256-YxXDhRi4HomcP8LtRjzGI68pxcIxpIwTeyQwIjSukL8="; + sha256 = "sha256-8Acukfa7hah4svbb9KC3yFDE3rgEnVVMZTQLO/ad8Kw="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/default.nix index 9b67dd49c8..69ee361497 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/default.nix @@ -25,5 +25,7 @@ gst-vaapi = callPackage ./vaapi { }; + icamerasrc = callPackage ./icamerasrc { }; + # note: gst-python is in ./python/default.nix - called under pythonPackages } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix new file mode 100644 index 0000000000..d67f646b2b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, gst_all_1 +, ipu6-camera-hal +, libdrm +}: + +stdenv.mkDerivation rec { + pname = "icamerasrc"; + version = "20221209"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "icamerasrc"; + rev = "refs/tags/rpl_plat_${version}_pv"; + hash = "sha256-qlV363l4tUjUAa1LiZQq55byKpz1tLESKAXEmgiYHVo="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + preConfigure = '' + # https://github.com/intel/ipu6-camera-hal/issues/1 + export CHROME_SLIM_CAMHAL=ON + # https://github.com/intel/icamerasrc/issues/22 + export STRIP_VIRTUAL_CHANNEL_CAMHAL=ON + ''; + + buildInputs = [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ipu6-camera-hal + libdrm + ]; + + NIX_CFLAGS_COMPILE = [ + # gstcameradeinterlace.cpp:55:10: fatal error: gst/video/video.h: No such file or directory + "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "GStreamer Plugin for MIPI camera support through the IPU6/IPU6EP/IPU6SE on Intel Tigerlake/Alderlake/Jasperlake platforms"; + homepage = "https://github.com/intel/icamerasrc/tree/icamerasrc_slim_api"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ hexa ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index af81a55fca..5a1cc8ca9c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -8,6 +8,7 @@ , docbook_xml_dtd_43 , gtk-doc , meson +, mesonEmulatorHook , ninja , python3 , makeWrapper @@ -21,6 +22,8 @@ , atk , at-spi2-atk , gobject-introspection +, buildPackages +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages , fribidi , xorg , libepoxy @@ -39,7 +42,6 @@ , wayland-protocols , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux -, withGtkDoc ? stdenv.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform) , cups , AppKit , Cocoa @@ -63,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtk+3"; version = "3.24.36"; - outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; + outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; outputBin = "dev"; setupHooks = [ @@ -94,7 +96,6 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ gettext - gobject-introspection makeWrapper meson ninja @@ -102,12 +103,15 @@ stdenv.mkDerivation (finalAttrs: { python3 sassc gdk-pixbuf - ] ++ finalAttrs.setupHooks ++ lib.optionals withGtkDoc [ + ] ++ finalAttrs.setupHooks ++ lib.optionals withIntrospection [ + gobject-introspection docbook_xml_dtd_43 docbook-xsl-nons gtk-doc # For xmllint libxml2 + ] ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ] ++ lib.optionals waylandSupport [ wayland-scanner ]; @@ -157,12 +161,13 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ - "-Dgtk_doc=${lib.boolToString withGtkDoc}" + "-Dgtk_doc=${lib.boolToString withIntrospection}" "-Dtests=false" "-Dtracker3=${lib.boolToString trackerSupport}" "-Dbroadway_backend=${lib.boolToString broadwaySupport}" "-Dx11_backend=${lib.boolToString x11Support}" "-Dquartz_backend=${lib.boolToString (stdenv.isDarwin && !x11Support)}" + "-Dintrospection=${lib.boolToString withIntrospection}" ]; doCheck = false; # needs X11 diff --git a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix index e0501bd50c..0b5cb9ae8e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "harfbuzz${lib.optionalString withIcu "-icu"}"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { url = "https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"; - hash = "sha256-e0aFtwZsXGuNxs17AvY8VU+4zBxN3PxEvChO+jwgzyg="; + hash = "sha256-LPTT2PIlAHURmQo2o0GV8NZWLKVt8KiwiFs4KDeUgZk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/hipfft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hipfft/default.nix index 0fdd217c47..7f64cb3b57 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hipfft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hipfft/default.nix @@ -20,7 +20,7 @@ # Can also use cuFFT stdenv.mkDerivation (finalAttrs: { pname = "hipfft"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" diff --git a/third_party/nixpkgs/pkgs/development/libraries/hipsparse/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hipsparse/default.nix index 0252c57aef..769c6da0fa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hipsparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hipsparse/default.nix @@ -17,7 +17,7 @@ # This can also use cuSPARSE as a backend instead of rocSPARSE stdenv.mkDerivation (finalAttrs: { pname = "hipsparse"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" diff --git a/third_party/nixpkgs/pkgs/development/libraries/httplib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/httplib/default.nix index 3d0ef7740e..e18808b753 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/httplib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/httplib/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { pname = "httplib"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "yhirose"; repo = "cpp-httplib"; rev = "v${version}"; - hash = "sha256-Qr8jaZSj5xPiTF8reur09/R2jrtDk5hxHKeVTccHbZQ="; + hash = "sha256-F0MXuScZP2kmyCWv+DVXOB9rRk2T7hMgum7Zbs8X7QI="; }; # Header-only library. diff --git a/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix b/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix index 09d68fa019..17c73c118c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix @@ -29,14 +29,14 @@ let { shortName, shortDescription, dictFileName }: mkDict rec { inherit dictFileName; - version = "2.2"; + version = "2.5"; pname = "hunspell-dict-${shortName}-rla"; readmeFile = "README.txt"; src = fetchFromGitHub { owner = "sbosio"; repo = "rla-es"; rev = "v${version}"; - sha256 = "0n9ms092k7vg7xpd3ksadxydbrizkb7js7dfxr08nbnnb9fgy0i8"; + sha256 = "sha256-oGnxOGHzDogzUMZESydIxRTbq9Dmd03flwHx16AK1yk="; }; meta = with lib; { description = "Hunspell dictionary for ${shortDescription} from rla"; @@ -46,13 +46,13 @@ let platforms = platforms.all; }; nativeBuildInputs = [ bash coreutils which zip unzip ]; - patchPhase = '' + postPatch = '' substituteInPlace ortograf/herramientas/make_dict.sh \ - --replace /bin/bash bash \ + --replace /bin/bash ${bash}/bin/bash \ --replace /dev/stderr stderr.log substituteInPlace ortograf/herramientas/remover_comentarios.sh \ - --replace /bin/bash bash \ + --replace /bin/bash ${bash}/bin/bash \ ''; buildPhase = '' cd ortograf/herramientas @@ -442,7 +442,7 @@ rec { es_CR = es-cr; es-cr = mkDictFromRla { shortName = "es-cr"; - shortDescription = "Spanish (Costra Rica)"; + shortDescription = "Spanish (Costa Rica)"; dictFileName = "es_CR"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/incrtcl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/incrtcl/default.nix index 4234e56edd..4558ebbd0d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/incrtcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/incrtcl/default.nix @@ -2,11 +2,11 @@ tcl.mkTclDerivation rec { pname = "incrtcl"; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { url = "mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl${version}.tar.gz"; - sha256 = "sha256-rExnDq8bWyVb/KzKgyCzPVa72S/VRGPGPW9pmocOFWw="; + sha256 = "sha256-idOs2GXP3ZY7ECtF+K9hg5REyK6sQ0qk+666gUQPjCY="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix new file mode 100644 index 0000000000..d8ac28f4ce --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, fetchFromGitHub + +# build +, cmake +, pkg-config + +# runtime +, expat +, ipu6-camera-bin +, libtool +, gst_all_1 +}: + +stdenv.mkDerivation { + pname = "ipu6-camera-hal"; + version = "unstable-2023-01-09"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "ipu6-camera-hal"; + rev = "37292891c73367d22ba1fc96ea9b6e4546903037"; + hash = "sha256-dJvTZt85rt5/v2JXOsfbSY933qffyXW74L0nWdIlqug="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + cmakeFlags = [ + "-DIPU_VER=${ipu6-camera-bin.ipuVersion}" + # missing libiacss + "-DUSE_PG_LITE_PIPE=ON" + # missing libipu4 + "-DENABLE_VIRTUAL_IPU_PIPE=OFF" + ]; + + NIX_CFLAGS_COMPILE = [ + "-I${lib.getDev ipu6-camera-bin}/include/ia_imaging" + "-I${lib.getDev ipu6-camera-bin}/include/ia_camera" + ]; + + enableParallelBuilding = true; + + buildInputs = [ + expat + ipu6-camera-bin + libtool + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ]; + + preFixup = '' + ls -lah $out/lib/pkgconfig/ + sed -Ei \ + -e "s,^prefix=.*,prefix=$out," \ + -e "s,^exec_prefix=.*,exec_prefix=''${prefix}," \ + -e "s,^libdir=.*,libdir=''${prefix}/lib," \ + -e "s,^includedir=.*,includedir=''${prefix}/include/libcamhal," \ + $out/lib/pkgconfig/libcamhal.pc + ''; + + meta = with lib; { + description = "HAL for processing of images in userspace"; + homepage = "https://github.com/intel/ipu6-camera-hal"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/jbig2enc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jbig2enc/default.nix index 26b21aa7c9..734cb3839a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jbig2enc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jbig2enc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { hash = "sha256-IAL4egXgaGmCilzcryjuvOoHhahyrfGWY68GBfXXgAM="; }; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ leptonica zlib diff --git a/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix index efac369085..4b54ccc066 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix @@ -7,6 +7,8 @@ , nixosTests , pkg-config , gettext +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, buildPackages , gobject-introspection , gi-docgen , libxslt @@ -18,7 +20,8 @@ stdenv.mkDerivation rec { pname = "json-glib"; version = "1.6.6"; - outputs = [ "out" "dev" "devdoc" "installedTests" ]; + outputs = [ "out" "dev" "installedTests" ] + ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; @@ -43,10 +46,11 @@ stdenv.mkDerivation rec { gettext glib libxslt - gobject-introspection - gi-docgen ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames + ] ++ lib.optionals withIntrospection [ + gobject-introspection + gi-docgen ]; propagatedBuildInputs = [ @@ -55,6 +59,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dinstalled_test_prefix=${placeholder "installedTests"}" + (lib.mesonEnable "introspection" withIntrospection) + (lib.mesonEnable "gtk_doc" withIntrospection) ]; # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix index 516f1ea885..1e8ce2dd52 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix @@ -128,7 +128,7 @@ let oxygen-icons5 = callPackage ./oxygen-icons5.nix {}; prison = callPackage ./prison.nix {}; qqc2-desktop-style = callPackage ./qqc2-desktop-style.nix {}; - solid = callPackage ./solid.nix {}; + solid = callPackage ./solid {}; sonnet = callPackage ./sonnet.nix {}; syntax-highlighting = callPackage ./syntax-highlighting.nix {}; threadweaver = callPackage ./threadweaver.nix {}; 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 fc58557021..2aa04acc13 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.103/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.104/ -A '*.tar.xz' ) diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/solid.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/solid/default.nix similarity index 89% rename from third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/solid.nix rename to third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/solid/default.nix index 69ef8c8adc..8c39025e94 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/solid.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/solid/default.nix @@ -6,6 +6,7 @@ mkDerivation { pname = "solid"; + patches = [ ./fix-search-path.patch ]; nativeBuildInputs = [ bison extra-cmake-modules flex media-player-info ]; buildInputs = [ qtdeclarative qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/solid/fix-search-path.patch b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/solid/fix-search-path.patch new file mode 100644 index 0000000000..010aa1f3ef --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/solid/fix-search-path.patch @@ -0,0 +1,17 @@ +diff --git a/src/solid/devices/backends/fstab/fstabhandling.cpp b/src/solid/devices/backends/fstab/fstabhandling.cpp +index ac2a628..7ee46cc 100644 +--- a/src/solid/devices/backends/fstab/fstabhandling.cpp ++++ b/src/solid/devices/backends/fstab/fstabhandling.cpp +@@ -275,7 +275,11 @@ bool Solid::Backends::Fstab::FstabHandling::callSystemCommand(const QString &com + const QObject *receiver, + std::function callback) + { +- static const QStringList searchPaths{QStringLiteral("/sbin"), QStringLiteral("/bin"), QStringLiteral("/usr/sbin"), QStringLiteral("/usr/bin")}; ++ static const QStringList searchPaths{QStringLiteral("/run/wrappers/bin"), ++ QStringLiteral("/sbin"), ++ QStringLiteral("/bin"), ++ QStringLiteral("/usr/sbin"), ++ QStringLiteral("/usr/bin")}; + static const QString joinedPaths = searchPaths.join(QLatin1Char(':')); + const QString exec = QStandardPaths::findExecutable(commandName, searchPaths); + if (exec.isEmpty()) { 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 6aa97206e3..d47c7152f5 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.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/attica-5.103.0.tar.xz"; - sha256 = "17b0kshlgi110v42zmvbsmcjjc48rn617l4dmviwd0ycd2kgqd1s"; - name = "attica-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/attica-5.104.0.tar.xz"; + sha256 = "0vxlh4qaws64qns13jpf026fxknpscj312vr3vpw8vwq8201qjf3"; + name = "attica-5.104.0.tar.xz"; }; }; baloo = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/baloo-5.103.0.tar.xz"; - sha256 = "1055wv29dd4i7az79q2qdk65wk5xqyslwxnwhxr30xzyp60i9smk"; - name = "baloo-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/baloo-5.104.0.tar.xz"; + sha256 = "0akklz0r4pc7dyk7jxf1hh8qz1i6hfvnbi3s0smsznm5f5x1ywls"; + name = "baloo-5.104.0.tar.xz"; }; }; bluez-qt = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/bluez-qt-5.103.0.tar.xz"; - sha256 = "1w6q3cna46ifv1gvnxp45n0z8civ2cab9sjbvsc3apks6w2iahzz"; - name = "bluez-qt-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/bluez-qt-5.104.0.tar.xz"; + sha256 = "1xg9i1f1jb53a937m7gky1jvglivqp1jf41krs781d5mb9kpw6vh"; + name = "bluez-qt-5.104.0.tar.xz"; }; }; breeze-icons = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/breeze-icons-5.103.0.tar.xz"; - sha256 = "1gas85qliib44j5cfpq47hfzni38afqyf9lxkgv1d0q7y87df9br"; - name = "breeze-icons-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/breeze-icons-5.104.0.tar.xz"; + sha256 = "0smfx8r4pmfj2qbk5cfsngyw8psv5sgk4f466z6pl73gzg1sqbgz"; + name = "breeze-icons-5.104.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/extra-cmake-modules-5.103.0.tar.xz"; - sha256 = "0ij3kjggmil995kcjbfirwy1fis60wgj6m7jxaynz59qrdajxjlj"; - name = "extra-cmake-modules-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/extra-cmake-modules-5.104.0.tar.xz"; + sha256 = "1nc5ynfz903jc87xawnww3pf1y73x9jvmxnbrj24nqv6vcgv57p4"; + name = "extra-cmake-modules-5.104.0.tar.xz"; }; }; frameworkintegration = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/frameworkintegration-5.103.0.tar.xz"; - sha256 = "1gljch9nrnw28ix2q2hs29rk0bfzzr4pv0m1msdr0nm1lmyr7w93"; - name = "frameworkintegration-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/frameworkintegration-5.104.0.tar.xz"; + sha256 = "1s5r72ghs0xkk397693j6vvdi8vk5hkni78rrk0h63fw2x2hgj2i"; + name = "frameworkintegration-5.104.0.tar.xz"; }; }; kactivities = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kactivities-5.103.0.tar.xz"; - sha256 = "0dc89yx89kjjvmb6jycqmyb55pml46vy7xw24myin6xfisb8nckd"; - name = "kactivities-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kactivities-5.104.0.tar.xz"; + sha256 = "0lvrj7q88vgivl0jg2c8kayj9r0zjnpi5l7y87sdwi1sfqjibhr9"; + name = "kactivities-5.104.0.tar.xz"; }; }; kactivities-stats = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kactivities-stats-5.103.0.tar.xz"; - sha256 = "0ga51n9c64c4mhmbw1fisbxgcmy77qzi6bhvj3lgs1f829hi1r7r"; - name = "kactivities-stats-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kactivities-stats-5.104.0.tar.xz"; + sha256 = "0hxskcsbplj4s1cdkwhvwpxrinqhyqkmg8kf9dghsybfs6gkb7jf"; + name = "kactivities-stats-5.104.0.tar.xz"; }; }; kapidox = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kapidox-5.103.0.tar.xz"; - sha256 = "0j1di36qxgl5p1ljp2jlgp60psgq2724q0ysfsxapl3p4h9swdy5"; - name = "kapidox-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kapidox-5.104.0.tar.xz"; + sha256 = "0khrk65l1vl8ycghircjln76i2bdlv2xq7yq2pgqqfiaqmgd02c8"; + name = "kapidox-5.104.0.tar.xz"; }; }; karchive = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/karchive-5.103.0.tar.xz"; - sha256 = "0lqkvp42dc7rd6s00dlfxv4zm81zqyr8ijn6nmiychyw3mlxyarp"; - name = "karchive-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/karchive-5.104.0.tar.xz"; + sha256 = "0bpx6iankpgssfqiyz8vaz3vrkq2zipxd4h5gn8x46k9d3z3sbxn"; + name = "karchive-5.104.0.tar.xz"; }; }; kauth = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kauth-5.103.0.tar.xz"; - sha256 = "0m1x0b9ysl2rvm607q9qra6kwaalrgm8i8z4q7j8197a9njawffd"; - name = "kauth-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kauth-5.104.0.tar.xz"; + sha256 = "07jqgndkvrxdjwya0qlghq79wl28hlsnyad6wlvg3hb6ircqch31"; + name = "kauth-5.104.0.tar.xz"; }; }; kbookmarks = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kbookmarks-5.103.0.tar.xz"; - sha256 = "1b5dn6g54ix60dkvw6dmbxqjgimq6qy50qhrn2fj7r1rm6059pqs"; - name = "kbookmarks-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kbookmarks-5.104.0.tar.xz"; + sha256 = "0m33jd30kd214wf4v78rfjfffqbr69y72n9likfcdkrk09cnbrc5"; + name = "kbookmarks-5.104.0.tar.xz"; }; }; kcalendarcore = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kcalendarcore-5.103.0.tar.xz"; - sha256 = "1pafc7iwin7lbh6n7b5qr1h7x3n6wdviqazcjl2z7ikysnqkphbp"; - name = "kcalendarcore-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kcalendarcore-5.104.0.tar.xz"; + sha256 = "0chlr9kazgkiasx18gxckiys1dapvjs0bkyh7yirjmzkgazkf44f"; + name = "kcalendarcore-5.104.0.tar.xz"; }; }; kcmutils = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kcmutils-5.103.0.tar.xz"; - sha256 = "1xgrjv7r6zrlvjjqv07bqfb63f0vbhjj0sshi7qmf68k33g3c5fw"; - name = "kcmutils-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kcmutils-5.104.0.tar.xz"; + sha256 = "12hns58m4h768nfgspsac6ch0h95si6gf2j2dgr24ia4s241ajvm"; + name = "kcmutils-5.104.0.tar.xz"; }; }; kcodecs = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kcodecs-5.103.0.tar.xz"; - sha256 = "0fbgw84wf435ws0d9lldbgrmbscv6wz8pcws8dvfr7hkxkiwl52y"; - name = "kcodecs-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kcodecs-5.104.0.tar.xz"; + sha256 = "0swxj2kr37pnwdxsipfii8q02g58lvm9lsh4kflqgfjyhvv0kjby"; + name = "kcodecs-5.104.0.tar.xz"; }; }; kcompletion = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kcompletion-5.103.0.tar.xz"; - sha256 = "0kvnrg3p7washajvll9qqsk81bw289s75vrqm5safgdvlb5p88yh"; - name = "kcompletion-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kcompletion-5.104.0.tar.xz"; + sha256 = "045m5q1mh2c65zj5lb999p5i2ag346rg439gqq2dz0qjhx305vdh"; + name = "kcompletion-5.104.0.tar.xz"; }; }; kconfig = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kconfig-5.103.0.tar.xz"; - sha256 = "065r7ggdh3yxnqas7x20kqhyv070d7xryvc8apj0xsz1cvsychaz"; - name = "kconfig-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kconfig-5.104.0.tar.xz"; + sha256 = "0f19xj1a3ra3j93i1zzypqqw55dxjgc6baam2yq3x3p7n2vsdrxq"; + name = "kconfig-5.104.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kconfigwidgets-5.103.0.tar.xz"; - sha256 = "0wx3dbqp3xhx3334qaxjv8hpixg25791lsnkbainhq2frhwfy77r"; - name = "kconfigwidgets-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kconfigwidgets-5.104.0.tar.xz"; + sha256 = "08j5svm9ggrl8akq0w13wlw17cv4d4lvw4ggg26a3j512fw1947b"; + name = "kconfigwidgets-5.104.0.tar.xz"; }; }; kcontacts = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kcontacts-5.103.0.tar.xz"; - sha256 = "136ql3ycc1dw7njifxmqqsqkq2ig393206s0d0l6j7jlympng8sk"; - name = "kcontacts-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kcontacts-5.104.0.tar.xz"; + sha256 = "1jaj73jpdnvcia8q0kzrixpradcv3j9r2hln5mq9r0rssbj66h6m"; + name = "kcontacts-5.104.0.tar.xz"; }; }; kcoreaddons = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kcoreaddons-5.103.0.tar.xz"; - sha256 = "0sigfyznlnqba66i3qg22w1jl8lkhd1rjwd8da7gvgy2fh19vfdy"; - name = "kcoreaddons-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kcoreaddons-5.104.0.tar.xz"; + sha256 = "0h2fg77gg4z3my06111whnlmrb2939igwg6c1m406v7dgx50sxpd"; + name = "kcoreaddons-5.104.0.tar.xz"; }; }; kcrash = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kcrash-5.103.0.tar.xz"; - sha256 = "1rzbszkqirrgiiqjr468pw253c7a1d96bmhf0awhj9qnz5qs361m"; - name = "kcrash-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kcrash-5.104.0.tar.xz"; + sha256 = "15palx95pkbxf83nn7qalh80whfp7msn4i049zbsjl9fkr7h1mhj"; + name = "kcrash-5.104.0.tar.xz"; }; }; kdav = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kdav-5.103.0.tar.xz"; - sha256 = "0rm1nsbi6n6f6zvpja8cznz2lj4ca6jvzqjmvrd76pw2f2fii8il"; - name = "kdav-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kdav-5.104.0.tar.xz"; + sha256 = "0waw2saxlwsf22q3zlwz10vh6wcwabd3i5cbwnhlli2z86l7p2bg"; + name = "kdav-5.104.0.tar.xz"; }; }; kdbusaddons = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kdbusaddons-5.103.0.tar.xz"; - sha256 = "1qx4xcl6cakazpq7mpsnv2dl202y5agdypw0vvvw8j9bmc3bfxf6"; - name = "kdbusaddons-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kdbusaddons-5.104.0.tar.xz"; + sha256 = "1d2nzlw069m3m9i2x1rkqd4agssgckl2g7kjd0vvq1y4h42dssjc"; + name = "kdbusaddons-5.104.0.tar.xz"; }; }; kdeclarative = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kdeclarative-5.103.0.tar.xz"; - sha256 = "0lmjzxjm4hs4cb1m6704n6gqwpqvn8pib138mw8fvl8c03xmrjmn"; - name = "kdeclarative-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kdeclarative-5.104.0.tar.xz"; + sha256 = "1h76xn6f8wyw3bryxxvj90vah25z3kp2n0rx41gv0j11gsyr99w2"; + name = "kdeclarative-5.104.0.tar.xz"; }; }; kded = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kded-5.103.0.tar.xz"; - sha256 = "13clr3d1rls3w4syr0bsiiqlvpv54lhvw9jwy0p7hpz1rsz619q0"; - name = "kded-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kded-5.104.0.tar.xz"; + sha256 = "1by4gakr17cxpl0frcly73szpq95k5d6lgv4qmr5skn468h9g197"; + name = "kded-5.104.0.tar.xz"; }; }; kdelibs4support = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/portingAids/kdelibs4support-5.103.0.tar.xz"; - sha256 = "0lzq25a4q857j91496lxyhs4jf2l3p8s38xxnh0099f5la0akhpv"; - name = "kdelibs4support-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/portingAids/kdelibs4support-5.104.0.tar.xz"; + sha256 = "1wim766adlxkig7wmpb9jvv6d2navf3n24h9gj8hbkk4721bgalv"; + name = "kdelibs4support-5.104.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/portingAids/kdesignerplugin-5.103.0.tar.xz"; - sha256 = "1jismdz12lnq6dkv3c44jicjjpl25hxm7ghl7yw4nh73c76xflhw"; - name = "kdesignerplugin-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/portingAids/kdesignerplugin-5.104.0.tar.xz"; + sha256 = "10w1jvr47579azrg1h6bxxy7b6rshpzj5mkxkqynhf3ryd2056xw"; + name = "kdesignerplugin-5.104.0.tar.xz"; }; }; kdesu = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kdesu-5.103.0.tar.xz"; - sha256 = "19mbmnd1bl76dq8v0rm62lgkyl9b93a85g2zb1d9zkcqa5xcx2hi"; - name = "kdesu-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kdesu-5.104.0.tar.xz"; + sha256 = "1ckfic4zvmn0mab1aklg28f77w23rinpqm8yyx5g10b8dcgyp7i1"; + name = "kdesu-5.104.0.tar.xz"; }; }; kdewebkit = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/portingAids/kdewebkit-5.103.0.tar.xz"; - sha256 = "1kkmy641c4814aq8nfb56yq4ch724cwyv487wljpfly75migwcnz"; - name = "kdewebkit-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/portingAids/kdewebkit-5.104.0.tar.xz"; + sha256 = "1dl62bf0kxcnwzghbrrrh7p1awjyck41bqg907y49i76hflimqj0"; + name = "kdewebkit-5.104.0.tar.xz"; }; }; kdnssd = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kdnssd-5.103.0.tar.xz"; - sha256 = "1va56vqviic7y4b21g0kz6kdwf56bgylwv2wwrlbxcnz3dnsnyi6"; - name = "kdnssd-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kdnssd-5.104.0.tar.xz"; + sha256 = "1zk0rxrm63xdjjspa63smw4x9rsc5sakcxpaiysf265605yma89v"; + name = "kdnssd-5.104.0.tar.xz"; }; }; kdoctools = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kdoctools-5.103.0.tar.xz"; - sha256 = "1a74mkbfpxiyzs0p3q7hhndp1ricmc5mdbl96nd2c1i62pg84mxs"; - name = "kdoctools-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kdoctools-5.104.0.tar.xz"; + sha256 = "1p243fzm135vbqgdrpj9rah3ywaipsdamgz3add3an4cpk94wnqi"; + name = "kdoctools-5.104.0.tar.xz"; }; }; kemoticons = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kemoticons-5.103.0.tar.xz"; - sha256 = "10psbw1myvvnj5d2ri5f4la4dqa3sj124qd7iyijw0k870hw5h8k"; - name = "kemoticons-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kemoticons-5.104.0.tar.xz"; + sha256 = "1q62jjpyf7sfd45ksb01mpls3vp4bfh58sdp4bk0chnq0nlz6qff"; + name = "kemoticons-5.104.0.tar.xz"; }; }; kfilemetadata = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kfilemetadata-5.103.0.tar.xz"; - sha256 = "1h10jvdljlpasrkiidbdzfk8xs1gm5hm1j8m8nvz4mglhby9r329"; - name = "kfilemetadata-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kfilemetadata-5.104.0.tar.xz"; + sha256 = "016mdmnykcbgpms6xwxfavkq2cs289626bhpffhsgipf3sg1jkqy"; + name = "kfilemetadata-5.104.0.tar.xz"; }; }; kglobalaccel = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kglobalaccel-5.103.0.tar.xz"; - sha256 = "14jgs7nz4qw3d183s3rxkbz1mmbjamr57qdw7zi2xfpnma56ggls"; - name = "kglobalaccel-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kglobalaccel-5.104.0.tar.xz"; + sha256 = "1bkyp9x7cf9qp1mn67s7hzxzz7mvafgvdbqrmywrklxl82azilnr"; + name = "kglobalaccel-5.104.0.tar.xz"; }; }; kguiaddons = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kguiaddons-5.103.0.tar.xz"; - sha256 = "0cmjsp19q0c3cq433yq0id9habmrq0q8x3kvzi12pn64xzyq0cp6"; - name = "kguiaddons-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kguiaddons-5.104.0.tar.xz"; + sha256 = "03c4jcz8q0bn4r9d55f9d94330m1chk934z8x7wzcjk8bgi8v3gv"; + name = "kguiaddons-5.104.0.tar.xz"; }; }; kholidays = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kholidays-5.103.0.tar.xz"; - sha256 = "1kahvipcxkcz3qql6rf3qlafpmqs51jj478icnb4hhfp8q2m9xda"; - name = "kholidays-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kholidays-5.104.0.tar.xz"; + sha256 = "0b98z4psq6b1jl63r821sr327cxgps77l2ngg3d2fp5ns4ly8ks8"; + name = "kholidays-5.104.0.tar.xz"; }; }; khtml = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/portingAids/khtml-5.103.0.tar.xz"; - sha256 = "0d26ni10rdy6b368ij20j6bgf03hzdc7b7602fxnvwg0i0h54r4s"; - name = "khtml-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/portingAids/khtml-5.104.0.tar.xz"; + sha256 = "0iy4yq83xflbj8l91ki63wk2y08lgw1dxbc1m5nxjr7krrsah6z1"; + name = "khtml-5.104.0.tar.xz"; }; }; ki18n = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/ki18n-5.103.0.tar.xz"; - sha256 = "1rj0g12xjwm42qyrxb55mcpaz52s78b7i8ms9svrlza2gxi93siq"; - name = "ki18n-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/ki18n-5.104.0.tar.xz"; + sha256 = "1qafw55ply9k6jhk95s035gr3a1lg56nxdbs5i3zm06652g5p0gy"; + name = "ki18n-5.104.0.tar.xz"; }; }; kiconthemes = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kiconthemes-5.103.0.tar.xz"; - sha256 = "0khjzcy8b7rbf2pvpkin941a1cp1lsb2vr7n1ff3gdp33ra98828"; - name = "kiconthemes-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kiconthemes-5.104.0.tar.xz"; + sha256 = "1pycdidcgixshlhjfxzivh6fgxygs5p24f4qaf5s5nmca3wxkx3h"; + name = "kiconthemes-5.104.0.tar.xz"; }; }; kidletime = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kidletime-5.103.0.tar.xz"; - sha256 = "0hlq6jmkpdjmzcqzjdbhz3xw0b198cvd98zwyabirb8lf4v51wdh"; - name = "kidletime-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kidletime-5.104.0.tar.xz"; + sha256 = "0qc032mwd538s0lk6p0zks44jwdh1wdqicgpcw8jlk3rn9xslm4a"; + name = "kidletime-5.104.0.tar.xz"; }; }; kimageformats = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kimageformats-5.103.0.tar.xz"; - sha256 = "0zhyf9fh7i4jig8iryh2cp1m340ja2bzskayfisgx7fcm8bw8zfx"; - name = "kimageformats-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kimageformats-5.104.0.tar.xz"; + sha256 = "0pdl9gap5r5i6hcfx9443iw8f763nn7c9n4b0s9mnxzzmfs2px3r"; + name = "kimageformats-5.104.0.tar.xz"; }; }; kinit = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kinit-5.103.0.tar.xz"; - sha256 = "0y2xashdz2zv8gddaxr5w16l8yf1afi29b3a2rzh94ms9l0sln75"; - name = "kinit-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kinit-5.104.0.tar.xz"; + sha256 = "0d3jpmqylmgcxi7p21ij2nkvgmclkigjcfyypnhfqnzpja8nhy3i"; + name = "kinit-5.104.0.tar.xz"; }; }; kio = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kio-5.103.0.tar.xz"; - sha256 = "0izljyzjzcbsf6hg4302b2vjjxvxkvs23nxs0x0cr2d4b8v3fj0b"; - name = "kio-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kio-5.104.0.tar.xz"; + sha256 = "0473vlk0wpbz4nz2cyv19qkdblg6bdqs96kvrk26yh3jvsjr72ss"; + name = "kio-5.104.0.tar.xz"; }; }; kirigami2 = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kirigami2-5.103.0.tar.xz"; - sha256 = "0i1pr1w1082i00zzxx5x9zhr3ijsyl3l9i5nzx4znxvp3qi7yrm6"; - name = "kirigami2-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kirigami2-5.104.0.tar.xz"; + sha256 = "1cfs1fmwxk3sjv75kz42a8w19kdcl3yvqbjncwzwa8qkgdfy8dx0"; + name = "kirigami2-5.104.0.tar.xz"; }; }; kitemmodels = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kitemmodels-5.103.0.tar.xz"; - sha256 = "1jvhlcc0v3ww883rxb0nn4bh4pn91hmkdrr96vcwmwh8m1plsv1m"; - name = "kitemmodels-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kitemmodels-5.104.0.tar.xz"; + sha256 = "1mqqgddz9ci97zzs5xpj8vihklsxxmf6a4996gil6x30zki2zb0b"; + name = "kitemmodels-5.104.0.tar.xz"; }; }; kitemviews = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kitemviews-5.103.0.tar.xz"; - sha256 = "0klwci9dsa11f43q6nhcay506m800sk5gc03fkv0992y8mnh8sc0"; - name = "kitemviews-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kitemviews-5.104.0.tar.xz"; + sha256 = "1g28bb3qpha2lfmxcjzwjy6fzjmykr71jkn6g7x1jwqqik30v4ll"; + name = "kitemviews-5.104.0.tar.xz"; }; }; kjobwidgets = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kjobwidgets-5.103.0.tar.xz"; - sha256 = "11j8zx4lj04hw5g7jg7jyw6p34fd6qq9p813v2hlszfbjz3hldgs"; - name = "kjobwidgets-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kjobwidgets-5.104.0.tar.xz"; + sha256 = "18gyp1p2bldyn5l97x0lvqmdl983k7wgw427a5m6c85zscj4299v"; + name = "kjobwidgets-5.104.0.tar.xz"; }; }; kjs = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/portingAids/kjs-5.103.0.tar.xz"; - sha256 = "01wlv1lalmdspq2rgisv6csd4yxl0mxi476bcpr3i1zvvx9y2ijs"; - name = "kjs-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/portingAids/kjs-5.104.0.tar.xz"; + sha256 = "0dgb8impa7r8pp9q0d7kswy95lpn47b81wwwfz7a6hzsjpqb7mmx"; + name = "kjs-5.104.0.tar.xz"; }; }; kjsembed = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/portingAids/kjsembed-5.103.0.tar.xz"; - sha256 = "0b44pxk01pk30rgqx2lxmwfq5x3nlj5yqcbc3qgfpj0hpfgkfl99"; - name = "kjsembed-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/portingAids/kjsembed-5.104.0.tar.xz"; + sha256 = "02xisllcg89lnywpnhnhbgk6dfsr1lgh2d58a8yczcn5vm9zh4dh"; + name = "kjsembed-5.104.0.tar.xz"; }; }; kmediaplayer = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/portingAids/kmediaplayer-5.103.0.tar.xz"; - sha256 = "1bwgy1l9qlx3cq2sjqva1g9d8j1di2mxs3cj9v6gjgn67cywm2sw"; - name = "kmediaplayer-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/portingAids/kmediaplayer-5.104.0.tar.xz"; + sha256 = "120avg4a36yzpj8ni5zbrwdwc1p9nzbaw2hbz88w636llv10ymg7"; + name = "kmediaplayer-5.104.0.tar.xz"; }; }; knewstuff = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/knewstuff-5.103.0.tar.xz"; - sha256 = "13mpx8frr9ypxx7p3567gi5w4g1ja40asp4cjs2qa9gs05y7kfj6"; - name = "knewstuff-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/knewstuff-5.104.0.tar.xz"; + sha256 = "0p2a6pqgi25mh9q6v6scxwm73mbqvpvsvlm02vfad1vgflwwz6zq"; + name = "knewstuff-5.104.0.tar.xz"; }; }; knotifications = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/knotifications-5.103.0.tar.xz"; - sha256 = "0dnrm3idaz8nnwr2va88xcf9pgxx5jrcxng5n7n8yh030dmcsg4g"; - name = "knotifications-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/knotifications-5.104.0.tar.xz"; + sha256 = "060dqk7jarc8sx133n6chs04igv5f3ag7xxiqxr3xrvzx69h4vf7"; + name = "knotifications-5.104.0.tar.xz"; }; }; knotifyconfig = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/knotifyconfig-5.103.0.tar.xz"; - sha256 = "0z99s5ds619905dykw4ny8vsv2rkng6mw97kxma5padq2nspbfjs"; - name = "knotifyconfig-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/knotifyconfig-5.104.0.tar.xz"; + sha256 = "0a5f5n904c7gn739fs56qbyz8rw50rdd9ijwvsiamdvqcg3z58jd"; + name = "knotifyconfig-5.104.0.tar.xz"; }; }; kpackage = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kpackage-5.103.0.tar.xz"; - sha256 = "15cvd5hc8dzmvas803canqxq5b0azdi2mb2qa7yj7881bjz08nvb"; - name = "kpackage-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kpackage-5.104.0.tar.xz"; + sha256 = "1945l5fcxv3k791zgvp00d2bxwh2805vjjmrcngyzlvyprb8la77"; + name = "kpackage-5.104.0.tar.xz"; }; }; kparts = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kparts-5.103.0.tar.xz"; - sha256 = "0wdmjg7vmqb3z8sq0g7krf3c5kwp1kfaklfrp5spc8nbh722y3az"; - name = "kparts-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kparts-5.104.0.tar.xz"; + sha256 = "1k80wx8jk19add3v1bmp1065nczc0cwd6qycj6cnd428ri30d936"; + name = "kparts-5.104.0.tar.xz"; }; }; kpeople = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kpeople-5.103.0.tar.xz"; - sha256 = "0b1qg0cklwdalgal4vamlis3mn3vxv54spl9fv3nm36pz3ddxm8m"; - name = "kpeople-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kpeople-5.104.0.tar.xz"; + sha256 = "15kc5q54gq01wpyc94r59vxdrv02fngwapshq57adw7aqw8ya2w2"; + name = "kpeople-5.104.0.tar.xz"; }; }; kplotting = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kplotting-5.103.0.tar.xz"; - sha256 = "14kb103jrzy8x5w0k62p2wi8pwdvivvi3chhrh71rsq3h4k56ddv"; - name = "kplotting-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kplotting-5.104.0.tar.xz"; + sha256 = "029z4k76adhzyf7mbwhpilkrzpjj9cj7rz32fvpvl4h5m9q4ryax"; + name = "kplotting-5.104.0.tar.xz"; }; }; kpty = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kpty-5.103.0.tar.xz"; - sha256 = "0jgah1sn4rfdrwldlp0xdzxwhnwdhk68lfcxyigyq5zig29zirls"; - name = "kpty-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kpty-5.104.0.tar.xz"; + sha256 = "01jmxa80s4dv0a46f8hkfm4sdz59zq0fanq8bj9hpn45jcj2w9dz"; + name = "kpty-5.104.0.tar.xz"; }; }; kquickcharts = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kquickcharts-5.103.0.tar.xz"; - sha256 = "198xnsdf6iaiqqvz38q1fh72yc8cjycfndwngvwnzy8cplgqxbd8"; - name = "kquickcharts-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kquickcharts-5.104.0.tar.xz"; + sha256 = "09g3hjfmzpqflkc1winlavwrjy41zq3rbcndiy210g688n2i5l6r"; + name = "kquickcharts-5.104.0.tar.xz"; }; }; kross = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/portingAids/kross-5.103.0.tar.xz"; - sha256 = "03gw42lfjr6fl159vnlsppax4pklkxccrxmfjajr8xa3vwm8fqyq"; - name = "kross-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/portingAids/kross-5.104.0.tar.xz"; + sha256 = "04pyw1gy6swr86papghgi9l9gxc9qw5bwirrcxmw7ic6cga1ap3v"; + name = "kross-5.104.0.tar.xz"; }; }; krunner = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/krunner-5.103.0.tar.xz"; - sha256 = "0wna2p6flqg2xmky7j19ifwysrihnc738gzignygijlnz6jrxs05"; - name = "krunner-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/krunner-5.104.0.tar.xz"; + sha256 = "193q5hrcffxh99ms06qfrkmxc4h56qacgqfzimdq1smnwplnjwjs"; + name = "krunner-5.104.0.tar.xz"; }; }; kservice = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kservice-5.103.0.tar.xz"; - sha256 = "0f8axm47qk6x6l75mjvj879sfcndpyazx7wf16a6af1vklqkp86q"; - name = "kservice-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kservice-5.104.0.tar.xz"; + sha256 = "18yqi975nd5g6kfys23p28kchn6sp74x7fsagkwi0npa72bi0nr1"; + name = "kservice-5.104.0.tar.xz"; }; }; ktexteditor = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/ktexteditor-5.103.0.tar.xz"; - sha256 = "03z5xsxrk48whm976ci8w44s23fxr98bx86m2in9amfymcfnab32"; - name = "ktexteditor-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/ktexteditor-5.104.0.tar.xz"; + sha256 = "1rjizg18d3c2qs5jr9zr35c335sb8p6c8czqwyrrv4zhzdvivq9c"; + name = "ktexteditor-5.104.0.tar.xz"; }; }; ktextwidgets = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/ktextwidgets-5.103.0.tar.xz"; - sha256 = "1rxmd7chc2ld767bdkm1qmigbasxcjbif90vksf6d00vmsm2kq4m"; - name = "ktextwidgets-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/ktextwidgets-5.104.0.tar.xz"; + sha256 = "1skxw7i2wdjz5r5v93cqlj4ngr1l8lzjql6fl0ki4jx5x35jizj8"; + name = "ktextwidgets-5.104.0.tar.xz"; }; }; kunitconversion = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kunitconversion-5.103.0.tar.xz"; - sha256 = "0xxhzi4nq77941bcpx4833sk7p6fpigc21jzszy4400kzkjr3rzd"; - name = "kunitconversion-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kunitconversion-5.104.0.tar.xz"; + sha256 = "1a6p3rmyywjjpiap4k7bvqh1f2h3pgbccq5jz21s4swk06k8762h"; + name = "kunitconversion-5.104.0.tar.xz"; }; }; kwallet = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kwallet-5.103.0.tar.xz"; - sha256 = "0gzjzqpqpngk3syx802s8y8z0gmbzd09qmkrwrwfb0ssf9dyk5ra"; - name = "kwallet-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kwallet-5.104.0.tar.xz"; + sha256 = "1d9v786g6729j0nbaqi6hwkd16vcyxi5ggi7m6yp7rfayh5l4n30"; + name = "kwallet-5.104.0.tar.xz"; }; }; kwayland = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kwayland-5.103.0.tar.xz"; - sha256 = "1ad2697vymr0kw1zm9risy84izc402gma0ji1mhqcmrhfgn28807"; - name = "kwayland-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kwayland-5.104.0.tar.xz"; + sha256 = "0xp0py9z3jqh1lg03rqcrz919a5l3cxkp3fg9bpvmkc5iql61sq5"; + name = "kwayland-5.104.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kwidgetsaddons-5.103.0.tar.xz"; - sha256 = "0hb4ikk7i4b0nl2cmi2p8iw3n5v69i9lpd0452zzpl98idzcq22c"; - name = "kwidgetsaddons-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kwidgetsaddons-5.104.0.tar.xz"; + sha256 = "081i2awi4xx9wi576n123ivwkqhjf75811qd0z91mra3rm9bbfsa"; + name = "kwidgetsaddons-5.104.0.tar.xz"; }; }; kwindowsystem = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kwindowsystem-5.103.0.tar.xz"; - sha256 = "198kpz69zy7qzl4z69pxk06j2yf6z2zmg85i544i979rskpzhspc"; - name = "kwindowsystem-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kwindowsystem-5.104.0.tar.xz"; + sha256 = "06pqda7f6ccyhiakw8y8d60iz09hkn9784xadgyjszdv9qsyw43b"; + name = "kwindowsystem-5.104.0.tar.xz"; }; }; kxmlgui = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/kxmlgui-5.103.0.tar.xz"; - sha256 = "0134n806z7d2qy2wijg8mzwl6xv0dwjkz0yym58vafgh6l085pv0"; - name = "kxmlgui-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/kxmlgui-5.104.0.tar.xz"; + sha256 = "1rlkghydps36223clfp0xqd3apnqqwkhqwp4q6bh3jmk25a5lpgl"; + name = "kxmlgui-5.104.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/portingAids/kxmlrpcclient-5.103.0.tar.xz"; - sha256 = "14vnhm1kllcgpgrcjbf14hmzw4bi63k93fixkskfbb6gkh0ikxz7"; - name = "kxmlrpcclient-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/portingAids/kxmlrpcclient-5.104.0.tar.xz"; + sha256 = "1df3pr2ai1xqc9b5byy19gxy6sav08sykazks5mdcyy5v1zsraci"; + name = "kxmlrpcclient-5.104.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/modemmanager-qt-5.103.0.tar.xz"; - sha256 = "0p744iw9b8x4lkcmkncm7mfs2yvg9j95n3as6bmvqhfwyx4p3c88"; - name = "modemmanager-qt-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/modemmanager-qt-5.104.0.tar.xz"; + sha256 = "0v9bk5p6j47nps0walsbh1f71nm8vm3j7p7hf9klfdjxjbc8rzkv"; + name = "modemmanager-qt-5.104.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/networkmanager-qt-5.103.0.tar.xz"; - sha256 = "1ki1n0qm54fzdy8qc4mvb850h9jf1hpfx02zw8qwxx4a15by7jhx"; - name = "networkmanager-qt-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/networkmanager-qt-5.104.0.tar.xz"; + sha256 = "1263l7i2yh2nsmmcfn7qgmhj1zpwvmykxj2zhrqcwx7mxg7xfaqa"; + name = "networkmanager-qt-5.104.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/oxygen-icons5-5.103.0.tar.xz"; - sha256 = "134nhzackrqalb4dwlf9h75xx1zxmdfa08m91fp7msqis62bwzrq"; - name = "oxygen-icons5-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/oxygen-icons5-5.104.0.tar.xz"; + sha256 = "1s66m4vd7r2b4wf1zw7w84za7v56hilfcww7mxwkzcc8nf4iwpq5"; + name = "oxygen-icons5-5.104.0.tar.xz"; }; }; plasma-framework = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/plasma-framework-5.103.0.tar.xz"; - sha256 = "1qca3r1sg0xximb5z6sdr6fxvyrfdcsjy3gv9ynj5fzqwk6cxcx0"; - name = "plasma-framework-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/plasma-framework-5.104.0.tar.xz"; + sha256 = "0ny5h2jirwdvvfvwr9ak8ri0fq4482wbi9sfkffhfh603lgdafzs"; + name = "plasma-framework-5.104.0.tar.xz"; }; }; prison = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/prison-5.103.0.tar.xz"; - sha256 = "127jn03kc78p3r0y0h0ga0fm7csq3dmg59msnapfchf0z81gkia4"; - name = "prison-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/prison-5.104.0.tar.xz"; + sha256 = "1f7nh433p1ww1vx9pbr9v9w2hg4hkbhah215afnslfxazcxsr09c"; + name = "prison-5.104.0.tar.xz"; }; }; purpose = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/purpose-5.103.0.tar.xz"; - sha256 = "0ah0vfpk96snpavjsazv2h2cym2i0pp0hnkfydl1840h6kybs27k"; - name = "purpose-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/purpose-5.104.0.tar.xz"; + sha256 = "1h9f7znx0azhwc6ajnj2x7gqxkd0qcz5kcfwwx80yx6if07rlvh8"; + name = "purpose-5.104.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/qqc2-desktop-style-5.103.0.tar.xz"; - sha256 = "1998nwbkv9pqxkpdrmnl2a0ljg1490nfw23i7h9y5xg6m46bm3pi"; - name = "qqc2-desktop-style-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/qqc2-desktop-style-5.104.0.tar.xz"; + sha256 = "1g7yqjg1dxgygb3nryb61648frlyd1h75yrmq78dvdc51agywwls"; + name = "qqc2-desktop-style-5.104.0.tar.xz"; }; }; solid = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/solid-5.103.0.tar.xz"; - sha256 = "0i6kwd2gsmikqnnl4wlhpbvws3z23s836yyzpz98vlf9rxxhhrz0"; - name = "solid-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/solid-5.104.0.tar.xz"; + sha256 = "1ks3q4wfrnw7ppsja75qwjsfwdm7h5vbv4lnbg1zxjmlf6y376ia"; + name = "solid-5.104.0.tar.xz"; }; }; sonnet = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/sonnet-5.103.0.tar.xz"; - sha256 = "0kryq5icfqhyvavyxbbiv237gckk6cqay0iyh29snr20d0h2yf4k"; - name = "sonnet-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/sonnet-5.104.0.tar.xz"; + sha256 = "0lxrq3jjs1wl7j1gpj1zxs8jygqlscsv2vbr8n3jzb7ly18nw9qp"; + name = "sonnet-5.104.0.tar.xz"; }; }; syndication = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/syndication-5.103.0.tar.xz"; - sha256 = "107nfbh4kcwgnw46sfyb6vrr9gvpgi44rgh9s9vpmwrcvh388nng"; - name = "syndication-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/syndication-5.104.0.tar.xz"; + sha256 = "0ldz4ln4ibia09zjvvkwl9jijyd8hsf8wj65yh5iypa9qc7ddccb"; + name = "syndication-5.104.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/syntax-highlighting-5.103.0.tar.xz"; - sha256 = "081nkc00ii78bj5hy88bd46w1ma4ckgg25w8xh3q6gqq4nnqy6a9"; - name = "syntax-highlighting-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/syntax-highlighting-5.104.0.tar.xz"; + sha256 = "0ifdjmirp5qw6ggw7xwygz8ayl0c5vkiy4qa0gc93nq4ky20i382"; + name = "syntax-highlighting-5.104.0.tar.xz"; }; }; threadweaver = { - version = "5.103.0"; + version = "5.104.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.103/threadweaver-5.103.0.tar.xz"; - sha256 = "10pc8wx53yrizbh5nzqd5s7ly2qpiha5l1dbz5m8nxbli6hm7g19"; - name = "threadweaver-5.103.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.104/threadweaver-5.104.0.tar.xz"; + sha256 = "0ix616k2527y5wmzykdf2v6h16jk2frgspjqxc308y6gy3yyqgcn"; + name = "threadweaver-5.104.0.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/keystone/default.nix b/third_party/nixpkgs/pkgs/development/libraries/keystone/default.nix index 0bb979f7a5..278385a1fd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/keystone/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/keystone/default.nix @@ -3,6 +3,7 @@ , pkg-config , cmake , python3 +, fixDarwinDylibNames }: stdenv.mkDerivation rec { @@ -25,6 +26,9 @@ stdenv.mkDerivation rec { pkg-config cmake python3 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # TODO: could be replaced by setting CMAKE_INSTALL_NAME_DIR? + fixDarwinDylibNames ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix b/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix index d30dcb4492..455be6497d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix @@ -1,14 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, addOpenGLRunpath, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, addOpenGLRunpath +, cmake +}: stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.9.4"; + version = "1.9.9"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; - rev = "v${version}"; - sha256 = "sha256-4AQnMMKo4BvajfhhKmhTZA0snKPnO4WjOuZAeiWU5PY="; + rev = "refs/tags/v${version}"; + hash = "sha256-zzlecBk7Mi3Nhj4eIAp81pq7+lIiKpvEaNeXuJKDPII="; }; nativeBuildInputs = [ cmake addOpenGLRunpath ]; @@ -20,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "oneAPI Level Zero Specification Headers and Loader"; homepage = "https://github.com/oneapi-src/level-zero"; + changelog = "https://github.com/oneapi-src/level-zero/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = [ maintainers.ziguana ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix index 9bee726e50..5129637c80 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "libaom"; - version = "3.5.0"; + version = "3.6.0"; src = fetchzip { url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; - sha256 = "sha256-kEU8DVgB4JoyB6Lbh/XfC3LZcsVEM2STkZV8iZBCNis="; + sha256 = "sha256-tt19UCsZP99rq6BYBSzSHecyIu4CiimD+P1f3CY2QEU="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix index 7ed461516c..84c3eb39ef 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix @@ -10,11 +10,11 @@ assert fontconfigSupport -> fontconfig != null; stdenv.mkDerivation rec { pname = "libass"; - version = "0.16.0"; + version = "0.17.1"; src = fetchurl { url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Xb3p4iM5EZz47tWe6mxiOgdG71qQtonmigkBCQeOPAg="; + sha256 = "sha256-8NoLv7pHbBauPhz9hiJW0wkVkR96uqGxbOYu5lMZJ4Q="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libax25/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libax25/default.nix index 7388a728f5..27f5190990 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libax25/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libax25/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "libax25"; version = "0.0.12-rc5"; - buildInputs = [ glibc ] ++ lib.optional stdenv.hostPlatform.isStatic [ glibc.static ]; + buildInputs = [ glibc ] ++ lib.optionals stdenv.hostPlatform.isStatic [ glibc.static ]; # Due to recent unsolvable administrative domain problems with linux-ax25.org, # the new domain is linux-ax25.in-berlin.de diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdatovka/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdatovka/default.nix index 8cddc9a9f3..a6744c23e1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdatovka/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdatovka/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { "--with-docbook-xsl-stylesheets=${docbook_xsl}/xml/xsl/docbook" ]; - buildInputs = [ pkg-config autoreconfHook expat gpgme libgcrypt libxml2 libxslt gnutls curl docbook_xsl ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = [ expat gpgme libgcrypt libxml2 libxslt gnutls curl docbook_xsl ]; meta = with lib; { description = "Client library for accessing SOAP services of Czech government-provided Databox infomation system"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix index b34282dd37..e3f9d82d1a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.114"; + version = "2.4.115"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-MEnPhDpH0S5e7vvDvjSW14L6CfQjRr8Lfe/j0eWY0CY="; + sha256 = "sha256-VUz7/gVCvds5G04+Bb+7/D4oK5Vb1WIY0hwGFkgfZes="; }; outputs = [ "out" "dev" "bin" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix index 1ad19d425d..1c3a5e31de 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = lib.optionals enableOpx [ libuuid numactl ] ++ lib.optional enablePsm2 [ libpsm2 ]; + buildInputs = lib.optionals enableOpx [ libuuid numactl ] ++ lib.optionals enablePsm2 [ libpsm2 ]; configureFlags = [ (if enablePsm2 then "--enable-psm2=${libpsm2}" else "--disable-psm2") diff --git a/third_party/nixpkgs/pkgs/development/libraries/libffi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libffi/default.nix index 2031f175ea..681f9cbfb2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libffi/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { preCheck = '' # The tests use -O0 which is not compatible with -D_FORTIFY_SOURCE. + NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify3/} NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/} ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfido2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfido2/default.nix index 92e907024f..6904177567 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfido2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfido2/default.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { pname = "libfido2"; - version = "1.12.0"; + version = "1.13.0"; # releases on https://developers.yubico.com/libfido2/Releases/ are signed src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-gT1tJRFhQ9FtLpZ5FxinSCXaFrd0qNCT2W8Grhcw2cU="; + sha256 = "sha256-UdQ3J+KhxFRMf9DuR3hvRD458TiK2nNaUJrUrwokWco="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgbinder/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgbinder/default.nix index 69166ab33f..054dc08470 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgbinder/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgbinder/default.nix @@ -22,6 +22,13 @@ stdenv.mkDerivation rec { libglibutil ]; + postPatch = '' + # Fix pkg-config and ranlib names for cross-compilation + substituteInPlace Makefile \ + --replace "pkg-config" "$PKG_CONFIG" \ + --replace "ranlib" "$RANLIB" + ''; + makeFlags = [ "LIBDIR=$(out)/lib" "INSTALL_INCLUDE_DIR=$(dev)/include/gbinder" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgit2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgit2/default.nix index e6808b47ab..c560b55a15 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgit2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgit2/default.nix @@ -12,18 +12,21 @@ , libiconv , Security , staticBuild ? stdenv.hostPlatform.isStatic +# for passthru.tests +, libgit2-glib +, python3Packages }: stdenv.mkDerivation rec { pname = "libgit2"; - version = "1.5.1"; - # also check the following packages for updates: python3.pkgs.pygit2 and libgit2-glib + version = "1.6.2"; + # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "sha256-KzBMwpqn6wUFhgB3KDclBS0BvZSVcasM5AG/y+L91xM="; + hash = "sha256-XmGlh0iehQIufAPpndSkYy4EQ8vG0I6MGB+jQQpCe9k="; }; cmakeFlags = [ @@ -41,6 +44,11 @@ stdenv.mkDerivation rec { doCheck = false; # hangs. or very expensive? + passthru.tests = { + inherit libgit2-glib; + inherit (python3Packages) pygit2; + }; + meta = with lib; { description = "Linkable library implementation of Git that you can use in your application"; homepage = "https://libgit2.org/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libglibutil/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libglibutil/default.nix index 730ebf2704..50ee2d289f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libglibutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libglibutil/default.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation rec { glib ]; + postPatch = '' + # Fix pkg-config name for cross-compilation + substituteInPlace Makefile --replace "pkg-config" "$PKG_CONFIG" + ''; + makeFlags = [ "LIBDIR=$(out)/lib" "INSTALL_INCLUDE_DIR=$(dev)/include/gutil" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix index 5d008f394e..2257e3405e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "libheif"; - version = "1.14.2"; + version = "1.15.1"; outputs = [ "bin" "out" "dev" "man" ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - sha256 = "sha256-JwPeSNUc++z6RfMe0qAuXdekzLWR/MCmsT+Ykvp9a/s="; + sha256 = "sha256-5908S46hEXhCYcTsqulmUnat0KOlXsnY5LI/l1l7/1Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix index f85181d376..2cb8642ca8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix @@ -1,7 +1,8 @@ { lib , stdenv , fetchFromGitHub -, buildPackages +, pkgsBuildBuild +, pkgsBuildHost , cmake , glib , icu @@ -13,6 +14,7 @@ , python3 , tzdata , fixDarwinDylibNames +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable pkgsBuildHost , gobject-introspection , vala }: @@ -31,20 +33,24 @@ stdenv.mkDerivation rec { }; strictDeps = true; + + depsBuildBuild = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # provides ical-glib-src-generator that runs during build + libical + ]; + nativeBuildInputs = [ cmake ninja perl pkg-config + ] ++ lib.optionals withIntrospection [ gobject-introspection vala # Docs building fails: # https://github.com/NixOS/nixpkgs/pull/67204 # previously with https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489 # gtk-doc docbook_xsl docbook_xml_dtd_43 # for docs - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # provides ical-glib-src-generator that runs during build - libical ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; @@ -63,10 +69,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_GTK_DOC=False" - "-DGOBJECT_INTROSPECTION=True" - "-DICAL_GLIB_VAPI=True" + "-DGOBJECT_INTROSPECTION=${if withIntrospection then "True" else "False"}" + "-DICAL_GLIB_VAPI=${if withIntrospection then "True" else "False"}" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DIMPORT_ICAL_GLIB_SRC_GENERATOR=${lib.getDev buildPackages.libical}/lib/cmake/LibIcal/IcalGlibSrcGenerator.cmake" + "-DIMPORT_ICAL_GLIB_SRC_GENERATOR=${lib.getDev pkgsBuildBuild.libical}/lib/cmake/LibIcal/IcalGlibSrcGenerator.cmake" ]; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libidn2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libidn2/default.nix index 9d7babd01d..d76f304881 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libidn2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libidn2/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "2.3.2"; src = fetchurl { - url = "mirror://gnu/gnu/libidn/${pname}-${version}.tar.gz"; + url = "mirror://gnu/libidn/${pname}-${version}.tar.gz"; sha256 = "sha256-dpQM1Od46Ak1eanRlbJf/16Tbp3GJCBoUotDenZ2T5E="; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libime/default.nix index 1e076389a0..a128975652 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libime/default.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation rec { pname = "libime"; - version = "1.0.15"; + version = "1.0.17"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - sha256 = "sha256-QZxXhrrSkxe7bDY7V7Ns5YZaaYJiEnGmHgGLstGMBzc="; + sha256 = "sha256-mc0Mknqki0pY4oKf8B6H67N+1eMu7wbqF7wES22Kw1A="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix index 700223cd1a..7dc0ae5b8c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix @@ -1,5 +1,4 @@ { stdenv, lib, fetchFromGitHub -, fetchpatch , brotli , cmake , giflib @@ -21,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libjxl"; - version = "0.7.0"; + version = "0.8.1"; outputs = [ "out" "dev" ]; @@ -29,20 +28,11 @@ stdenv.mkDerivation rec { owner = "libjxl"; repo = "libjxl"; rev = "v${version}"; - sha256 = "sha256-9DBLQ/gMyy2ZUm7PCWYJ7XOzkgQM0cAewJZzMNo8UPs="; + hash = "sha256-WWuvUTMrlR6ePbEs01ulLnuMiUqGrh4qELWFh0QMaGU="; # There are various submodules in `third_party/`. fetchSubmodules = true; }; - patches = [ - # present in master - (fetchpatch { - name = "fix-test-failure-on-ia64-ppc64-riscv64"; - url = "https://github.com/libjxl/libjxl/commit/bb8eac5d6acec223e44cf8cc72ae02f0816de311.patch"; - hash = "sha256-DuUCStWEquhWo7bOss0RgZ7ouYE4FpWrIMFywYR424s="; - }) - ]; - nativeBuildInputs = [ cmake gtest @@ -99,6 +89,9 @@ stdenv.mkDerivation rec { # Use our version of highway, though it is still statically linked in "-DJPEGXL_FORCE_SYSTEM_HWY=ON" + # Use our version of gtest + "-DJPEGXL_FORCE_SYSTEM_GTEST=ON" + # TODO: Update this package to enable this (overridably via an option): # Viewer tools for evaluation. # "-DJPEGXL_ENABLE_VIEWERS=ON" diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblc3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblc3/default.nix index d0d95fd47d..13ef2169e3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblc3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblc3/default.nix @@ -7,7 +7,7 @@ let name = "liblc3"; - version = "1.0.1"; + version = "1.0.2"; in stdenv.mkDerivation { pname = name; @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "google"; repo = "liblc3"; rev = "v${version}"; - sha256 = "sha256-W0pCfFmM+6N6+HdGdQ/GBNHjBspkwtlxZC2m2noKGx0="; + sha256 = "sha256-Be+dPUnxC2+cHzqL2FAqXOU7NjEAHiPBKh7spuYkvhc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libliftoff/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libliftoff/default.nix index fa0bc6d3d9..e143473550 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libliftoff/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libliftoff/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libliftoff"; - version = "0.3.0"; + version = "0.4.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MbXDUkAA9gY6Qb6Ok33MNuqIfb4bPIEHd1IVH/UmH10="; + sha256 = "sha256-NPwhsd6IOQ0XxNQQNdaaM4kmwoLftokV86WYhoa5csY="; }; nativeBuildInputs = [ meson pkg-config ninja ]; @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/emersion/libliftoff/releases/tag/v${version}"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ pedrohlc primeos Scrumplex ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix index b9b6121446..a1ef6b72ee 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix @@ -11,9 +11,9 @@ , perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liblouis"; - version = "3.24.0"; + version = "3.25.0"; outputs = [ "out" "dev" "info" "doc" ] # configure: WARNING: cannot generate manual pages while cross compiling @@ -22,10 +22,11 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; - rev = "v${version}"; - sha256 = "sha256-QSrCQhP3t+WPyBQPLJbZEaDCjXD8Lo6IAGKHsbL2S1o="; + rev = "v${finalAttrs.version}"; + hash = "sha256-On5PbBgvDAeD41oGb5EKBtKvi/VXnLsVrTMX7tcwnq4="; }; + strictDeps = true; nativeBuildInputs = [ autoreconfHook pkg-config @@ -39,7 +40,9 @@ stdenv.mkDerivation rec { buildInputs = [ # lou_checkYaml libyaml - # maketable.d + ]; + + nativeCheckInputs = [ perl ]; @@ -63,7 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open-source braille translator and back-translator"; - homepage = "https://liblouis.org/"; + homepage = "https://liblouis.io/"; license = with licenses; [ lgpl21Plus # library gpl3Plus # tools @@ -71,4 +74,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix index 7629dd8a6f..0bc649780c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix @@ -6,6 +6,8 @@ , pkg-config , vala , gobject-introspection +, buildPackages +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libmanette"; version = "0.2.6"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; @@ -30,23 +32,29 @@ stdenv.mkDerivation rec { meson ninja pkg-config + glib + ] ++ lib.optionals withIntrospection [ vala gobject-introspection gtk-doc docbook-xsl-nons docbook_xml_dtd_43 - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + ] ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ]; buildInputs = [ glib - libgudev libevdev + ] ++ lib.optionals withIntrospection [ + libgudev ]; mesonFlags = [ - "-Ddoc=true" + (lib.mesonBool "doc" withIntrospection) + (lib.mesonEnable "gudev" withIntrospection) + (lib.mesonBool "introspection" withIntrospection) + (lib.mesonBool "vapi" withIntrospection) ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix index f9f15b6839..55bfc17239 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix @@ -9,7 +9,8 @@ , help2man , systemd , bash-completion -, withIntrospection ? stdenv.hostPlatform == stdenv.buildPlatform +, buildPackages +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages , gobject-introspection }: diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnotify/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnotify/default.nix index e047b34fa8..1238b91920 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnotify/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnotify/default.nix @@ -8,7 +8,8 @@ , glib , gdk-pixbuf , gnome -, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform) +, buildPackages +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages , gobject-introspection }: diff --git a/third_party/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix index 3cfec00b13..694625c8af 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +}: stdenv.mkDerivation rec { pname = "libomxil-bellagio"; @@ -15,6 +18,12 @@ stdenv.mkDerivation rec { patches = [ ./fedora-fixes.patch ./fno-common.patch + # Fix stack overread: https://sourceforge.net/p/omxil/patches/8/ + (fetchurl { + name = "no-overread.patch"; + url = "https://sourceforge.net/p/omxil/patches/8/attachment/0001-src-base-omx_base_component.c-fix-stack-overread.patch"; + hash = "sha256-ElpiDxU0Ii4Ou8ebVx4Ne9UnB6mesC8cRj77N7LdovA="; + }) ]; # Disable parallel build as it fails as: diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpipeline/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpipeline/default.nix index f682d394c1..3630980353 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpipeline/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpipeline/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libpipeline"; - version = "1.5.6"; + version = "1.5.7"; src = fetchurl { url = "mirror://savannah/libpipeline/libpipeline-${version}.tar.gz"; - sha256 = "sha256-YPu559w5hSjl86d2r1e7KMo/5dnwzYqWGsbOv+bpt5c="; + sha256 = "sha256-uLRRlJiQIqeewTF/ZKKnWxVRsqVb6gb2dwTLKi5GkLA="; }; patches = lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix index 754ac2097b..3b56ab079b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3Packages.Mako + python3Packages.mako ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/librclone/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librclone/default.nix new file mode 100644 index 0000000000..dbf46ab398 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/librclone/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, buildGoModule +, rclone +}: + +let + ext = stdenv.hostPlatform.extensions.sharedLibrary; +in buildGoModule rec { + pname = "librclone"; + inherit (rclone) version src vendorSha256; + + buildPhase = '' + runHook preBuild + cd librclone + go build --buildmode=c-shared -o librclone${ext} github.com/rclone/rclone/librclone + runHook postBuildd + ''; + + installPhase = '' + runHook preInstall + install -Dt $out/lib librclone${ext} + install -Dt $out/include librclone.h + runHook postInstall + ''; + + meta = { + description = "Rclone as a C library"; + homepage = "https://github.com/rclone/rclone/tree/master/librclone"; + maintainers = with lib.maintainers; [ dotlambda ]; + inherit (rclone.meta) license platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix index a78bf86a18..57ed620fbf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix @@ -20,7 +20,9 @@ , python3Packages , gnome , vala -, withIntrospection ? stdenv.hostPlatform == stdenv.buildPlatform +, writeScript +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, buildPackages , gobject-introspection , _experimental-update-script-combinators , common-updater-scripts @@ -71,6 +73,7 @@ stdenv.mkDerivation rec { bzip2 pango libintl + vala # for share/vala/Makefile.vapigen ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Foundation @@ -93,6 +96,15 @@ stdenv.mkDerivation rec { doCheck = false; # all tests fail on libtool-generated rsvg-convert not being able to find coreutils + GDK_PIXBUF_QUERYLOADERS = writeScript "gdk-pixbuf-loader-loaders-wrapped" '' + ${lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (stdenv.hostPlatform.emulator buildPackages)} ${lib.getDev gdk-pixbuf}/bin/gdk-pixbuf-query-loaders + ''; + + preConfigure = '' + PKG_CONFIG_VAPIGEN_VAPIGEN="$(type -p vapigen)" + export PKG_CONFIG_VAPIGEN_VAPIGEN + ''; + # It wants to add loaders and update the loaders.cache in gdk-pixbuf # Patching the Makefiles to it creates rsvg specific loaders and the # relevant loader.cache here. @@ -114,10 +126,14 @@ stdenv.mkDerivation rec { # 'error: linker `cc` not found' when cross-compiling export RUSTFLAGS="-Clinker=$CC" + '' + lib.optionalString ((stdenv.buildPlatform != stdenv.hostPlatform) && (stdenv.hostPlatform.emulatorAvailable buildPackages)) '' + # the replacement is the native conditional + substituteInPlace gdk-pixbuf-loader/Makefile \ + --replace 'RUN_QUERY_LOADER_TEST = false' 'RUN_QUERY_LOADER_TEST = test -z "$(DESTDIR)"' \ ''; # Not generated when cross compiling. - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' # Merge gdkpixbuf and librsvg loaders cat ${lib.getLib gdk-pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix index 4a2ad99af4..607f038b88 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix @@ -12,6 +12,8 @@ , docbook_xml_dtd_42 , libgcrypt , gobject-introspection +, buildPackages +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages , vala , gi-docgen , gnome @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { pname = "libsecret"; version = "0.20.5"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; @@ -44,10 +46,11 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_42 libintl - gobject-introspection vala - gi-docgen glib + ] ++ lib.optionals withIntrospection [ + gi-docgen + gobject-introspection ]; buildInputs = [ @@ -66,7 +69,12 @@ stdenv.mkDerivation rec { gjs ]; - doCheck = stdenv.isLinux; + mesonFlags = [ + (lib.mesonBool "introspection" withIntrospection) + (lib.mesonBool "gtk_doc" withIntrospection) + ]; + + doCheck = stdenv.isLinux && withIntrospection; postPatch = '' patchShebangs ./tool/test-*.sh diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix index 62abb162b0..2ea9978ed4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix @@ -9,7 +9,9 @@ , libsysprof-capture , sqlite , glib-networking +, buildPackages , gobject-introspection +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages , vala , libpsl , python3 @@ -22,7 +24,7 @@ stdenv.mkDerivation rec { pname = "libsoup"; version = "3.2.2"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; @@ -39,6 +41,7 @@ stdenv.mkDerivation rec { pkg-config glib python3 + ] ++ lib.optionals withIntrospection [ gi-docgen gobject-introspection vala @@ -61,15 +64,16 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency "-Dgssapi=disabled" - "-Dvapi=enabled" - "-Dintrospection=enabled" "-Dntlm=disabled" # Requires wstest from autobahn-testsuite. "-Dautobahn=disabled" # Requires gnutls, not added for closure size. "-Dpkcs11_tests=disabled" - ] ++ lib.optionals (!stdenv.isLinux) [ - "-Dsysprof=disabled" + + (lib.mesonEnable "docs" withIntrospection) + (lib.mesonEnable "introspection" withIntrospection) + (lib.mesonEnable "sysprof" stdenv.isLinux) + (lib.mesonEnable "vapi" withIntrospection) ]; # TODO: For some reason the pkg-config setup hook does not pick this up. diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix index 05bf4b1552..df9ce5c5b6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix @@ -15,6 +15,8 @@ , gnomeSupport ? true , sqlite , glib-networking +, buildPackages +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages }: stdenv.mkDerivation rec { @@ -37,6 +39,7 @@ stdenv.mkDerivation rec { ninja pkg-config glib + ] ++ lib.optionals withIntrospection [ gobject-introspection vala ]; @@ -58,6 +61,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency "-Dgssapi=disabled" + "-Dvapi=${if withIntrospection then "enabled" else "disabled"}" + "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" "-Dgnome=${lib.boolToString gnomeSupport}" "-Dntlm=disabled" ] ++ lib.optionals (!stdenv.isLinux) [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix index f2147632eb..b88bb75748 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix @@ -44,6 +44,27 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/libtiff/libtiff/-/commit/d1b6b9c1b3cae2d9e37754506c1ad8f4f7b646b5.diff"; sha256 = "sha256-FWUlyJyHXac6fuM5f9PG33kcF5Bm4fyFmYnaDal46iM="; }) + (fetchpatch { + name = "CVE-2023-0800.CVE-2023-0801.CVE-2023-0802.CVE-2023-0803.CVE-2023-0804.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/33aee1275d9d1384791d2206776eb8152d397f00.patch"; + sha256 = "sha256-wNSa1D9EWObTs331utjIKgo9p9PUWqTM54qG+1Hhm1A="; + }) + (fetchpatch { + name = "CVE-2023-0795.CVE-2023-0796.CVE-2023-0797.CVE-2023-0798.CVE-2023-0799.prerequisite-0.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/9c22495e5eeeae9e00a1596720c969656bb8d678.patch"; + sha256 = "sha256-NTs+dCUweKddQDzJLqbdIdvNbaSweGG0cSVt57tntoI="; + }) + (fetchpatch { + name = "CVE-2023-0795.CVE-2023-0796.CVE-2023-0797.CVE-2023-0798.CVE-2023-0799.prerequisite-1.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/d63de61b1ec3385f6383ef9a1f453e4b8b11d536.patch"; + includes = [ "tools/tiffcrop.c" ]; + sha256 = "sha256-VHg5aAcHKwRkDFDyC1rLjCjj1rMzcq/2SUR/r1fQubQ="; + }) + (fetchpatch { + name = "CVE-2023-0795.CVE-2023-0796.CVE-2023-0797.CVE-2023-0798.CVE-2023-0799.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/afaabc3e50d4e5d80a94143f7e3c997e7e410f68.patch"; + sha256 = "sha256-9+oXKVJEeaIuMBdtvhNlUBNpw9uzg31s+zxt4GJo6Lo="; + }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiger/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtiger/default.nix index 60dee56e6a..7876c23bcc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtiger/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtiger/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, libkate, pango, cairo, pkg-config, darwin }: +{ stdenv, lib, fetchurl, autoreconfHook, pkg-config +, libkate, pango, cairo, darwin +}: stdenv.mkDerivation rec { pname = "libtiger"; @@ -9,7 +11,15 @@ stdenv.mkDerivation rec { sha256 = "0rj1bmr9kngrgbxrjbn4f4f9pww0wmf6viflinq7ava7zdav4hkk"; }; - nativeBuildInputs = [ pkg-config ]; + patches = [ + ./pkg-config.patch + ]; + + postPatch = '' + substituteInPlace configure.ac --replace "-Werror" "-Wno-error" + ''; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libkate pango cairo ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.ApplicationServices; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiger/pkg-config.patch b/third_party/nixpkgs/pkgs/development/libraries/libtiger/pkg-config.patch new file mode 100644 index 0000000000..68c8925446 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libtiger/pkg-config.patch @@ -0,0 +1,37 @@ +From 3ebeb0932edc01b7768216dc7d3b3c5aac21fba0 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Sun, 26 Feb 2023 17:21:48 +0000 +Subject: [PATCH] configure.ac: detect pkg-config properly + +When cross compiling, the relevant pkg-config program might be prefixed +with the name of the host platform, so the previous check was not +correct. Detect pkg-config properly, using the appropriate macro. +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2f63684..bf2faf7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -46,7 +46,7 @@ AC_CHECK_FUNCS([select nanosleep usleep]) + + AC_TYPE_SIZE_T + +-AC_CHECK_PROG(HAVE_PKG_CONFIG,pkg-config,yes) ++PKG_PROG_PKG_CONFIG + + AC_ARG_ENABLE(doc, [ --disable-doc Disable building documentation (default enabled)]) + if test "x$enable_doc" != "xno" +@@ -57,7 +57,7 @@ else + fi + AM_CONDITIONAL(HAVE_DOXYGEN,test "${HAVE_DOXYGEN}" = "yes") + +-if test "x$HAVE_PKG_CONFIG" = "xyes" ++if test "x$PKG_CONFIG" != "x" + then + PKG_CHECK_MODULES(KATE,kate >= 0.2.0) + PKG_CHECK_MODULES(PANGOCAIRO,pangocairo >= 1.16) +-- +2.37.1 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunistring/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libunistring/default.nix index 8c899268f7..51eb5558d6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libunistring/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libunistring/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "libunistring"; - version = "1.0"; + version = "1.1"; src = fetchurl { url = "mirror://gnu/libunistring/${pname}-${version}.tar.gz"; - sha256 = "sha256-PAGEwOSS18IIzjHSXdHSxY8MPtbLvgMsWySM3a0xhUQ="; + sha256 = "sha256-oiUr7uyDCsREufaNazitiD2xmRnbNbUiIs+CfDhb22o="; }; outputs = [ "out" "dev" "info" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix index ccf41038cc..f1a9fbe9b2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix @@ -10,7 +10,8 @@ , libcap_ng , libvirt , libxml2 -, withIntrospection ? stdenv.hostPlatform == stdenv.buildPlatform +, buildPackages +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages , gobject-introspection , withDocs ? stdenv.hostPlatform == stdenv.buildPlatform , gtk-doc diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvpx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvpx/default.nix index 1d791aec6f..2a77677680 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvpx/default.nix @@ -75,13 +75,13 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; stdenv.mkDerivation rec { pname = "libvpx"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "webmproject"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9SFFE2GfYYMgxp1dpmL3STTU2ea1R5vFKA1L0pZwIvQ="; + sha256 = "sha256-IH+ZWbBUlU5fbciYe+dNGnTFFCte2BXxAlLcvmzdAeY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix index dbc5008a1a..f14bbb3b31 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix @@ -8,6 +8,7 @@ , udev , libgudev , python3 +, valgrind }: stdenv.mkDerivation rec { @@ -23,6 +24,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-9zqW6zPrFcxv/yAAtFgdVavKVMXeDBoMP3E/XriUcT0="; }; + postPatch = '' + patchShebangs test/check-files-in-git.sh + ''; + nativeBuildInputs = [ pkg-config meson @@ -36,13 +41,24 @@ stdenv.mkDerivation rec { libgudev ]; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + mesonFlags = [ - "-Dtests=disabled" + "-Dtests=${if doCheck then "enabled" else "disabled"}" ]; + nativeCheckInputs = [ + valgrind + ] ++ (with python3.pkgs; [ + libevdev + pytest + pyudev + ]); + meta = with lib; { platforms = platforms.linux; homepage = "https://linuxwacom.github.io/"; + changelog = "https://github.com/linuxwacom/libwacom/blob/${src.rev}/NEWS"; description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux"; maintainers = teams.freedesktop.members; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lightning/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lightning/default.nix index 8398c80d50..f8d7ee2e65 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lightning/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lightning/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "lightning"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { url = "mirror://gnu/lightning/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - hash = "sha256-TjmE/xzPC6MKmFIR1A/FwGsl8BTr3z2A0P49DIDdfA4="; + hash = "sha256-mGcWgdVoR3DMsGoH+juPAypFS9tW6vwY5vqwRFnqPKo="; }; nativeCheckInputs = [ libopcodes ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lmdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lmdb/default.nix index a8b5da5b56..dbc15f11c3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lmdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lmdb/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "lmdb"; - version = "0.9.29"; + version = "0.9.30"; src = fetchFromGitLab { domain = "git.openldap.org"; owner = "openldap"; repo = "openldap"; rev = "LMDB_${version}"; - sha256 = "19zq5s1amrv1fhw1aszcn2w2xjrk080l6jj5hc9f46yiqf98jjg3"; + sha256 = "sha256-zLa9BtSPzujHAIZKDl69lTo72cI3m/GZejFw5v8bFsg="; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix index c0252eb923..83643e423f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -88,7 +88,7 @@ let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "22.3.5"; + version = "22.3.7"; branch = lib.versions.major version; withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm; @@ -120,7 +120,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 = "3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9"; + hash = "sha256-iUzi9KHC52F3zdIoRiAZLQ2jBmskPuwvux18838TBCw="; }; # TODO: @@ -227,7 +227,7 @@ self = stdenv.mkDerivation { nativeBuildInputs = [ meson pkg-config ninja intltool bison flex file - python3Packages.python python3Packages.Mako python3Packages.ply + python3Packages.python python3Packages.mako python3Packages.ply jdupes glslang ] ++ lib.optional haveWayland wayland-scanner; diff --git a/third_party/nixpkgs/pkgs/development/libraries/migraphx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/migraphx/default.nix index 15581e00e5..fc4ccec94a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/migraphx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/migraphx/default.nix @@ -46,7 +46,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "migraphx"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" diff --git a/third_party/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix b/third_party/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix index 5f7dc56ed7..4fc4974b01 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix @@ -14,30 +14,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizip-ng"; - version = "3.0.7"; + version = "3.0.8"; src = fetchFromGitHub { owner = "zlib-ng"; repo = finalAttrs.pname; rev = finalAttrs.version; - sha256 = "sha256-m/zSVx8vYzLA23Cusd1p/ZSGd1mV3gM6UqDnmEXqpq4="; + sha256 = "sha256-Vzp+5fQBJoO1pG7j8LwC2/B/cOgM/exhKyb3zHuy89Y="; }; - patches = [ - (fetchpatch { - name = "find-system-gtest.patch"; - url = "https://github.com/zlib-ng/minizip-ng/commit/be23c8d3b7e2cb5ba619e60517cad277ee510fb7.patch"; - sha256 = "sha256-azwrGj6kgTyTepGAmOlxDOFOwJKQE5J2bwUIn6sgKUY="; - }) - - # otherwise signing unit tests fail - (fetchpatch { - name = "disable-mz-signing-by-default.patch"; - url = "https://github.com/zlib-ng/minizip-ng/commit/60649ada97581afc0bc2fffc50ce402ff1e6df5d.patch"; - sha256 = "sha256-bHGM4H8RPYkfAjxcS1bPohR9IFOFT0Mx4Mg34UnnD+w="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib bzip2 xz zstd openssl ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix b/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix index c2d4e6aa56..b7a881548d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix @@ -27,13 +27,13 @@ mkDerivation rec { pname = "mlt"; - version = "7.12.0"; + version = "7.14.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "sha256-Y7lbfwA0lkQB3PjYQIQaQ0BeXGcgyCmMnDqqZJ8zUaA="; + sha256 = "sha256-BmvgDj/zgGJNpTy5A9XPOl+9001Kc0qSFSqQ3gwZPmI="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix index ba31225c81..dcba45f41c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix @@ -53,9 +53,6 @@ stdenv.mkDerivation rec { spdlog ]; - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; - meta = with lib; { description = "Client API library for the Matrix protocol."; homepage = "https://github.com/Nheko-Reborn/mtxclient"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/muparserx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/muparserx/default.nix index bdc558dc10..c6b6c75c22 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/muparserx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/muparserx/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "muparserx"; - version = "4.0.11"; + version = "4.0.12"; src = fetchFromGitHub { owner = "beltoforion"; repo = "muparserx"; rev = "v${version}"; - sha256 = "sha256-BWzHlz1mQYsvWa53EtO05Rb4rRHJBSRguJTHLtgqpPw="; + sha256 = "sha256-rekPXmncNdVX6LvPQP1M2Pzs3pyiCCcLPLnPFiyWJ4s="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss/latest.nix b/third_party/nixpkgs/pkgs/development/libraries/nss/latest.nix index 0a74f9a386..58b5ce6e3f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nss/latest.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.88.1"; - hash = "sha256-J9JD7fh9HPG7nIYfA9OH4OkjDOUBf0MIyUH1WLVLNJY="; + version = "3.89"; + hash = "sha256-VcN6P02gENBXT7izkmTLHntM6ebClUwcfs+fQe4AvtU="; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix index e5b5d1acc0..393c05fd00 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation rec { pname = "ogre"; - version = "13.6.2"; + version = "13.6.3"; src = fetchFromGitHub { owner = "OGRECave"; repo = "ogre"; rev = "v${version}"; - hash = "sha256-4Jmhseg1+4g0b8Pa8A4YL+ixYMe/HxzXrDaXUfElh+k="; + hash = "sha256-+A+GpS6kZREczX0oOETAQJ+smiFVAEzPMIskU/Vh/9U="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix index e5300e9731..6bb2b4c235 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "opencl-headers"; - version = "2022.09.30"; + version = "2023.02.06"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-Headers"; rev = "v${version}"; - sha256 = "sha256-Vbh+bt/g+7glEyqMYCKTANggaIOW/n1L3TaCNouc/28="; + sha256 = "sha256-BJDaDokyHgmyl+bGqCwG1J7iOvu0E3P3iYZ1/krot8s="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix index c89a8eb5db..69c3316986 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix @@ -12,15 +12,18 @@ , openssl , systemdMinimal , libxcrypt + +# passthru +, nixosTests }: stdenv.mkDerivation rec { pname = "openldap"; - version = "2.6.3"; + version = "2.6.4"; src = fetchurl { url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz"; - hash = "sha256-0qKh1x3z13OWscFq11AuZ030RuBgcrDlpOlBw9BsDUY="; + hash = "sha256-1RcE5QF4QwwGzz2KoXTaZrrfVZdHpH2SC7VLLUqkCZE="; }; # TODO: separate "out" and "bin" @@ -117,6 +120,10 @@ stdenv.mkDerivation rec { chmod +x "$out"/lib/*.{so,dylib} ''; + passthru.tests = { + inherit (nixosTests) openldap; + }; + meta = with lib; { homepage = "https://www.openldap.org/"; description = "An open source implementation of the Lightweight Directory Access Protocol"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openvr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openvr/default.nix new file mode 100644 index 0000000000..23df943062 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/openvr/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, cmake +, libGL +, jsoncpp +, fetchFromGitHub +, fetchpatch2 +}: + +stdenv.mkDerivation rec { + pname = "openvr"; + version = "1.23.8"; + + src = fetchFromGitHub { + owner = "ValveSoftware"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ZdL1HDRSpPykbV3M0CjCZkOt7XlF7Z7OAhOey2ALeHg="; + }; + + patches = [ + # https://github.com/ValveSoftware/openvr/pull/594 + (fetchpatch2 { + name = "use-correct-CPP11-definition-for-vsprintf_s.patch"; + url = "https://github.com/ValveSoftware/openvr/commit/0fa21ba17748efcca1816536e27bdca70141b074.patch"; + sha256 = "sha256-0sPNDx5qKqCzN35FfArbgJ0cTztQp+SMLsXICxneLx4="; + }) + # https://github.com/ValveSoftware/openvr/pull/1716 + (fetchpatch2 { + name = "add-ability-to-build-with-system-installed-jsoncpp.patch"; + url = "https://github.com/ValveSoftware/openvr/commit/54a58e479f4d63e62e9118637cd92a2013a4fb95.patch"; + sha256 = "sha256-aMojjbNjLvsGev0JaBx5sWuMv01sy2tG/S++I1NUi7U="; + }) + ]; + + postUnpack = '' + # Move in-tree jsoncpp out to complement the patch above + # fetchpatch2 is not able to handle these renames + mkdir source/thirdparty + mv source/src/json source/thirdparty/jsoncpp + ''; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ jsoncpp libGL ]; + + cmakeFlags = [ "-DUSE_SYSTEM_JSONCPP=ON" "-DBUILD_SHARED=1" ]; + + meta = with lib;{ + homepage = "https://github.com/ValveSoftware/openvr"; + description = "An API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting"; + license = licenses.bsd3; + maintainers = with maintainers; [ pedrohlc Scrumplex ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix index 027100379b..3379e3d04d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ]; + ] + ++ lib.optional withPython python.pkgs.pythonImportsCheckHook; buildInputs = [ root_py @@ -50,11 +51,7 @@ stdenv.mkDerivation rec { --replace 'readlink' '${coreutils}/bin/readlink' ''; - doInstallCheck = withPython; - # prevent nix from trying to dereference a null python - installCheckPhase = lib.optionalString withPython '' - PYTHONPATH=${placeholder "out"}/${python.sitePackages} python -c 'import pyHepMC3' - ''; + pythonImportsCheck = [ "pyHepMC3" ]; meta = with lib; { description = "The HepMC package is an object oriented, C++ event record for High Energy Physics Monte Carlo generators and simulation"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix index 6502ff0903..4e249459d7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.4.13"; + version = "0.4.14"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - sha256 = "sha256-Zz8N6OPwZ4Dwaygiy46C3sN9zPGC12+55S/qns+S+h4="; + sha256 = "sha256-PKS+WErdZuSU4jrFHQcRbnZIHlnlv06R6ZxIAIBptko="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix index ec05f890f7..e5a5565171 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix @@ -24,6 +24,8 @@ , useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal , systemdMinimal , elogind +, buildPackages +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages # A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault). # Not yet investigated; it may be due to the "Make netgroup support optional" # patch not updating the tests correctly yet, or doing something wrong, @@ -65,14 +67,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ glib - gtk-doc pkg-config gettext meson ninja perl rsync - gobject-introspection (python3.pythonForBuild.withPackages (pp: with pp; [ dbus-python (python-dbusmock.overridePythonAttrs (attrs: { @@ -85,7 +85,10 @@ stdenv.mkDerivation rec { libxslt docbook-xsl-nons docbook_xml_dtd_412 - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + ] ++ lib.optionals withIntrospection [ + gobject-introspection + gtk-doc + ] ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ]; @@ -113,7 +116,9 @@ stdenv.mkDerivation rec { "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "-Dpolkitd_user=polkituser" #TODO? config.ids.uids.polkituser "-Dos_type=redhat" # only affects PAM includes + "-Dintrospection=${lib.boolToString withIntrospection}" "-Dtests=${lib.boolToString doCheck}" + "-Dgtk_doc=${lib.boolToString withIntrospection}" "-Dman=true" ] ++ lib.optionals stdenv.isLinux [ "-Dsession_tracking=${if useSystemd then "libsystemd-login" else "libelogind"}" diff --git a/third_party/nixpkgs/pkgs/development/libraries/presage/default.nix b/third_party/nixpkgs/pkgs/development/libraries/presage/default.nix index b3c3c21e30..8f7e158670 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/presage/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/presage/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/community/presage/gcc6.patch"; + name = "gcc6.patch"; + url = "https://git.alpinelinux.org/aports/plain/community/presage/gcc6.patch?id=40e2044c9ecb36eacb3a1fd043f09548d210dc01"; sha256 = "0243nx1ygggmsly7057vndb4pkjxg9rpay5gyqqrq9jjzjzh63dj"; }) ./fixed-cppunit-detection.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/prometheus-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/prometheus-cpp/default.nix index 521626f246..dda515932f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/prometheus-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/prometheus-cpp/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "prometheus-cpp"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "jupp0r"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F8paJhptEcOMtP0FCJ3ragC4kv7XSVPiZheM5UZChno="; + sha256 = "sha256-qx6oBxd0YrUyFq+7ArnKBqOwrl5X8RS9nErhRDUJ7+8="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix index 9a0be5169d..67e16f6f3e 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 = "11.2.0"; + version = "11.3.0"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "v${version}"; - hash = "sha256-AkLuclDm9qjVbpFqenlbgTWt/GAWzOj9d1lqgt6aPNo="; + hash = "sha256-UZq973X93E+Ll1IKjfJNPQuQwBFOU3egFGODgXV21x0="; }; nativeBuildInputs = [ cmake perl ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix index 31de73b25e..8560779b8d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix @@ -7,7 +7,7 @@ Check for any minor version changes. */ -{ newScope +{ makeScopeWithSplicing, generateSplicesForMkScope , lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper , bison, cups ? null, harfbuzz, libGL, perl, python3 , gstreamer, gst-plugins-base, gtk3, dconf @@ -119,6 +119,9 @@ let callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; }; in { + # remove before 23.11 + overrideScope' = lib.warn "qt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope; + inherit callPackage qtCompatVersion qtModule srcs; mkDerivationWith = @@ -225,4 +228,4 @@ let } ../hooks/wrap-qt-apps-hook.sh; }; -in lib.makeScope newScope addPackages +in makeScopeWithSplicing (generateSplicesForMkScope "qt5") (_: {}) (_: {}) addPackages diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix index ef1192e6b1..d74bf46dd6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -13,12 +13,15 @@ , xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm , zlib, at-spi2-core # optional dependencies -, cups ? null, libmysqlclient ? null, postgresql ? null +, cups ? null, postgresql ? null , withGtk3 ? false, dconf, gtk3 # options , libGLSupported ? !stdenv.isDarwin , libGL + # qmake detection for libmysqlclient does not seem to work when cross compiling +, mysqlSupport ? stdenv.hostPlatform == stdenv.buildPlatform +, libmysqlclient , buildExamples ? false , buildTests ? false , debug ? false @@ -73,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { ) ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups - ++ lib.optional (libmysqlclient != null) libmysqlclient + ++ lib.optional (mysqlSupport) libmysqlclient ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which ] @@ -258,7 +261,7 @@ stdenv.mkDerivation (finalAttrs: { "-L" "${lib.getLib openssl}/lib" "-I" "${openssl.dev}/include" "-system-sqlite" - ''-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql'' + ''-${if mysqlSupport then "plugin" else "no"}-sql-mysql'' ''-${if postgresql != null then "plugin" else "no"}-sql-psql'' "-make libs" @@ -297,7 +300,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (cups != null) [ "-L" "${cups.lib}/lib" "-I" "${cups.dev}/include" - ] ++ lib.optionals (libmysqlclient != null) [ + ] ++ lib.optionals (mysqlSupport) [ "-L" "${libmysqlclient}/lib" "-I" "${libmysqlclient}/include" ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/qxmpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qxmpp/default.nix index aede57810a..2b14142e34 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qxmpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qxmpp/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "qxmpp"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "qxmpp-project"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6iI+s+iSKK8TeocvyOxou7cF9ZXlWr5prUbPhoHOoSM="; + sha256 = "sha256-nwU0Iw3aLv4EyNdblTOQKcCYVYfK8i54c0piks4DoUo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix index b67824b5cc..f73e01b647 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { sha256 = "1qm62iad1xfsixv1li7qy475xc7gc04hmi2q21qdk6l69gk7mf82"; }) (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/community/rapidjson/do-not-include-gtest-src-dir.patch"; + name = "do-not-include-gtest-src-dir.patch"; + url = "https://git.alpinelinux.org/aports/plain/community/rapidjson/do-not-include-gtest-src-dir.patch?id=9e5eefc7a5fcf5938a8dc8a3be8c75e9e6809909"; hash = "sha256-BjSZEwfCXA/9V+kxQ/2JPWbc26jQn35CfN8+8NW24s4="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix index 8b6d945d25..2020352323 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "re2"; - version = "2023-02-01"; + version = "2023-03-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - hash = "sha256-YENgO5Ig6SLNdGEsdhKNb4THhocyAv1MMcg4FVYBB7U="; + hash = "sha256-T+P7qT8x5dXkLZAL8VjvqPD345sa6ALX1f5rflE0dwc="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocalution/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocalution/default.nix index 27d6f01c6b..2796215d03 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocalution/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocalution/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocalution"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" diff --git a/third_party/nixpkgs/pkgs/development/libraries/rure/Cargo.lock b/third_party/nixpkgs/pkgs/development/libraries/rure/Cargo.lock index 9aa6e7d046..89fefcd907 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rure/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/libraries/rure/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] [[package]] name = "libc" -version = "0.2.137" +version = "0.2.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" [[package]] name = "memchr" @@ -25,9 +25,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "regex" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", diff --git a/third_party/nixpkgs/pkgs/development/libraries/rure/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rure/default.nix index aef8b9c8f3..1771abd336 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rure/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rure/default.nix @@ -2,6 +2,7 @@ , stdenv , rustPlatform , fetchCrate +, fixDarwinDylibNames }: let @@ -27,6 +28,10 @@ rustPlatform.buildRustPackage { install -Dm644 include/rure.h -t "$dev/include" ''; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + fixDarwinDylibNames + ]; + passthru.updateScript = ./update.sh; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix index ad3bb4f6ec..2ad8424975 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix @@ -78,9 +78,6 @@ stdenv.mkDerivation rec { "-DCMAKE_LIBRARY_PATH=${cudaPackages.cudatoolkit}/lib64/stubs" ]; - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; - postInstall = lib.strings.optionalString enablePython '' export OPENMM_LIB_PATH=$out/lib export OPENMM_INCLUDE_PATH=$out/include diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix index c544436af8..e9ca26d239 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix @@ -12,13 +12,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ipopt"; - version = "3.14.10"; + version = "3.14.11"; src = fetchFromGitHub { owner = "coin-or"; repo = "Ipopt"; rev = "releases/${version}"; - sha256 = "sha256-4SHmqalrGeqp1nBx2BQLRnRWEYw5lJk5Yao67GQw3qM="; + sha256 = "sha256-PzNDiTZkPORFckFJryFuvn/rsfx3wrXJ9Qde88gH5o4="; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix index c997fcc090..6ab68e297c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix @@ -95,7 +95,10 @@ let cuda_cudart # cuda_runtime.h libcublas libcusparse + ] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ cuda_nvprof # + ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ + cuda_profiler_api # ]; }; in diff --git a/third_party/nixpkgs/pkgs/development/libraries/serd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/serd/default.nix index 1a1f3475c3..8bb82d4809 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/serd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/serd/default.nix @@ -1,21 +1,59 @@ -{ lib, stdenv, fetchurl, pkg-config, python3, wafHook }: +{ lib +, stdenv +, fetchurl +, doxygen +, mandoc +, meson +, ninja +, pkg-config +, python3 +, sphinx +, writeScript +}: stdenv.mkDerivation rec { pname = "serd"; - version = "0.30.10"; + version = "0.30.16"; + + outputs = [ "out" "dev" "doc" "man" ]; src = fetchurl { - url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "sha256-r/qA3ux4kh+GM15vw/GLgK7+z0JPaldV6fL6DrBxDt8="; + url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; + hash = "sha256-9Q9IbaUZzdjQOyDJ5CQU5FkTP1okRBHY5jyu+NmskUY="; }; - dontAddWafCrossFlags = true; + nativeBuildInputs = [ + doxygen + mandoc + meson + ninja + pkg-config + python3 + sphinx + ]; - nativeBuildInputs = [ pkg-config python3 wafHook ]; + postPatch = '' + patchShebangs . + ''; + + 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 'download.drobilla.net/serd-0.30.16.tar.xz">' + new_version="$(curl -s https://drobilla.net/category/serd/ | + pcregrep -o1 'download.drobilla.net/serd-([0-9.]+).tar.xz' | + head -n1)" + update-source-version ${pname} "$new_version" + ''; + }; meta = with lib; { description = "A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples"; - homepage = "http://drobilla.net/software/serd"; + homepage = "https://drobilla.net/software/serd"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; mainProgram = "serdi"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix index a44dc213f6..ecd7bb39fe 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.1.3"; + version = "3.1.5"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-VDwpCPyjhkXgehcMJs6srD3PFtlC2m4jurJum6wNeVY="; + sha256 = "sha256-gBHgPKEeoryjMVL/EonmeY/7imcJej/Yj8ovPk/moTk="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/smooth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/smooth/default.nix index cc71bca442..52d125a880 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/smooth/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/smooth/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "smooth"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "enzo1982"; repo = "smooth"; rev = "v${version}"; - sha256 = "sha256-30qVXK54SDL2+ZPbTINZix4Ax1iOMg2WLeEDyAr77Og="; + sha256 = "sha256-J2Do1iAbE1GBC8co/4nxOzeGJQiPRc+21fgMDpzKX+A="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix index 91f694649b..981a0c9ceb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.40.1"; + version = "3.41.0"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { - url = "https://sqlite.org/2022/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "sha256-LF3qIH+lCNdlrx72ILY33LBlcq+m8B8IFb1bv4ZLM9k="; + url = "https://sqlite.org/2023/sqlite-autoconf-${archiveVersion version}.tar.gz"; + hash = "sha256-Sfd6xT/Zql1zlfJJnLgWQQ5WIZhKEhuFjMygUxCwXHA="; }; outputs = [ "bin" "dev" "out" ]; @@ -93,6 +93,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { + changelog = "https://www.sqlite.org/releaselog/${lib.replaceStrings [ "." ] [ "_" ] version}.html"; description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; downloadPage = "https://sqlite.org/download.html"; homepage = "https://www.sqlite.org/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix index bb0a1a7d73..50c246464b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.40.1"; + version = "3.41.0"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { - url = "https://sqlite.org/2022/sqlite-src-${archiveVersion version}.zip"; - sha256 = "sha256-UGQSaqUNsgw1V4thK1bDEpQlwFBu1NFhDvpKDwG9+NA="; + url = "https://sqlite.org/2023/sqlite-src-${archiveVersion version}.zip"; + hash = "sha256-ZKdjijXoa5kfDBWujigwBjtpSygGi491lTWOMgWp62Y="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/srtp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/srtp/default.nix index 6c90380517..8bcd854f36 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/srtp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/srtp/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libsrtp"; - version = "2.4.2"; + version = "2.5.0"; src = fetchFromGitHub { owner = "cisco"; repo = "libsrtp"; rev = "v${version}"; - sha256 = "sha256-6FAkfxC7Tg7uIAmTmRt5Sn8/YofILfpe7Y4pSaq8XL8="; + sha256 = "sha256-OvCw7oF1OuamP3qO2BsimeBSHq1rcXFLfK8KnbbgkMU="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/stduuid/default.nix b/third_party/nixpkgs/pkgs/development/libraries/stduuid/default.nix index 07e43bb952..c7e31c9900 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/stduuid/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/stduuid/default.nix @@ -1,5 +1,5 @@ { stdenv, cmake, fetchFromGitHub, lib }: let - version = "1.2.2"; + version = "1.2.3"; in stdenv.mkDerivation { name = "stduuid-${version}"; @@ -7,7 +7,7 @@ in stdenv.mkDerivation { owner = "mariusbancila"; repo = "stduuid"; rev = "v${version}"; - hash = "sha256-itx1OF1gmEEMy2tJlkN5dpF6o0dlesecuHYfpJdhf7c="; + hash = "sha256-MhpKv+gH3QxiaQMx5ImiQjDGrbKUFaaoBLj5Voh78vg="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ta-lib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ta-lib/default.nix index 57e3f34bc6..b3900f6451 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ta-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ta-lib/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { - name = "ta-lib"; + pname = "ta-lib"; version = "0.4.0"; src = fetchFromGitHub { owner = "rafa-dot-el"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tagparser/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tagparser/default.nix index 8eb57c5441..f20d5a39ea 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tagparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tagparser/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "tagparser"; - version = "11.5.1"; + version = "11.6.0"; src = fetchFromGitHub { owner = "Martchus"; repo = "tagparser"; rev = "v${version}"; - hash = "sha256-6HvPbbDsHIYyTs0M5M8TkgqyAz0QtgRjuNJhYWFjNG4="; + hash = "sha256-zi1n5Mdto8DmUq5DWxcr4f+DX6Sq/JsK8uzRzj5f0/E="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tbb/2020_3.nix b/third_party/nixpkgs/pkgs/development/libraries/tbb/2020_3.nix new file mode 100644 index 0000000000..a3144de636 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/tbb/2020_3.nix @@ -0,0 +1,106 @@ +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +, fixDarwinDylibNames +}: + +stdenv.mkDerivation rec { + pname = "tbb"; + version = "2020.3"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "oneapi-src"; + repo = "oneTBB"; + rev = "v${version}"; + sha256 = "prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU="; + }; + + patches = [ + # Fixes build with Musl. + (fetchurl { + url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/GLIBC-PREREQ-is-not-defined-on-musl.patch"; + sha256 = "gUfXQ9OZQ82qD6brgauBCsKdjLvyHafMc18B+KxZoYs="; + }) + + # Fixes build with Musl. + (fetchurl { + url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch"; + sha256 = "fhorfqO1hHKZ61uq+yTR7eQ8KYdyLwpM3K7WpwJpV74="; + }) + + # Fixes build with upcoming gcc-13: + # https://github.com/oneapi-src/oneTBB/pull/833 + (fetchurl { + name = "gcc-13.patch"; + url = "https://github.com/oneapi-src/oneTBB/pull/833/commits/c18342ba667d1f33f5e9a773aa86b091a9694b97.patch"; + sha256 = "ZUExE3nsW80Z5GPWZnDNuDiHHaD1EF7qNl/G5M+Wcxg="; + }) + + # Fixes build for aarch64-darwin + (fetchurl { + name = "aarch64-darwin.patch"; + url = "https://github.com/oneapi-src/oneTBB/pull/258/commits/86f6dcdc17a8f5ef2382faaef860cfa5243984fe.patch"; + sha256 = "sha256-JXqrFPCb3q1vfxk752tQu7HhApCB4YH2LoVnGRwmspk="; + }) + ]; + + nativeBuildInputs = (lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames + ]); + + makeFlags = lib.optionals stdenv.cc.isClang [ + "compiler=clang" + ] ++ (lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) + (if stdenv.hostPlatform.isAarch64 then "arch=arm64" + else if stdenv.hostPlatform.isx86_64 then "arch=intel64" + else throw "Unsupported cross architecture")); + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/ + mv include $out/ + rm $out/include/index.html + + runHook postInstall + ''; + + postInstall = let + pcTemplate = fetchurl { + url = "https://github.com/oneapi-src/oneTBB/raw/478de5b1887c928e52f029d706af6ea640a877be/integration/pkg-config/tbb.pc.in"; + sha256 = "2pCad9txSpNbzac0vp/VY3x7HNySaYkbH3Rx8LK53pI="; + }; + in '' + # Generate pkg-config file based on upstream template. + # It should not be necessary with tbb after 2021.2. + mkdir -p "$out/lib/pkgconfig" + substitute "${pcTemplate}" "$out/lib/pkgconfig/tbb.pc" \ + --subst-var-by CMAKE_INSTALL_PREFIX "$out" \ + --subst-var-by CMAKE_INSTALL_LIBDIR "lib" \ + --subst-var-by CMAKE_INSTALL_INCLUDEDIR "include" \ + --subst-var-by TBB_VERSION "${version}" \ + --subst-var-by TBB_LIB_NAME "tbb" + ''; + + meta = with lib; { + description = "Intel Thread Building Blocks C++ Library"; + homepage = "http://threadingbuildingblocks.org/"; + license = licenses.asl20; + longDescription = '' + Intel Threading Building Blocks offers a rich and complete approach to + expressing parallelism in a C++ program. It is a library that helps you + take advantage of multi-core processor performance without having to be a + threading expert. Intel TBB is not just a threads-replacement library. It + represents a higher-level, task-based parallelism that abstracts platform + details and threading mechanisms for scalability and performance. + ''; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice tmarkus ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix index ec22952cc4..ff6a334383 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix @@ -1,13 +1,13 @@ { lib , stdenv -, fetchurl , fetchFromGitHub -, fixDarwinDylibNames +, fetchpatch +, cmake }: stdenv.mkDerivation rec { pname = "tbb"; - version = "2020.3"; + version = "2021.8.0"; outputs = [ "out" "dev" ]; @@ -15,77 +15,39 @@ stdenv.mkDerivation rec { owner = "oneapi-src"; repo = "oneTBB"; rev = "v${version}"; - sha256 = "prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU="; + hash = "sha256-7MjUdPB1GsPt7ZkYj7DCisq20X8psljsVCjDpCSTYT4="; }; + nativeBuildInputs = [ + cmake + ]; + patches = [ - # Fixes build with Musl. - (fetchurl { - url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/GLIBC-PREREQ-is-not-defined-on-musl.patch"; - sha256 = "gUfXQ9OZQ82qD6brgauBCsKdjLvyHafMc18B+KxZoYs="; + # Fix musl build from https://github.com/oneapi-src/oneTBB/pull/899 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/899.patch"; + hash = "sha256-kU6RRX+sde0NrQMKlNtW3jXav6J4QiVIUmD50asmBPU="; }) - # Fixes build with Musl. - (fetchurl { - url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch"; - sha256 = "fhorfqO1hHKZ61uq+yTR7eQ8KYdyLwpM3K7WpwJpV74="; - }) - - # Fixes build with upcoming gcc-13: - # https://github.com/oneapi-src/oneTBB/pull/833 - (fetchurl { - name = "gcc-13.patch"; - url = "https://github.com/oneapi-src/oneTBB/pull/833/commits/c18342ba667d1f33f5e9a773aa86b091a9694b97.patch"; - sha256 = "ZUExE3nsW80Z5GPWZnDNuDiHHaD1EF7qNl/G5M+Wcxg="; - }) - - # Fixes build for aarch64-darwin - (fetchurl { - name = "aarch64-darwin.patch"; - url = "https://github.com/oneapi-src/oneTBB/pull/258/commits/86f6dcdc17a8f5ef2382faaef860cfa5243984fe.patch"; - sha256 = "sha256-JXqrFPCb3q1vfxk752tQu7HhApCB4YH2LoVnGRwmspk="; + # Fix/suppress warnings on gcc12.1 from https://github.com/oneapi-src/oneTBB/pull/866 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/866.patch"; + hash = "sha256-e44Yv84Hfl5xoxWWTnLJLSGeNA1RBbah4/L43gPLS+c="; }) ]; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ - fixDarwinDylibNames - ]; + # Fix build with modern gcc + # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]', + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=stringop-overflow" ] ++ + # Workaround for gcc-12 ICE when using -O3 + # https://gcc.gnu.org/PR108854 + lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ]; - makeFlags = lib.optionals stdenv.cc.isClang [ - "compiler=clang" - ] ++ (lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) - (if stdenv.hostPlatform.isAarch64 then "arch=arm64" - else if stdenv.hostPlatform.isx86_64 then "arch=intel64" - else throw "Unsupported cross architecture")); - - enableParallelBuilding = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/ - mv include $out/ - rm $out/include/index.html - - runHook postInstall - ''; - - postInstall = let - pcTemplate = fetchurl { - url = "https://github.com/oneapi-src/oneTBB/raw/478de5b1887c928e52f029d706af6ea640a877be/integration/pkg-config/tbb.pc.in"; - sha256 = "2pCad9txSpNbzac0vp/VY3x7HNySaYkbH3Rx8LK53pI="; - }; - in '' - # Generate pkg-config file based on upstream template. - # It should not be necessary with tbb after 2021.2. - mkdir -p "$out/lib/pkgconfig" - substitute "${pcTemplate}" "$out/lib/pkgconfig/tbb.pc" \ - --subst-var-by CMAKE_INSTALL_PREFIX "$out" \ - --subst-var-by CMAKE_INSTALL_LIBDIR "lib" \ - --subst-var-by CMAKE_INSTALL_INCLUDEDIR "include" \ - --subst-var-by TBB_VERSION "${version}" \ - --subst-var-by TBB_LIB_NAME "tbb" + # Disable failing test on musl + # test/conformance/conformance_resumable_tasks.cpp:37:24: error: ‘suspend’ is not a member of ‘tbb::v1::task’; did you mean ‘tbb::detail::r1::suspend’? + postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace test/CMakeLists.txt \ + --replace 'conformance_resumable_tasks' "" ''; meta = with lib; { @@ -101,6 +63,6 @@ stdenv.mkDerivation rec { details and threading mechanisms for scalability and performance. ''; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice tmarkus ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix index 9027c14de9..f66c08684d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -7,6 +7,8 @@ , pkg-config , asciidoc , gobject-introspection +, buildPackages +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages , python3 , docbook-xsl-nons , docbook_xml_dtd_45 @@ -52,12 +54,14 @@ stdenv.mkDerivation rec { pkg-config asciidoc gettext + glib libxslt wrapGAppsNoGuiHook - gobject-introspection docbook-xsl-nons docbook_xml_dtd_45 (python3.pythonForBuild.withPackages (p: [ p.pygobject3 ])) + ] ++ lib.optionals withIntrospection [ + gobject-introspection ]; buildInputs = [ @@ -77,6 +81,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddocs=true" + (lib.mesonEnable "introspection" withIntrospection) + (lib.mesonBool "test_utils" withIntrospection) ] ++ ( let # https://gitlab.gnome.org/GNOME/tracker/-/blob/master/meson.build#L159 diff --git a/third_party/nixpkgs/pkgs/development/libraries/volk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/volk/default.nix index f5cec86e14..5f7db0d66d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/volk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/volk/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 - python3.pkgs.Mako + python3.pkgs.mako ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix b/third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix index 0fc513b68f..e2a90d2e28 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "waffle"; - version = "1.7.0"; + version = "1.7.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "waffle"; rev = "v${version}"; - sha256 = "iY+dAgXutD/uDFocwd9QXjq502IOsk+3RQMA2S/CMV4="; + sha256 = "sha256-dwDNMLgZrILb559yGs4sNA7D+nD60972+JOy0PKfL0w="; }; buildInputs = [ 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 index c9fafdd276..a16ddebbef 100644 --- 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 @@ -21,9 +21,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; + homepage = "https://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; + # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/v0.3.1/webrtc/rtc_base/system/arch.h + # + our patches + platforms = intersectLists platforms.unix (platforms.arm ++ platforms.aarch64 ++ platforms.mips ++ platforms.power ++ platforms.riscv ++ platforms.x86); }; } 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 5a53564603..9a95494558 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 @@ -33,11 +33,13 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; + homepage = "https://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; + # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/webrtc/rtc_base/system/arch.h + platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.mips ++ platforms.riscv ++ platforms.x86); # 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; + broken = stdenv.isx86_32; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/xcb-imdkit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xcb-imdkit/default.nix index a976368243..dc9dbb041b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xcb-imdkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xcb-imdkit/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "xcb-imdkit"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "fcitx"; repo = "xcb-imdkit"; rev = version; - sha256 = "sha256-WSJBEB6VHRYUkzXr7frdLLpKihuS00ZUINW7e4oYOlY="; + sha256 = "sha256-jbIhcxZzGlklpoMjLAYkKlh/CBE8R4jARO6nfnzSXOQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/zchunk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zchunk/default.nix index c05ba6d0cf..212196bf30 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zchunk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zchunk/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "zchunk"; repo = pname; rev = version; - hash = "sha256-YzCEQuG38lVhCwZznhIyny6Yya8iNuhdqgYBz9OhGOc="; + hash = "sha256-9T1u2Qvy2gRUQzgAp81x+tSbHXuEoxhYhS1T9XntvKk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix b/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix index 5a0f3138bb..70cbbfd4ce 100644 --- a/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.208"; + version = "0.6.211"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fgbHaY0trO7MiYxhdatq81PaOIVQpSIU3cUnrIvGI2M="; + sha256 = "sha256-cDG++heWXGJw6ctho/lJfHZ9eTrsmexFzh0i+tIDpMI="; }; vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; diff --git a/third_party/nixpkgs/pkgs/development/misc/datafusion/default.nix b/third_party/nixpkgs/pkgs/development/misc/datafusion/default.nix index f048839292..6e79d0a3be 100644 --- a/third_party/nixpkgs/pkgs/development/misc/datafusion/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/datafusion/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-w+/5Ig+U8y4nwu7QisnZvc3UlZaEU/kovV6birOWndE="; - buildInputs = lib.optional stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/cbor/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/cbor/default.nix index 9302ca7a97..fd4d7ca190 100644 --- a/third_party/nixpkgs/pkgs/development/nim-packages/cbor/default.nix +++ b/third_party/nixpkgs/pkgs/development/nim-packages/cbor/default.nix @@ -2,12 +2,12 @@ buildNimPackage rec { pname = "cbor"; - version = "20221007"; + version = "20230310"; src = fetchFromSourcehut { owner = "~ehmry"; repo = "nim_${pname}"; rev = version; - hash = "sha256-zFkYsXFRAiBrfz3VNML3l+rYrdJmczl0bfZcJSbHHbM="; + hash = "sha256-VmSYWgXDJLB2D2m3/ymrEytT2iW5JE56WmDz2MPHAqQ="; }; doCheck = true; meta = with lib; diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/coap/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/coap/default.nix new file mode 100644 index 0000000000..b7a35dcb1a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/nim-packages/coap/default.nix @@ -0,0 +1,20 @@ +{ lib, buildNimPackage, fetchFromGitea, taps }: + +buildNimPackage rec { + pname = "coap"; + version = "20230125"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "eris"; + repo = "${pname}-nim"; + rev = version; + hash = "sha256-wlDyqRxXTrX+zXDIe2o9FTU2o26LO/6m7H/FGok1JDw="; + }; + propagatedBuildInputs = [ taps ]; + meta = src.meta // { + description = + "Nim implementation of the Constrained Application Protocol (CoAP) over TCP"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ ehmry ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/eris/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/eris/default.nix new file mode 100644 index 0000000000..9c5820398a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/nim-packages/eris/default.nix @@ -0,0 +1,37 @@ +{ lib, buildNimPackage, fetchFromGitea, pkg-config +, base32, coap, cbor, freedesktop_org, syndicate, tkrzw }: + +buildNimPackage rec { + pname = "eris"; + version = "20230201"; + outputs = [ "bin" "out" ]; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "eris"; + repo = "nim-${pname}"; + rev = version; + hash = "sha256-6vlD/woqTkbSRWhRtQD/ynk0DG+GrGwh6x+qUmo6YSQ="; + }; + propagatedNativeBuildInputs = [ pkg-config ]; + propagatedBuildInputs = [ + base32 + coap + cbor + freedesktop_org + syndicate + tkrzw + ]; + postInstall = '' + mkdir -p "$bin/share/applications" + substitute "eris-open.desktop" "$bin/share/applications/eris-open.desktop"\ + --replace "Exec=eriscmd " "Exec=$bin/bin/eriscmd " + + install -D "eris-link.xml" -t "$bin/share/mime/packages" + install -D "eris48.png" "$bin/share/icons/hicolor/48x48/apps/eris.png" + ''; + meta = src.meta // { + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ ehmry ]; + mainProgram = "eriscmd"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/freedesktop_org/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/freedesktop_org/default.nix new file mode 100644 index 0000000000..745659622c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/nim-packages/freedesktop_org/default.nix @@ -0,0 +1,32 @@ +{ lib, buildNimPackage, fetchFromSourcehut, fetchFromGitHub }: + +let + # freedesktop_org requires a fork of configparser + configparser = buildNimPackage rec { + pname = "configparser"; + version = "20230120"; + src = fetchFromGitHub { + repo = "nim-" + pname; + owner = "ehmry"; + rev = "695f1285d63f1954c25eb1f42798d90fa7bcbe14"; + hash = "sha256-Z2Qr14pv2RHzQNfEYIKuXKHfHvvIfaEiGCHHCWJZFyw="; + }; + doCheck = true; + }; +in buildNimPackage rec { + pname = "freedesktop_org"; + version = "20230201"; + src = fetchFromSourcehut { + owner = "~ehmry"; + repo = pname; + rev = version; + hash = "sha256-gEN8kiWYCfC9H7o4UE8Xza5s7OwU3TFno6XnIlEm9Dg="; + }; + propagatedBuildInputs = [ configparser ]; + doCheck = true; + meta = src.meta // { + description = "Some Nim procedures for looking up freedesktop.org data"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ ehmry ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/preserves/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/preserves/default.nix new file mode 100644 index 0000000000..251975bcad --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/nim-packages/preserves/default.nix @@ -0,0 +1,20 @@ +{ lib, stdenv, buildNimPackage, fetchFromGitea, npeg }: + +buildNimPackage rec { + pname = "preserves"; + version = "20221102"; + src = fetchFromGitea { + domain = "git.syndicate-lang.org"; + owner = "ehmry"; + repo = "${pname}-nim"; + rev = version; + hash = "sha256-oRsq1ugtrOvTn23596BXRy71TQZ4h/Vv6JGqBTZdoKY="; + }; + propagatedBuildInputs = [ npeg ]; + doCheck = !stdenv.isDarwin; + meta = src.meta // { + description = "Nim implementation of the Preserves data language"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ ehmry ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/safeset/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/safeset/default.nix new file mode 100644 index 0000000000..df613143e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/nim-packages/safeset/default.nix @@ -0,0 +1,22 @@ +{ lib, buildNimPackage, fetchFromGitHub }: +buildNimPackage rec { + pname = "safeset"; + + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "avahe-kellenberger"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ZLdStoNVoQhRkD2iEzKxhs1UPfgnbJM9QCDHdjH7vTU="; + }; + + doCheck = true; + + meta = with lib; + src.meta // { + description = "safeset library for nim"; + license = [ licenses.gpl2 ]; + maintainers = [ maintainers.marcusramberg ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/syndicate/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/syndicate/default.nix new file mode 100644 index 0000000000..62f7ca936f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/nim-packages/syndicate/default.nix @@ -0,0 +1,20 @@ +{ lib, buildNimPackage, fetchFromGitea, nimSHA2, preserves }: + +buildNimPackage rec { + pname = "syndicate"; + version = "20221102"; + src = fetchFromGitea { + domain = "git.syndicate-lang.org"; + owner = "ehmry"; + repo = "${pname}-nim"; + rev = version; + hash = "sha256-yTPbEsBcpEPXfmhykbWzWdnJ2ExEJxdii1L+mqx8VGQ="; + }; + propagatedBuildInputs = [ nimSHA2 preserves ]; + doCheck = true; + meta = src.meta // { + description = "Nim implementation of the Syndicated Actor model"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ ehmry ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/x11/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/x11/default.nix new file mode 100644 index 0000000000..abfac2e4b8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/nim-packages/x11/default.nix @@ -0,0 +1,22 @@ +{ lib, buildNimPackage, fetchFromGitHub }: + +buildNimPackage rec { + pname = "x11"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "nim-lang"; + repo = pname; + rev = "2093a4c01360cbb5dd33ab79fd4056e148b53ca1"; + hash = "sha256-2XRyXiBxAc9Zx/w0zRBHRZ240qww0FJvIvOKZ8YH50A="; + }; + + doCheck = true; + + meta = with lib; + src.meta // { + description = "X11 library for nim"; + license = [ licenses.mit ]; + maintainers = [ maintainers.marcusramberg ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-env.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-env.nix index 5dad9ec63d..bc1e36628a 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-env.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-env.nix @@ -530,12 +530,15 @@ let then ln -s $out/lib/node_modules/.bin $out/bin - # Patch the shebang lines of all the executables + # Fixup all executables ls $out/bin/* | while read i do file="$(readlink -f "$i")" chmod u+rwx "$file" - patchShebangs "$file" + if isScript "$file" + then + sed -i 's/\r$//' "$file" # convert crlf to lf + fi done fi 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 1314cb6901..4c7dd72762 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -148,13 +148,13 @@ let sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="; }; }; - "@angular-devkit/architect-0.1502.0" = { + "@angular-devkit/architect-0.1502.2" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1502.0"; + version = "0.1502.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1502.0.tgz"; - sha512 = "/HmyAQhb4BNbcVRL2uaLwrJAAeYVUD42Bipoq8+kUNzoRv9QqJTIOx+2fSsmwBk8C+Jx3184UD3SfUmEnFPt4g=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1502.2.tgz"; + sha512 = "+NE2IV+tuPgcBdC+1ac7eYIBqZDH0VskXTqbhHiRKySbK0vF3/cwTw6Ie07phl0xC1dxLXeRE52L5YwX5jERFQ=="; }; }; "@angular-devkit/core-15.0.4" = { @@ -175,13 +175,13 @@ let sha512 = "PW5MRmd9DHJR4FaXchwQtj9pXnsghSTnwRvfZeCRNYgU2sv0DKyTV+YTSJB+kNXnoPNG1Je6amDEkiXecpspXg=="; }; }; - "@angular-devkit/core-15.2.0" = { + "@angular-devkit/core-15.2.2" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "15.2.0"; + version = "15.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.0.tgz"; - sha512 = "kUE5XvQzn+fiEvFqIk8x0q4hvRD+dKfAMM7p0uPQ69O9cj2b8c01oDvLOskvwhIJOnKTxnK/1d2gFQLupPci4A=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.2.tgz"; + sha512 = "YPwDSldpVcuSJuIkXy5iRzaPA78ySXKc80OicHR6XtMsrHlwY7DuxQoSWr+ih9LAqpeeBz9ECMalztwohdy0MA=="; }; }; "@angular-devkit/schematics-15.0.4" = { @@ -202,13 +202,13 @@ let sha512 = "jpddxo9Qd2yRQ1t9FLhAx5S+luz6HkyhDytq0LFKbxf9ikf1J4oy9riPBFl4pRmrNARWcHZ6GbD20/Ky8PjmXQ=="; }; }; - "@angular-devkit/schematics-15.2.0" = { + "@angular-devkit/schematics-15.2.2" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "15.2.0"; + version = "15.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.2.0.tgz"; - sha512 = "LrsbQWaMRrLPBCgTOw7F+BvA4mjCljC+42NmiId/GXdU9FljEw/Ly1+u7LJREnE1yYqGQeR8zd8xjgIS0mTc3A=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.2.2.tgz"; + sha512 = "i1yQzzv1bJtVrhWPixdXg61nkR/mO5/mQ6SA8rq9t0NAjs4W08MBZ6TUspPvt4iLy9+W6pImW45tUmnfkdhhdQ=="; }; }; "@angular-devkit/schematics-cli-15.1.4" = { @@ -436,13 +436,13 @@ let sha512 = "Lahx5zntHPZia35myYDBRuF58tlwPskwHc5CWBZC/4bMKB6siTBWwtMrkqXcsNwQiFSzSx5hKdRPUmemrEp3Gg=="; }; }; - "@apollo/usage-reporting-protobuf-4.0.2" = { + "@apollo/usage-reporting-protobuf-4.1.0" = { name = "_at_apollo_slash_usage-reporting-protobuf"; packageName = "@apollo/usage-reporting-protobuf"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/usage-reporting-protobuf/-/usage-reporting-protobuf-4.0.2.tgz"; - sha512 = "GfE8aDqi/lAFut95pjH9IRvH0zGsQ5G/2lYL0ZLZfML7ArX+A4UVHFANQcPCcUYGE6bI6OPhLekg4Vsjf6B1cw=="; + url = "https://registry.npmjs.org/@apollo/usage-reporting-protobuf/-/usage-reporting-protobuf-4.1.0.tgz"; + sha512 = "hXouMuw5pQVkzi8dgMybmr6Y11+eRmMQVoB5TF0HyTwAg9SOq/v3OCuiYqcVUKdBcskU9Msp+XvjAk0GKpWCwQ=="; }; }; "@apollo/utils.dropunuseddefinitions-1.1.0" = { @@ -571,22 +571,22 @@ let sha512 = "6bBFeDTtPOn4jZaiD3p0f05MEGQL9pw2Zbfj546oFETNmjJFWO3nzHz6/m+P53calknCvyVzZ5YhoBLIvzn5iw=="; }; }; - "@astrojs/compiler-1.1.2" = { + "@astrojs/compiler-1.2.0" = { name = "_at_astrojs_slash_compiler"; packageName = "@astrojs/compiler"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-1.1.2.tgz"; - sha512 = "L3/JrdNwBFKcoDeStmRgJWvI2t/5nNJm7HnGjDy4e8BH3qKv8iQYdpvuQjeYRA00k6I1lxZGBm/0wU+Lg7HPiQ=="; + url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-1.2.0.tgz"; + sha512 = "O8yPCyuq+PU9Fjht2tIW6WzSWiq8qDF1e8uAX2x+SOGFzKqOznp52UlDG2mSf+ekf0Z3R34sb64O7SgX+asTxg=="; }; }; - "@asyncapi/specs-4.1.1" = { + "@asyncapi/specs-4.1.2" = { name = "_at_asyncapi_slash_specs"; packageName = "@asyncapi/specs"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@asyncapi/specs/-/specs-4.1.1.tgz"; - sha512 = "CtJdKTQnzX3UwHVBgwrzLIwmnlxl1VKsLNG9ORgdUoD7BFB1fEh9hjdCD3Qh3eHhvlfizLtlFlGet1yQBSi1mg=="; + url = "https://registry.npmjs.org/@asyncapi/specs/-/specs-4.1.2.tgz"; + sha512 = "A6iUCI96LB1Uma9DIaFcFKegNiOsGkquk0UUtkx7VbBJO+bOlwKfUhl5n+nwKaVR/UjyszeBtbUEodIC7Q3oBQ=="; }; }; "@aws-crypto/crc32-2.0.0" = { @@ -1156,22 +1156,22 @@ let sha512 = "/R5q5agdPd7HJB68XMzpxrNPk158EHUvkFkuRu5Qf3kkkHebEzWEBlWoVpUe6ss4rP9Tqcue6xPuaftEmhjpYw=="; }; }; - "@aws-sdk/signature-v4-3.272.0" = { + "@aws-sdk/signature-v4-3.282.0" = { name = "_at_aws-sdk_slash_signature-v4"; packageName = "@aws-sdk/signature-v4"; - version = "3.272.0"; + version = "3.282.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.272.0.tgz"; - sha512 = "pWxnHG1NqJWMwlhJ6NHNiUikOL00DHROmxah6krJPMPq4I3am2KY2Rs/8ouWhnEXKaHAv4EQhSALJ+7Mq5S4/A=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.282.0.tgz"; + sha512 = "rnSL3UyF/No7+O2EMtN1sTCiqL1a+odbfnfo3wCSl8DH5PEYINt2kZgVEvT1Fgaffk1pUggBBOZoR+arPIIDJA=="; }; }; - "@aws-sdk/signature-v4-crt-3.272.0" = { + "@aws-sdk/signature-v4-crt-3.282.0" = { name = "_at_aws-sdk_slash_signature-v4-crt"; packageName = "@aws-sdk/signature-v4-crt"; - version = "3.272.0"; + version = "3.282.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.272.0.tgz"; - sha512 = "egTOzuMoQvKXR8B1kT0Ym6He0BrADj5S2nJxhmIqmuANLXulUVfi9yxdlPfI9eWGimzOCzVsyd8Pl7HYU67FSA=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.282.0.tgz"; + sha512 = "NKtqmJLfutjwtpwFFOTBPyEi4262+R+cMhjYo6CwEHXlbXgPbPlyuuIdSuFlL8MecGC61nw2prBlwkTjR//pxA=="; }; }; "@aws-sdk/signature-v4-multi-region-3.226.0" = { @@ -1543,13 +1543,13 @@ let sha512 = "zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw=="; }; }; - "@azure/core-rest-pipeline-1.10.1" = { + "@azure/core-rest-pipeline-1.10.2" = { name = "_at_azure_slash_core-rest-pipeline"; packageName = "@azure/core-rest-pipeline"; - version = "1.10.1"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.1.tgz"; - sha512 = "Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA=="; + url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.2.tgz"; + sha512 = "e3WzAsRKLor5EgK2bQqR1OY5D7VBqzORHtlqtygZZQGCYOIBsynqrZBa8MFD1Ue9r8TPtofOLditalnlQHS45Q=="; }; }; "@azure/core-tracing-1.0.0-preview.13" = { @@ -1570,13 +1570,13 @@ let sha512 = "I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw=="; }; }; - "@azure/core-util-1.1.1" = { + "@azure/core-util-1.2.0" = { name = "_at_azure_slash_core-util"; packageName = "@azure/core-util"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.1.1.tgz"; - sha512 = "A4TBYVQCtHOigFb2ETiiKFDocBoI1Zk2Ui1KpI42aJSIDexF7DHQFpnjonltXAIU/ceH+1fsZAWWgvX6/AKzog=="; + url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.2.0.tgz"; + sha512 = "ffGIw+Qs8bNKNLxz5UPkz4/VBM/EZY07mPve1ZYFqYUdPwFqRj0RPk0U7LZMOfT7GCck9YjuT1Rfp1PApNl1ng=="; }; }; "@azure/identity-2.1.0" = { @@ -1597,31 +1597,31 @@ let sha512 = "0112LegxeR03L8J4k+q6HwBVvrpd9y+oInG0FG3NaHXN7YUubVBon/eb5jFI6edGrvNigpxSR0XIsprFXdkzCQ=="; }; }; - "@azure/logger-1.0.3" = { + "@azure/logger-1.0.4" = { name = "_at_azure_slash_logger"; packageName = "@azure/logger"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/logger/-/logger-1.0.3.tgz"; - sha512 = "aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g=="; + url = "https://registry.npmjs.org/@azure/logger/-/logger-1.0.4.tgz"; + sha512 = "ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg=="; }; }; - "@azure/msal-browser-2.33.0" = { + "@azure/msal-browser-2.34.0" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.33.0"; + version = "2.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.33.0.tgz"; - sha512 = "c7CVh1tfUfxiWkEIhoIb11hL4PGo4hz0M+gMy34ATagAKdLK7qyEu/5AXJWAf5lz5eE+vQhm7+LKiuETrcXXGw=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.34.0.tgz"; + sha512 = "stoXdlfAtyVIMOp1lS5PorgO5f66MGRi3Q1FBlXhVZFTsTfAWrNdSOx1m/PXWHskWE9aXO+NEzXVOoWmDNnvNA=="; }; }; - "@azure/msal-common-10.0.0" = { + "@azure/msal-common-11.0.0" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "10.0.0"; + version = "11.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-10.0.0.tgz"; - sha512 = "/LghpT93jsZLy55QzTsRZWMx6R1Mjc1Aktwps8sKSGE3WbrGwbSsh2uhDlpl6FMcKChYjJ0ochThWwwOodrQNg=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-11.0.0.tgz"; + sha512 = "SZH8ObQ3Hq5v3ogVGBYJp1nNW7p+MtM4PH4wfNadBP9wf7K0beQHF9iOtRcjPOkwZf+ZD49oXqw91LndIkdk8g=="; }; }; "@azure/msal-common-7.6.0" = { @@ -1633,13 +1633,13 @@ let sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@azure/msal-node-1.15.0" = { + "@azure/msal-node-1.16.0" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.15.0"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.15.0.tgz"; - sha512 = "fwC5M0c8pxOAzmScPbpx7j28YVTDebUaizlVF7bR0xvlU0r3VWW5OobCcr9ybqKS6wGyO7u4EhXJS9rjRWAuwA=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.16.0.tgz"; + sha512 = "eGXPp65i++mAIvziafbCH970TCeECB6iaQP7aRzZEjtU238cW4zKm40U8YxkiCn9rR1G2VeMHENB5h6WRk7ZCQ=="; }; }; "@azure/storage-blob-12.11.0" = { @@ -2938,13 +2938,13 @@ let sha512 = "ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw=="; }; }; - "@babel/types-7.18.4" = { + "@babel/types-7.19.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.18.4"; + version = "7.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.18.4.tgz"; - sha512 = "ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz"; + sha512 = "YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA=="; }; }; "@babel/types-7.21.2" = { @@ -3226,40 +3226,40 @@ let sha512 = "gB5C5nDIacLUdsMuW8YsM9SzK3vaFANe4J11CVXpovpy7bZUGrcJKmc6m/0gWG789pKr6XSZY2aEetjFvSRw5g=="; }; }; - "@cspell/cspell-bundled-dicts-6.27.0" = { + "@cspell/cspell-bundled-dicts-6.28.0" = { name = "_at_cspell_slash_cspell-bundled-dicts"; packageName = "@cspell/cspell-bundled-dicts"; - version = "6.27.0"; + version = "6.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-6.27.0.tgz"; - sha512 = "udRkEUz0QIAecCUECVac8IBCu7f5siCrxUZmsoZINgqLlSh0ppmn4/CiiA+sefj99rOq/vB4VEEQCnMShfl5qw=="; + url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-6.28.0.tgz"; + sha512 = "RjAf67eejzQVXPX45xmIGFgSewtUeY5R+xun6xz1pQFIIrgsoxYNZ1hbdj72sX6+QdkJDf1WF3S9zMfiRVlOXQ=="; }; }; - "@cspell/cspell-pipe-6.27.0" = { + "@cspell/cspell-pipe-6.28.0" = { name = "_at_cspell_slash_cspell-pipe"; packageName = "@cspell/cspell-pipe"; - version = "6.27.0"; + version = "6.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-6.27.0.tgz"; - sha512 = "lS3kIew5+ETExORdPcJkEA03ylrEL9CHaJ1xE7SSezU3mqoUgbVW5/f2+PCIWPu1mVvUpWef2X1ODddiPPp9NQ=="; + url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-6.28.0.tgz"; + sha512 = "/D8cmitszZCethV4ekz+RMigwlkk5kLcOiVdjKBx/YHC5CtpkQ+v5ZlaTpxAKCoOyfyKW6hI8UNhNIx7ZyrizQ=="; }; }; - "@cspell/cspell-service-bus-6.27.0" = { + "@cspell/cspell-service-bus-6.28.0" = { name = "_at_cspell_slash_cspell-service-bus"; packageName = "@cspell/cspell-service-bus"; - version = "6.27.0"; + version = "6.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-6.27.0.tgz"; - sha512 = "GC3WseMeBE1xtIftBgfTOQxgAMHmLF5HhjHo2rVIfCKv3uyQXuNsGYmtqY7dm4GDrBx1vIYjOoT2xtEaSLoUPw=="; + url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-6.28.0.tgz"; + sha512 = "l3PtT8wZTTB3HcCFg0WYAamzt9MO4fVevOj+6lOaTTQDh5iV+4+XmutkdKGoDmMpe3EdqOeYJ5SC96NUb6U5CA=="; }; }; - "@cspell/cspell-types-6.27.0" = { + "@cspell/cspell-types-6.28.0" = { name = "_at_cspell_slash_cspell-types"; packageName = "@cspell/cspell-types"; - version = "6.27.0"; + version = "6.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-6.27.0.tgz"; - sha512 = "eHKpAhIUYIjssqF20IrihzNAPDTWJsFpBzg7UznX03Z4Y77JrGAgdRZ6h69uaIafQb7uotNYWnDazpVSkMpikQ=="; + url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-6.28.0.tgz"; + sha512 = "+LJ7IlD4X9eaw8fBPtHYH8g5eFIkEZssLrjAOLA2hIps5aVNZ6J6oS4lUOVdKaDjdn6qsPgTpHGZJ2rV/RSrCA=="; }; }; "@cspell/dict-ada-4.0.1" = { @@ -3316,13 +3316,13 @@ let sha512 = "Aw07qiTroqSST2P5joSrC4uOA05zTXzI2wMb+me3q4Davv1D9sCkzXY0TGoC2vzhNv5ooemRi9KATGaBSdU1sw=="; }; }; - "@cspell/dict-companies-3.0.8" = { + "@cspell/dict-companies-3.0.9" = { name = "_at_cspell_slash_dict-companies"; packageName = "@cspell/dict-companies"; - version = "3.0.8"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.0.8.tgz"; - sha512 = "tQPpkxgog+7xGN3dA9p2Hd4O95+hFYfJuHeY9GgxNahBQyq3bv0REAc6xlqdtkIpfV2ga93B0l37mQr1p107Iw=="; + url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.0.9.tgz"; + sha512 = "wSkVIJjk33Sm3LhieNv9TsSvUSeP0R/h8xx06NqbMYF43w9J8hZiMHlbB3FzaSOHRpXT5eBIJBVTeFbceZdiqg=="; }; }; "@cspell/dict-cpp-1.1.40" = { @@ -3820,13 +3820,13 @@ let sha512 = "KuyOQaby9NID/pn7EkXilpUxjVIvvyLzhr7BPsDS6FcvUE8Yhss6bJowEDHSv6pa+W2387phoqbDf2rTicquAA=="; }; }; - "@cspell/dict-python-4.0.1" = { + "@cspell/dict-python-4.0.2" = { name = "_at_cspell_slash_dict-python"; packageName = "@cspell/dict-python"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.0.1.tgz"; - sha512 = "1wtUgyaTqRiQY0/fryk0oW22lcxNUnZ5DwteTzfatMdbgR0OHXTlHbI8vYxpHLWalSoch7EpLsnaymG+fOrt8g=="; + url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.0.2.tgz"; + sha512 = "w1jSWDR1CkO23cZFbSYgnD/ZqknDZSVCI1AOE6sSszOJR8shmBkV3lMBYd+vpLsWhmkLLBcZTXDkiqFLXDGowQ=="; }; }; "@cspell/dict-r-2.0.1" = { @@ -3964,22 +3964,22 @@ let sha512 = "niiEMPWPV9IeRBRzZ0TBZmNnkK3olkOPYxC1Ny2AX4TGlYRajcW0WUtoSHmvvjZNfWLSg2L6ruiBeuPSbjnG6A=="; }; }; - "@cspell/dynamic-import-6.27.0" = { + "@cspell/dynamic-import-6.28.0" = { name = "_at_cspell_slash_dynamic-import"; packageName = "@cspell/dynamic-import"; - version = "6.27.0"; + version = "6.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-6.27.0.tgz"; - sha512 = "PrBAH0+6OERWeY57PUH+9WmxYtUBnBjTYmm+3Zpg3SUd/ToD0cNf83OJCrcDF7KNQYE9rjCPUfVdsOe3aJlIHw=="; + url = "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-6.28.0.tgz"; + sha512 = "drPfcTDDnWfQqSA3TqYMewocbFnPIW08/xKnouC7QFThgNocLD6TkBExa9timCATEsL7HujeAFEgMaPPTPFMqA=="; }; }; - "@cspell/strong-weak-map-6.27.0" = { + "@cspell/strong-weak-map-6.28.0" = { name = "_at_cspell_slash_strong-weak-map"; packageName = "@cspell/strong-weak-map"; - version = "6.27.0"; + version = "6.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-6.27.0.tgz"; - sha512 = "4hel0Dik7GTX8yVOjOXlumIOzYD8mWzDeyMEhEJb3qwDfsTPeeYo1EMTSgtS+oJXR6kQ09qBrF1lok44v6NOAQ=="; + url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-6.28.0.tgz"; + sha512 = "M8qffYu672xMbF3JH5TmlXydfoglhiO/Tuy2fziQHtaTRm5Qp0KrSioSvHq+3QxnmHVTa91vYuzmr6qoAxqPjQ=="; }; }; "@cspotcode/source-map-consumer-0.8.0" = { @@ -5017,13 +5017,13 @@ let sha512 = "OU5P5mJyD3OoWYMWY+yIgwvgNS9cFAU10f+DDuvtogcWQOoJIsQ4Hy2McSfUfhKjq8L0FuWVb4Rt7kgA+XK86A=="; }; }; - "@exodus/schemasafe-1.0.0-rc.9" = { + "@exodus/schemasafe-1.0.0-rc.11" = { name = "_at_exodus_slash_schemasafe"; packageName = "@exodus/schemasafe"; - version = "1.0.0-rc.9"; + version = "1.0.0-rc.11"; src = fetchurl { - url = "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.0.0-rc.9.tgz"; - sha512 = "dGGHpb61hLwifAu7sotuHFDBw6GTdpG8aKC0fsK17EuTzMRvUrH7lEAr6LTJ+sx3AZYed9yZ77rltVDHyg2hRg=="; + url = "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.0.0-rc.11.tgz"; + sha512 = "jlDglM3cbjrpq+D4oDBP/tztQDJn2hNqOak/wIOIVxbv8+d9Yn8or4Misr0zx9UEsvVFYNCQsE97zVvIU0/Idw=="; }; }; "@expo/apple-utils-0.0.0-alpha.37" = { @@ -5629,22 +5629,22 @@ let sha512 = "VGCtAmPU/3uj/QV4Kx7gO/H2vNrhNSB346sE7xM+bBtxj+hf/owaGTvN6/tuZ8HXQu8tjTf8+ubQ3d7D7DUIjA=="; }; }; - "@fluentui/font-icons-mdl2-8.5.9" = { + "@fluentui/font-icons-mdl2-8.5.12" = { name = "_at_fluentui_slash_font-icons-mdl2"; packageName = "@fluentui/font-icons-mdl2"; - version = "8.5.9"; + version = "8.5.12"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.5.9.tgz"; - sha512 = "u2a45ZE7GDLOSLpKPIDykVfbZs48oLT1m12JUdz4oGTkR9bR0+l8cnQL/+rYTu0KcJp2V5F9zLyTpJdlZnV36w=="; + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.5.12.tgz"; + sha512 = "fn/xvJ3BaoH4N2X58UJq4lymPV2zWRDfCwPX62oGYuxGYoc2F7+MSXSgCJMy106KvfYO1IkIdppWwtkoKKq7fw=="; }; }; - "@fluentui/foundation-legacy-8.2.29" = { + "@fluentui/foundation-legacy-8.2.32" = { name = "_at_fluentui_slash_foundation-legacy"; packageName = "@fluentui/foundation-legacy"; - version = "8.2.29"; + version = "8.2.32"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.29.tgz"; - sha512 = "apO4PcZtU8N4zFW9fLE6aEb6JdlPyssI98MHSvCWKMiUqWSUhimvIgJ75CT3XmbKdI3bXu/miKjWSOMIHsZkiQ=="; + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.32.tgz"; + sha512 = "1KwzkWtna+m52g9vbVxbSmkkUP3Xopv5ImAZQsyr20l3XU8sdauks40DM31PVLCT8JlXKNR0cfx2DspZNOr0rQ=="; }; }; "@fluentui/keyboard-key-0.4.5" = { @@ -5665,31 +5665,31 @@ let sha512 = "i9Wy+7V+lKfX+UWRTrrK+3xm4aa8jl9tK2/7Ku696yWJ5v3D6xjRcMevfxUZDrZ3xS4/GRFfWKPHkAjzz/BQoQ=="; }; }; - "@fluentui/react-8.106.1" = { + "@fluentui/react-8.106.4" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "8.106.1"; + version = "8.106.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-8.106.1.tgz"; - sha512 = "cLagkBBsknKOYFXBeWBwAm5VryPeJFVUIgLa0XlXcxmeOco/IhmWlhY5gEEQ9YoX1dFyNVcYXWxNFR55KUpZoA=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.106.4.tgz"; + sha512 = "Lq/FJa8ww8mRI5/1xzl/DvV96DLRm210g1Oe1PL3i5rsTuOIY4ZqcjffNEVLztSemm2u2sRoZUS/wQnUcWi1Xw=="; }; }; - "@fluentui/react-focus-8.8.15" = { + "@fluentui/react-focus-8.8.18" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "8.8.15"; + version = "8.8.18"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.8.15.tgz"; - sha512 = "TRYOSkQ6hQmZnfiM8k8Uw7bVAi69iguFc4V6lO90QHZ3fHQxlIHBHEmBzysYDORKMwQbtbllCtkm9ImlhsxEJw=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.8.18.tgz"; + sha512 = "qH4mD7BM0n8318X4jCZRV5Gv4b94xSluhMEK0uZwM6A+AClucEX93+7cgYanss0QU4yhOYrtQ+xJURQHVThq+Q=="; }; }; - "@fluentui/react-hooks-8.6.17" = { + "@fluentui/react-hooks-8.6.18" = { name = "_at_fluentui_slash_react-hooks"; packageName = "@fluentui/react-hooks"; - version = "8.6.17"; + version = "8.6.18"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.6.17.tgz"; - sha512 = "UdsK3YZ6Rx5fCNFfIcyJ2il8j5Ypb7OQY+0Qe2nmrn+/NKrtCeFVCIAs+i5MzjlL5wOsX27YXZwqby2DBUuSPg=="; + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.6.18.tgz"; + sha512 = "8XtDs3VmdIjwYU9y5xWMxZg0DhZ4CNJx7aPjEdGiLfn6EyUTvJFZO5DcdlCF126Thbb1bqsD94iV8/GdS5ikCw=="; }; }; "@fluentui/react-portal-compat-context-9.0.4" = { @@ -5701,13 +5701,13 @@ let sha512 = "qw2lmkxZ2TmgC0pB2dvFyrzVffxBdpCx1BdWRaF+MRGUlTxRtqfybSx3Edsqa6NMewc3J0ThLMFdVFBQ5Yafqw=="; }; }; - "@fluentui/react-window-provider-2.2.6" = { + "@fluentui/react-window-provider-2.2.7" = { name = "_at_fluentui_slash_react-window-provider"; packageName = "@fluentui/react-window-provider"; - version = "2.2.6"; + version = "2.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.2.6.tgz"; - sha512 = "bcQM5mdi4ugVb30GNtde8sP173F+l9p7uQfgK/I8O07EfKHUHZeY4wj5arD53s1cUIQI0kxWJ5RD7upZNRQeQA=="; + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.2.7.tgz"; + sha512 = "fi5nYs2h4H70yrJ4g+XN4Tp4PCbwvyIErBz0Bdyai8b86VUtYLnGt+MDDrFqLqt17tcooH8u29iGyGGNFy2yYw=="; }; }; "@fluentui/set-version-8.2.5" = { @@ -5719,31 +5719,31 @@ let sha512 = "DwJq9wIXLc8WkeJ/lqYM4Sv+R0Ccb6cy3cY1Bqaa5POsroVKIfL6W+njvAMOj3LO3+DaXo2aDeiUnnw70M8xIw=="; }; }; - "@fluentui/style-utilities-8.9.2" = { + "@fluentui/style-utilities-8.9.5" = { name = "_at_fluentui_slash_style-utilities"; packageName = "@fluentui/style-utilities"; - version = "8.9.2"; + version = "8.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.9.2.tgz"; - sha512 = "cnP3p73+9RDE91Dy6aWHgkkBLbtv9Ct66YD6Hgr/tU3th3Z/CJU2TcJ4EN8RqiIBCiO4LU+W2jrFFZNnXTAxEw=="; + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.9.5.tgz"; + sha512 = "vkS7mRD/bPw6BDlvV4OXZbgowZ7Vo5TfmLMQ3b98B2h0RydRsXwl6p99WV289QL7jJmdo/PBfBBTh9i/mQe9MA=="; }; }; - "@fluentui/theme-2.6.23" = { + "@fluentui/theme-2.6.24" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "2.6.23"; + version = "2.6.24"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.23.tgz"; - sha512 = "xuX3jHsIrB/LbgVwmZwiXkmCT+EY8c7b97wV2SGDpVUSsFDSQMQPZgQ3eAfXNA1ZLbgYcxBycm5f+gDxjlKA8g=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.24.tgz"; + sha512 = "UUXmBSAEDwRQsCs5cnUo9t8C6n38bWaD0Gaaxfp+j1R1Rdox4RQUNIReh5yyyO26RGTFJ/6pcx5xaiS19J5uGg=="; }; }; - "@fluentui/utilities-8.13.7" = { + "@fluentui/utilities-8.13.8" = { name = "_at_fluentui_slash_utilities"; packageName = "@fluentui/utilities"; - version = "8.13.7"; + version = "8.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.13.7.tgz"; - sha512 = "whH09ttg7DGzANijSFXTF//xJNYjTrMB6TcgC7ge+5suI7VVwsh3NZc9lYN2mKKUveHEOjLgeunEhQ3neAvn5Q=="; + url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.13.8.tgz"; + sha512 = "UpuuB1wZdZK8XZTOagnWRC3ArdKQmY4X9WPgQ1E62Ko/IeE8hFOOUfQ6CFjdm/mg4+fmV3ITr97+edfKaxIPVA=="; }; }; "@forge/api-2.11.1" = { @@ -5944,13 +5944,13 @@ let sha512 = "j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA=="; }; }; - "@google-cloud/pubsub-3.3.0" = { + "@google-cloud/pubsub-3.4.1" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "3.3.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-3.3.0.tgz"; - sha512 = "pypP7JYqKnVOO7wES71TkyxQD7UluWMc/7zH5wFZ6ycLRfonLvO1XBBS3Hcg4ltMEjBlYxRC6ODbzYLfuZm9/g=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-3.4.1.tgz"; + sha512 = "6sTJAFQYeUeAEyBiz2hMvEku3fUvFwNHKrkHjM3w6hcnN37xCH60NDlnZvGuT2rRXG24QBq6Fx3Pe/3nkaybUQ=="; }; }; "@grammarly/sdk-1.11.0" = { @@ -6034,13 +6034,13 @@ let sha512 = "6U7QLZT8cEUxAMXDP4xXVplLi6RBwx7ih7TevlBto66A/qFp3PDb6o/VFo07yBKozr8PGMZ4jMfEWBGxmbGdxA=="; }; }; - "@graphql-tools/executor-graphql-ws-0.0.11" = { + "@graphql-tools/executor-graphql-ws-0.0.12" = { name = "_at_graphql-tools_slash_executor-graphql-ws"; packageName = "@graphql-tools/executor-graphql-ws"; - version = "0.0.11"; + version = "0.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-0.0.11.tgz"; - sha512 = "muRj6j897ks2iKqe3HchWFFzd+jFInSRuLPvHJ7e4WPrejFvaZx3BQ9gndfJvVkfYUZIFm13stCGXaJJTbVM0Q=="; + url = "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-0.0.12.tgz"; + sha512 = "aFD79i9l282Ob5dOZ7JsyhhXXP1o8eQh0prYkSSVo/OU2ndzWigfANz4DJgWgS3LwBjLDlMcmaXPZZeXt3m4Tg=="; }; }; "@graphql-tools/executor-http-0.1.9" = { @@ -6115,13 +6115,13 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/load-7.8.12" = { + "@graphql-tools/load-7.8.13" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "7.8.12"; + version = "7.8.13"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.8.12.tgz"; - sha512 = "JwxgNS2c6i6oIdKttcbXns/lpKiyN7c6/MkkrJ9x2QE9rXk5HOhSJxRvPmOueCuAin1542xUrcDRGBXJ7thSig=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.8.13.tgz"; + sha512 = "c97/GuUl81Wpa38cx3E6nMz8gUrvVcFokoPfDOaA5uTWSTXA1UxaF4KrvM9P5rNFaKVAtF9f6nMIusRE5B0mag=="; }; }; "@graphql-tools/merge-6.2.17" = { @@ -6142,22 +6142,22 @@ let sha512 = "BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg=="; }; }; - "@graphql-tools/merge-8.3.18" = { + "@graphql-tools/merge-8.4.0" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "8.3.18"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.18.tgz"; - sha512 = "R8nBglvRWPAyLpZL/f3lxsY7wjnAeE0l056zHhcO/CgpvK76KYUt9oEkR05i8Hmt8DLRycBN0FiotJ0yDQWTVA=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.4.0.tgz"; + sha512 = "3XYCWe0d3I4F1azNj1CdShlbHfTIfiDgj00R9uvFH8tHKh7i1IWN3F7QQYovcHKhayaR6zPok3YYMESYQcBoaA=="; }; }; - "@graphql-tools/mock-8.7.18" = { + "@graphql-tools/mock-8.7.19" = { name = "_at_graphql-tools_slash_mock"; packageName = "@graphql-tools/mock"; - version = "8.7.18"; + version = "8.7.19"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.7.18.tgz"; - sha512 = "ZbXMp86V0DmfgUZhr5aGHtNIS2hBazhvTpPlFCyNOP+RMio3ErKnSsma3T1jV1ZyMo11l7QrxV9Xxn3uA0dv+w=="; + url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.7.19.tgz"; + sha512 = "LT2boYM+Y1vGFEhzmC7xDFRL8RPG20FbNcuk2/hHGH0Kh8K1hkItvL89tul3Pl7N6xerOnDZ3c3fx7Ls5GuFxA=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -6178,13 +6178,13 @@ let sha512 = "0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg=="; }; }; - "@graphql-tools/schema-9.0.16" = { + "@graphql-tools/schema-9.0.17" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "9.0.16"; + version = "9.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-9.0.16.tgz"; - sha512 = "kF+tbYPPf/6K2aHG3e1SWIbapDLQaqnIHVRG6ow3onkFoowwtKszvUyOASL6Krcv2x9bIMvd1UkvRf9OaoROQQ=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-9.0.17.tgz"; + sha512 = "HVLq0ecbkuXhJlpZ50IHP5nlISqH2GbNgjBJhhRzHeXhfwlUOT4ISXGquWTmuq61K0xSaO0aCjMpxe4QYbKTng=="; }; }; "@graphql-tools/url-loader-6.10.1" = { @@ -6196,13 +6196,13 @@ let sha512 = "DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw=="; }; }; - "@graphql-tools/url-loader-7.17.13" = { + "@graphql-tools/url-loader-7.17.14" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "7.17.13"; + version = "7.17.14"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.17.13.tgz"; - sha512 = "FEmbvw68kxeZLn4VYGAl+NuBPk09ZnxymjW07A6mCtiDayFgYfHdWeRzXn/iM5PzsEuCD73R1sExtNQ/ISiajg=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.17.14.tgz"; + sha512 = "7boEmrZlbViqQSSvu2VFCGi9YAY7E0BCVObiv1sLYbFR+62mo825As0haU5l7wlx1zCDyUlOleNz+X2jVvBbSQ=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -6268,13 +6268,13 @@ let sha512 = "1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg=="; }; }; - "@graphql-tools/wrap-9.3.7" = { + "@graphql-tools/wrap-9.3.8" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "9.3.7"; + version = "9.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-9.3.7.tgz"; - sha512 = "gavfiWLKgvmC2VPamnMzml3zmkBoo0yt+EmOLIHY6O92o4uMTR281WGM77tZIfq+jzLtjoIOThUSjC/cN/6XKg=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-9.3.8.tgz"; + sha512 = "MGsExYPiILMw4Qff7HcvE9MMSYdjb/tr5IQYJbxJIU4/TrBHox1/smne8HG+Bd7kmDlTTj7nU/Z8sxmoRd0hOQ=="; }; }; "@graphql-typed-document-node/core-3.1.2" = { @@ -6304,6 +6304,15 @@ let sha512 = "f/xC+6Z2QKsRJ+VSSFlt4hA5KSRm+PKvMWV8kMPkMgGlFidR6PeIkXrOasIY2roe+WROM6GFQLlgDKfeEZo2YQ=="; }; }; + "@grpc/grpc-js-1.8.12" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.8.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.12.tgz"; + sha512 = "MbUMvpVvakeKhdYux6gbSIPJaFMLNSY8jw4PqLI+FFztGrQRrYYAnHlR94+ncBQQewkpXQaW449m3tpH/B/ZnQ=="; + }; + }; "@grpc/grpc-js-1.8.4" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; @@ -6313,15 +6322,6 @@ let sha512 = "oaETBotls7FTBpySg5dhyUCyXSxSeCMmkBBXHXG1iw57MiNoB6D7VRhkrXYbwyHM3Q3Afjp4KlsBX0Zb+ELZXw=="; }; }; - "@grpc/grpc-js-1.8.9" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.8.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.9.tgz"; - sha512 = "xzsl2HamhovnZddS/2pMF4Q+FgwINaBvxoFGQ+G54Lo7Xsge36VvfDO/TDkL7FofmrRK/X5weRvwlJh7rKwN4w=="; - }; - }; "@grpc/proto-loader-0.7.4" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -6448,13 +6448,13 @@ let sha512 = "ZI9tcbPfX2d8oP1PNeLzrZLXISAIDUtJQWk4JVVJKCxktC6tQ3JyWXT9t1FbB5xtl82M1jdCgyAbWbjhUtRWcA=="; }; }; - "@hpcc-js/wasm-1.16.6" = { + "@hpcc-js/wasm-2.5.0" = { name = "_at_hpcc-js_slash_wasm"; packageName = "@hpcc-js/wasm"; - version = "1.16.6"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-1.16.6.tgz"; - sha512 = "heqfVIqFifmjEaUiHW6ZHLHZ4fQ8EFFhYlNJWFB/F/gHsjKEuBih0bNbSHkdh0opuKNwqfGvLqNXpoNbbec69g=="; + url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.5.0.tgz"; + sha512 = "G26BamgaHW46f6P8bmkygapgNcy+tTDMwIvCzmMzdp39sxUS1u4gaT/vR2SSDc4x3SfL5RE4B2B8ef/wd429Hg=="; }; }; "@httptoolkit/websocket-stream-6.0.1" = { @@ -6556,13 +6556,22 @@ let sha512 = "trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="; }; }; - "@ibm-cloud/openapi-ruleset-0.37.3" = { + "@ibm-cloud/openapi-ruleset-0.45.5" = { name = "_at_ibm-cloud_slash_openapi-ruleset"; packageName = "@ibm-cloud/openapi-ruleset"; - version = "0.37.3"; + version = "0.45.5"; src = fetchurl { - url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset/-/openapi-ruleset-0.37.3.tgz"; - sha512 = "saQM/1YTfhW7ou/mtmC4BMUhW/UM54aD47KBZucjrZLvAelzt8Lykm5zeN59Cu4cs/LBDEcvJfyZzDpPhdcVjQ=="; + url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset/-/openapi-ruleset-0.45.5.tgz"; + sha512 = "8FqJQj8osll6iLOD5JsFWR+kOU1HbCp1Z2PjHeE67Wb/srz7V9B+YyjZOO9QAgLLHwvgt07XS13FQ+ArNNetGg=="; + }; + }; + "@ibm-cloud/openapi-ruleset-utilities-0.0.1" = { + name = "_at_ibm-cloud_slash_openapi-ruleset-utilities"; + packageName = "@ibm-cloud/openapi-ruleset-utilities"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset-utilities/-/openapi-ruleset-utilities-0.0.1.tgz"; + sha512 = "LBWf21EYmOJnM4azYPM4LsNbiH9GBK8rc1dwmDhuUELI43dEOGWSs2ateLn8/E9vyrVELGwQ1Y3Bu61YHa8kaA=="; }; }; "@intervolga/optimize-cssnano-plugin-1.0.6" = { @@ -7204,13 +7213,13 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsdoc/salty-0.2.3" = { + "@jsdoc/salty-0.2.5" = { name = "_at_jsdoc_slash_salty"; packageName = "@jsdoc/salty"; - version = "0.2.3"; + version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.3.tgz"; - sha512 = "bbtCxCkxcnWhi50I+4Lj6mdz9w3pOXOgEQrID8TCZ/DF51fW7M9GCQW2y45SpBDdHd1Eirm1X/Cf6CkAAe8HPg=="; + url = "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.5.tgz"; + sha512 = "TfRP53RqunNe2HBobVBJ0VLhK1HbfvBYeTC1ahnN64PWvyYyGebmMiPkuwvD9fpw2ZbkoPb8Q7mwy0aR8Z9rvw=="; }; }; "@jsep-plugin/regex-1.0.3" = { @@ -7231,22 +7240,22 @@ let sha512 = "qtLGzCNzPVJ3kdH6/zoLWDPjauHIKiLSBAR71Wa0+PWvGA8wODUQvRgxtpUA5YqAYL3CQ8S4qXhd/9WuWTZirg=="; }; }; - "@jsii/check-node-1.76.0" = { + "@jsii/check-node-1.77.0" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; - version = "1.76.0"; + version = "1.77.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.76.0.tgz"; - sha512 = "iAQohlms0FQNtmAsXOV9Rrd7QDikkLw68R2TPwhlVKuLPdHPKIK3gyeN0jqZzc0luNQ9h+3P7kSqfpKd+Kr79Q=="; + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.77.0.tgz"; + sha512 = "kgq4h5SrpIuM9CZ6uZVZ9KrJCPSn6zwz4y60ZEIFMA5aqkBN1n7MhTJglG6I8IaL2uYm7P5kZf6+eGNI+n3tig=="; }; }; - "@jsii/spec-1.76.0" = { + "@jsii/spec-1.77.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.76.0"; + version = "1.77.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.76.0.tgz"; - sha512 = "7L8KeG44ECq0ulKYWaOr0FQvnFW7RavjxEGvMAdKfIOXb5mZyGERnj5pKl5kmq2m1lWE2VBZELoTfM7dDlAPtg=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.77.0.tgz"; + sha512 = "QmwXRREX8W1YOdKHbfu+Tw0rygdCJ2AYcKt7iu56Is2giQ9doyRLKvzywXoKxJjZtj9E7Sp0GdDob8pl8cwmlg=="; }; }; "@json2csv/formatters-6.1.2" = { @@ -7825,13 +7834,13 @@ let sha512 = "W+IzEBw8a6LOOfRJM02dTT7BDZijxm+Z7lhtOAz1+y9vQm1Kdz9jlAO+qCEKsfxtUOmKilW8DIRqFw2aUgKeGg=="; }; }; - "@microsoft/rush-lib-5.93.1" = { + "@microsoft/rush-lib-5.93.2" = { name = "_at_microsoft_slash_rush-lib"; packageName = "@microsoft/rush-lib"; - version = "5.93.1"; + version = "5.93.2"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.93.1.tgz"; - sha512 = "8ZCSW4He9VPAAsF2T/OxVaTN06wLbzeEveOvEuwNJ5h6AQYPTtlH0yv8cDDuZqSEVgOv/gK4D+kAExOszYm06A=="; + url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.93.2.tgz"; + sha512 = "EFlEY8nRmVrcI7Va8/iTQdeT4ORvWj3Ez+EGqCqzU8g39IyKJvp1Yrva4wGebIs5xH7rxLQiFLvDa2iZ/0kanQ=="; }; }; "@miniflare/cache-2.12.1" = { @@ -8059,58 +8068,58 @@ let sha512 = "h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ=="; }; }; - "@msgpackr-extract/msgpackr-extract-darwin-arm64-3.0.1" = { + "@msgpackr-extract/msgpackr-extract-darwin-arm64-3.0.2" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-darwin-arm64"; packageName = "@msgpackr-extract/msgpackr-extract-darwin-arm64"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.1.tgz"; - sha512 = "5o52DqsMswZhfFIsuqLYUXlSpYdwpTyPxGNdByvuWKp2ZMFkI2qne9FAbsYWkLYKTY0b5OnuFRasvGO4VwZhJw=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.2.tgz"; + sha512 = "9bfjwDxIDWmmOKusUcqdS4Rw+SETlp9Dy39Xui9BEGEk19dDwH0jhipwFzEff/pFg95NKymc6TOTbRKcWeRqyQ=="; }; }; - "@msgpackr-extract/msgpackr-extract-darwin-x64-3.0.1" = { + "@msgpackr-extract/msgpackr-extract-darwin-x64-3.0.2" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-darwin-x64"; packageName = "@msgpackr-extract/msgpackr-extract-darwin-x64"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.1.tgz"; - sha512 = "/UbtGNtEkfoqdLmNbHx2r+g5YPARwxmB4PoG47q3a/4qnAU/3cSJFo3oidDRZzB5KD3+lYvq29HRA4+nXJ0LNw=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.2.tgz"; + sha512 = "lwriRAHm1Yg4iDf23Oxm9n/t5Zpw1lVnxYU3HnJPTi2lJRkKTrps1KVgvL6m7WvmhYVt/FIsssWay+k45QHeuw=="; }; }; - "@msgpackr-extract/msgpackr-extract-linux-arm-3.0.1" = { + "@msgpackr-extract/msgpackr-extract-linux-arm-3.0.2" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-linux-arm"; packageName = "@msgpackr-extract/msgpackr-extract-linux-arm"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.1.tgz"; - sha512 = "WCFK1OVoXXTHDGEkpVTKxWsKphfutyrrU2HtIDaecgKfTCI/kBoT6FVMQrm7mSdVcBuxpsBkL25L6k2fz2wFlQ=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.2.tgz"; + sha512 = "MOI9Dlfrpi2Cuc7i5dXdxPbFIgbDBGgKR5F2yWEa6FVEtSWncfVNKW5AKjImAQ6CZlBK9tympdsZJ2xThBiWWA=="; }; }; - "@msgpackr-extract/msgpackr-extract-linux-arm64-3.0.1" = { + "@msgpackr-extract/msgpackr-extract-linux-arm64-3.0.2" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-linux-arm64"; packageName = "@msgpackr-extract/msgpackr-extract-linux-arm64"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.1.tgz"; - sha512 = "2aCdVMgx8BrNOP0E6Xf00z2C5+pGUgQpS7F5rTGhWWnyAsCNKOScBxj7waWKBOz6K5mPTFLQcV+yoAf3iGMBSA=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.2.tgz"; + sha512 = "FU20Bo66/f7He9Fp9sP2zaJ1Q8L9uLPZQDub/WlUip78JlPeMbVL8546HbZfcW9LNciEXc8d+tThSJjSC+tmsg=="; }; }; - "@msgpackr-extract/msgpackr-extract-linux-x64-3.0.1" = { + "@msgpackr-extract/msgpackr-extract-linux-x64-3.0.2" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-linux-x64"; packageName = "@msgpackr-extract/msgpackr-extract-linux-x64"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.1.tgz"; - sha512 = "VQr5D19ssachwhvVWWiTLZlB8pD+rD/XLlcCU3iOlSsb6O2OIfmSrVCqPS59KtP61EW4hTOovnmtJv+9EqcMFA=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.2.tgz"; + sha512 = "gsWNDCklNy7Ajk0vBBf9jEx04RUxuDQfBse918Ww+Qb9HCPoGzS+XJTLe96iN3BVK7grnLiYghP/M4L8VsaHeA=="; }; }; - "@msgpackr-extract/msgpackr-extract-win32-x64-3.0.1" = { + "@msgpackr-extract/msgpackr-extract-win32-x64-3.0.2" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-win32-x64"; packageName = "@msgpackr-extract/msgpackr-extract-win32-x64"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.1.tgz"; - sha512 = "2gqEM4ybMpI51HPOiYgI63n9UDF7qvwZB2w92RQJQVb27gLUeUtTL7kJx/NpZvuNC4dcPJDY7kU7p5GWZ6Z5Qw=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.2.tgz"; + sha512 = "O+6Gs8UeDbyFpbSh2CPEz/UOrrdWPTBYNblZK5CxxLisYt4kGX3Sc+czffFonyjiGSq3jWLwJS/CCJc7tBr4sQ=="; }; }; "@nestjs/schematics-9.0.4" = { @@ -8194,130 +8203,130 @@ let sha512 = "zhxmFk48QEC4coBN0G0JDHt727+BlZS2QZarWs9hLeNDBdhjlU58RY0lhDgqODu/Z3JvBmIdPhCtDcvHpe4zmw=="; }; }; - "@node-rs/crc32-1.6.0" = { + "@node-rs/crc32-1.6.1" = { name = "_at_node-rs_slash_crc32"; packageName = "@node-rs/crc32"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32/-/crc32-1.6.0.tgz"; - sha512 = "B21ivhDp8IKhEaxOZ/H3gdtDVyFHmnHudfGMeTysLj2arRpntCIoxyL0pMXz7g4kf6FupzvNESHb8557LvCWHA=="; + url = "https://registry.npmjs.org/@node-rs/crc32/-/crc32-1.6.1.tgz"; + sha512 = "LRl9o3Ft7Rqs1DrMHr6HLHSx6SAtAJrgNFQZddiCwtpt6CF82ubKOhjY6wK/Cx8dbXq1IoXE0V3CS02oosHQGQ=="; }; }; - "@node-rs/crc32-android-arm-eabi-1.6.0" = { + "@node-rs/crc32-android-arm-eabi-1.6.1" = { name = "_at_node-rs_slash_crc32-android-arm-eabi"; packageName = "@node-rs/crc32-android-arm-eabi"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-android-arm-eabi/-/crc32-android-arm-eabi-1.6.0.tgz"; - sha512 = "ZxWoWfEaKJ4k9x9IRSzZwPff1xTbeTbTTWOXFgnW0myVqFRF4toGiRK3uJnj7of47SsVwjZn1XrO2snLbo77Bg=="; + url = "https://registry.npmjs.org/@node-rs/crc32-android-arm-eabi/-/crc32-android-arm-eabi-1.6.1.tgz"; + sha512 = "pvYzF2Jfw0EbE7hUGTB7Hapc/Q2vBUynxndVQhJSP1hgajNKgxdx5yYuKvINFeXYIpsEQ6tS1r4muRq3/+v61w=="; }; }; - "@node-rs/crc32-android-arm64-1.6.0" = { + "@node-rs/crc32-android-arm64-1.6.1" = { name = "_at_node-rs_slash_crc32-android-arm64"; packageName = "@node-rs/crc32-android-arm64"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-android-arm64/-/crc32-android-arm64-1.6.0.tgz"; - sha512 = "DyeB3uzMD3Ctfr3dZzLwfy6zDK5GFdaqgCElILwx7S5tMeqlEpLxeAqMFoiovq98+0G+QHhNlAikfDJWDYTmFA=="; + url = "https://registry.npmjs.org/@node-rs/crc32-android-arm64/-/crc32-android-arm64-1.6.1.tgz"; + sha512 = "dtmAGGB91sstUsWw+a6hsJweLpuFnu7ID9aFjbI2ghUf2ybiL479nGE36kxtlAYei8eqRcjmvo7+G4VjFXDuxg=="; }; }; - "@node-rs/crc32-darwin-arm64-1.6.0" = { + "@node-rs/crc32-darwin-arm64-1.6.1" = { name = "_at_node-rs_slash_crc32-darwin-arm64"; packageName = "@node-rs/crc32-darwin-arm64"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-darwin-arm64/-/crc32-darwin-arm64-1.6.0.tgz"; - sha512 = "Mb4fx1EtEc163ZuuU1kOYJpgQDiKllnjX5WW0k5JFL17MwOwC2AiZfiIVxqjqDUZ6kim8Fvg3205zxNpYcy5Xw=="; + url = "https://registry.npmjs.org/@node-rs/crc32-darwin-arm64/-/crc32-darwin-arm64-1.6.1.tgz"; + sha512 = "b8LQ5mBf2+7MwiINr9uvWawYLOticMiqlyczE+WkJqUh59UGPXuSEMAmJG7zE+5zXkn2lVu4vB40klW4aBr9vg=="; }; }; - "@node-rs/crc32-darwin-x64-1.6.0" = { + "@node-rs/crc32-darwin-x64-1.6.1" = { name = "_at_node-rs_slash_crc32-darwin-x64"; packageName = "@node-rs/crc32-darwin-x64"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-darwin-x64/-/crc32-darwin-x64-1.6.0.tgz"; - sha512 = "lizIV4mxI5jw3vviHBLRM6Q8u0iizeIKHx2QKTEiD4b2KMZrce1kv0QAnz/RNxZ47ajRe3cp5B8KceSm8/qcng=="; + url = "https://registry.npmjs.org/@node-rs/crc32-darwin-x64/-/crc32-darwin-x64-1.6.1.tgz"; + sha512 = "VhVDKvk/HymNDySbXeeoRFhBDBpqSAl0UwX2SNU2mE86cudsPGP49s41oYlI/qN2YeSrlKPJlzOo65Y4PhxVQg=="; }; }; - "@node-rs/crc32-freebsd-x64-1.6.0" = { + "@node-rs/crc32-freebsd-x64-1.6.1" = { name = "_at_node-rs_slash_crc32-freebsd-x64"; packageName = "@node-rs/crc32-freebsd-x64"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-freebsd-x64/-/crc32-freebsd-x64-1.6.0.tgz"; - sha512 = "mdl9K0JixpprjfJQ3gEfyvwH4kzklqROmoDoDRX2DiF86c6KVaVVN2w33PgHXfsJo36taime2+pMaHexae+lNQ=="; + url = "https://registry.npmjs.org/@node-rs/crc32-freebsd-x64/-/crc32-freebsd-x64-1.6.1.tgz"; + sha512 = "VPeq58gtUHUxe2KHwmeloO7X25fk1BbU3aJsKswe1wQIbms2KNfypy6fVNQs/VLsTurRZKJSJNKJxFvb8Vs6pQ=="; }; }; - "@node-rs/crc32-linux-arm-gnueabihf-1.6.0" = { + "@node-rs/crc32-linux-arm-gnueabihf-1.6.1" = { name = "_at_node-rs_slash_crc32-linux-arm-gnueabihf"; packageName = "@node-rs/crc32-linux-arm-gnueabihf"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm-gnueabihf/-/crc32-linux-arm-gnueabihf-1.6.0.tgz"; - sha512 = "fyyQi2qiGLqy5bMdzG+Y4p+/nRvjOG92t6qZBFmdWrcQnj0jxfPqORPNUYvSGfvDW7PgUI/+IAo8bpgNt6GbzA=="; + url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm-gnueabihf/-/crc32-linux-arm-gnueabihf-1.6.1.tgz"; + sha512 = "Ee9oNLnAhd3xXyvC3xEtVNlvWTPs17S17gBo6Go+xRHVRf1nS8Xvxkt27WDpYt4DQnvCz8n5u52gbaVjSqi0tA=="; }; }; - "@node-rs/crc32-linux-arm64-gnu-1.6.0" = { + "@node-rs/crc32-linux-arm64-gnu-1.6.1" = { name = "_at_node-rs_slash_crc32-linux-arm64-gnu"; packageName = "@node-rs/crc32-linux-arm64-gnu"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm64-gnu/-/crc32-linux-arm64-gnu-1.6.0.tgz"; - sha512 = "NhFPUDz/A8C/su/kNrtG0FgtQJuxW1KwIUJySAinGVDDqSWUcKr+jeFMsYKWU331AIJW6uCMIaJowE2tQ0lnBQ=="; + url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm64-gnu/-/crc32-linux-arm64-gnu-1.6.1.tgz"; + sha512 = "0Q90Tzl/gpZtQ13pcEnnqL/usWk7X5l7SCquB9QW9IIAha+vtVOyylcuyrXOiDQaMcEfVs2EMWtcufXfrxZwiw=="; }; }; - "@node-rs/crc32-linux-arm64-musl-1.6.0" = { + "@node-rs/crc32-linux-arm64-musl-1.6.1" = { name = "_at_node-rs_slash_crc32-linux-arm64-musl"; packageName = "@node-rs/crc32-linux-arm64-musl"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm64-musl/-/crc32-linux-arm64-musl-1.6.0.tgz"; - sha512 = "N35CF21n07JkKAAEp+6E+ARrOUsk6Z5In/h16wDArTagMb+u6VxByc97G01htnb+G0ZpZ0q8MLWuH29gbypOGg=="; + url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm64-musl/-/crc32-linux-arm64-musl-1.6.1.tgz"; + sha512 = "PF1klYsrRwfCALepuvCn6Egbw+k5MaNoEuR6l94sJmWE1KkEcAtFXiV5R2o4XDsWxRk8haKYymH27QGqpslxxw=="; }; }; - "@node-rs/crc32-linux-x64-gnu-1.6.0" = { + "@node-rs/crc32-linux-x64-gnu-1.6.1" = { name = "_at_node-rs_slash_crc32-linux-x64-gnu"; packageName = "@node-rs/crc32-linux-x64-gnu"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-linux-x64-gnu/-/crc32-linux-x64-gnu-1.6.0.tgz"; - sha512 = "6cZIh4un/IlKHJKWQS1KPbMIEkfK47cHd4m7YkwNjwXiT62hzkyfWA+D/io0L8glqUyGAcStQGv8fpRngIkdkw=="; + url = "https://registry.npmjs.org/@node-rs/crc32-linux-x64-gnu/-/crc32-linux-x64-gnu-1.6.1.tgz"; + sha512 = "6NpgS8NQpGy8xQDSfKWBAA129fANvL+WxoZ3PjGT4yFLcisHA2g5FYDIxnH79Q0p2bIsB6DFP6v310r2Weck6g=="; }; }; - "@node-rs/crc32-linux-x64-musl-1.6.0" = { + "@node-rs/crc32-linux-x64-musl-1.6.1" = { name = "_at_node-rs_slash_crc32-linux-x64-musl"; packageName = "@node-rs/crc32-linux-x64-musl"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-linux-x64-musl/-/crc32-linux-x64-musl-1.6.0.tgz"; - sha512 = "DKd2SwAsf5RJW9BHZqLW0NAKxCRFL3GDEzuUm43wn53XEcL6hmezCUtmNHOmdehIiwNyGEruBh1kekH3JPSYYw=="; + url = "https://registry.npmjs.org/@node-rs/crc32-linux-x64-musl/-/crc32-linux-x64-musl-1.6.1.tgz"; + sha512 = "W17m90y6U0erfH0Hpqu7iCF6F9g4x3RXe0Y9H8ewu4q77P8JkOj2yhWiFUG/xJbVmDJ87mGBJkIXQx9NH6xK+w=="; }; }; - "@node-rs/crc32-win32-arm64-msvc-1.6.0" = { + "@node-rs/crc32-win32-arm64-msvc-1.6.1" = { name = "_at_node-rs_slash_crc32-win32-arm64-msvc"; packageName = "@node-rs/crc32-win32-arm64-msvc"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-win32-arm64-msvc/-/crc32-win32-arm64-msvc-1.6.0.tgz"; - sha512 = "OzO+4V426M1qIJWGkIJwbhJ38MdIA/AJvsoW3O5t/zkabtbZVNROJi2aWObxQvUmb+kowItzNj4OqcWz0ZEqMQ=="; + url = "https://registry.npmjs.org/@node-rs/crc32-win32-arm64-msvc/-/crc32-win32-arm64-msvc-1.6.1.tgz"; + sha512 = "Vs+7xsERI5v+zQ+jPXCuRDB8oW2dZMy5kzeKM6oB43mYIoLLWWw5JgaMCOsbkb50da8BIaZxn8eWaqv8TNfzwg=="; }; }; - "@node-rs/crc32-win32-ia32-msvc-1.6.0" = { + "@node-rs/crc32-win32-ia32-msvc-1.6.1" = { name = "_at_node-rs_slash_crc32-win32-ia32-msvc"; packageName = "@node-rs/crc32-win32-ia32-msvc"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-win32-ia32-msvc/-/crc32-win32-ia32-msvc-1.6.0.tgz"; - sha512 = "uONkPIn9Lxdq34CSJFeYvy1npzgEXMbfukoyTLikXi3TlTb+tTqRKLZtUx3/ypuRg+t3ka9iVeywFqhWfBYIFg=="; + url = "https://registry.npmjs.org/@node-rs/crc32-win32-ia32-msvc/-/crc32-win32-ia32-msvc-1.6.1.tgz"; + sha512 = "ux9MC146/kCKHBxNCQnVJxroQn0TaUTubyYFivh+YTnhVMw+kVls5HukesT5o1CXVochhFjIJ8AfVPWoeZg1BQ=="; }; }; - "@node-rs/crc32-win32-x64-msvc-1.6.0" = { + "@node-rs/crc32-win32-x64-msvc-1.6.1" = { name = "_at_node-rs_slash_crc32-win32-x64-msvc"; packageName = "@node-rs/crc32-win32-x64-msvc"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-win32-x64-msvc/-/crc32-win32-x64-msvc-1.6.0.tgz"; - sha512 = "raJJVGbP/KbffTAbIW5hl9/N4VMj9zIonskJy2xVEmo/B6TZtkjhRcaXZvgWqjVqh2SzO94HCphygD1qxT4EYw=="; + url = "https://registry.npmjs.org/@node-rs/crc32-win32-x64-msvc/-/crc32-win32-x64-msvc-1.6.1.tgz"; + sha512 = "/HQScvmbh1j7Y1uFS4ceL7hjU50wraUWQ5jD8cIAb1ibcf04Lwsm7BMh5BkoT8ZC/WtIALMxVM01kn5SJjPCgw=="; }; }; "@nodelib/fs.scandir-2.1.5" = { @@ -8644,112 +8653,112 @@ let sha512 = "ql+AbRur1TeOdl1FY+RAwGW9fcr4ZwiVKabdvm93mujGREVuVLbdkXRJDrkTXSdCjaxYydr1wlA2v67jxWG5BQ=="; }; }; - "@nrwl/cli-15.7.2" = { + "@nrwl/cli-15.8.5" = { name = "_at_nrwl_slash_cli"; packageName = "@nrwl/cli"; - version = "15.7.2"; + version = "15.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/cli/-/cli-15.7.2.tgz"; - sha512 = "A/72FAW1e0ku8YB/PaCqN9BpVvciO83MS5F5bvX5PA8xCNqe1+iXp/5T2ASnN2lB9zR3fQJmvR7mHKTKQlqQQQ=="; + url = "https://registry.npmjs.org/@nrwl/cli/-/cli-15.8.5.tgz"; + sha512 = "voy16nUO1MxRMRqCpLlhDB9U4KyPfGHZABXtfMEIQk+W3alncatFMMSVvMQZmi8HXwubM8LxWSOnPtTtOCKBrQ=="; }; }; - "@nrwl/devkit-15.7.2" = { + "@nrwl/devkit-15.8.5" = { name = "_at_nrwl_slash_devkit"; packageName = "@nrwl/devkit"; - version = "15.7.2"; + version = "15.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-15.7.2.tgz"; - sha512 = "HMGi7L6w2g4IrYwhb04snD8Zr24Z/gzau5i9WUNkwzrjeR1xAm0Cc9WRre221zaeohtK11gyBt7BerT1tgkNwA=="; + url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-15.8.5.tgz"; + sha512 = "NgpD1I1BfFb6wRxB5i5PGP4hMyRhPsArCyENWWvY4gCn8tylAc7yjpQyiDiy2QnymL2PjWM8QeAeCOy1eF2xgw=="; }; }; - "@nrwl/nx-darwin-arm64-15.7.2" = { + "@nrwl/nx-darwin-arm64-15.8.5" = { name = "_at_nrwl_slash_nx-darwin-arm64"; packageName = "@nrwl/nx-darwin-arm64"; - version = "15.7.2"; + version = "15.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/nx-darwin-arm64/-/nx-darwin-arm64-15.7.2.tgz"; - sha512 = "F82exjuqkAkElSTxEcTFeLMhHpbGiccfTQh2VjXMS+ONldxM+Kd7atJjtUG8wKNXfg0lxxjjAdnzLy3iBuN/HQ=="; + url = "https://registry.npmjs.org/@nrwl/nx-darwin-arm64/-/nx-darwin-arm64-15.8.5.tgz"; + sha512 = "/8yXbh1J3k85MAW/A6cDiPeEnbt66SE9BPnM2IPlGoZrXakQvAXEn+gsjQlvnP3q2EaEyv7e5+GA+8d+p6mT5A=="; }; }; - "@nrwl/nx-darwin-x64-15.7.2" = { + "@nrwl/nx-darwin-x64-15.8.5" = { name = "_at_nrwl_slash_nx-darwin-x64"; packageName = "@nrwl/nx-darwin-x64"; - version = "15.7.2"; + version = "15.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/nx-darwin-x64/-/nx-darwin-x64-15.7.2.tgz"; - sha512 = "MNT7Bxz6yhoVLCgGpR0NtVkj20SER1CbrCaY7tmsKVNY9iA/EOZhz9qa3LeA1KZ4lw8Gpi2vD42mOngn7Mwr7w=="; + url = "https://registry.npmjs.org/@nrwl/nx-darwin-x64/-/nx-darwin-x64-15.8.5.tgz"; + sha512 = "zEVoi0d+YChLrQMypoGFwu73t3YiD8UkXSozMtUEa2mg/se4e7jh+15tB6Te+Oq5aL0JKwQpr027GE4YtAmpLw=="; }; }; - "@nrwl/nx-linux-arm-gnueabihf-15.7.2" = { + "@nrwl/nx-linux-arm-gnueabihf-15.8.5" = { name = "_at_nrwl_slash_nx-linux-arm-gnueabihf"; packageName = "@nrwl/nx-linux-arm-gnueabihf"; - version = "15.7.2"; + version = "15.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-15.7.2.tgz"; - sha512 = "QGyPkYnZ9LnUnuCzrP50bwsMJ9n6r8K2bNC1sQQwioijY+4MHNL+bMTOGWc8+lYBP7Ju3gpTqozGV3FQVkaM2w=="; + url = "https://registry.npmjs.org/@nrwl/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-15.8.5.tgz"; + sha512 = "4C5wN0C7gQD6/lC9+UKUsB6mbHvowKhlaO529GIgtzrCLmfEh/LJ/CybnnKGpFEB/8Y5GpCa2uTWyA1XcPDzUw=="; }; }; - "@nrwl/nx-linux-arm64-gnu-15.7.2" = { + "@nrwl/nx-linux-arm64-gnu-15.8.5" = { name = "_at_nrwl_slash_nx-linux-arm64-gnu"; packageName = "@nrwl/nx-linux-arm64-gnu"; - version = "15.7.2"; + version = "15.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-15.7.2.tgz"; - sha512 = "HqufFVIvuunfChEFGkIhsLhhQjWLTFcCH2aQBSNesHpm6AhFVRGyokNu+PT6NNobr+BTrqJMocBqNQR1uvSyRQ=="; + url = "https://registry.npmjs.org/@nrwl/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-15.8.5.tgz"; + sha512 = "SMQ+oIsyK75JiKeSMprmb8VXce6MLdfcS5GWWOihpoDWfUC9FoQHAu4X1OtxHbVTmJfoEOInJKAhPxXAi5obdw=="; }; }; - "@nrwl/nx-linux-arm64-musl-15.7.2" = { + "@nrwl/nx-linux-arm64-musl-15.8.5" = { name = "_at_nrwl_slash_nx-linux-arm64-musl"; packageName = "@nrwl/nx-linux-arm64-musl"; - version = "15.7.2"; + version = "15.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/nx-linux-arm64-musl/-/nx-linux-arm64-musl-15.7.2.tgz"; - sha512 = "9B8q6I/OVyQuYe+Yg2wNyxza/CsbvejIUsrK3QGGWUwHlkklqOSmUOHyTrcyMHUSped6CWPyKdIywngYOQzltQ=="; + url = "https://registry.npmjs.org/@nrwl/nx-linux-arm64-musl/-/nx-linux-arm64-musl-15.8.5.tgz"; + sha512 = "GVENjltZ17aJ6KOCibdBtLXQcGY5lpBqKolB9+rIYJvTWuV1k/uHOkYJDG7Vl70Rj46rC8K0Jp6BCpJHCv1ksQ=="; }; }; - "@nrwl/nx-linux-x64-gnu-15.7.2" = { + "@nrwl/nx-linux-x64-gnu-15.8.5" = { name = "_at_nrwl_slash_nx-linux-x64-gnu"; packageName = "@nrwl/nx-linux-x64-gnu"; - version = "15.7.2"; + version = "15.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/nx-linux-x64-gnu/-/nx-linux-x64-gnu-15.7.2.tgz"; - sha512 = "8/6WtQn4derYKUWu5SxWWM+1dGihSZXMhDW9l/sXOr/qbMZu3XBmM2XZSguw/+p9gEVHcMmN0+D+Cai+q6/vDQ=="; + url = "https://registry.npmjs.org/@nrwl/nx-linux-x64-gnu/-/nx-linux-x64-gnu-15.8.5.tgz"; + sha512 = "AW8YjhZv3c+LRUoLvHLx4BZaDakQbPCPx70+c/uQyDkQP/ckYJc0gRjoZukolcI6+AvNcBhkI559RL9W4qb9iw=="; }; }; - "@nrwl/nx-linux-x64-musl-15.7.2" = { + "@nrwl/nx-linux-x64-musl-15.8.5" = { name = "_at_nrwl_slash_nx-linux-x64-musl"; packageName = "@nrwl/nx-linux-x64-musl"; - version = "15.7.2"; + version = "15.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/nx-linux-x64-musl/-/nx-linux-x64-musl-15.7.2.tgz"; - sha512 = "c5SbqYZZBeBHhH5E30xwb4cHzCMVa/GQMCyTpZgsS/AHAPHbdkv+pO6bxxALvLPTyimcub7V+xbLCL7rgALzyw=="; + url = "https://registry.npmjs.org/@nrwl/nx-linux-x64-musl/-/nx-linux-x64-musl-15.8.5.tgz"; + sha512 = "m4Iy/pbzH0LTsADq/X+74nfVzm2Tt0zorOXXy/uQN4ozL/JNGVpwvxdOFxZ7e3RBXDX4u6awUzSE52Z2d2f0uA=="; }; }; - "@nrwl/nx-win32-arm64-msvc-15.7.2" = { + "@nrwl/nx-win32-arm64-msvc-15.8.5" = { name = "_at_nrwl_slash_nx-win32-arm64-msvc"; packageName = "@nrwl/nx-win32-arm64-msvc"; - version = "15.7.2"; + version = "15.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-15.7.2.tgz"; - sha512 = "gWD/+gSO3XBma8PHX1Dp86fM6EcntHFfa7n/BISwDFkZ19MfV/gK6HbO847fkD6I34/IcDM/z1PsFwoIpTeoow=="; + url = "https://registry.npmjs.org/@nrwl/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-15.8.5.tgz"; + sha512 = "4AT1PHo5At8AXvgE5XlQbimE0THeSji6J3XZ1UTqq7n3L26QicNdnZcaHGyL1ukMtXRIwT/yed+xu1PFkXF4QA=="; }; }; - "@nrwl/nx-win32-x64-msvc-15.7.2" = { + "@nrwl/nx-win32-x64-msvc-15.8.5" = { name = "_at_nrwl_slash_nx-win32-x64-msvc"; packageName = "@nrwl/nx-win32-x64-msvc"; - version = "15.7.2"; + version = "15.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/nx-win32-x64-msvc/-/nx-win32-x64-msvc-15.7.2.tgz"; - sha512 = "ARE4qGPgk+e+pSm0uPhHan5UCRtwNYc5ddVNS88NFrVoDTPm5MxYLGdvLnshWWio/Bx526FcwUMSCBWSW8HIFw=="; + url = "https://registry.npmjs.org/@nrwl/nx-win32-x64-msvc/-/nx-win32-x64-msvc-15.8.5.tgz"; + sha512 = "53vzsQErvN4OeF/qBgfPg6OZ3smX4V8Lza59bwql9aAjjlMe1Ff9Su0BgAqlhVfSiYGxAirfHljgA6aWFqpCHQ=="; }; }; - "@nrwl/tao-15.7.2" = { + "@nrwl/tao-15.8.5" = { name = "_at_nrwl_slash_tao"; packageName = "@nrwl/tao"; - version = "15.7.2"; + version = "15.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/tao/-/tao-15.7.2.tgz"; - sha512 = "srx9heMIt/QIyuqfewiVYbRpFcD/2pHkTkrEEUKspPd25kzAL2adcAITQKVCHI7/VS2sPdDR67pVsGQPZFBMRQ=="; + url = "https://registry.npmjs.org/@nrwl/tao/-/tao-15.8.5.tgz"; + sha512 = "pb/hUprOOv2vgvbevGz9hiu8LLOtK7KKuBe4JLSXrFxfHEQjMFsK/2aymnts0ZQrA83QlIG2Mr0tuSKj6/iWvg=="; }; }; "@oclif/command-1.8.0" = { @@ -9283,58 +9292,58 @@ let sha512 = "oPQdbFDmZvjXk5ZDoBGXG8B4tSB/qW5vQunJWQMFUBp7Xe8O1ByPANueJ+Jzg58esEBegyyxZ7LRmfJr7kFcFg=="; }; }; - "@orval/angular-6.12.0" = { + "@orval/angular-6.12.1" = { name = "_at_orval_slash_angular"; packageName = "@orval/angular"; - version = "6.12.0"; + version = "6.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/angular/-/angular-6.12.0.tgz"; - sha512 = "PtJYqmf666csQn90fb+3/lcG8uOEFOYXJIO8aeKzeEVgLeYw3sLXY5qje6KTWP6uxQKPVlmvNskdIPazobQCeQ=="; + url = "https://registry.npmjs.org/@orval/angular/-/angular-6.12.1.tgz"; + sha512 = "X9zpI7wccGnZh/pKApSkuG1vwa8W3VVIHvY0H6iJ3fDi721JicdwF28bIdYFpRYEyVXLSEc24NELvcyJeXapeQ=="; }; }; - "@orval/axios-6.12.0" = { + "@orval/axios-6.12.1" = { name = "_at_orval_slash_axios"; packageName = "@orval/axios"; - version = "6.12.0"; + version = "6.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/axios/-/axios-6.12.0.tgz"; - sha512 = "O3IzwtN0qzlUfJ0mOpS7HauoNKtaHq4fJ4IpUvGC8O9ZhnleVlVxd5Q0Ua+5vQSPSTeR8rqHGFOgH49N8UgN7g=="; + url = "https://registry.npmjs.org/@orval/axios/-/axios-6.12.1.tgz"; + sha512 = "aXihe799adzHzLJJVrs/QjgfKlIH0XE0jTnLFD2ugMg7RmL/O1TBhq+cZ0XT4tV0nvnsLJf8E6Q063N988BF+g=="; }; }; - "@orval/core-6.12.0" = { + "@orval/core-6.12.1" = { name = "_at_orval_slash_core"; packageName = "@orval/core"; - version = "6.12.0"; + version = "6.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/core/-/core-6.12.0.tgz"; - sha512 = "zLO9k2IpzAGkafBj/uqCwiNH5n3h97uV29o3Rxq6YFyV67xMUFxhQN4mhiK/Lm1z+ZfYrdUyoJxfiXVLXqdYqA=="; + url = "https://registry.npmjs.org/@orval/core/-/core-6.12.1.tgz"; + sha512 = "W0R6broXx8ax50eLhTteOZ9wSVLT1Do1HYlFTjoDKMUSRvUQP8TtV6VIbI8UdMm9ZVx5YnSshbYvb4PBk3TuEw=="; }; }; - "@orval/msw-6.12.0" = { + "@orval/msw-6.12.1" = { name = "_at_orval_slash_msw"; packageName = "@orval/msw"; - version = "6.12.0"; + version = "6.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/msw/-/msw-6.12.0.tgz"; - sha512 = "r6ABZ9frp607xcIPeMTNjai+9RzOYcRAiztk3S7nVTcEEvQWBpvr63wzXkKu1yyUjN5UxUXSGYgfLS7McDbLdA=="; + url = "https://registry.npmjs.org/@orval/msw/-/msw-6.12.1.tgz"; + sha512 = "53j9bsQjGM9/9bnP1X2vDPM1ZBx4iS2w60nzQ7WQGrIZO+TLsz5OF1KAbjjCRa/Ll35aqME0FyYMES1+VzCVEA=="; }; }; - "@orval/query-6.12.0" = { + "@orval/query-6.12.1" = { name = "_at_orval_slash_query"; packageName = "@orval/query"; - version = "6.12.0"; + version = "6.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/query/-/query-6.12.0.tgz"; - sha512 = "0S54tRrFQbyWbiwZPkGSud56dufVukGUmxy9UAx0oBz6PE6dCpSwGTsqta1POhr3oIPjGXEumW0ED3NivaMRtA=="; + url = "https://registry.npmjs.org/@orval/query/-/query-6.12.1.tgz"; + sha512 = "N2hgcVVC7JMtMg6B8TjT7WbOHdGeSlHTsjtGWufBL/ap0+yhEk2mi2ZbHaL4SxJAG+oRudUoTEy+0e5/CBhbiQ=="; }; }; - "@orval/swr-6.12.0" = { + "@orval/swr-6.12.1" = { name = "_at_orval_slash_swr"; packageName = "@orval/swr"; - version = "6.12.0"; + version = "6.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/swr/-/swr-6.12.0.tgz"; - sha512 = "dTmzvOWZhoMlcy2dEnNH5FpKV8fJdAW3BX3gX5KP/S8xFH8IPNlRZTUOLNb1AagMzzmRjEL4E29DhhuAQi4p0g=="; + url = "https://registry.npmjs.org/@orval/swr/-/swr-6.12.1.tgz"; + sha512 = "UNQifWs2q8KQz1DMbzMBNS059jx+jJC1/fUEBtgRg+p9c8BdiKV0X+ijy0CEz6GZjryGBMz+twCblYmGYflDzA=="; }; }; "@parcel/bundler-default-2.8.3" = { @@ -9940,6 +9949,15 @@ let sha512 = "SXsM27SGH3yTWKc2fKR4SYNxsmnvuBQ9dd6QHtEWmiZ/VqaOYPAIlS8+vMcn27YLtAEBGvNRSh3TPNvtjZgfqA=="; }; }; + "@pnpm/config.env-replace-1.0.0" = { + name = "_at_pnpm_slash_config.env-replace"; + packageName = "@pnpm/config.env-replace"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.0.0.tgz"; + sha512 = "ZVPVDi1E8oeXlYqkGRtX0CkzLTwE2zt62bjWaWKaAvI8NZqHzlMvGeSNDpW+JB3+aKanYb4UETJOF1/CxGPemA=="; + }; + }; "@pnpm/crypto.base32-hash-1.0.1" = { name = "_at_pnpm_slash_crypto.base32-hash"; packageName = "@pnpm/crypto.base32-hash"; @@ -9976,13 +9994,13 @@ let sha512 = "YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA=="; }; }; - "@pnpm/npm-conf-1.0.5" = { + "@pnpm/npm-conf-2.1.0" = { name = "_at_pnpm_slash_npm-conf"; packageName = "@pnpm/npm-conf"; - version = "1.0.5"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-1.0.5.tgz"; - sha512 = "hD8ml183638O3R6/Txrh0L8VzGOrFXgRtRDG4qQC4tONdZ5Z1M+tlUUDUvrjYdmK6G+JTBTeaCLMna11cXzi8A=="; + url = "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.1.0.tgz"; + sha512 = "Oe6ntvgsMTE3hDIqy6sajqHF+MnzJrOF06qC2QSiUEybLL7cp6tjoKUa32gpd9+KPVl4QyMs3E3nsXrx/Vdnlw=="; }; }; "@pnpm/package-bins-4.1.0" = { @@ -10075,22 +10093,22 @@ let sha512 = "J/p2PcgT39Za4wpukbN6iUkEUvL5aE7Bs9kXBeEkrjEgc0Uu7J7B2ypwx9J0qM3m3lk2273RT5/4oGv8pfFLcg=="; }; }; - "@prisma/engines-4.10.1" = { + "@prisma/engines-4.11.0" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "4.10.1"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-4.10.1.tgz"; - sha512 = "B3tcTxjx196nuAu1GOTKO9cGPUgTFHYRdkPkTS4m5ptb2cejyBlH9X7GOfSt3xlI7p4zAJDshJP4JJivCg9ouA=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-4.11.0.tgz"; + sha512 = "0AEBi2HXGV02cf6ASsBPhfsVIbVSDC9nbQed4iiY5eHttW9ZtMxHThuKZE1pnESbr8HRdgmFSa/Kn4OSNYuibg=="; }; }; - "@prisma/prisma-fmt-wasm-4.10.1-2.aead147aa326ccb985dcfed5b065b4fdabd44b19" = { + "@prisma/prisma-fmt-wasm-4.11.0-57.8fde8fef4033376662cad983758335009d522acb" = { name = "_at_prisma_slash_prisma-fmt-wasm"; packageName = "@prisma/prisma-fmt-wasm"; - version = "4.10.1-2.aead147aa326ccb985dcfed5b065b4fdabd44b19"; + version = "4.11.0-57.8fde8fef4033376662cad983758335009d522acb"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-4.10.1-2.aead147aa326ccb985dcfed5b065b4fdabd44b19.tgz"; - sha512 = "BUIxpsKel5dwplRrb3JzfLRnRqTStWg1TfJ1is5xYMexJ0U2y1n7O6XRwiuUCQgJjoerPDJ5eZ8X++q1geSUWA=="; + url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-4.11.0-57.8fde8fef4033376662cad983758335009d522acb.tgz"; + sha512 = "KV+IrVh8LdwBfJjDGdbZZDg+KwQ6b4Ee7/hLiTpL8ZHLI2IdGOufRxvmZSTuio28wfAporSA+N0YdzAdx43gWA=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -10336,58 +10354,58 @@ let sha512 = "W6MbUWpb/VaV+Kf0c3jmMIJw3WwwF7iK5nAfcOS+ZwrlbxtIl37+1hEydFlJ209vCR9HL12PaMwdh2Vpihj6Jw=="; }; }; - "@remix-run/dev-1.13.0" = { + "@remix-run/dev-1.14.0" = { name = "_at_remix-run_slash_dev"; packageName = "@remix-run/dev"; - version = "1.13.0"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/dev/-/dev-1.13.0.tgz"; - sha512 = "hPqUjM9RRcz3inBOWqP3GKhggVz0a0ikWaRZpdKrhpQNCNiF6Hunbx876mJERj2YrmIzJ05eoeQmmdF6xcr4qg=="; + url = "https://registry.npmjs.org/@vercel/remix-run-dev/-/remix-run-dev-1.14.0.tgz"; + sha512 = "567BSCe3YNTKVKFYWSjC7sj8y0AbiAolCz1roW2JpdZXY7GoxoP+I8mtQV7RGrgpvUzhVL0go1B2EIxFJzZhDQ=="; }; }; - "@remix-run/express-1.13.0" = { + "@remix-run/express-1.14.0" = { name = "_at_remix-run_slash_express"; packageName = "@remix-run/express"; - version = "1.13.0"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/express/-/express-1.13.0.tgz"; - sha512 = "MX80PdQu3k1HlQsHlUjPBZe5rpTdn4FqZ5Fg4d85cVi+GMfu3x8n8hB0xbCDLhmRbKTR01PQ01j3UUNtsWWikg=="; + url = "https://registry.npmjs.org/@remix-run/express/-/express-1.14.0.tgz"; + sha512 = "Kj7kVbj3f86TTbwE8kbSqHjLEzHJvs+cvYdlBEDrWsuXj1q5ciHs7Jjun6qSLrrOxCtEMqFXc6s530p67M1fiQ=="; }; }; - "@remix-run/node-1.13.0" = { + "@remix-run/node-1.14.0" = { name = "_at_remix-run_slash_node"; packageName = "@remix-run/node"; - version = "1.13.0"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/node/-/node-1.13.0.tgz"; - sha512 = "FDvPGaoDyon8UGYQ9DroLtiX8vFa0efBQQSHV3az0s7HbUpugw7BcA6NBW5pIs2z5sszCCeRbAgSIXcETLzfhw=="; + url = "https://registry.npmjs.org/@remix-run/node/-/node-1.14.0.tgz"; + sha512 = "TAm6AMAxFTccCAUIMki5VY+6vhBmItFvms1K+uTZc0z62ct0i1JEH+xl2POj6wB0UJhlq8IWchAZ41KKttPV1A=="; }; }; - "@remix-run/router-1.3.2" = { + "@remix-run/router-1.3.3" = { name = "_at_remix-run_slash_router"; packageName = "@remix-run/router"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/router/-/router-1.3.2.tgz"; - sha512 = "t54ONhl/h75X94SWsHGQ4G/ZrCEguKSRQr7DrjTciJXW0YU1QhlwYeycvK5JgkzlxmvrK7wq1NB/PLtHxoiDcA=="; + url = "https://registry.npmjs.org/@remix-run/router/-/router-1.3.3.tgz"; + sha512 = "YRHie1yQEj0kqqCTCJEfHqYSSNlZQ696QJG+MMiW4mxSl9I0ojz/eRhJS4fs88Z5i6D1SmoF9d3K99/QOhI8/w=="; }; }; - "@remix-run/serve-1.13.0" = { + "@remix-run/serve-1.14.0" = { name = "_at_remix-run_slash_serve"; packageName = "@remix-run/serve"; - version = "1.13.0"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/serve/-/serve-1.13.0.tgz"; - sha512 = "ondApr1ZUbQR6iy1iGvdarBGqvTZdET4wSNFb2+2NrbxW9Y9E3RZ7q+5M5/iiuy1qbdqubqsoq2N7uFk+gDGxw=="; + url = "https://registry.npmjs.org/@remix-run/serve/-/serve-1.14.0.tgz"; + sha512 = "lf/hEwogYgxqiNdRdEoAf6u2IJK8o0QmsC2EIqc6sHIHTL1X+kDw39m46ePAFY/wU/ymRUtD+dote+u3PCAczA=="; }; }; - "@remix-run/server-runtime-1.13.0" = { + "@remix-run/server-runtime-1.14.0" = { name = "_at_remix-run_slash_server-runtime"; packageName = "@remix-run/server-runtime"; - version = "1.13.0"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-1.13.0.tgz"; - sha512 = "gjIW3XCeIlOt3rrOZMD6HixQydRgs1SwYjP99ZAVruG2+gNq/tL2OusMFYTLvtWrybt215tPROyF/6iTLsaO3g=="; + url = "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-1.14.0.tgz"; + sha512 = "qkqfT7DDwVzLICtJxMGthIU4T7DVtLy+oxKAzOi9eiCFlr3aWqV30YJ5Kq6r/kP8tighlnHbj1uEo41+WbD8uA=="; }; }; "@remix-run/web-blob-3.0.4" = { @@ -10606,13 +10624,13 @@ let sha512 = "SaLe/x/Q/uBVdNFK5V1xXvsVps0y7h1sN7aSJllQyFbugyOaxhNRF25bwEDnicARNEjJw0pk0lYnJQ9Kr6ev0A=="; }; }; - "@rushstack/package-deps-hash-4.0.8" = { + "@rushstack/package-deps-hash-4.0.9" = { name = "_at_rushstack_slash_package-deps-hash"; packageName = "@rushstack/package-deps-hash"; - version = "4.0.8"; + version = "4.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-4.0.8.tgz"; - sha512 = "ad2ZnGWLlcga4GVRVo3mibkTrrnDs8xvABTr79z7zwA43htaVbddwFs3Y+tyqaPo8s92Tqh47jzrGDJTqm6Vyg=="; + url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-4.0.9.tgz"; + sha512 = "RoxZ1hfoyAXpEjggJyjUdiRQ5Qou2iMWPbfQuhqGzfUsc6ANUiS3zs0qLWFsUj8T+d8pCbQr2trwCUBoQzCD9Q=="; }; }; "@rushstack/rig-package-0.3.18" = { @@ -10624,31 +10642,31 @@ let sha512 = "SGEwNTwNq9bI3pkdd01yCaH+gAsHqs0uxfGvtw9b0LJXH52qooWXnrFTRRLG1aL9pf+M2CARdrA9HLHJys3jiQ=="; }; }; - "@rushstack/rush-amazon-s3-build-cache-plugin-5.93.1" = { + "@rushstack/rush-amazon-s3-build-cache-plugin-5.93.2" = { name = "_at_rushstack_slash_rush-amazon-s3-build-cache-plugin"; packageName = "@rushstack/rush-amazon-s3-build-cache-plugin"; - version = "5.93.1"; + version = "5.93.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.93.1.tgz"; - sha512 = "urEQ+u7oSdfQnbuuVURbTE3RaJVh7rOSyB8RN2xAYh88HveYMeduq3EU5/0afHKnRs/UJG/iwt6EqCbXRR0J+w=="; + url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.93.2.tgz"; + sha512 = "khLwdHY7CfRxY7mNcjYVcfGwY3A1wsKg84/Ixesw0MlzPdUyUZdcQuvwszPui8ayFBOmD1tjlNLydmMCAri3yQ=="; }; }; - "@rushstack/rush-azure-storage-build-cache-plugin-5.93.1" = { + "@rushstack/rush-azure-storage-build-cache-plugin-5.93.2" = { name = "_at_rushstack_slash_rush-azure-storage-build-cache-plugin"; packageName = "@rushstack/rush-azure-storage-build-cache-plugin"; - version = "5.93.1"; + version = "5.93.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.93.1.tgz"; - sha512 = "urbl28yUit+GJ4cgU9iAfWEhu6bP0/kdBaQEsOTYoLYRGnF0uBJ6O+46aMOp4WsqxAk+K+xL6ixw1ZE1BTix6g=="; + url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.93.2.tgz"; + sha512 = "kkVU1hpQLar8mokaku56axdaXsJQh4hpe+DZKdPdrPZkYhz2dRaNYrsxOSkuUDPzeBsfTXq90BVMwmkkLRyLXg=="; }; }; - "@rushstack/rush-sdk-5.93.1" = { + "@rushstack/rush-sdk-5.93.2" = { name = "_at_rushstack_slash_rush-sdk"; packageName = "@rushstack/rush-sdk"; - version = "5.93.1"; + version = "5.93.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.93.1.tgz"; - sha512 = "rHfGvxyiR6nO5nqruqz/0N3GpAIi4P565FYcadnHsK791ncoh60lBHvQU9b9oRdpZjl2dHjoAQrr+pgSgOY/vw=="; + url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.93.2.tgz"; + sha512 = "HRRgYIAxEM0/4HoAYCEGgTp2dgDziBI1sg4TRUzFj59cbysRUWXByX2dDTdupcd3aCwWkiOYW/JtxM/fANP16w=="; }; }; "@rushstack/stream-collator-4.0.227" = { @@ -10714,13 +10732,13 @@ let sha512 = "mzqWiZ5Its8aCXGdv9EA4ROgwoLdqKoEgbKOnLjUtk2xuliGJ2L9Y54xcMSTtzDAUUEhZCKMDPTXloCqYAUpCQ=="; }; }; - "@schematics/angular-15.2.0" = { + "@schematics/angular-15.2.2" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "15.2.0"; + version = "15.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-15.2.0.tgz"; - sha512 = "KnsG7xyEbjg+6zflANkdynXdS3wi9rSCg+8Y7erKdygD90O/JcT68PcanvTU2GfawDkBtvAR5VMURw2TIfCTnw=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-15.2.2.tgz"; + sha512 = "H8R2TziGgJkXFZf3NQCOKQhkbGhVX8bPQAKv/YFEpPm1n//cPshysf2r3nBCc0WcTGkdC087UTCYvbFjQ7Fa6w=="; }; }; "@segment/ajv-human-errors-2.2.0" = { @@ -10759,13 +10777,13 @@ let sha512 = "tOfZ/umqB2AcHPGbIrsFLcvApdTm9ggpi/kQZFkej7kMphjT+SGBiQfYtjyg9jcRW+ilAR4JXC9BGKsdEQ+8Vw=="; }; }; - "@sentry/core-7.39.0" = { + "@sentry/core-7.42.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.39.0"; + version = "7.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.39.0.tgz"; - sha512 = "45WJIcWWCQnZ8zhHtcrkJjQ4YydmzMWY4pmRuBG7Qp+zrCT6ISoyODcjY+SCHFdvXkiYFi8+bFZa1qG3YQnnYw=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.42.0.tgz"; + sha512 = "vNcTyoQz5kUXo5vMGDyc5BJMO0UugPvMfYMQVxqt/BuDNR30LVhY+DL2tW1DFZDvRvyn5At+H7kSTj6GFrANXQ=="; }; }; "@sentry/hub-6.19.7" = { @@ -10777,13 +10795,13 @@ let sha512 = "y3OtbYFAqKHCWezF0EGGr5lcyI2KbaXW2Ik7Xp8Mu9TxbSTuwTe4rTntwg8ngPjUQU3SUHzgjqVB8qjiGqFXCA=="; }; }; - "@sentry/integrations-7.39.0" = { + "@sentry/integrations-7.42.0" = { name = "_at_sentry_slash_integrations"; packageName = "@sentry/integrations"; - version = "7.39.0"; + version = "7.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.39.0.tgz"; - sha512 = "NJzPSAI8/YqlHj0ZbrIQrRRb4CE0IhH2UAmp96HbSqXyfiSBrGrEjPurgjKPjkYiWDpUiSolN5bhAxRG5xbe/w=="; + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.42.0.tgz"; + sha512 = "5P3LsU+HRmdh458mav3dNh8RCn0TROIxwa/b7jk1TLWcXHrNp5REjo1oI4PTC+fFbNE4b7ydwHNEzI65rz7gyA=="; }; }; "@sentry/minimal-6.19.7" = { @@ -10804,13 +10822,13 @@ let sha512 = "gtmRC4dAXKODMpHXKfrkfvyBL3cI8y64vEi3fDD046uqYcrWdgoQsffuBbxMAizc6Ez1ia+f0Flue6p15Qaltg=="; }; }; - "@sentry/node-7.39.0" = { + "@sentry/node-7.42.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.39.0"; + version = "7.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.39.0.tgz"; - sha512 = "oe1OBxgs6t/FizjxkSPtuvJv5wJMO+mLENZkiE0PpBD56JyZrWK48kYIt2ccWAfk6Vh235/oIpmqET150xB4lQ=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.42.0.tgz"; + sha512 = "mmpVSDeoM5aEbKOMq3Wt54wAvH53bkivhRh3Ip+R7Uj3aOKkcVJST2XlbghHgoYQXTWz+pl475EVyODWgY9QYg=="; }; }; "@sentry/types-6.19.7" = { @@ -10822,13 +10840,13 @@ let sha512 = "jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg=="; }; }; - "@sentry/types-7.39.0" = { + "@sentry/types-7.42.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.39.0"; + version = "7.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.39.0.tgz"; - sha512 = "5Y83Y8O3dT5zT2jTKEIPMcpn5lUm05KRMaCXuw0sRsv4r9TbBUKeqiSU1LjowT8rB/XNy8m7DHav8+NmogPaJw=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.42.0.tgz"; + sha512 = "Ga0xaBIR/peuXQ88hI9a5TNY3GLNoH8jpsgPaAjAtRHkLsTx0y3AR+PrD7pUysza9QjvG+Qux01DRvLgaNKOHA=="; }; }; "@sentry/utils-6.19.7" = { @@ -10840,13 +10858,13 @@ let sha512 = "z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA=="; }; }; - "@sentry/utils-7.39.0" = { + "@sentry/utils-7.42.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.39.0"; + version = "7.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.39.0.tgz"; - sha512 = "/ZxlPgm1mGgmuMckCTc9iyqDuFTEYNEoMB53IjVFz8ann+37OiWB7Py/QV1rEEsv3xKrGbA8thhRhV9E1sjTlQ=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.42.0.tgz"; + sha512 = "cBiDZVipC+is+IVgsTQLJyZWUZQxlLZ9GarNT+XZOZ5BFh0acFtz88hO6+S7vGmhcx2aCvsdC9yb2Yf+BphK6Q=="; }; }; "@serialport/binding-mock-10.2.2" = { @@ -11038,6 +11056,15 @@ let sha512 = "RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="; }; }; + "@sinclair/typebox-0.25.24" = { + name = "_at_sinclair_slash_typebox"; + packageName = "@sinclair/typebox"; + version = "0.25.24"; + src = fetchurl { + url = "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.24.tgz"; + sha512 = "XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ=="; + }; + }; "@sindresorhus/chunkify-0.2.0" = { name = "_at_sindresorhus_slash_chunkify"; packageName = "@sindresorhus/chunkify"; @@ -11551,202 +11578,103 @@ let sha512 = "gqBJSmJMWomZFxlppaKea7NeAqFrDrrS0RMt24No92M3nJWcyI9YKGEQKl+EyJqZ5gh6w1s0cTklMHMzRwA1NA=="; }; }; - "@swc/core-1.3.36" = { + "@swc/core-1.3.38" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.36"; + version = "1.3.38"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.36.tgz"; - sha512 = "Ogrd9uRNIj7nHjXxG66UlKBIcXESUenJ7OD6K2a8p82qlg6ne7Ne5Goiipm/heHYhSfVmjcnRWL9ZJ4gv+YCPA=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.38.tgz"; + sha512 = "AiEVehRFws//AiiLx9DPDp1WDXt+yAoGD1kMYewhoF6QLdTz8AtYu6i8j/yAxk26L8xnegy0CDwcNnub9qenyQ=="; }; }; - "@swc/core-1.3.37" = { - name = "_at_swc_slash_core"; - packageName = "@swc/core"; - version = "1.3.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.37.tgz"; - sha512 = "VOFlEQ1pReOM73N9A7R8rt561GU8Rxsq833jiimWDUB2sXEN3V6n6wFTgYmZuMz2T4/R0cQA1nV48KkaT4gkFw=="; - }; - }; - "@swc/core-darwin-arm64-1.3.36" = { + "@swc/core-darwin-arm64-1.3.38" = { name = "_at_swc_slash_core-darwin-arm64"; packageName = "@swc/core-darwin-arm64"; - version = "1.3.36"; + version = "1.3.38"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.36.tgz"; - sha512 = "lsP+C8p9cC/Vd9uAbtxpEnM8GoJI/MMnVuXak7OlxOtDH9/oTwmAcAQTfNGNaH19d2FAIRwf+5RbXCPnxa2Zjw=="; + url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.38.tgz"; + sha512 = "4ZTJJ/cR0EsXW5UxFCifZoGfzQ07a8s4ayt1nLvLQ5QoB1GTAf9zsACpvWG8e7cmCR0L76R5xt8uJuyr+noIXA=="; }; }; - "@swc/core-darwin-arm64-1.3.37" = { - name = "_at_swc_slash_core-darwin-arm64"; - packageName = "@swc/core-darwin-arm64"; - version = "1.3.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.37.tgz"; - sha512 = "iIyVqqioUpVeT/hbBVfkrsjfCyL4idNH+LVKGmoTAWaTTSB0+UNhNuA7Wh2CqIHWh1Mv7IlumitWPcqsVDdoEw=="; - }; - }; - "@swc/core-darwin-x64-1.3.36" = { + "@swc/core-darwin-x64-1.3.38" = { name = "_at_swc_slash_core-darwin-x64"; packageName = "@swc/core-darwin-x64"; - version = "1.3.36"; + version = "1.3.38"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.36.tgz"; - sha512 = "jaLXsozWN5xachl9fPxDMi5nbWq1rRxPAt6ISeiYB6RJk0MQKH1634pOweBBem2pUDDzwDFXFw6f22LTm/cFvA=="; + url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.38.tgz"; + sha512 = "Kim727rNo4Dl8kk0CR8aJQe4zFFtsT1TZGlNrNMUgN1WC3CRX7dLZ6ZJi/VVcTG1cbHp5Fp3mUzwHsMxEh87Mg=="; }; }; - "@swc/core-darwin-x64-1.3.37" = { - name = "_at_swc_slash_core-darwin-x64"; - packageName = "@swc/core-darwin-x64"; - version = "1.3.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.37.tgz"; - sha512 = "dao5nXPWKxtaxqak4ZkRyBoApNIelW/glantQhPhj0FjMjuIQc+v03ldJ8XDByWOG+6xuVUTheANCtEccxoQBw=="; - }; - }; - "@swc/core-linux-arm-gnueabihf-1.3.36" = { + "@swc/core-linux-arm-gnueabihf-1.3.38" = { name = "_at_swc_slash_core-linux-arm-gnueabihf"; packageName = "@swc/core-linux-arm-gnueabihf"; - version = "1.3.36"; + version = "1.3.38"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.36.tgz"; - sha512 = "vcBdTHjoEpvJDbFlgto+S6VwAHzLA9GyCiuNcTU2v4KNQlFzhbO4A4PMfMCb/Z0RLJEr16tirfHdWIxjU3h8nw=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.38.tgz"; + sha512 = "yaRdnPNU2enlJDRcIMvYVSyodY+Amhf5QuXdUbAj6rkDD6wUs/s9C6yPYrFDmoTltrG+nBv72mUZj+R46wVfSw=="; }; }; - "@swc/core-linux-arm-gnueabihf-1.3.37" = { - name = "_at_swc_slash_core-linux-arm-gnueabihf"; - packageName = "@swc/core-linux-arm-gnueabihf"; - version = "1.3.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.37.tgz"; - sha512 = "/mVrc8H/f062CUkqKGmBiil2VIYu4mKawHxERfeP1y38X5K/OwjG5s9MgO9TVxy+Ly6vejwj70kRhSa3hVp1Bw=="; - }; - }; - "@swc/core-linux-arm64-gnu-1.3.36" = { + "@swc/core-linux-arm64-gnu-1.3.38" = { name = "_at_swc_slash_core-linux-arm64-gnu"; packageName = "@swc/core-linux-arm64-gnu"; - version = "1.3.36"; + version = "1.3.38"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.36.tgz"; - sha512 = "o7f5OsvwWppJo+qIZmrGO5+XC6DPt6noecSbRHjF6o1YAcR13ETPC14k1eC9H1YbQwpyCFNVAFXyNcUbCeQyrQ=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.38.tgz"; + sha512 = "iNY1HqKo/wBSu3QOGBUlZaLdBP/EHcwNjBAqIzpb8J64q2jEN02RizqVW0mDxyXktJ3lxr3g7VW9uqklMeXbjQ=="; }; }; - "@swc/core-linux-arm64-gnu-1.3.37" = { - name = "_at_swc_slash_core-linux-arm64-gnu"; - packageName = "@swc/core-linux-arm64-gnu"; - version = "1.3.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.37.tgz"; - sha512 = "eRQ3KaZI0j5LidTfOIi/kUVOOMuVmw1HCdt/Z1TAUKoHMLVxY8xcJ3pEE3/+ednI60EmHpwpJRs6LelXyL6uzQ=="; - }; - }; - "@swc/core-linux-arm64-musl-1.3.36" = { + "@swc/core-linux-arm64-musl-1.3.38" = { name = "_at_swc_slash_core-linux-arm64-musl"; packageName = "@swc/core-linux-arm64-musl"; - version = "1.3.36"; + version = "1.3.38"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.36.tgz"; - sha512 = "FSHPngMi3c0fuGt9yY2Ubn5UcELi3EiPLJxBSC3X8TF9atI/WHZzK9PE9Gtn0C/LyRh4CoyOugDtSOPzGYmLQg=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.38.tgz"; + sha512 = "LJCFgLZoPRkPCPmux+Q5ctgXRp6AsWhvWuY61bh5bIPBDlaG9pZk94DeHyvtiwT0syhTtXb2LieBOx6NqN3zeA=="; }; }; - "@swc/core-linux-arm64-musl-1.3.37" = { - name = "_at_swc_slash_core-linux-arm64-musl"; - packageName = "@swc/core-linux-arm64-musl"; - version = "1.3.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.37.tgz"; - sha512 = "w2BRLODyxNQY2rfHZMZ5ir6QrrnGBPlnIslTrgKmVbn1OjZoxUCtuqhrYnCmybaAc4DOkeH02TqynEFXrm+EMw=="; - }; - }; - "@swc/core-linux-x64-gnu-1.3.36" = { + "@swc/core-linux-x64-gnu-1.3.38" = { name = "_at_swc_slash_core-linux-x64-gnu"; packageName = "@swc/core-linux-x64-gnu"; - version = "1.3.36"; + version = "1.3.38"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.36.tgz"; - sha512 = "PHSsH2rek5pr3e0K09VgWAbrWK2vJhaI7MW9TPoTjyACYjcs3WwjcjQ30MghXUs2Dc/bXjWAOi9KFTjq/uCyFg=="; + url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.38.tgz"; + sha512 = "hRQGRIWHmv2PvKQM/mMV45mVXckM2+xLB8TYLLgUG66mmtyGTUJPyxjnJkbI86WNGqo18k+lAuMG2mn6QmzYwQ=="; }; }; - "@swc/core-linux-x64-gnu-1.3.37" = { - name = "_at_swc_slash_core-linux-x64-gnu"; - packageName = "@swc/core-linux-x64-gnu"; - version = "1.3.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.37.tgz"; - sha512 = "CfoH8EsZJZ9kunjMUjBNYD5fFuO86zw+K/o4wEw72Yg6ZEiqPmeIlCKU8tpTv4sK+CbhUXrmVzMB5tqsb2jALQ=="; - }; - }; - "@swc/core-linux-x64-musl-1.3.36" = { + "@swc/core-linux-x64-musl-1.3.38" = { name = "_at_swc_slash_core-linux-x64-musl"; packageName = "@swc/core-linux-x64-musl"; - version = "1.3.36"; + version = "1.3.38"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.36.tgz"; - sha512 = "4LfMYQHzozHCKkIcmQy83b+4SpI+mOp6sYNbXqSRz5dYvTVjegKZXe596P1U/87cK2cgR4uYvkgkgBXquaWvwQ=="; + url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.38.tgz"; + sha512 = "PTYSqtsIfPHLKDDNbueI5e0sc130vyHRiFOeeC6qqzA2FAiVvIxuvXHLr0soPvKAR1WyhtYmFB9QarcctemL2w=="; }; }; - "@swc/core-linux-x64-musl-1.3.37" = { - name = "_at_swc_slash_core-linux-x64-musl"; - packageName = "@swc/core-linux-x64-musl"; - version = "1.3.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.37.tgz"; - sha512 = "9YPrHYNdoG7PK11gV51GfL45biI2dic+YTqHUDKyykemsD7Ot1zUFX7Ty//pdvpKcKSff6SrHbfFACD5ziNirA=="; - }; - }; - "@swc/core-win32-arm64-msvc-1.3.36" = { + "@swc/core-win32-arm64-msvc-1.3.38" = { name = "_at_swc_slash_core-win32-arm64-msvc"; packageName = "@swc/core-win32-arm64-msvc"; - version = "1.3.36"; + version = "1.3.38"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.36.tgz"; - sha512 = "7y3dDcun79TAjCyk3Iv0eOMw1X/KNQbkVyKOGqnEgq9g22F8F1FoUGKHNTzUqVdzpHeJSsHgW5PlkEkl3c/d9w=="; + url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.38.tgz"; + sha512 = "9lHfs5TPNs+QdkyZFhZledSmzBEbqml/J1rqPSb9Fy8zB6QlspixE6OLZ3nTlUOdoGWkcTTdrOn77Sd7YGf1AA=="; }; }; - "@swc/core-win32-arm64-msvc-1.3.37" = { - name = "_at_swc_slash_core-win32-arm64-msvc"; - packageName = "@swc/core-win32-arm64-msvc"; - version = "1.3.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.37.tgz"; - sha512 = "h17Ek8/wCDje6BrXOvCXBM80oBRmTSMMdLyt87whTl5xqYlWYYs9oQIzZndNRTlNpTgjGO8Ns2eo4kwVxIkBIA=="; - }; - }; - "@swc/core-win32-ia32-msvc-1.3.36" = { + "@swc/core-win32-ia32-msvc-1.3.38" = { name = "_at_swc_slash_core-win32-ia32-msvc"; packageName = "@swc/core-win32-ia32-msvc"; - version = "1.3.36"; + version = "1.3.38"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.36.tgz"; - sha512 = "zK0VR3B4LX5hzQ+7eD+K+FkxJlJg5Lo36BeahMzQ+/i0IURpnuyFlW88sdkFkMsc2swdU6bpvxLZeIRQ3W4OUg=="; + url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.38.tgz"; + sha512 = "SbL6pfA2lqvDKnwTHwOfKWvfHAdcbAwJS4dBkFidr7BiPTgI5Uk8wAPcRb8mBECpmIa9yFo+N0cAFRvMnf+cNw=="; }; }; - "@swc/core-win32-ia32-msvc-1.3.37" = { - name = "_at_swc_slash_core-win32-ia32-msvc"; - packageName = "@swc/core-win32-ia32-msvc"; - version = "1.3.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.37.tgz"; - sha512 = "1BR175E1olGy/zdt94cgdb6ps/lBNissAOaxyBk8taFpcjy3zpdP30yAoH0GIsC6isnZ5JfArbOJNRXXO5tE0Q=="; - }; - }; - "@swc/core-win32-x64-msvc-1.3.36" = { + "@swc/core-win32-x64-msvc-1.3.38" = { name = "_at_swc_slash_core-win32-x64-msvc"; packageName = "@swc/core-win32-x64-msvc"; - version = "1.3.36"; + version = "1.3.38"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.36.tgz"; - sha512 = "2bIjr9DhAckGiXZEvj6z2z7ECPcTimG+wD0VuQTvr+wkx46uAJKl5Kq+Zk+dd15ErL7JGUtCet1T7bf1k4FwvQ=="; - }; - }; - "@swc/core-win32-x64-msvc-1.3.37" = { - name = "_at_swc_slash_core-win32-x64-msvc"; - packageName = "@swc/core-win32-x64-msvc"; - version = "1.3.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.37.tgz"; - sha512 = "1siDQ7dccQ1pesJmgAL3BUBbRPtfbNInOWnZOkiie/DfFqGQ117QKnCVyjUvwFKfTQx1+3UUTDmMSlRd00SlXg=="; + url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.38.tgz"; + sha512 = "UFveLrL6eGvViOD8OVqUQa6QoQwdqwRvLtL5elF304OT8eCPZa8BhuXnWk25X8UcOyns8gFcb8Fhp3oaLi/Rlw=="; }; }; "@swc/helpers-0.4.14" = { @@ -11758,22 +11686,13 @@ let sha512 = "4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw=="; }; }; - "@swc/wasm-1.3.36" = { + "@swc/wasm-1.3.38" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.36"; + version = "1.3.38"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.36.tgz"; - sha512 = "ZNxKASN36p6GTg2whIRdxQjiQHiDA9JjovRTB3iiHF1cTAEskyrbAdrxFOTrgD0swaSi4+KCujPwpAPpJVyMJg=="; - }; - }; - "@swc/wasm-1.3.37" = { - name = "_at_swc_slash_wasm"; - packageName = "@swc/wasm"; - version = "1.3.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.37.tgz"; - sha512 = "cRlyLuQrMKE6ppo07jVcYAEK69l+O+g+u5xZBon466vA416IK86jHYxGZqXRP+HEF6P/imntLbJgj9F/AGFEBA=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.38.tgz"; + sha512 = "7A4T9/R48J4Vy/1DB2yYuY29CYNgyqDgvlTW1rdaGJGv7i7TxTmx6lnMm4b8/MU+TUJ5NRL/MDPVjmQ8Vwkwbg=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -12082,6 +12001,15 @@ let sha512 = "yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ=="; }; }; + "@tufjs/models-1.0.0" = { + name = "_at_tufjs_slash_models"; + packageName = "@tufjs/models"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@tufjs/models/-/models-1.0.0.tgz"; + sha512 = "RRMu4uMxWnZlxaIBxahSb2IssFZiu188sndesZflWOe1cA/qUqtemSIoBWbuVKPvvdktapImWNnKpBcc+VrCQw=="; + }; + }; "@turist/fetch-7.2.0" = { name = "_at_turist_slash_fetch"; packageName = "@turist/fetch"; @@ -12397,15 +12325,6 @@ let sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; }; }; - "@types/estree-0.0.50" = { - name = "_at_types_slash_estree"; - packageName = "@types/estree"; - version = "0.0.50"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz"; - sha512 = "C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw=="; - }; - }; "@types/estree-0.0.51" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; @@ -12523,6 +12442,15 @@ let sha512 = "MxObHvNl4A69ofaTRU8DFqvgzzv8s9yRtaPPm5gud9HDNvpB3GPQFvNuTWAI59B9huVGV5jXYJwbCsmBsOGYWA=="; }; }; + "@types/geojson-7946.0.10" = { + name = "_at_types_slash_geojson"; + packageName = "@types/geojson"; + version = "7946.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz"; + sha512 = "Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA=="; + }; + }; "@types/get-stdin-5.0.1" = { name = "_at_types_slash_get-stdin"; packageName = "@types/get-stdin"; @@ -12946,15 +12874,6 @@ let sha512 = "Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ=="; }; }; - "@types/node-14.17.34" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "14.17.34"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.17.34.tgz"; - sha512 = "USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg=="; - }; - }; "@types/node-14.18.33" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -12964,13 +12883,13 @@ let sha512 = "qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg=="; }; }; - "@types/node-14.18.36" = { + "@types/node-14.18.37" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.18.36"; + version = "14.18.37"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.18.36.tgz"; - sha512 = "FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.18.37.tgz"; + sha512 = "7GgtHCs/QZrBrDzgIJnQtuSvhFSwhyYSI2uafSwZoNt1iOGhEN5fwNrQMjtONyHm9+/LoA4453jH0CMYcr06Pg=="; }; }; "@types/node-15.14.9" = { @@ -12991,13 +12910,22 @@ let sha512 = "ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w=="; }; }; - "@types/node-16.18.13" = { + "@types/node-16.11.68" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.18.13"; + version = "16.11.68"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.18.13.tgz"; - sha512 = "l0/3XZ153UTlNOnZK8xSNoJlQda9/WnYgiTdcKKPJSZjdjI9MU+A9oMXOesAWLSnqAaaJhj3qfQsU07Dr8OUwg=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.68.tgz"; + sha512 = "JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ=="; + }; + }; + "@types/node-16.18.14" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "16.18.14"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-16.18.14.tgz"; + sha512 = "wvzClDGQXOCVNU4APPopC2KtMYukaF1MN/W3xAmslx22Z4/IF1/izDMekuyoUlwfnDHYCIZGaj7jMwnJKBTxKw=="; }; }; "@types/node-16.9.1" = { @@ -13018,22 +12946,31 @@ let sha512 = "DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA=="; }; }; - "@types/node-18.13.0" = { + "@types/node-18.14.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.13.0"; + version = "18.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.13.0.tgz"; - sha512 = "gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.14.4.tgz"; + sha512 = "VhCw7I7qO2X49+jaKcAUwi3rR+hbxT5VcYF493+Z5kMLI0DL568b7JI4IDJaxWFH0D/xwmGJNoXisyX+w7GH/g=="; }; }; - "@types/node-18.14.2" = { + "@types/node-18.14.6" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.14.2"; + version = "18.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.14.2.tgz"; - sha512 = "1uEQxww3DaghA0RxqHx0O0ppVlo43pJhepY51OxuQIKHpjbnYLA7vcdwioNPzIqmC2u3I/dmylcqjlh0e7AyUA=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.14.6.tgz"; + sha512 = "93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA=="; + }; + }; + "@types/node-18.15.0" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "18.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-18.15.0.tgz"; + sha512 = "z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w=="; }; }; "@types/node-6.14.13" = { @@ -13225,13 +13162,13 @@ let sha512 = "F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ=="; }; }; - "@types/sass-1.43.1" = { + "@types/sass-1.45.0" = { name = "_at_types_slash_sass"; packageName = "@types/sass"; - version = "1.43.1"; + version = "1.45.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sass/-/sass-1.43.1.tgz"; - sha512 = "BPdoIt1lfJ6B7rw35ncdwBZrAssjcwzI5LByIrYs+tpXlj/CAkuVdRsgZDdP4lq5EjyWzwxZCqAoFyHKFwp32g=="; + url = "https://registry.npmjs.org/@types/sass/-/sass-1.45.0.tgz"; + sha512 = "jn7qwGFmJHwUSphV8zZneO3GmtlgLsmhs/LQyVvQbIIa+fzGMUiHI4HXJZL3FT8MJmgXWbLGiVVY7ElvHq6vDA=="; }; }; "@types/scheduler-0.16.2" = { @@ -13657,13 +13594,13 @@ let sha512 = "aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg=="; }; }; - "@typescript-eslint/eslint-plugin-5.54.0" = { + "@typescript-eslint/eslint-plugin-5.54.1" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.54.0"; + version = "5.54.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.54.0.tgz"; - sha512 = "+hSN9BdSr629RF02d7mMtXhAJvDTyCbprNYJKrXETlul/Aml6YZwd90XioVbjejQeHbb3R8Dg0CkRgoJDxo8aw=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.54.1.tgz"; + sha512 = "a2RQAkosH3d3ZIV08s3DcL/mcGc2M/UC528VkPULFxR9VnVPT8pBu0IyBAJJmVsCmhVfwQX1v6q+QGnmSe1bew=="; }; }; "@typescript-eslint/experimental-utils-4.33.0" = { @@ -13684,13 +13621,13 @@ let sha512 = "ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA=="; }; }; - "@typescript-eslint/parser-5.54.0" = { + "@typescript-eslint/parser-5.54.1" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.54.0"; + version = "5.54.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.54.0.tgz"; - sha512 = "aAVL3Mu2qTi+h/r04WI/5PfNWvO6pdhpeMRWk9R7rEV4mwJNzoWf5CCU5vDKBsPIFQFjEq1xg7XBI2rjiMXQbQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.54.1.tgz"; + sha512 = "8zaIXJp/nG9Ff9vQNh7TI+C3nA6q6iIsGJ4B4L6MhZ7mHnTMR4YP5vp2xydmFXIy8rpyIVbNAG44871LMt6ujg=="; }; }; "@typescript-eslint/scope-manager-4.33.0" = { @@ -13702,22 +13639,22 @@ let sha512 = "5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ=="; }; }; - "@typescript-eslint/scope-manager-5.54.0" = { + "@typescript-eslint/scope-manager-5.54.1" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.54.0"; + version = "5.54.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.54.0.tgz"; - sha512 = "VTPYNZ7vaWtYna9M4oD42zENOBrb+ZYyCNdFs949GcN8Miwn37b8b7eMj+EZaq7VK9fx0Jd+JhmkhjFhvnovhg=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.54.1.tgz"; + sha512 = "zWKuGliXxvuxyM71UA/EcPxaviw39dB2504LqAmFDjmkpO8qNLHcmzlh6pbHs1h/7YQ9bnsO8CCcYCSA8sykUg=="; }; }; - "@typescript-eslint/type-utils-5.54.0" = { + "@typescript-eslint/type-utils-5.54.1" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.54.0"; + version = "5.54.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.54.0.tgz"; - sha512 = "WI+WMJ8+oS+LyflqsD4nlXMsVdzTMYTxl16myXPaCXnSgc7LWwMsjxQFZCK/rVmTZ3FN71Ct78ehO9bRC7erYQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.54.1.tgz"; + sha512 = "WREHsTz0GqVYLIbzIZYbmUUr95DKEKIXZNH57W3s+4bVnuF1TKe2jH8ZNH8rO1CeMY3U4j4UQeqPNkHMiGem3g=="; }; }; "@typescript-eslint/types-4.33.0" = { @@ -13729,13 +13666,13 @@ let sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ=="; }; }; - "@typescript-eslint/types-5.54.0" = { + "@typescript-eslint/types-5.54.1" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.54.0"; + version = "5.54.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.0.tgz"; - sha512 = "nExy+fDCBEgqblasfeE3aQ3NuafBUxZxgxXcYfzYRZFHdVvk5q60KhCSkG0noHgHRo/xQ/BOzURLZAafFpTkmQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.1.tgz"; + sha512 = "G9+1vVazrfAfbtmCapJX8jRo2E4MDXxgm/IMOF4oGh3kq7XuK3JRkOg6y2Qu1VsTRmWETyTkWt1wxy7X7/yLkw=="; }; }; "@typescript-eslint/typescript-estree-4.33.0" = { @@ -13747,22 +13684,22 @@ let sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA=="; }; }; - "@typescript-eslint/typescript-estree-5.54.0" = { + "@typescript-eslint/typescript-estree-5.54.1" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.54.0"; + version = "5.54.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.0.tgz"; - sha512 = "X2rJG97Wj/VRo5YxJ8Qx26Zqf0RRKsVHd4sav8NElhbZzhpBI8jU54i6hfo9eheumj4oO4dcRN1B/zIVEqR/MQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.1.tgz"; + sha512 = "bjK5t+S6ffHnVwA0qRPTZrxKSaFYocwFIkZx5k7pvWfsB1I57pO/0M0Skatzzw1sCkjJ83AfGTL0oFIFiDX3bg=="; }; }; - "@typescript-eslint/utils-5.54.0" = { + "@typescript-eslint/utils-5.54.1" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.54.0"; + version = "5.54.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.54.0.tgz"; - sha512 = "cuwm8D/Z/7AuyAeJ+T0r4WZmlnlxQ8wt7C7fLpFlKMR+dY6QO79Cq1WpJhvZbMA4ZeZGHiRWnht7ZJ8qkdAunw=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.54.1.tgz"; + sha512 = "IY5dyQM8XD1zfDe5X8jegX6r2EVU5o/WJnLu/znLPWCBF7KNGC+adacXnt5jEYS9JixDcoccI6CvE4RCjHMzCQ=="; }; }; "@typescript-eslint/visitor-keys-4.33.0" = { @@ -13774,13 +13711,13 @@ let sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; }; }; - "@typescript-eslint/visitor-keys-5.54.0" = { + "@typescript-eslint/visitor-keys-5.54.1" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.54.0"; + version = "5.54.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.0.tgz"; - sha512 = "xu4wT7aRCakGINTLGeyGqDn+78BwFlggwBjnHa1ar/KaGagnmwLYmlrXIrgAaQ3AE1Vd6nLfKASm7LrFHNbKGA=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.1.tgz"; + sha512 = "q8iSoHTgwCfgcRJ2l2x+xCbu8nBlRAlsQ33k24Adj8eoVBE0f8dUeI+bAa8F84Mv05UGbAx57g2zrRsYIooqQg=="; }; }; "@uphold/request-logger-2.0.0" = { @@ -13828,13 +13765,13 @@ let sha512 = "UGyyGAMXzop9C/fIoe7Ij63DkPSy1uMw2jipB5dnB8R3kl80za7LYzVnA1HvBEt2ZPWfMuwez/VGLOQ7XX4bTA=="; }; }; - "@vanilla-extract/babel-plugin-debug-ids-1.0.1" = { + "@vanilla-extract/babel-plugin-debug-ids-1.0.2" = { name = "_at_vanilla-extract_slash_babel-plugin-debug-ids"; packageName = "@vanilla-extract/babel-plugin-debug-ids"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vanilla-extract/babel-plugin-debug-ids/-/babel-plugin-debug-ids-1.0.1.tgz"; - sha512 = "ynyKqsJiMzM1/yiIJ6QdqpWKlK4IMJJWREpPtaemZrE1xG1B4E/Nfa6YazuDWjDkCJC1tRIpEGnVs+pMIjUxyw=="; + url = "https://registry.npmjs.org/@vanilla-extract/babel-plugin-debug-ids/-/babel-plugin-debug-ids-1.0.2.tgz"; + sha512 = "LjnbQWGeMwaydmovx8jWUR8BxLtLiPyq0xz5C8G5OvFhsuJxvavLdrBHNNizvr1dq7/3qZGlPv0znsvU4P44YA=="; }; }; "@vanilla-extract/css-1.9.5" = { @@ -13846,13 +13783,13 @@ let sha512 = "aVSv6q24zelKRtWx/l9yshU3gD1uCDMZ2ZGcIiYnAcPfyLryrG/1X5DxtyiPKcyI/hZWoteHofsN//2q9MvzOA=="; }; }; - "@vanilla-extract/integration-6.1.0" = { + "@vanilla-extract/integration-6.1.2" = { name = "_at_vanilla-extract_slash_integration"; packageName = "@vanilla-extract/integration"; - version = "6.1.0"; + version = "6.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vanilla-extract/integration/-/integration-6.1.0.tgz"; - sha512 = "7gDkOibk/DraG35ZpiAYqWd33wLA6YRnieC5vw7ItoFEzCv9bUaS9c+ZyktyWW3nRnL+e7Pc6FS6l7MKgEsX1w=="; + url = "https://registry.npmjs.org/@vanilla-extract/integration/-/integration-6.1.2.tgz"; + sha512 = "80Qff+mry4aUC3O2xv6N+FzylI9L64ZZ5THXUKFueZNTTswqgnxLlT9Nsf1nQYtvaZjavorVt3qpq+aakBZHvg=="; }; }; "@vanilla-extract/private-1.0.3" = { @@ -13864,58 +13801,58 @@ let sha512 = "17kVyLq3ePTKOkveHxXuIJZtGYs+cSoev7BlP+Lf4916qfDhk/HBjvlYDe8egrea7LNPHKwSZJK/bzZC+Q6AwQ=="; }; }; - "@vercel/build-utils-6.3.1" = { + "@vercel/build-utils-6.3.4" = { name = "_at_vercel_slash_build-utils"; packageName = "@vercel/build-utils"; - version = "6.3.1"; + version = "6.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-6.3.1.tgz"; - sha512 = "mFd6QZJX1SaweTa9BB+zO6OyGeQWsk+z0LFhsSblnWue2wjmeZ3z3TBt8V/Wlae5NMg4+E2AFcDf/lr3ENeCfg=="; + url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-6.3.4.tgz"; + sha512 = "7qhJP/5yz/9aBmkJirRxcTrvrLdV6PUT9DpxsILnfdw7WAJ5KSa59kBj8Aw4VhW4CqK4pFcuMMHr73aYRcEmkg=="; }; }; - "@vercel/gatsby-plugin-vercel-analytics-1.0.7" = { + "@vercel/gatsby-plugin-vercel-analytics-1.0.8" = { name = "_at_vercel_slash_gatsby-plugin-vercel-analytics"; packageName = "@vercel/gatsby-plugin-vercel-analytics"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-analytics/-/gatsby-plugin-vercel-analytics-1.0.7.tgz"; - sha512 = "j4DsneQ+oOF0Zurvisj+H2ds8s8ZEqfI4iD6xgFY9mB2UdGixhzFRjvDBH6g4pfUQXfO76K5GiA1afumGlJbwA=="; + url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-analytics/-/gatsby-plugin-vercel-analytics-1.0.8.tgz"; + sha512 = "EL5xH3KOtAwzLc50NA2Df5BQwIV9tu8QBIG0unSTUtOpIaqqnOMBZT86DxadsAniUs7xYRcaeXOkQog/PbpWDw=="; }; }; - "@vercel/gatsby-plugin-vercel-builder-1.1.9" = { + "@vercel/gatsby-plugin-vercel-builder-1.2.1" = { name = "_at_vercel_slash_gatsby-plugin-vercel-builder"; packageName = "@vercel/gatsby-plugin-vercel-builder"; - version = "1.1.9"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-1.1.9.tgz"; - sha512 = "Djd8a59niZeZL4iX1by+zeD0LM1HIkBi8SE/9owKlt8e1CJbo0VBat+uVEUTQ+Vfq+E2gcCDodimSlbNz09JnA=="; + url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-1.2.1.tgz"; + sha512 = "L4Sydz8JJPZM9ZmIoxCMCc6TnQVEgbwPbmKNPESLPPUZkPpyaNcMYa8APkbyiEQMp8tuq5flEE21Aoq5tDkD3A=="; }; }; - "@vercel/go-2.3.8" = { + "@vercel/go-2.3.11" = { name = "_at_vercel_slash_go"; packageName = "@vercel/go"; - version = "2.3.8"; + version = "2.3.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/go/-/go-2.3.8.tgz"; - sha512 = "gL+bqelYG/YBiZFc1A+XNOOrHwd7EBoGH4KeqQi9I2NH6gn5sMg7/dvg2C92nf8Hzz6Q4BkVx1QB4Qo0ldazXQ=="; + url = "https://registry.npmjs.org/@vercel/go/-/go-2.3.11.tgz"; + sha512 = "IuFnrQzTuTBp08/+2UHWIZ4KYB0TJvTjVEvGE275nsDXqlssZRDNHXfjGTEouScCN7HuYQMkEFRn+xlMb+0qHg=="; }; }; - "@vercel/hydrogen-0.0.54" = { + "@vercel/hydrogen-0.0.57" = { name = "_at_vercel_slash_hydrogen"; packageName = "@vercel/hydrogen"; - version = "0.0.54"; + version = "0.0.57"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/hydrogen/-/hydrogen-0.0.54.tgz"; - sha512 = "oNgwer0JlmRS9MomYE202basrsHpMrA4uU+LEC2uPyhLk7HMac4DiIXXt59ddY/UJUiN6+F1UX48x1UXdmAW8Q=="; + url = "https://registry.npmjs.org/@vercel/hydrogen/-/hydrogen-0.0.57.tgz"; + sha512 = "VOI7AYJlrrxoPaxbYpAJz/t0516a7/sMtukAT834T7Ne/MOgj5fU6n/IOTBqz3si8tZ7NybWIlM+T5iJSozoZw=="; }; }; - "@vercel/next-3.6.1" = { + "@vercel/next-3.6.6" = { name = "_at_vercel_slash_next"; packageName = "@vercel/next"; - version = "3.6.1"; + version = "3.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/next/-/next-3.6.1.tgz"; - sha512 = "aEtq99LHqnZ5fYdodaKPKGGgoKnzRYJPYhl5WX+j0cpF3LTYlnKbMnmelY5RGbfyYvkKzLCrLTg40qhMi+JFGg=="; + url = "https://registry.npmjs.org/@vercel/next/-/next-3.6.6.tgz"; + sha512 = "vnlMCHwyXkUGB3Bc5nUwf27fe1Q8t+1VosSAY+97tCJURlIodvSKDBMmR/x+Fb/uoWip66MmO63DH9szLUw0cQ=="; }; }; "@vercel/nft-0.22.5" = { @@ -13927,76 +13864,76 @@ let sha512 = "mug57Wd1BL7GMj9gXMgMeKUjdqO0e4u+0QLPYMFE1rwdJ+55oPy6lp3nIBCS8gOvigT62UI4QKUL2sGqcoW4Hw=="; }; }; - "@vercel/node-2.9.8" = { + "@vercel/node-2.9.12" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; - version = "2.9.8"; + version = "2.9.12"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node/-/node-2.9.8.tgz"; - sha512 = "GqRqUmdT5/l8XY68ulUJKgijCrWw/p2sgxzrq5Mj40B2nOC5CQa0HLLiNd/Q+jnIrrJkdBpB1xeVkebEv1mgng=="; + url = "https://registry.npmjs.org/@vercel/node/-/node-2.9.12.tgz"; + sha512 = "NGbOK9bl7Lhnr1OfB+iz2yIOuMhOQKZz66jn11153mDqqlQ93i7cNcQeMU61A1waJj1KubqViMGWKgxO7QTCUw=="; }; }; - "@vercel/node-bridge-3.1.12" = { + "@vercel/node-bridge-3.1.14" = { name = "_at_vercel_slash_node-bridge"; packageName = "@vercel/node-bridge"; - version = "3.1.12"; + version = "3.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node-bridge/-/node-bridge-3.1.12.tgz"; - sha512 = "RYMYzyR/QyT+1JeOHBtBxwDc8XszYbChq0b18uqt4/PQ8rUWdcHMUkUoNjScB6RmqScX+vTzYj8eLS8UfHxnaQ=="; + url = "https://registry.npmjs.org/@vercel/node-bridge/-/node-bridge-3.1.14.tgz"; + sha512 = "TAbo0rwBenmWywcEup+5lZgr6ILPPq55P33JRX+oJJuTxYib0NqVj47gEvLTxaj3MoJFgp0iDlC9A0uAf4ykxQ=="; }; }; - "@vercel/python-3.1.50" = { + "@vercel/python-3.1.53" = { name = "_at_vercel_slash_python"; packageName = "@vercel/python"; - version = "3.1.50"; + version = "3.1.53"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/python/-/python-3.1.50.tgz"; - sha512 = "J9DMiQNoED+gVzX4T7MjdOeMn9Fy+BhXC0zT+EkxFoTWpEDYx6zzACdOMwiKgjetLujRWeMWQXT++64oeArBHA=="; + url = "https://registry.npmjs.org/@vercel/python/-/python-3.1.53.tgz"; + sha512 = "jr6D7AZ70cFfTV7+dmqFL9d1ssbx/3/o1AwOm1iq/XlAGLNhoMYVaT/m/oC7st82OyBUk7X0Ek5NLaUZsjlQbg=="; }; }; - "@vercel/redwood-1.1.6" = { + "@vercel/redwood-1.1.9" = { name = "_at_vercel_slash_redwood"; packageName = "@vercel/redwood"; - version = "1.1.6"; + version = "1.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-1.1.6.tgz"; - sha512 = "b+G/bptoxoqVnA+CvZn1AwiPc0ODjXEX7vb+qwJ3CDD7FP4axF6gNM100g5Q6W+qhEWoQ7ssIY/njnpQgPWrmQ=="; + url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-1.1.9.tgz"; + sha512 = "blFWThhosa+LhqReoXI+xnXoD9Gj2PK/jIfvSo9vP2Kzbzr/hLfcaDqv1ZQted/PuZilaa3gX9j7e/kPFsXulw=="; }; }; - "@vercel/remix-1.4.1" = { + "@vercel/remix-1.6.2" = { name = "_at_vercel_slash_remix"; packageName = "@vercel/remix"; - version = "1.4.1"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/remix/-/remix-1.4.1.tgz"; - sha512 = "Tmq8zDZIW3feYMzVcMVTDF1hKiHdZXXvwQpNXy5oPJOK6j1mNXcr51z0LZMPIcxLUns8ZC1h18xvDl0x04j63A=="; + url = "https://registry.npmjs.org/@vercel/remix/-/remix-1.6.2.tgz"; + sha512 = "y0b32OJbQpvcEZPIB+BNyoCIpXH+hN/T/WN6PEPYOFzMQzb9Zjh2SEMBO+mh3azbq64RWWedxljIrSyR59jfAQ=="; }; }; - "@vercel/routing-utils-2.1.9" = { + "@vercel/routing-utils-2.1.10" = { name = "_at_vercel_slash_routing-utils"; packageName = "@vercel/routing-utils"; - version = "2.1.9"; + version = "2.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/routing-utils/-/routing-utils-2.1.9.tgz"; - sha512 = "DVE9coIpicZQBKWL0DgIe5wnZsi4SRPbD51XxFCvvnRyYxG34DY09R0aMz4ZQQdPK2asJF57i5rbcplXYaEOkg=="; + url = "https://registry.npmjs.org/@vercel/routing-utils/-/routing-utils-2.1.10.tgz"; + sha512 = "eOde+TQBcGOpEMd5EVTE36rK5NQOewEepEUCX1jrSgwbf/vzYP5B82zwcGdtddxEwzWqJV4QjltS6H0GZOgf6A=="; }; }; - "@vercel/ruby-1.3.67" = { + "@vercel/ruby-1.3.70" = { name = "_at_vercel_slash_ruby"; packageName = "@vercel/ruby"; - version = "1.3.67"; + version = "1.3.70"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.3.67.tgz"; - sha512 = "2j9QO8U59wRBbOWwcbnjpqteguD11GbPhJLNRZ9zJsp5Ku1YGF2NY975EwIKlDMra8WCehHAkm7JuvNCPunwRg=="; + url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.3.70.tgz"; + sha512 = "tVCl78XWuZEzi8oyumzB7pAuxLPK54zTko6yJVqXtytOyuLorTB+LLEV9wDzh+Yird8bVsA/hDf6qoYJaFYagA=="; }; }; - "@vercel/static-build-1.3.12" = { + "@vercel/static-build-1.3.16" = { name = "_at_vercel_slash_static-build"; packageName = "@vercel/static-build"; - version = "1.3.12"; + version = "1.3.16"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-1.3.12.tgz"; - sha512 = "KufcZlf4qamzUuBVa3+7UHy62WfvMqrP5xid91DNCVFLnTzauoViMhufMU601SwERxH1fPYS78mzsQd1h+5Mfw=="; + url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-1.3.16.tgz"; + sha512 = "Nz1qXjcgaWZfZd3CU/1WITLIu9kcGu7tiBs1+t2Fh1013rwQdb/YothpjXKauUhMbUm3blgH0Jej86N2ctrpTw=="; }; }; "@vercel/static-config-2.0.13" = { @@ -14035,13 +13972,13 @@ let sha512 = "ukOMWnCg1tCvT7WnDfsUKQOFDQGsyR5tNgRpwmqi+5/vzU3ghdDXzvIM4IOPdSb3OeSsBNvmSL8nxIVOqi2WXA=="; }; }; - "@vscode/test-electron-2.2.3" = { + "@vscode/test-electron-2.3.0" = { name = "_at_vscode_slash_test-electron"; packageName = "@vscode/test-electron"; - version = "2.2.3"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.2.3.tgz"; - sha512 = "7DmdGYQTqRNaLHKG3j56buc9DkstriY4aV0S3Zj32u0U9/T0L8vwWAC9QGCh1meu1VXDEla1ze27TkqysHGP0Q=="; + url = "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.0.tgz"; + sha512 = "fwzA9RtazH1GT/sckYlbxu6t5e4VaMXwCVtyLv4UAG0hP6NTfnMaaG25XCfWqlVwFhBMcQXHBCy5dmz2eLUnkw=="; }; }; "@vue/cli-overlay-4.5.19" = { @@ -14989,22 +14926,22 @@ let sha512 = "WKj/lI4QjnLuPrim0cfO7i+HsDSXHxNv1y0CrJhdntuO3hxWZmnXCwNDnwOvry11OjRin6cgWNF+j/9Pn8TN4w=="; }; }; - "@whatwg-node/fetch-0.8.1" = { + "@whatwg-node/fetch-0.8.2" = { name = "_at_whatwg-node_slash_fetch"; packageName = "@whatwg-node/fetch"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.8.1.tgz"; - sha512 = "Fkd1qQHK2tAWxKlC85h9L86Lgbq3BzxMnHSnTsnzNZMMzn6Xi+HlN8/LJ90LxorhSqD54td+Q864LgwUaYDj1Q=="; + url = "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.8.2.tgz"; + sha512 = "6u1xGzFZvskJpQXhWreR9s1/4nsuY4iFRsTb4BC3NiDHmzgj/Hu1Ovt4iHs5KAjLzbnsjaQOI5f5bQPucqvPsQ=="; }; }; - "@whatwg-node/node-fetch-0.3.0" = { + "@whatwg-node/node-fetch-0.3.1" = { name = "_at_whatwg-node_slash_node-fetch"; packageName = "@whatwg-node/node-fetch"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.3.0.tgz"; - sha512 = "mPM8WnuHiI/3kFxDeE0SQQXAElbz4onqmm64fEGCwYEcBes2UsvIDI8HwQIqaXCH42A9ajJUPv4WsYoN/9oG6w=="; + url = "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.3.1.tgz"; + sha512 = "/U4onp5eBkRHfFe/VL+ppyupqj7z6iBtjcuPSosQNH2/y+LxRn5lyFb7Vqhb5DokjrDMjssLcqiVYnx+UABFsw=="; }; }; "@withgraphite/graphite-cli-routes-0.23.0" = { @@ -15349,13 +15286,13 @@ let sha512 = "GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; }; }; - "@yarnpkg/parsers-3.0.0-rc.39" = { + "@yarnpkg/parsers-3.0.0-rc.40" = { name = "_at_yarnpkg_slash_parsers"; packageName = "@yarnpkg/parsers"; - version = "3.0.0-rc.39"; + version = "3.0.0-rc.40"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.39.tgz"; - sha512 = "BsD4zq3EVmaHqlynXTceNuEFAtrfToV4fI9GA54moKlWZL4Eb2eXrhgf1jV2nMYx18SZxYO4Jc5Kf1sCDNRjOg=="; + url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.40.tgz"; + sha512 = "sKbi5XhHKXCjzb5m0ftGuQuODM2iUXEsrCSl8MkKexNWHepCmU3IPaGTPC5gHZy4sOvsb9JqTLaZEez+kDzG+Q=="; }; }; "@zeit/schemas-2.29.0" = { @@ -15394,76 +15331,76 @@ let sha512 = "nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg=="; }; }; - "@zwave-js/cc-10.10.0" = { + "@zwave-js/cc-10.11.1" = { name = "_at_zwave-js_slash_cc"; packageName = "@zwave-js/cc"; - version = "10.10.0"; + version = "10.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/cc/-/cc-10.10.0.tgz"; - sha512 = "ZT+V5+llCZknSe5CwaVom5PpEFbFfm6pXbzS6nJ2Nt5m7//G4qExK+356qOfE7vsEz9KgIDEbDGfEtfhq/heUQ=="; + url = "https://registry.npmjs.org/@zwave-js/cc/-/cc-10.11.1.tgz"; + sha512 = "B1R8VQTFERWPafKb5V9SaB2H27Mpp18XnOrwR6inZxeG62TaB38FH7VgyLcxn0C7QNlKvTF11fA7CGZ7B+JQxA=="; }; }; - "@zwave-js/config-10.10.0" = { + "@zwave-js/config-10.11.1" = { name = "_at_zwave-js_slash_config"; packageName = "@zwave-js/config"; - version = "10.10.0"; + version = "10.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/config/-/config-10.10.0.tgz"; - sha512 = "nlCYS8SZol0IM66OFgOF2eFC0NRc4qreVrC2NfUTdxy3plClSOhsQeZsREyvXyxEtrhMaW5G93M6Ad7+YbIh7Q=="; + url = "https://registry.npmjs.org/@zwave-js/config/-/config-10.11.1.tgz"; + sha512 = "dCrhYMYMzY8Pwd43B5lUlPBEsmOsbJFB669QS4OLZJtmvSGDbc7WP5fUJoR09DiLzIlxnEHUc7VwLfROoqwsww=="; }; }; - "@zwave-js/core-10.10.0" = { + "@zwave-js/core-10.11.1" = { name = "_at_zwave-js_slash_core"; packageName = "@zwave-js/core"; - version = "10.10.0"; + version = "10.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/core/-/core-10.10.0.tgz"; - sha512 = "jwejHy/HEAHTCIJJkAF+4b8F1mTK2xVLdZzdPNh4t9RBRpFH+cxuKS4DP7iEHAyDROvyOmzW//QOxZMHEmbqwg=="; + url = "https://registry.npmjs.org/@zwave-js/core/-/core-10.11.1.tgz"; + sha512 = "Hiv8x9xYOWmhL9nLIEyXJ4XTGixUGErL/iSM0dHT3upVo+OIkp5iluEAL8cRhSV4hOueckE+WXwqziiDlRlW1g=="; }; }; - "@zwave-js/host-10.10.0" = { + "@zwave-js/host-10.11.1" = { name = "_at_zwave-js_slash_host"; packageName = "@zwave-js/host"; - version = "10.10.0"; + version = "10.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/host/-/host-10.10.0.tgz"; - sha512 = "SrbfE3um8S1lFhW9WaZcbIIzqCirB0ej6U64azhxSQLRWDj0mbkqso1FZvbqzOgT67HTFejiICDe6MqVnl2beA=="; + url = "https://registry.npmjs.org/@zwave-js/host/-/host-10.11.1.tgz"; + sha512 = "AZ3pRA0i4i6jfdceqSdLvVSZUxQqN/rkpfmxzpQxKYwtd0kzfpZD13mkvktsYF+3fDNmOk5Mp19I+Q78WEi/Bg=="; }; }; - "@zwave-js/nvmedit-10.10.0" = { + "@zwave-js/nvmedit-10.11.1" = { name = "_at_zwave-js_slash_nvmedit"; packageName = "@zwave-js/nvmedit"; - version = "10.10.0"; + version = "10.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-10.10.0.tgz"; - sha512 = "EGSXNUptfwQPONtrZPkYkV3wefaKrheEx2GheH11L9v4Bg1KfxVMLJh92p9c0/sGZTayZnAR0q5Pt41BeuMhBA=="; + url = "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-10.11.1.tgz"; + sha512 = "wn/ldo/u9c5ttLTMNhARo4eseCmY9RI+WUZiRvgbShiSROWZWYps+rMZXql2eTtBOLrzat/nYDz2Xk9Gv27NUA=="; }; }; - "@zwave-js/serial-10.10.0" = { + "@zwave-js/serial-10.11.1" = { name = "_at_zwave-js_slash_serial"; packageName = "@zwave-js/serial"; - version = "10.10.0"; + version = "10.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/serial/-/serial-10.10.0.tgz"; - sha512 = "3Bp9lR3uojiEyZV6wtj8RDijRDhcGPhK3xu0wQZ2OEYZOKuGyGB1XNpVaRhowj26UQ2e6ztcz8S/tr8poNRDXA=="; + url = "https://registry.npmjs.org/@zwave-js/serial/-/serial-10.11.1.tgz"; + sha512 = "SOflxz90nQ94vlQoXX9GUEj8dyJVUoYQQuWpiYpYAaa3DAh1fkMHpxJ/90md83TfjP/OpCzgb3fdZFzb0HgDRQ=="; }; }; - "@zwave-js/shared-10.10.0" = { + "@zwave-js/shared-10.11.1" = { name = "_at_zwave-js_slash_shared"; packageName = "@zwave-js/shared"; - version = "10.10.0"; + version = "10.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/shared/-/shared-10.10.0.tgz"; - sha512 = "UOEyaQ60nRO9zWlsOyK3prYZCUtjfbXNPd/mZSzWrWeZcNzKcU5VdZGHHJnbCDf3wS0zyOhB66afBlY7O0RpuQ=="; + url = "https://registry.npmjs.org/@zwave-js/shared/-/shared-10.11.1.tgz"; + sha512 = "lAxZ1qPkZB4Kl4lMAUVIqMcdTLW5ZAdKUKYOVGXpdfOdXkavhtLYbjdW5kdsjU7R9fwB7lO1BRooGsC8m2L/gQ=="; }; }; - "@zwave-js/testing-10.10.0" = { + "@zwave-js/testing-10.11.1" = { name = "_at_zwave-js_slash_testing"; packageName = "@zwave-js/testing"; - version = "10.10.0"; + version = "10.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/testing/-/testing-10.10.0.tgz"; - sha512 = "VylUNmdrGMVaUFOvFqZuQGa9fLmZ6HPhrgLHcECbn7YBjgk7kz2Ha+irrsfny73zYT0t/BtYlZl3M54I2S5ahQ=="; + url = "https://registry.npmjs.org/@zwave-js/testing/-/testing-10.11.1.tgz"; + sha512 = "zLXtAKg5sxg7vD6JxkWfD9uvb3m/fgqAHwg1iHbgqYCCw+WcwNwWYf5AwuftvYeTvwjBz1MxV15JlzQukxYFBQ=="; }; }; "@zxing/text-encoding-0.9.0" = { @@ -16024,13 +15961,13 @@ let sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; }; - "agentkeepalive-4.2.1" = { + "agentkeepalive-4.3.0" = { name = "agentkeepalive"; packageName = "agentkeepalive"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz"; - sha512 = "Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA=="; + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.3.0.tgz"; + sha512 = "7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg=="; }; }; "aggregate-error-3.1.0" = { @@ -16312,6 +16249,15 @@ let sha512 = "NLU4tCHlWt0tzEaFQL7NIoWhq2KmQSmz0JvyS2lYn6fc4fEjTMSabhJUx8H1r5995FX8fE3rZ15uIHU6u+ovlQ=="; }; }; + "anser-2.1.1" = { + name = "anser"; + packageName = "anser"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/anser/-/anser-2.1.1.tgz"; + sha512 = "nqLm4HxOTpeLOxcmB3QWmV5TcDFhW9y/fyQ+hivtDFcK4OQ+pQ5fzPnXHM1Mfcm0VkLtvVi1TCPr++Qy0Q/3EQ=="; + }; + }; "ansi-0.3.1" = { name = "ansi"; packageName = "ansi"; @@ -16780,22 +16726,22 @@ let sha512 = "L5TiS8E2Hn/Yz7SSnWIVbZw0ZfEIXZCa5VUiVxD9P53JvSrf4aStvsFDlGWPvpIdCR+aly2CfoB79B9/JjKFqg=="; }; }; - "apollo-reporting-protobuf-3.3.3" = { + "apollo-reporting-protobuf-3.4.0" = { name = "apollo-reporting-protobuf"; packageName = "apollo-reporting-protobuf"; - version = "3.3.3"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.3.3.tgz"; - sha512 = "L3+DdClhLMaRZWVmMbBcwl4Ic77CnEBPXLW53F7hkYhkaZD88ivbCVB1w/x5gunO6ZHrdzhjq0FHmTsBvPo7aQ=="; + url = "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.4.0.tgz"; + sha512 = "h0u3EbC/9RpihWOmcSsvTW2O6RXVaD/mPEjfrPkxRPTEPWqncsgOoRJw+wih4OqfH3PvTJvoEIf4LwKrUaqWog=="; }; }; - "apollo-server-core-3.11.1" = { + "apollo-server-core-3.12.0" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "3.11.1"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.11.1.tgz"; - sha512 = "t/eCKrRFK1lYZlc5pHD99iG7Np7CEm3SmbDiONA7fckR3EaB/pdsEdIkIwQ5QBBpT5JLp/nwvrZRVwhaWmaRvw=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.12.0.tgz"; + sha512 = "hq7iH6Cgldgmnjs9FVSZeKWRpi0/ZR+iJ1arzeD2VXGxxgk1mAm/cz1Tx0TYgegZI+FvvrRl0UhKEx7sLnIxIg=="; }; }; "apollo-server-env-4.2.1" = { @@ -16816,31 +16762,31 @@ let sha512 = "xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA=="; }; }; - "apollo-server-express-3.11.1" = { + "apollo-server-express-3.12.0" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "3.11.1"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.11.1.tgz"; - sha512 = "x9ngcpXbBlt4naCXTwNtBFb/mOd9OU0wtFXvJkObHF26NsRazu3DxDfEuekA6V1NFOocD+A9jmVMQeQWug5MgA=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.12.0.tgz"; + sha512 = "m8FaGPUfDOEGSm7QRWRmUUGjG/vqvpQoorkId9/FXkC57fz/A59kEdrzkMt9538Xgsa5AV+X4MEWLJhTvlW3LQ=="; }; }; - "apollo-server-plugin-base-3.7.1" = { + "apollo-server-plugin-base-3.7.2" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "3.7.1"; + version = "3.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-3.7.1.tgz"; - sha512 = "g3vJStmQtQvjGI289UkLMfThmOEOddpVgHLHT2bNj0sCD/bbisj4xKbBHETqaURokteqSWyyd4RDTUe0wAUDNQ=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-3.7.2.tgz"; + sha512 = "wE8dwGDvBOGehSsPTRZ8P/33Jan6/PmL0y0aN/1Z5a5GcbFhDaaJCjK5cav6npbbGL2DPKK0r6MPXi3k3N45aw=="; }; }; - "apollo-server-types-3.7.1" = { + "apollo-server-types-3.8.0" = { name = "apollo-server-types"; packageName = "apollo-server-types"; - version = "3.7.1"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-3.7.1.tgz"; - sha512 = "aE9RDVplmkaOj/OduNmGa+0a1B5RIWI0o3zC1zLvBTVWMKTpo0ifVf11TyMkLCY+T7cnZqVqwyShziOyC3FyUw=="; + url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-3.8.0.tgz"; + sha512 = "ZI/8rTE4ww8BHktsVpb91Sdq7Cb71rdSkXELSwdSR0eXu600/sY+1UXhTWdiJvk+Eq5ljqoHLwLbY2+Clq2b9A=="; }; }; "app-path-2.2.0" = { @@ -16960,13 +16906,13 @@ let sha512 = "ZzXXpZpDRGcy6Pp5V319nDF9/+Ey7jNknEXZyaBajtC5onN0dcBem6ng5jcb3MPH2AjYWRI8XgyNEuzP/6Y5/A=="; }; }; - "applicationinsights-native-metrics-0.0.8" = { + "applicationinsights-native-metrics-0.0.9" = { name = "applicationinsights-native-metrics"; packageName = "applicationinsights-native-metrics"; - version = "0.0.8"; + version = "0.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/applicationinsights-native-metrics/-/applicationinsights-native-metrics-0.0.8.tgz"; - sha512 = "3areRz2+Q1EPWbQYokfOgYXLkZyBzeReI9716nw97p697gFUfGqYgwJ5fCopftvHycW2zuRWTFJWmA70S5605A=="; + url = "https://registry.npmjs.org/applicationinsights-native-metrics/-/applicationinsights-native-metrics-0.0.9.tgz"; + sha512 = "JGnb6Ou/E4XuM3eKZP+nvpA9NWYLscclwoMFvAHyUknthiNJwREHYrNQT3c63P7AWoFsyf6cyUqeo9KX1jMp8w=="; }; }; "aproba-1.2.0" = { @@ -18472,13 +18418,22 @@ let sha512 = "qRrXLgK4FpkdxeagjrHuhtEEvYrvRbddTBg1I7KBuMCIhXHzSS3nEUmdZjdyMuQJEvt0BCJjwVkNh8e/5TauDQ=="; }; }; - "aws-sdk-2.1324.0" = { + "aws-sdk-2.1331.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1324.0"; + version = "2.1331.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1324.0.tgz"; - sha512 = "7T9Jn6qtzCANdqRcdhxZ9Fx31/U+h/VPFxEU3+sFEnC7WtGtRlgmsJOY2lIdFKRXkHYT3Jw5MqDyjnb/i1QqbA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1331.0.tgz"; + sha512 = "zrA1ymbt/D4GtieF7FuiZacv1fp9BBp9qnHUmy0YbPd9dwH5iwPIFkzdGTABbQ+F3a6b//AjtTpcF/JGVjCtTw=="; + }; + }; + "aws-sdk-2.1332.0" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "2.1332.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1332.0.tgz"; + sha512 = "WuzpeiVv+80gPDv+foHTDap0FW0OkBax+wXf8frm1mub0aBOAGJ2rGnTaCbNVPOZ5zbMFSiEuODvlebMdWBnRg=="; }; }; "aws-sign2-0.6.0" = { @@ -18634,13 +18589,13 @@ let sha512 = "XdiGPhrpaT5J8wdERRKs5g8E0Zy1pvOYTli7z9E8nmOn3YGp4FhtjhrOyFmX/8veWCwdI69mCHKJw6l+4J/bHA=="; }; }; - "b4a-1.6.1" = { + "b4a-1.6.2" = { name = "b4a"; packageName = "b4a"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/b4a/-/b4a-1.6.1.tgz"; - sha512 = "AsKjNhz72yxteo/0EtQEiwkMUgk/tGmycXlbG4g3Ard2/ULtNLUykGOkeK0egmN27h0xMAhb76jYccW+XTBExA=="; + url = "https://registry.npmjs.org/b4a/-/b4a-1.6.2.tgz"; + sha512 = "YFqjbZ8iqX/wWJVmF1SSOB5TYDwsPd/sZzhSdu2PskElf55PjEe+0MhsEPgoa5eTK1VS/WqJMz9qwIFwZta+3g=="; }; }; "babel-code-frame-6.26.0" = { @@ -19102,13 +19057,13 @@ let sha512 = "ZNB4525U7BxT6v9C8LEtywyCgB4Pjnm7/bh+ru/Z9Ecxvg3fDjaJ6z305z9a61orQdbB1zqYHh5JbUqx4s4K0g=="; }; }; - "bash-language-server-4.7.0" = { + "bash-language-server-4.8.2" = { name = "bash-language-server"; packageName = "bash-language-server"; - version = "4.7.0"; + version = "4.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.7.0.tgz"; - sha512 = "JLe8bk0/FtOiGIdFWg/2JoAGJctYQyrYpmj24dhCSEAjIq9HHqr9I6L9k32fh9WkWjHcrh6v70Epiv6m+SxvDQ=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.8.2.tgz"; + sha512 = "B/jBGVeRMdQs+fHkEDycxD6L8/nf2WwoH3r+kt+O4GqknZ9AX3gNVE8sGjCOf0iLEvAChi6tqefYRRY2nKM4xw=="; }; }; "basic-auth-1.1.0" = { @@ -19147,13 +19102,13 @@ let sha512 = "x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="; }; }; - "bcfg-0.1.7" = { + "bcfg-0.1.8" = { name = "bcfg"; packageName = "bcfg"; - version = "0.1.7"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/bcfg/-/bcfg-0.1.7.tgz"; - sha512 = "+4beq5bXwfmxdcEoHYQsaXawh1qFzjLcRvPe5k5ww/NEWzZTm56Jk8LuPmfeGB7X584jZ8xGq6UgMaZnNDa5Ww=="; + url = "https://registry.npmjs.org/bcfg/-/bcfg-0.1.8.tgz"; + sha512 = "1zHJM1/sztv9ldutWyJDZSRYQJEuRBTIzLWZ2J5ncWoWI2T6b4/hahhvQmnzucfeleU5Mx5+bcwCsF2wcWt2vA=="; }; }; "bcrypt-5.0.1" = { @@ -19345,13 +19300,13 @@ let sha512 = "pbnl5XzGBdrFU/wT4jqmJVPn2B6UHPBOhzMQkY/SPUPB6QtUXtmBHBIwCbXJol93mOpGMnQyP/+BB19q04xj7g=="; }; }; - "better-sqlite3-8.1.0" = { + "better-sqlite3-8.2.0" = { name = "better-sqlite3"; packageName = "better-sqlite3"; - version = "8.1.0"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.1.0.tgz"; - sha512 = "p1m09H+Oi8R9TPj810pdNswMFuVgRNgCJEWypp6jlkOgSwMIrNyuj3hW78xEuBRGok5RzeaUW8aBtTWF3l/TQA=="; + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.2.0.tgz"; + sha512 = "8eTzxGk9535SB3oSNu0tQ6I4ZffjVCBUjKHN9QeeIFtphBX0sEd0NxAuglBNR9TO5ThnxBB7GqzfcYo9kjadJQ=="; }; }; "bevent-0.1.5" = { @@ -20470,13 +20425,13 @@ let sha512 = "j//dBVuyacJbvW+tvZ9HuH03fZ46QcaKvvhZickZqtB271DxJ7SNRSNxrV/dZX0085m7hISRZWbzWlJvx/rHSg=="; }; }; - "boxen-7.0.1" = { + "boxen-7.0.2" = { name = "boxen"; packageName = "boxen"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-7.0.1.tgz"; - sha512 = "8k2eH6SRAK00NDl1iX5q17RJ8rfl53TajdYxE3ssMLehbg487dEVgsad4pIsZb/QqBgYWIl6JOauMTLGX2Kpkw=="; + url = "https://registry.npmjs.org/boxen/-/boxen-7.0.2.tgz"; + sha512 = "1Z4UJabXUP1/R9rLpoU3O2lEMnG3pPLAs/ZD2lF3t2q7qD5lM8rqbtnvtvm4N0wEyNlE+9yZVTVAGmd1V5jabg=="; }; }; "bplist-creator-0.0.6" = { @@ -20686,22 +20641,22 @@ let sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="; }; }; - "browser-sync-client-2.28.1" = { + "browser-sync-client-2.28.3" = { name = "browser-sync-client"; packageName = "browser-sync-client"; - version = "2.28.1"; + version = "2.28.3"; src = fetchurl { - url = "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.28.1.tgz"; - sha512 = "srFIhUU6CtsLtvBsVmTgRtFt/kFbcl/PYvenpfxPIKTDSxQf35cCjYwYF1osyJdvRoeKoDlaK/fv6eN6/cXRKw=="; + url = "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.28.3.tgz"; + sha512 = "SMsnGkyXlySVLBWRrXdnTdtQCy0Sl5UoiF8BVtigj9S49DaPWQiesbsyq+uJBUKgpyNve+cvfpBU3KSfIp6oLQ=="; }; }; - "browser-sync-ui-2.28.1" = { + "browser-sync-ui-2.28.3" = { name = "browser-sync-ui"; packageName = "browser-sync-ui"; - version = "2.28.1"; + version = "2.28.3"; src = fetchurl { - url = "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.28.1.tgz"; - sha512 = "yPylRdTE8HS/MxcgGpYfcW/JVde+tVnoTIwotVqzqybW8Kg0e3GfFlS7fD0W+KtI/rS4U5GxVsqERxdqpAjCoQ=="; + url = "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.28.3.tgz"; + sha512 = "Mj5M+O3jroGp5hlO6pDfUo19wzUTIuvGyzaRrJAYUgsSkpFacrX+MLCjN9VbZm9fYXbtHyIsnIUUIlYag87wgQ=="; }; }; "browserify-16.5.2" = { @@ -21434,13 +21389,13 @@ let sha512 = "8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA=="; }; }; - "bval-0.1.7" = { + "bval-0.1.8" = { name = "bval"; packageName = "bval"; - version = "0.1.7"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/bval/-/bval-0.1.7.tgz"; - sha512 = "Ohv+MV7C0xAt5DJ4u681EVCArZ+ybEpz8yPjAozBEZYmR/rp9AX9QJB9PJ0aVlzEodjr3PIKTQrZfaONP8XR9w=="; + url = "https://registry.npmjs.org/bval/-/bval-0.1.8.tgz"; + sha512 = "38WQyq94sgKaJbHSmkOwZqba6Ac0KIKPO0SMDNg/mCcwUos2NIrMg5Bb2LkzIer+RzS186IYusNeSrJrKdaqhA=="; }; }; "bweb-0.1.12" = { @@ -22019,13 +21974,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001458" = { + "caniuse-lite-1.0.30001464" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001458"; + version = "1.0.30001464"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001458.tgz"; - sha512 = "lQ1VlUUq5q9ro9X+5gOEyH7i3vm+AYVT1WDCVB69XOZ17KZRhnZ9J0Sqz7wTHQaLBJccNCHq8/Ww5LlOIZbB0w=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001464.tgz"; + sha512 = "oww27MtUmusatpRpCGSOneQk2/l5czXANDSFvsc7VuOQ86s3ANhZetpwXNf1zY/zdfP63Xvjz325DAdAoES13g=="; }; }; "canvas-2.11.0" = { @@ -22181,22 +22136,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.7.14" = { + "cdk8s-2.7.25" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.7.14"; + version = "2.7.25"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.7.14.tgz"; - sha512 = "MJXV6Fqp6m6t9iYOqR5Vw2748/xIr3AHMXSD4uItAHuYRnAXJAyrp4WtbxiOyRk0qnCH8MNNEWZBc1mb0PJgEQ=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.7.25.tgz"; + sha512 = "MwCZvNn14EWibak5RM+CfgMJwZ+mpUrtUyrxhedAsA4pSELHUNpVUqYsLRBJwbabWRV7N0cUwaZVeU9XYMLe1A=="; }; }; - "cdk8s-plus-25-2.4.37" = { + "cdk8s-plus-25-2.4.47" = { name = "cdk8s-plus-25"; packageName = "cdk8s-plus-25"; - version = "2.4.37"; + version = "2.4.47"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.4.37.tgz"; - sha512 = "vVtsOLBUxyqa1m7/Ip4PuT9GvxaHavp5hW7ndSc96dFFPvLvZRvE7CBZZQwe9MY8GPfXC12Y9oiVxmE5pb0LPQ=="; + url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.4.47.tgz"; + sha512 = "2iNl2XWT+T9zKtW+xaEJQBxNs9b2Ol3RL+FglrH1FnPnm+WiCl+/P1S7OAKtybZtzBXykImp/oCSz3vQ8+d3gg=="; }; }; "cdktf-0.15.5" = { @@ -23846,13 +23801,13 @@ let sha512 = "+xi2ENsvchtUNa8oBUU58gHgmyN6BEEeZ8NIEgeQ0XnC+AoyihivgZYe+OOiNi+fLy/NUowugwV5gP8XWYDm0Q=="; }; }; - "codemaker-1.76.0" = { + "codemaker-1.77.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.76.0"; + version = "1.77.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.76.0.tgz"; - sha512 = "EqnBOOiEV+kjyRghA5Z0TX22VnVH2Mgo2diOSYelcmntlTSiQkZimGof6jxE5j1buzjEVBK1d1W7bhRKYGegUg=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.77.0.tgz"; + sha512 = "XSHAqkXMn5OtcebJLVMFEW9puB+4ZmmChBFspEf62ZeYzs+ggSXEHW9GrjC/ZyX+sfxql6ciJP3z25sSp4VsVQ=="; }; }; "codepage-1.4.0" = { @@ -24413,15 +24368,6 @@ let sha512 = "KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ=="; }; }; - "commandpost-1.4.0" = { - name = "commandpost"; - packageName = "commandpost"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commandpost/-/commandpost-1.4.0.tgz"; - sha512 = "aE2Y4MTFJ870NuB/+2z1cXBhSBBzRydVVjzhFC4gtenEhpnj15yu0qptWGJsO9YGrcPZ3ezX8AWb1VA391MKpQ=="; - }; - }; "comment-json-1.1.3" = { name = "comment-json"; packageName = "comment-json"; @@ -24971,13 +24917,13 @@ let sha512 = "xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="; }; }; - "constructs-10.1.263" = { + "constructs-10.1.272" = { name = "constructs"; packageName = "constructs"; - version = "10.1.263"; + version = "10.1.272"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.1.263.tgz"; - sha512 = "lJq4n2iukIQE/XtSfMMwnOE33n67kSzNi6rF3C83RrHYtrQYRswOcAv3XJciCQoznxn99pKmgsxAQBYJlYcwFg=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.1.272.tgz"; + sha512 = "Rn5nwQoWjsVTeUOXqPsXE//uwd2Aj6Ln59/PTNIgyCUVuRMgRGTuKNT5w4cDauJWYnwsE+z15v2AvcHA85RToA=="; }; }; "consume-http-header-1.0.0" = { @@ -26205,22 +26151,22 @@ let sha512 = "pP2W2BvLrRKggS1fUk8qQw2FG8PhyV969dlwF3M0jAg/HH83n76H+KGdzGsmEut6VJFlJYQkd1ZZskjaeVWnrA=="; }; }; - "cspell-dictionary-6.27.0" = { + "cspell-dictionary-6.28.0" = { name = "cspell-dictionary"; packageName = "cspell-dictionary"; - version = "6.27.0"; + version = "6.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-6.27.0.tgz"; - sha512 = "u2HZ6Yl0tIBzflJ9Rt5i15kP1KN41XtyKfqCCntugX3gYtfbQ1t/HvAPcq4g7EDZV2tzqSKGcNvzuJgHJyxxFw=="; + url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-6.28.0.tgz"; + sha512 = "7RSap81rJ2JVENuErrcKqfN1rBfDN8UIJSn5uoQZj2Boz/IfV24wGs0izXcJ+jpZI9L5PoT0XpMyuT93rwo+hA=="; }; }; - "cspell-gitignore-6.27.0" = { + "cspell-gitignore-6.28.0" = { name = "cspell-gitignore"; packageName = "cspell-gitignore"; - version = "6.27.0"; + version = "6.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-6.27.0.tgz"; - sha512 = "aXIuSMtm2pW8Z0y4SHBqvXwY4Hk3lz4b3PD50IU1gn2mjk8GioEYAnWlN/FANeOuMjOXiRfLaX0McvNErnZxdw=="; + url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-6.28.0.tgz"; + sha512 = "AOlblIJsoMk8F7+CznmhUIM+jGpIP/rBFERo5yT7bF7GarO2MoONxFA5MauSDnRaIDxMuik/gCn4MzvgT8ZZgw=="; }; }; "cspell-glob-0.1.25" = { @@ -26232,22 +26178,22 @@ let sha512 = "/XaSHrGBpMJa+duFz3GKOWfrijrfdHT7a/XGgIcq3cymCSpOH+DPho42sl0jLI/hjM+8yv2m8aEoxRT8yVSnlg=="; }; }; - "cspell-glob-6.27.0" = { + "cspell-glob-6.28.0" = { name = "cspell-glob"; packageName = "cspell-glob"; - version = "6.27.0"; + version = "6.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-6.27.0.tgz"; - sha512 = "YzS9SiNU5iFIdEMCeVOsGlCvffCM7M51io9ylkkY6138NLCnqWw/DSePzIAAsuLqh9nsJt8xiXrHPerKiPnN3g=="; + url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-6.28.0.tgz"; + sha512 = "588E4RdswSNRoXf9mPtDxc+aSP3rpRwmJCrLEPtV6FdbG0YJDQOAmV2jP2qRqVouWOHjZZ84HwN79jfWt1ROsA=="; }; }; - "cspell-grammar-6.27.0" = { + "cspell-grammar-6.28.0" = { name = "cspell-grammar"; packageName = "cspell-grammar"; - version = "6.27.0"; + version = "6.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-6.27.0.tgz"; - sha512 = "03SH0+bWazhkzUUK+t6ywUZvWuDcqj4J171oIdA3fvdG7nBpTqyFc1/vU1mReZK7CDde16BUaqCkWgf+El+N1w=="; + url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-6.28.0.tgz"; + sha512 = "MQaaGn+aJxsUnYxi6yHeU0RvsD3ARo6/14aipbrx11uZYZjm8dDQVPFabW98aPjO7zd0qNuB6FBS/3FK6nbKkg=="; }; }; "cspell-io-4.1.7" = { @@ -26259,13 +26205,13 @@ let sha512 = "V0/tUu9FnIS3v+vAvDT6NNa14Nc/zUNX8+YUUOfFAiDJJTdqefmvcWjOJBIMYBf3wIk9iWLmLbMM+bNHqr7DSQ=="; }; }; - "cspell-io-6.27.0" = { + "cspell-io-6.28.0" = { name = "cspell-io"; packageName = "cspell-io"; - version = "6.27.0"; + version = "6.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-io/-/cspell-io-6.27.0.tgz"; - sha512 = "WsvXjbbWwIQVembEtlNuC8cJrGtyUuk8GvZzL9bBpSofU2UXvFjaQ9bAZjIeHibGQrIIuOM0ra0CqOcLb5mShA=="; + url = "https://registry.npmjs.org/cspell-io/-/cspell-io-6.28.0.tgz"; + sha512 = "h/KtXQDX1c7q/0tZvBlYe0MyaqmtJZ1dcL9kInQXrFhLnw3IPXcS3Nwux+FRj7DXJp5uXbM80hEu54z8fDnT6g=="; }; }; "cspell-lib-4.3.12" = { @@ -26277,13 +26223,13 @@ let sha512 = "yCCb6MoW1K8Tsr/WVEQoO4dfYhH9bCsjQayccb8MlyDaNNuWJHuX+gUGHsZSXSuChSh8PrTWKXJzs13/uM977g=="; }; }; - "cspell-lib-6.27.0" = { + "cspell-lib-6.28.0" = { name = "cspell-lib"; packageName = "cspell-lib"; - version = "6.27.0"; + version = "6.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-6.27.0.tgz"; - sha512 = "wwi3VCFiWaVFrV/ycm4yNBjjPY3pyhWud4lVJs51p2IkKqJbmR7hZ+bSIyw6d9MVzPKRD67eMaNBYXFGDaNHGQ=="; + url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-6.28.0.tgz"; + sha512 = "J24iWuaWU3O4L+4//wS3TA/Dw1GEqzZqeKsufOlpgU+P1+VplPaoIKmKBK44nM7RBPEz+fbyUxhnksLKD1tRmQ=="; }; }; "cspell-trie-lib-4.2.8" = { @@ -26295,13 +26241,13 @@ let sha512 = "Nt3c0gxOYXIc3/yhALDukpje1BgR6guvlUKWQO2zb0r7qRWpwUw2j2YM4dWbHQeH/3Hx5ei4Braa6cMaiJ5YBw=="; }; }; - "cspell-trie-lib-6.27.0" = { + "cspell-trie-lib-6.28.0" = { name = "cspell-trie-lib"; packageName = "cspell-trie-lib"; - version = "6.27.0"; + version = "6.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-6.27.0.tgz"; - sha512 = "kelDXszZKzlWbk7hV3cTtWYd2Gs3MXqTNSL3udtN4Oow74ik+h1bWsOOmXKKjtKvRctx4omWC1JdriQXfhBMBA=="; + url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-6.28.0.tgz"; + sha512 = "pF+C60Fdclg5oxXdnyA2biP6WjckaTs/eNMPTxbmQOEAraujZVyGFL3b464dwW9dJ8Qz1FuQc7fhQADelN2LrA=="; }; }; "cspell-util-bundle-4.1.11" = { @@ -26835,13 +26781,13 @@ let sha512 = "byxnDBxM1AVF3YfmsK7Smop9/usNz7gAZYSo9eYp61TGcNXraJby1rAiLyJSt1/8Iho2qaxZOtZCOvQMXogPtg=="; }; }; - "csv-parse-5.3.5" = { + "csv-parse-5.3.6" = { name = "csv-parse"; packageName = "csv-parse"; - version = "5.3.5"; + version = "5.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-5.3.5.tgz"; - sha512 = "8O5KTIRtwmtD3+EVfW6BCgbwZqJbhTYsQZry12F1TP5RUp0sD9tp1UnCWic3n0mLOhzeocYaCZNYxOGSg3dmmQ=="; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-5.3.6.tgz"; + sha512 = "WI330GjCuEioK/ii8HM2YE/eV+ynpeLvU+RXw4R8bRU8R0laK5zO3fDsc4gH8s472e3Ga38rbIjCAiQh+tEHkw=="; }; }; "csv-stream-0.2.0" = { @@ -27015,15 +26961,6 @@ let sha512 = "KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="; }; }; - "d3-array-3.1.1" = { - name = "d3-array"; - packageName = "d3-array"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-array/-/d3-array-3.1.1.tgz"; - sha512 = "33qQ+ZoZlli19IFiQx4QEpf2CBEayMRzhlisJHSCsSUbDXv6ZishqS1x7uFVClKG4Wr7rZVHvaAttoLow6GqdQ=="; - }; - }; "d3-array-3.2.2" = { name = "d3-array"; packageName = "d3-array"; @@ -27105,15 +27042,6 @@ let sha512 = "p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q=="; }; }; - "d3-color-2.0.0" = { - name = "d3-color"; - packageName = "d3-color"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz"; - sha512 = "SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ=="; - }; - }; "d3-color-3.1.0" = { name = "d3-color"; packageName = "d3-color"; @@ -27159,15 +27087,6 @@ let sha512 = "fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA=="; }; }; - "d3-dispatch-2.0.0" = { - name = "d3-dispatch"; - packageName = "d3-dispatch"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-2.0.0.tgz"; - sha512 = "S/m2VsXI7gAti2pBoLClFFTMOO1HTtT0j99AuXLoGFKO6deHDdnv6ZGTxSTTUTgO1zVcv82fCOtDjYK4EECmWA=="; - }; - }; "d3-dispatch-3.0.1" = { name = "d3-dispatch"; packageName = "d3-dispatch"; @@ -27186,15 +27105,6 @@ let sha512 = "rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w=="; }; }; - "d3-drag-2.0.0" = { - name = "d3-drag"; - packageName = "d3-drag"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-drag/-/d3-drag-2.0.0.tgz"; - sha512 = "g9y9WbMnF5uqB9qKqwIIa/921RYWzlUDv9Jl1/yONQwxbOfszAWTCm8u7HOTgJgRDXiRZN56cHT9pd24dmXs8w=="; - }; - }; "d3-drag-3.0.0" = { name = "d3-drag"; packageName = "d3-drag"; @@ -27231,15 +27141,6 @@ let sha512 = "lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ=="; }; }; - "d3-ease-2.0.0" = { - name = "d3-ease"; - packageName = "d3-ease"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-ease/-/d3-ease-2.0.0.tgz"; - sha512 = "68/n9JWarxXkOWMshcT5IcjbB+agblQUaIsbnXmrzejn2O82n3p2A9R2zEB9HIEFWKFwPAEDDN8gR0VdSAyyAQ=="; - }; - }; "d3-ease-3.0.1" = { name = "d3-ease"; packageName = "d3-ease"; @@ -27294,15 +27195,6 @@ let sha512 = "J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ=="; }; }; - "d3-format-2.0.0" = { - name = "d3-format"; - packageName = "d3-format"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz"; - sha512 = "Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA=="; - }; - }; "d3-format-3.1.0" = { name = "d3-format"; packageName = "d3-format"; @@ -27339,13 +27231,13 @@ let sha512 = "p0bK60CEzph1iqmnxut7d/1kyTmm3UWtPlwdkM31AU+LW+BXazd5zJdoCn7VFxNCHXRngPHRnsNn5uGjLRGndg=="; }; }; - "d3-graphviz-4.5.0" = { + "d3-graphviz-5.0.2" = { name = "d3-graphviz"; packageName = "d3-graphviz"; - version = "4.5.0"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-4.5.0.tgz"; - sha512 = "qEhZB19Tv7oNV92Hys/aY+XkVCyHAzM+VjqbjJoHK5YXLC3tRtZoSFr64tdrURl8qRsKnphtvPeFpHeJAbOgSQ=="; + url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-5.0.2.tgz"; + sha512 = "EVRow9rnFgm/L1trbbnu2PGOND11IcSEdWXbrDbz9hH0/Kj3YM2AqMkkTN/EAWgawD5/zryyCy+3Vm05oSJ1Kg=="; }; }; "d3-hierarchy-1.1.9" = { @@ -27375,15 +27267,6 @@ let sha512 = "V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA=="; }; }; - "d3-interpolate-2.0.1" = { - name = "d3-interpolate"; - packageName = "d3-interpolate"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz"; - sha512 = "c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ=="; - }; - }; "d3-interpolate-3.0.1" = { name = "d3-interpolate"; packageName = "d3-interpolate"; @@ -27402,15 +27285,6 @@ let sha512 = "VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="; }; }; - "d3-path-2.0.0" = { - name = "d3-path"; - packageName = "d3-path"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-path/-/d3-path-2.0.0.tgz"; - sha512 = "ZwZQxKhBnv9yHaiWd6ZU4x5BtCQ7pXszEV9CU6kRgwIQVQGLMv1oiL4M+MK/n79sYzsj+gcgpPQSctJUsLN7fA=="; - }; - }; "d3-path-3.1.0" = { name = "d3-path"; packageName = "d3-path"; @@ -27519,15 +27393,6 @@ let sha512 = "SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg=="; }; }; - "d3-selection-2.0.0" = { - name = "d3-selection"; - packageName = "d3-selection"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-selection/-/d3-selection-2.0.0.tgz"; - sha512 = "XoGGqhLUN/W14NmaqcO/bb1nqjDAw5WtSYb2X8wiuQWvSZUsUVYsOSkOybUrNvcBjaywBdYPy03eXHMXjk9nZA=="; - }; - }; "d3-selection-3.0.0" = { name = "d3-selection"; packageName = "d3-selection"; @@ -27600,15 +27465,6 @@ let sha512 = "B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw=="; }; }; - "d3-timer-2.0.0" = { - name = "d3-timer"; - packageName = "d3-timer"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-timer/-/d3-timer-2.0.0.tgz"; - sha512 = "TO4VLh0/420Y/9dO3+f9abDEFYeCUr2WZRlxJvbp4HPTQcSylXNiL6yZa9FIUvV1yRiFufl1bszTCLDqv9PWNA=="; - }; - }; "d3-timer-3.0.1" = { name = "d3-timer"; packageName = "d3-timer"; @@ -27627,15 +27483,6 @@ let sha512 = "sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA=="; }; }; - "d3-transition-2.0.0" = { - name = "d3-transition"; - packageName = "d3-transition"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-transition/-/d3-transition-2.0.0.tgz"; - sha512 = "42ltAGgJesfQE3u9LuuBHNbGrI/AJjNL2OAUdclE70UE6Vy239GCBEYD38uBPoLeNsOhFStGpPI0BAOV+HMxog=="; - }; - }; "d3-transition-3.0.1" = { name = "d3-transition"; packageName = "d3-transition"; @@ -27663,15 +27510,6 @@ let sha512 = "VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ=="; }; }; - "d3-zoom-2.0.0" = { - name = "d3-zoom"; - packageName = "d3-zoom"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-zoom/-/d3-zoom-2.0.0.tgz"; - sha512 = "fFg7aoaEm9/jf+qfstak0IYpnesZLiMX6GZvXtUSdv8RH2o4E2qeelgdU09eKS6wGuiGMfcnMI0nTIqWzRHGpw=="; - }; - }; "d3-zoom-3.0.0" = { name = "d3-zoom"; packageName = "d3-zoom"; @@ -29310,13 +29148,13 @@ let sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; }; }; - "diff2html-3.4.31" = { + "diff2html-3.4.33" = { name = "diff2html"; packageName = "diff2html"; - version = "3.4.31"; + version = "3.4.33"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.31.tgz"; - sha512 = "bgL4kUUChpBqyFykgalwXRXbeW+zCkGmoH4Ftw6+WFP5JccBUJPNMapfX2WDEb+KOLflrE7eJwvb5r8+zutetw=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.33.tgz"; + sha512 = "A9Frkyu9oEXqa8Q27Y5XKzp2ye4Jlwdktviy/o1WzwXiJzRSzjr1eg2frqBPdYEqnFvzJHvKdaWHX7U4QKEVFA=="; }; }; "diff3-0.0.3" = { @@ -29823,13 +29661,13 @@ let sha512 = "Be9tbQMZds4a3C6xTmz68NlMfeONA//4dOavl/1rNw50E+/QO0KVpbcU0PcaW0nsQxurXls9ZocqFxk8R2mWEA=="; }; }; - "dompurify-2.4.4" = { + "dompurify-2.4.5" = { name = "dompurify"; packageName = "dompurify"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-2.4.4.tgz"; - sha512 = "1e2SpqHiRx4DPvmRuXU5J0di3iQACwJM+mFGE2HAkkK7Tbnfk9WcghcAmyWc9CRrjyRRUpmuhPUH6LphQQR3EQ=="; + url = "https://registry.npmjs.org/dompurify/-/dompurify-2.4.5.tgz"; + sha512 = "jggCCd+8Iqp4Tsz0nIvpcb22InKEBrGz5dw3EQJMs8HPJDsKbFIO3STYtAvCfDx26Muevn1MHVI0XxjgFfmiSA=="; }; }; "domutils-1.4.3" = { @@ -30264,13 +30102,13 @@ let sha512 = "wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w=="; }; }; - "eazy-logger-4.0.0" = { + "eazy-logger-4.0.1" = { name = "eazy-logger"; packageName = "eazy-logger"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/eazy-logger/-/eazy-logger-4.0.0.tgz"; - sha512 = "ZnYemMI98cKlJt0Fkrw/7zVJYlnzVY22pbQJXmT1ZMmxnC732o7US9KaLXlf3x/g/ImS+uLIvF2R6nbcWP1uWw=="; + url = "https://registry.npmjs.org/eazy-logger/-/eazy-logger-4.0.1.tgz"; + sha512 = "2GSFtnnC6U4IEKhEI7+PvdxrmjJ04mdsj3wHZTFiw0tUtG4HCWzTr13ZYTk8XOGnA1xQMaDljoBOYlk3D/MMSw=="; }; }; "ecc-jsbn-0.1.2" = { @@ -30408,13 +30246,22 @@ let sha512 = "r1NDtlajsq7gf2EXgjRfblCVPquvD2yeg+6XGErOKblvxOpDi0iulZLVhgYDP4AEF1P5/HgbX/vwjlkEv7PEIQ=="; }; }; - "electron-to-chromium-1.4.313" = { + "electron-to-chromium-1.4.325" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.313"; + version = "1.4.325"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.313.tgz"; - sha512 = "QckB9OVqr2oybjIrbMI99uF+b9+iTja5weFe0ePbqLb5BHqXOJUO1SG6kDj/1WtWPRIBr51N153AEq8m7HuIaA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.325.tgz"; + sha512 = "K1C03NT4I7BuzsRdCU5RWkgZxtswnKDYM6/eMhkEXqKu4e5T+ck610x3FPzu1y7HVFSiQKZqP16gnJzPpji1TQ=="; + }; + }; + "electron-to-chromium-1.4.326" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.4.326"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.326.tgz"; + sha512 = "tFNZP7VlGDp88vR7TYQ/h5svw8lzfu44PU5tfDJ+JYdcsEuWv4GpEm7hOF3c4Z/o4QQ6lNxmlGtvGaBVMRM9uQ=="; }; }; "electrum-client-git+https://github.com/janoside/electrum-client" = { @@ -31941,6 +31788,15 @@ let sha512 = "BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew=="; }; }; + "eslint-config-prettier-8.7.0" = { + name = "eslint-config-prettier"; + packageName = "eslint-config-prettier"; + version = "8.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.7.0.tgz"; + sha512 = "HHVXLSlVUhMSmyW4ZzEuvjpwqamgmlfkutD53cYXLikh4pt/modINRcCIApJ84czDxM4GZInwUrromsDdTImTA=="; + }; + }; "eslint-config-standard-17.0.0" = { name = "eslint-config-standard"; packageName = "eslint-config-standard"; @@ -32337,13 +32193,13 @@ let sha512 = "m7OsYzocA8OQ3+9CxmhIv7NPHtyDR2ixaLCO7kLZ+YH+xQ/BpaZmll9EXmc+kBxzWA8BRBXbNEuEQqQ6vfsgDw=="; }; }; - "esquery-1.4.2" = { + "esquery-1.5.0" = { name = "esquery"; packageName = "esquery"; - version = "1.4.2"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.4.2.tgz"; - sha512 = "JVSoLdTlTDkmjFmab7H/9SL9qGSyjElT3myyKp7krqjVFQCDLmj1QFaCLRFBszBKI0XVZaiiXvuPIX3ZwHe1Ng=="; + url = "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz"; + sha512 = "YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg=="; }; }; "esrecurse-4.3.0" = { @@ -33048,13 +32904,13 @@ let sha512 = "/wSgNMxFusiYRy1rd19LT2SQlIXDppHpumpWo06wxjflD1OYxDLbl6rMVw+U3bxD5Nuhex4TKqv9Aem4D0lVzQ=="; }; }; - "expo-48.0.4" = { + "expo-48.0.6" = { name = "expo"; packageName = "expo"; - version = "48.0.4"; + version = "48.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/expo/-/expo-48.0.4.tgz"; - sha512 = "FGxaxqI8u0r3CvFQAEx/kpqZP4cA7q9ymMoIrrjtOsWvKsuk5Dt3gLEJpymGp6aicPuDXn3xBxo2dsRZF5NkUw=="; + url = "https://registry.npmjs.org/expo/-/expo-48.0.6.tgz"; + sha512 = "ylm91v/xYjBBEqFHH+mpNyGijJgFXx4NwgKgHCIEfcAQyTZLXpGCL6teOVzAmHCCVF7EdalLl3If/+n09jOi4g=="; }; }; "expo-application-5.1.1" = { @@ -33066,13 +32922,13 @@ let sha512 = "aDatTcTTCdTbHw8h4/Tq2ilc6InM5ntF9xWCJdOcnUEcglxxGphVI/lzJKBaBF6mJECA8mEOjpVg2EGxOctTwg=="; }; }; - "expo-asset-8.9.0" = { + "expo-asset-8.9.1" = { name = "expo-asset"; packageName = "expo-asset"; - version = "8.9.0"; + version = "8.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/expo-asset/-/expo-asset-8.9.0.tgz"; - sha512 = "zenkZrYcsJAcTVl478mCarVmaOE9r2GbTlVvKZaXL8UJIL4rnspk63xUSJLAGMArZIdHzsGFQMXlQG3pgEfzrg=="; + url = "https://registry.npmjs.org/expo-asset/-/expo-asset-8.9.1.tgz"; + sha512 = "ugavxA7Scn96TBdeTYQA6xtHktnk0o/0xk7nFkxJKoH/t2cZDFSB05X0BI2/LDZY4iE6xTPOYw4C4mmourWfuA=="; }; }; "expo-constants-14.2.1" = { @@ -33129,13 +32985,13 @@ let sha512 = "oOlkAccVnHwwR5ccvF/F/x4Omj9HWzSimMUlIVz0SVGdNBEqTPyn0L/d4uIufhyQbEWvrarqL8o5Yz11wEI0SQ=="; }; }; - "expo-modules-core-1.2.3" = { + "expo-modules-core-1.2.4" = { name = "expo-modules-core"; packageName = "expo-modules-core"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/expo-modules-core/-/expo-modules-core-1.2.3.tgz"; - sha512 = "bYWxL60NPzDTuvlBrNLlwu7K6H7GqlRKJJpF1c3lqHsMw9vusu3StHZhAXB2noMPD+Ww/pGa/A9tfTtieqvbcg=="; + url = "https://registry.npmjs.org/expo-modules-core/-/expo-modules-core-1.2.4.tgz"; + sha512 = "AV0NCTy9O8xQqpKgX6gvsDzV1ogpCzYpGxqM85Vw1xHsOF51s7Avu7NdNjBPUZOVuDderUXAvd97dWrtefSKcA=="; }; }; "expo-pwa-0.0.124" = { @@ -33993,13 +33849,13 @@ let sha512 = "483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ=="; }; }; - "fastpriorityqueue-0.7.2" = { + "fastpriorityqueue-0.7.3" = { name = "fastpriorityqueue"; packageName = "fastpriorityqueue"; - version = "0.7.2"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/fastpriorityqueue/-/fastpriorityqueue-0.7.2.tgz"; - sha512 = "5DtIKh6vtOmEGkYdEPNNb+mxeYCnBiKbK3s4gq52l6cX8I5QaTDWWw0Wx/iYo80fVOblSycHu1/iJeqeNxG8Jw=="; + url = "https://registry.npmjs.org/fastpriorityqueue/-/fastpriorityqueue-0.7.3.tgz"; + sha512 = "1+DZ5cjw6irYFvkmn4RqfmSZ0o7xgAqDtdO4wXYw2fxBrYIgUxEljrN/RYxIXwj6k08dIzNq+lkeYxwcxwZfuw=="; }; }; "fastq-1.15.0" = { @@ -34992,13 +34848,13 @@ let sha512 = "d+9na7t9FyH8gBJoNDSi28mE4NgQVGGvxQ4aHtFRetjyh5SXjuus+V5EZaxFmFdXVemSOrx0lsgEl/ZMjnOWJA=="; }; }; - "flow-parser-0.200.1" = { + "flow-parser-0.201.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.200.1"; + version = "0.201.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.200.1.tgz"; - sha512 = "N6gxgo0iQx0G2m3aJjg3RLxNLUG3EBYgBN/xDDPGQXSjvqNkTdEd2t1myE36Xi7GndZQWngDP7jf0GvxdL6pRg=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.201.0.tgz"; + sha512 = "G4oeDNpNGyIrweF9EnoHatncAihMT0tQgV6NMdyM5I7fhrz9Pr13PJ2KLQ673O4wj9KooTdBpeeYHdDNAQoyyw=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -36090,13 +35946,13 @@ let sha512 = "gSaYYIO1Y3wUtdfHmjDUZ8LWaxJQpiavzbF5Kq53akSzvmVg0RfyOcFDbO1KJ/KCGRFz2qG+lS81F0nkr7cRJA=="; }; }; - "gaxios-5.0.2" = { + "gaxios-5.1.0" = { name = "gaxios"; packageName = "gaxios"; - version = "5.0.2"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/gaxios/-/gaxios-5.0.2.tgz"; - sha512 = "TjtV2AJOZoMQqRYoy5eM8cCQogYwazWNYLQ72QB0kwa6vHHruYkGmhhyrlzbmgNHK1dNnuP2WSH81urfzyN2Og=="; + url = "https://registry.npmjs.org/gaxios/-/gaxios-5.1.0.tgz"; + sha512 = "aezGIjb+/VfsJtIcHGcBSerNEDdfdHeMros+RbYbGpmonKWQCOVOes0LVZhn1lDtIgq55qq0HaxymIoae3Fl/A=="; }; }; "gaze-1.1.3" = { @@ -36216,13 +36072,13 @@ let sha512 = "ys3h0hiteRwmY6BsvSttPmkhC0vEQHPJduANBRtH/dlDPZ0UBIb/dXy80IcckXyuQ6LKg+PloRqvGER9IS7F7g=="; }; }; - "gensequence-4.0.3" = { + "gensequence-5.0.2" = { name = "gensequence"; packageName = "gensequence"; - version = "4.0.3"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/gensequence/-/gensequence-4.0.3.tgz"; - sha512 = "izr+MKqJKjexkvLiPGhW96elQX8TuUR/su/xzILxjqzU1RDz1n1ZbqwDUnNFaRcq0gFR3oQfNH2JOH4Je1x/QA=="; + url = "https://registry.npmjs.org/gensequence/-/gensequence-5.0.2.tgz"; + sha512 = "JlKEZnFc6neaeSVlkzBGGgkIoIaSxMgvdamRoPN8r3ozm2r9dusqxeKqYQ7lhzmj2UhFQP8nkyfCaiLQxiLrDA=="; }; }; "gensync-1.0.0-beta.2" = { @@ -36918,13 +36774,13 @@ let sha512 = "r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ=="; }; }; - "glob-9.0.1" = { + "glob-9.2.1" = { name = "glob"; packageName = "glob"; - version = "9.0.1"; + version = "9.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-9.0.1.tgz"; - sha512 = "psRdn8MI0gRcH0xow0VOhYxXD/6ZaRGmgtfN0oWN/hCgjxpRQBMCl7wE4JRJSAUTdJsW+FmD0EtE0CgJhKqSVw=="; + url = "https://registry.npmjs.org/glob/-/glob-9.2.1.tgz"; + sha512 = "Pxxgq3W0HyA3XUvSXcFhRSs+43Jsx0ddxcFrbjxNGkL2Ak5BAUBxLqI5G6ADDeCHLfzzXFhe0b1yYcctGmytMA=="; }; }; "glob-base-0.3.0" = { @@ -37567,13 +37423,13 @@ let sha512 = "6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g=="; }; }; - "got-12.5.3" = { + "got-12.6.0" = { name = "got"; packageName = "got"; - version = "12.5.3"; + version = "12.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-12.5.3.tgz"; - sha512 = "8wKnb9MGU8IPGRIo+/ukTy9XLJBwDiCpIf5TVzQ9Cpol50eMTpBq2GAuDsuDIz7hTYmZgMgC1e9ydr6kSDWs3w=="; + url = "https://registry.npmjs.org/got/-/got-12.6.0.tgz"; + sha512 = "WTcaQ963xV97MN3x0/CbAriXFZcXCfgxVp91I+Ze6pawQOa7SgzwSx2zIJJsX+kTajMnVs0xcFD1TxZKFqhdnQ=="; }; }; "got-3.3.1" = { @@ -37828,22 +37684,22 @@ let sha512 = "Uiu3X7+s5c056WyrvdZVz2vG1fhAipMlYmtiCU/4Z2mX79OXDr1SqIon2MprC/pExIWJfAQZCcjYDY76fPBUQg=="; }; }; - "graphql-config-4.4.1" = { + "graphql-config-4.5.0" = { name = "graphql-config"; packageName = "graphql-config"; - version = "4.4.1"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-config/-/graphql-config-4.4.1.tgz"; - sha512 = "B8wlvfBHZ5WnI4IiuQZRqql6s+CKz7S+xpUeTb28Z8nRBi8tH9ChEBgT5FnTyE05PUhHlrS2jK9ICJ4YBl9OtQ=="; + url = "https://registry.npmjs.org/graphql-config/-/graphql-config-4.5.0.tgz"; + sha512 = "x6D0/cftpLUJ0Ch1e5sj1TZn6Wcxx4oMfmhaG9shM0DKajA9iR+j1z86GSTQ19fShbGvrSSvbIQsHku6aQ6BBw=="; }; }; - "graphql-language-service-5.1.1" = { + "graphql-language-service-5.1.2" = { name = "graphql-language-service"; packageName = "graphql-language-service"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-5.1.1.tgz"; - sha512 = "gpaDT9E3+3eWhoqO4C81CGhkzr7Vp2jH/eq+ykoUbgfvMEpqhGTfCeNmrf+S4K/+4WTkAAJBsYT0/ZPZkqe/Hg=="; + url = "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-5.1.2.tgz"; + sha512 = "oeuztbvd7fwKWZ/GCp0voqgctdIL4BDjTkd/phz1jEyH+pfj6inJWKKIkUJPW5ebWHx+mFsZ00wdE6tiCvW2fA=="; }; }; "graphql-language-service-interface-2.10.2" = { @@ -37864,13 +37720,13 @@ let sha512 = "duDE+0aeKLFVrb9Kf28U84ZEHhHcvTjWIT6dJbIAQJWBaDoht0D4BK9EIhd94I3DtKRc1JCJb2+70y1lvP/hiA=="; }; }; - "graphql-language-service-server-2.9.5" = { + "graphql-language-service-server-2.9.6" = { name = "graphql-language-service-server"; packageName = "graphql-language-service-server"; - version = "2.9.5"; + version = "2.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-server/-/graphql-language-service-server-2.9.5.tgz"; - sha512 = "u4X6mgoB5ufp64h9vT5UsFgQZ8GsbIIGLHfr/vndujlVpY+iHml9ea1o8on2c9i1LpB/ILa2zF90pJkBQgASfg=="; + url = "https://registry.npmjs.org/graphql-language-service-server/-/graphql-language-service-server-2.9.6.tgz"; + sha512 = "a+kwNEPX+ZvEUNxE8u8K/haxsfVfk1rn8AjzHWsXUhLfhl06vhCiU0kgdls1d/DiMJ3HbcNFjeKqV9OZcLNhdg=="; }; }; "graphql-language-service-types-1.8.7" = { @@ -37945,13 +37801,13 @@ let sha512 = "sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag=="; }; }; - "graphql-ws-5.11.3" = { + "graphql-ws-5.12.0" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "5.11.3"; + version = "5.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.11.3.tgz"; - sha512 = "fU8zwSgAX2noXAsuFiCZ8BtXeXZOzXyK5u1LloCdacsVth4skdBMPO74EG51lBoWSIZ8beUocdpV8+cQHBODnQ=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.12.0.tgz"; + sha512 = "PA3ImUp8utrpEjoxBMhvxsjkStvFEdU0E1gEBREt8HZIWkxOUymwJBhFnBL7t/iHhUq1GVPeZevPinkZFENxTw=="; }; }; "gray-matter-4.0.3" = { @@ -40096,13 +39952,13 @@ let sha512 = "acJLCk38YMfEPjBR/1vS13SFY7rBQLs9E5m1tSRnWc9UW3f+SZszgH+NP1fZRA1+O+CdG2eLGGmuUMJW52EwzQ=="; }; }; - "ibm-openapi-validator-0.88.3" = { + "ibm-openapi-validator-0.97.5" = { name = "ibm-openapi-validator"; packageName = "ibm-openapi-validator"; - version = "0.88.3"; + version = "0.97.5"; src = fetchurl { - url = "https://registry.npmjs.org/ibm-openapi-validator/-/ibm-openapi-validator-0.88.3.tgz"; - sha512 = "WHkkO5TXWSS12P8VybB04Stq+yFloMlHy2aVzcLAZo425PYIVMuIWhsH7zN9vwcZcOB/qAnWQ4T3PKn6wrcT+Q=="; + url = "https://registry.npmjs.org/ibm-openapi-validator/-/ibm-openapi-validator-0.97.5.tgz"; + sha512 = "MlXLjQCZRU0yqQ6EFzBhCehkFXp/rXuGsjsEglK+ldDJZV/YQy7dw1V6ROzoiibjm0f00J7L3ubLvlbIlHilGQ=="; }; }; "iconv-lite-0.4.19" = { @@ -40807,13 +40663,13 @@ let sha512 = "firNp1q3xxTzoItj/eOOSZQnYSlyrWks5llCTVX37nJ59K3eXbQ8PtzCguqo8YI19EELo5QxaKnJd4VxzhU8tg=="; }; }; - "ink-select-input-4.2.1" = { + "ink-select-input-4.2.2" = { name = "ink-select-input"; packageName = "ink-select-input"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ink-select-input/-/ink-select-input-4.2.1.tgz"; - sha512 = "WvlrYdwmdnD6/nE/9mNhaaanTQOKmwy/hT/vuAqbDec3PUQBQ8Pkwszii/8eGvDTx5bGiUHu18P9D5IoB/ERaw=="; + url = "https://registry.npmjs.org/ink-select-input/-/ink-select-input-4.2.2.tgz"; + sha512 = "E5AS2Vnd4CSzEa7Rm+hG47wxRQo1ASfh4msKxO7FHmn/ym+GKSSsFIfR+FonqjKNDPXYJClw8lM47RdN3Pi+nw=="; }; }; "ink-spinner-4.0.3" = { @@ -41545,13 +41401,13 @@ let sha512 = "kniTIJmaZYiwa17eTtWIfm0K342seyugl6vuC8DiiyiRAJWAVlLkqGCI0Im0neo0TkXw+pRcKaBPRdcKHnQJ6Q=="; }; }; - "irregular-plurals-3.4.0" = { + "irregular-plurals-3.4.1" = { name = "irregular-plurals"; packageName = "irregular-plurals"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.4.0.tgz"; - sha512 = "YXxECO/W6N9aMBVKMKKZ8TXESgq7EFrp3emCGGUcrYY1cgJIeZjoB75MTu8qi+NAKntS9NwPU8VdcQ3r6E6aWQ=="; + url = "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.4.1.tgz"; + sha512 = "JR7VL+1Kd9z79bE+2uSgifpzrTwLWmTvyeUewhxZCHVtpPImAsLk4adfRxg86uvdsJ8etYYrpzN7vRT30gGnOA=="; }; }; "is-3.3.0" = { @@ -41680,13 +41536,13 @@ let sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; }; }; - "is-array-buffer-3.0.1" = { + "is-array-buffer-3.0.2" = { name = "is-array-buffer"; packageName = "is-array-buffer"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz"; - sha512 = "ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ=="; + url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz"; + sha512 = "y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w=="; }; }; "is-arrayish-0.2.1" = { @@ -43651,6 +43507,15 @@ let sha512 = "j6PZcTup+evIz+cVy8wDB6+GlV20/YvgDKCQtV7FBTBgYhl8FtpurUclcHz+C4OerMRosaKRX1doxTWgWoCmBQ=="; }; }; + "jiti-1.17.1" = { + name = "jiti"; + packageName = "jiti"; + version = "1.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jiti/-/jiti-1.17.1.tgz"; + sha512 = "NZIITw8uZQFuzQimqjUxIrIcEdxYDFIe/0xYfIlVXTkiBjjyBEvgasj5bb0/cHtPRD/NziPbT312sFrkI5ALpw=="; + }; + }; "jju-1.4.0" = { name = "jju"; packageName = "jju"; @@ -43805,13 +43670,13 @@ let sha256 = "c1b7d85fad2ff0b6a2d1ed1140142c0450e3240a371703ad66d60cb3b5f612b6"; }; }; - "jquery-3.6.3" = { + "jquery-3.6.4" = { name = "jquery"; packageName = "jquery"; - version = "3.6.3"; + version = "3.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz"; - sha512 = "bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg=="; + url = "https://registry.npmjs.org/jquery/-/jquery-3.6.4.tgz"; + sha512 = "v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ=="; }; }; "jquery-ui-1.13.2" = { @@ -44201,49 +44066,49 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.76.0" = { + "jsii-1.77.0" = { name = "jsii"; packageName = "jsii"; - version = "1.76.0"; + version = "1.77.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.76.0.tgz"; - sha512 = "IlQmxPPnscn2Va/cnnXRnQ7bnxEkO8ImKW0MBlEr66oqxhFQ9jy9+FWzOp/5kfHzhyyyM5mcqitB8O6fr1moIw=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.77.0.tgz"; + sha512 = "3VODnWUhljro1+PmWlTWAEUPxWGWwCOmzOS6EG7l5E1KthurCgQDzhpTySlw80U85mGU9XvDJMcpvwuj3ESrKA=="; }; }; - "jsii-pacmak-1.76.0" = { + "jsii-pacmak-1.77.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.76.0"; + version = "1.77.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.76.0.tgz"; - sha512 = "70h0puIRpDeDyYk/jLxQk7vPbg3w3ppJRATlF0qPntMk/WnSo4uvr8hlz1BmRzOOvQ7JqXBuNOaVd+bp7Xolbw=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.77.0.tgz"; + sha512 = "mYrITqM/fTiS1rzGFYeIK90/Ab7S39/4wFlBlhVYqqxbeAwiOFS1+zfx2m5RBYGvJMw5rd6S4zoWg6CnK2kpPg=="; }; }; - "jsii-reflect-1.76.0" = { + "jsii-reflect-1.77.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.76.0"; + version = "1.77.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.76.0.tgz"; - sha512 = "voS5WyeitP3o0knus00v00NlxVLbaU9ykvEDamFw5KPEc4z4wvAwDG9wBfNmdO1OulXgID41WhMzJOEJFKle6A=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.77.0.tgz"; + sha512 = "wSEkBxdEjuZHp2qLPpUPFamhppvDBW+vUJi8/VnQlAYJMCOIvQPdj8GVfiMllc+6tir9xIHl8q30PZaanbQpXA=="; }; }; - "jsii-rosetta-1.76.0" = { + "jsii-rosetta-1.77.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.76.0"; + version = "1.77.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.76.0.tgz"; - sha512 = "y3OcYebjMdK/4Yxt8P9tMalK9Szmq8Xc4VXD3kGDIEulMjUxo3TpEUZc9WEfzVu6A+lSl/WRAwV50ZgzQyVWZg=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.77.0.tgz"; + sha512 = "gOpK7YxGb64Fwy6zvEpRV3umC3u77HAmltP3kSF/eGPmM04ggTQ17UEfN+XsEO4NXJh1LDniMDyMjOIa3QViBw=="; }; }; - "jsii-srcmak-0.1.838" = { + "jsii-srcmak-0.1.847" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.838"; + version = "0.1.847"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.838.tgz"; - sha512 = "5GJi0TGtO4NyTS5lT7rYnlpr4WD14rkUry5+3aMg/MYtECoX0IyTTHy/RBEFCQBZ47i7tZkQC9m5EIpGSSKpjA=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.847.tgz"; + sha512 = "icCv6UlSCYsijfZK6Mxik6A0YehtZKRJ8lRotJw24Ynw+lBh9aPhFYhfx9Q6m8Y8YqijLc2yxemMMiLpgdcTbg=="; }; }; "json-bigint-1.0.0" = { @@ -44615,13 +44480,13 @@ let sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; }; }; - "json2jsii-0.3.290" = { + "json2jsii-0.3.299" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.3.290"; + version = "0.3.299"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.290.tgz"; - sha512 = "aG3lEpWDluFecGHE+GbxzjSQBkQslgLjiw8S6ZZc5RRrI0ShDNj0bv8AXlPES4EwmBcv2w1jkjBxtWMLR4KxMw=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.299.tgz"; + sha512 = "Yu2EgEUmYS9o+YhD8KqriTdfuh8S3KcghqELPC0YpQ09fTa5Jal3zkzNLefsY/UeqsJvUXBIBTr30l3lmpJKUg=="; }; }; "json3-3.2.6" = { @@ -46289,13 +46154,13 @@ let sha512 = "oGnfMICKd0cmGxHdXG6VW5Ha/TLVgHJxCCYxHHyOO0PKAAweK8yUV8d0CUfgHaV/rUybTxbQ+oRhMQ6M7yPtyg=="; }; }; - "lightning-7.1.0" = { + "lightning-7.1.2" = { name = "lightning"; packageName = "lightning"; - version = "7.1.0"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-7.1.0.tgz"; - sha512 = "+46PVhATqGB+t01RipPHj/uOavsnDdKbSBMSNAyAmn2Yo1+lJSp8nYJpr2mfMikMmNDiP3NbBJTSqNjNBknHBQ=="; + url = "https://registry.npmjs.org/lightning/-/lightning-7.1.2.tgz"; + sha512 = "rT/94wdCV2rO4o1KLmQGwK6JoN3/IqyO0fduMK9TN7UNd1yq23b0lUNPR8Xm/zvD6CTnxStmQxjZLqJXAdnPZw=="; }; }; "lightningcss-1.19.0" = { @@ -46379,13 +46244,13 @@ let sha512 = "C+VuUTeSUOAaBZZOPT7Etn/agx/MatzJzGRkeV+zEABmPuntv1zihncsi+AyGmjkkzq3wVedEy7h0/4S84mUtg=="; }; }; - "lilconfig-2.0.6" = { + "lilconfig-2.1.0" = { name = "lilconfig"; packageName = "lilconfig"; - version = "2.0.6"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz"; - sha512 = "9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg=="; + url = "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz"; + sha512 = "utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ=="; }; }; "limit-spawn-0.0.3" = { @@ -46604,13 +46469,13 @@ let sha512 = "8eQvvZb/MiYcRUlg/iIaamWSSTLBpLidLiviqmZ3enpnliW1JIA6pgXsbfyKSWPK3bdzqPuRGnQKQevXsTAybQ=="; }; }; - "ln-service-54.10.0" = { + "ln-service-54.10.2" = { name = "ln-service"; packageName = "ln-service"; - version = "54.10.0"; + version = "54.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-54.10.0.tgz"; - sha512 = "lNEUUDMPkh78mY4Gl1HWK0qMvZOmP7sN2kWBYwOYKlhdvxzN9Mn2BkPUYx19wY9QpechbqIezVn3tS4zwnq9/A=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-54.10.2.tgz"; + sha512 = "EA5PZjiQhcSHwfKOTwPvEnbEeVy9AaCOiF3AplYCmYX8IskkUM36x8o4YaHmC2L2w7Le1B+KNExi7MzGZtznSg=="; }; }; "ln-service-54.9.0" = { @@ -48296,13 +48161,13 @@ let sha512 = "Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw=="; }; }; - "log4js-6.8.0" = { + "log4js-6.9.1" = { name = "log4js"; packageName = "log4js"; - version = "6.8.0"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-6.8.0.tgz"; - sha512 = "g+V8gZyurIexrOvWQ+AcZsIvuK/lBnx2argejZxL4gVZ4Hq02kUYH6WZOnqxgBml+zzQZYdaEoTN84B6Hzm8Fg=="; + url = "https://registry.npmjs.org/log4js/-/log4js-6.9.1.tgz"; + sha512 = "1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g=="; }; }; "logform-2.5.1" = { @@ -48683,13 +48548,13 @@ let sha512 = "ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA=="; }; }; - "lru-cache-7.17.0" = { + "lru-cache-7.18.3" = { name = "lru-cache"; packageName = "lru-cache"; - version = "7.17.0"; + version = "7.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.17.0.tgz"; - sha512 = "zSxlVVwOabhVyTi6E8gYv2cr6bXK+8ifYz5/uyJb9feXX6NACVDwY4p5Ut3WC3Ivo/QhpARHU3iujx2xGAYHbQ=="; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz"; + sha512 = "jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="; }; }; "lru-queue-0.1.0" = { @@ -51258,13 +51123,13 @@ let sha512 = "lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A=="; }; }; - "mini-css-extract-plugin-2.7.2" = { + "mini-css-extract-plugin-2.7.3" = { name = "mini-css-extract-plugin"; packageName = "mini-css-extract-plugin"; - version = "2.7.2"; + version = "2.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz"; - sha512 = "EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw=="; + url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.3.tgz"; + sha512 = "CD9cXeKeXLcnMw8FZdtfrRrLaM7gwCl4nKuKn2YkY2Bw5wdlB8zU2cCzw+w2zS9RFvbrufTBkMCJACNPwqQA0w=="; }; }; "mini-svg-data-uri-1.4.4" = { @@ -51375,6 +51240,15 @@ let sha512 = "9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g=="; }; }; + "minimatch-4.2.3" = { + name = "minimatch"; + packageName = "minimatch"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-4.2.3.tgz"; + sha512 = "lIUdtK5hdofgCTu3aT0sOaHsYR37viUuIc0rwnnDXImbwFRcumyLMeZaM0t0I/fgxS6s6JMfu0rLD1Wz9pv1ng=="; + }; + }; "minimatch-5.0.1" = { name = "minimatch"; packageName = "minimatch"; @@ -51411,13 +51285,13 @@ let sha512 = "sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg=="; }; }; - "minimatch-7.3.0" = { + "minimatch-7.4.2" = { name = "minimatch"; packageName = "minimatch"; - version = "7.3.0"; + version = "7.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-7.3.0.tgz"; - sha512 = "WaMDuhKa7a6zKiwplR1AOz+zGvJba24k5VU1Cy6NhEguavT2YRlHxuINUgTas4wiS6fwBpYq4TcA1XIECSntyw=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-7.4.2.tgz"; + sha512 = "xy4q7wou3vUoC9k1xGTXc+awNdGaGVHtFUaey8tiX4H1QRc04DZ/rmDFwNm2EBsuYEhAZ6SgMmYf3InGY6OauA=="; }; }; "minimist-0.0.10" = { @@ -51771,13 +51645,13 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; - "mkdirp-2.1.3" = { + "mkdirp-2.1.5" = { name = "mkdirp"; packageName = "mkdirp"; - version = "2.1.3"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.3.tgz"; - sha512 = "sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw=="; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.5.tgz"; + sha512 = "jbjfql+shJtAPrFoKxHOXip4xS+kul9W3OzfzzrqueWK2QMGon2bFH2opl6W9EagBThjEz+iysyi/swOoVfB/w=="; }; }; "mkdirp-classic-0.5.3" = { @@ -51834,13 +51708,13 @@ let sha512 = "+HQUNuh7AoQ9ZnU6c4rvbiVVl+wEkb9WqYsVDzGLng+Dqj1XntHu79PvEWKtSMoMj67vFp/ZPXcElosuJO8ckA=="; }; }; - "mobx-react-lite-3.4.0" = { + "mobx-react-lite-3.4.3" = { name = "mobx-react-lite"; packageName = "mobx-react-lite"; - version = "3.4.0"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-3.4.0.tgz"; - sha512 = "bRuZp3C0itgLKHu/VNxi66DN/XVkQG7xtoBVWxpvC5FhAqbOCP21+nPhULjnzEqd7xBMybp6KwytdUpZKEgpIQ=="; + url = "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-3.4.3.tgz"; + sha512 = "NkJREyFTSUXR772Qaai51BnE1voWx56LOL80xG7qkZr6vo8vEaLF3sz1JNUVh+rxmUzxYaqOhfuxTfqUh0FXUg=="; }; }; "mocha-2.5.3" = { @@ -52221,22 +52095,22 @@ let sha512 = "VoY2AaoowHZLLKyEb5FRzuhdSzXn5quGjcMKJOJHJPxp9baYZx5t6jiHUhp5aNRlqqlt+5GXQGovMLNKsrm1hg=="; }; }; - "msgpackr-1.8.4" = { + "msgpackr-1.8.5" = { name = "msgpackr"; packageName = "msgpackr"; - version = "1.8.4"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.4.tgz"; - sha512 = "BE3hD3PqV7jsNaV022uq0jMW+ZVc32wSYyQmwAoJUc+vPtCeyro2MOtAW61Fd9ZKNySM6y913E9fBY0mG+hKXg=="; + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.5.tgz"; + sha512 = "mpPs3qqTug6ahbblkThoUY2DQdNXcm4IapwOS3Vm/87vmpzLVelvp9h3It1y9l1VPpiFLV11vfOXnmeEwiIXwg=="; }; }; - "msgpackr-extract-3.0.1" = { + "msgpackr-extract-3.0.2" = { name = "msgpackr-extract"; packageName = "msgpackr-extract"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.1.tgz"; - sha512 = "8jiKrp+ApgrD/TqdnYjqNC2wwId1qPdC/zsop/rT1A5nAGJeQ6Y5HV8AasQ3vuh1ZMblYwMm+nMyFp7Sv0PUeA=="; + url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.2.tgz"; + sha512 = "SdzXp4kD/Qf8agZ9+iTu6eql0m3kWm1A2y1hkpTeVNENutaB0BwHlSvAIaMxwntmRUAUjon2V4L8Z/njd0Ct8A=="; }; }; "mssql-9.1.1" = { @@ -52608,13 +52482,13 @@ let sha512 = "Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig=="; }; }; - "mysql2-3.1.2" = { + "mysql2-3.2.0" = { name = "mysql2"; packageName = "mysql2"; - version = "3.1.2"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mysql2/-/mysql2-3.1.2.tgz"; - sha512 = "NXz6sUvHSEOKz1jv3koSga7eb2dHrwD/mnPmqbbZzMRvjQcSpb0Eh0ectWyYt1U60CLlEbjoA3XYjjbbReRF5Q=="; + url = "https://registry.npmjs.org/mysql2/-/mysql2-3.2.0.tgz"; + sha512 = "0Vn6a9WSrq6fWwvPgrvIwnOCldiEcgbzapVRDAtDZ4cMTxN7pnGqCTx8EG32S/NYXl6AXkdO+9hV1tSIi/LigA=="; }; }; "mz-2.7.0" = { @@ -55048,13 +54922,13 @@ let sha512 = "90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw=="; }; }; - "nx-15.7.2" = { + "nx-15.8.5" = { name = "nx"; packageName = "nx"; - version = "15.7.2"; + version = "15.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/nx/-/nx-15.7.2.tgz"; - sha512 = "VRb+CZCji3G4ikdMAGoh6TeU9Q6n5atRwqRSFhUX63er8zhlMvWHLskPMZC4q/81edo/E7RhbmEVUD5MB0JoeA=="; + url = "https://registry.npmjs.org/nx/-/nx-15.8.5.tgz"; + sha512 = "1c6Y3rPSzzlqQVJPo33Ej0HY/3t9ykeaPs074HpYxXH0+GU1BSIv/9EfXKQGvmBzjs5yAx6asGIv+H3QDrFt3A=="; }; }; "nyc-15.1.0" = { @@ -55724,13 +55598,13 @@ let sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g=="; }; }; - "oo-ascii-tree-1.76.0" = { + "oo-ascii-tree-1.77.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.76.0"; + version = "1.77.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.76.0.tgz"; - sha512 = "I/me4GK6Dybc9lsPYZJdnd1OOFbbnZtfEIIizrbTuFx/v1if375Y59w9ol/TJ75MlSAKs4aHj7Xm+A4E0JitSw=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.77.0.tgz"; + sha512 = "UQXPEVtecK9FDQxlp5WQ9nVBgS0sq96R9LWE1HBmlS3ZLJRqXh3+kdU7Bxs+qqF+cdWmE9uOggwihBffTpqLrA=="; }; }; "open-0.0.2" = { @@ -56453,6 +56327,15 @@ let sha512 = "KiOAIsdpUTcAXuykya5fnVVT+/5uS0Q1mrkRHcF89tpieSmY33O/tmc54CqwA+bfhbtEfZUNLHaPUiB9X3jt1A=="; }; }; + "ovsx-0.5.2" = { + name = "ovsx"; + packageName = "ovsx"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ovsx/-/ovsx-0.5.2.tgz"; + sha512 = "UbLultRCk46WddeA0Cly4hoRhzBJUiLgbIEViXlgOvV54LbsppClDkMLoCevUUBHoiNdMX2NuiSgURAEXgCZdw=="; + }; + }; "ow-0.21.0" = { name = "ow"; packageName = "ow"; @@ -57182,13 +57065,13 @@ let sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; }; }; - "papaparse-5.3.2" = { + "papaparse-5.4.0" = { name = "papaparse"; packageName = "papaparse"; - version = "5.3.2"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/papaparse/-/papaparse-5.3.2.tgz"; - sha512 = "6dNZu0Ki+gyV0eBsFKJhYr+MdQYAzFUGlBMNj3GNrmHxmz1lfRa24CjFObPXtjcetlOv5Ad299MhIK0znp3afw=="; + url = "https://registry.npmjs.org/papaparse/-/papaparse-5.4.0.tgz"; + sha512 = "ZBQABWG09p+u8rFoJVl/GhgxZ5zy9Zh1Lu/LVc7VX5T4nljjC14/YTcpebYwqP218B9X307eBOP7Tuhoqv7v7w=="; }; }; "parallel-transform-1.2.0" = { @@ -57803,13 +57686,13 @@ let sha512 = "9wCE6qKznvf9mQYYbgJ3sVOHmCWoUNMVFoZzNoznmISbhnNNPhN9xfY3sLmScHMetEJeoY7CXwfhCe7argfQow=="; }; }; - "passport-oauth2-1.6.1" = { + "passport-oauth2-1.7.0" = { name = "passport-oauth2"; packageName = "passport-oauth2"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.6.1.tgz"; - sha512 = "ZbV43Hq9d/SBSYQ22GOiglFsjsD1YY/qdiptA+8ej+9C1dL1TVB+mBE5kDH/D4AJo50+2i8f4bx0vg4/yDDZCQ=="; + url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.7.0.tgz"; + sha512 = "j2gf34szdTF2Onw3+76alNnaAExlUmHvkc7cL+cmaS5NzHzDP/BvFHJruueQ9XAeNOdpI+CH+PWid8RA7KCwAQ=="; }; }; "passport-oauth2-client-password-0.1.2" = { @@ -58055,13 +57938,13 @@ let sha512 = "4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ=="; }; }; - "path-scurry-1.5.0" = { + "path-scurry-1.6.1" = { name = "path-scurry"; packageName = "path-scurry"; - version = "1.5.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-scurry/-/path-scurry-1.5.0.tgz"; - sha512 = "hJ8rODLI9B2qwsYAd32rrI76gwVUPeu5kq/do6URDj2bJCVH3ilyT978Mv/NLuFMaqzHrn3XtiDLMZHaTTh4vA=="; + url = "https://registry.npmjs.org/path-scurry/-/path-scurry-1.6.1.tgz"; + sha512 = "OW+5s+7cw6253Q4E+8qQ/u1fVvcJQCJo/VFD8pje+dbJCF1n5ZRMV2AEHbGp+5Q7jxQIYJxkHopnj6nzdGeZLA=="; }; }; "path-to-glob-pattern-1.0.2" = { @@ -58325,13 +58208,13 @@ let sha512 = "vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw=="; }; }; - "pg-8.9.0" = { + "pg-8.10.0" = { name = "pg"; packageName = "pg"; - version = "8.9.0"; + version = "8.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.9.0.tgz"; - sha512 = "ZJM+qkEbtOHRuXjmvBtOgNOXOtLSbxiMiUVMgE4rV6Zwocy03RicCVvDXgx8l4Biwo8/qORUnEqn2fdQzV7KCg=="; + url = "https://registry.npmjs.org/pg/-/pg-8.10.0.tgz"; + sha512 = "ke7o7qSTMb47iwzOSaZMfeR7xToFdkE71ifIipOAAaLIM0DYzfOAXlgFFmYUIE2BcJtvnVlGCID84ZzCegE8CQ=="; }; }; "pg-connection-string-2.5.0" = { @@ -58343,13 +58226,13 @@ let sha512 = "r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="; }; }; - "pg-cursor-2.8.0" = { + "pg-cursor-2.9.0" = { name = "pg-cursor"; packageName = "pg-cursor"; - version = "2.8.0"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-cursor/-/pg-cursor-2.8.0.tgz"; - sha512 = "LrOaEHK+R1C40e+xeri3FTRY/VKp9uTOCVsKtGB7LJ57qbeaphYvWjbVly8AesdT1GfHXYcAnVdExKhW7DKOvA=="; + url = "https://registry.npmjs.org/pg-cursor/-/pg-cursor-2.9.0.tgz"; + sha512 = "tNX0FbHX6+hlhZVNbxhSQPDMNMFF6mOWQvwDobPROAFpilmXrZo3FozawqaBQKonFKpBloZZyWUL3Kkf5rLn6A=="; }; }; "pg-int8-1.0.1" = { @@ -58370,13 +58253,13 @@ let sha512 = "LBVNWkNh0fVx/cienARRP2y22J5OpUsKBe0TpxzAx3arEUUdIs77aLSAHS3scS7SMaqc+OkG40CEu5fN0/cjIw=="; }; }; - "pg-pool-3.5.2" = { + "pg-pool-3.6.0" = { name = "pg-pool"; packageName = "pg-pool"; - version = "3.5.2"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.2.tgz"; - sha512 = "His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.6.0.tgz"; + sha512 = "clFRf2ksqd+F497kWFyM21tMjeikn60oGDmqMT8UBrynEwVEX/5R5xd2sdvdo1cZCFlguORNpVuqxIj+aK4cfQ=="; }; }; "pg-protocol-1.6.0" = { @@ -58388,13 +58271,13 @@ let sha512 = "M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q=="; }; }; - "pg-query-stream-4.3.0" = { + "pg-query-stream-4.4.0" = { name = "pg-query-stream"; packageName = "pg-query-stream"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.3.0.tgz"; - sha512 = "+Eer4Y1e43rAaphFNu9/VJKn9nKTApFKCSwVtDjXYnuO4QYqWHOEkApmGJv8gvaU5T6fcuEtjsN24gk+Rx7X9A=="; + url = "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.4.0.tgz"; + sha512 = "shmP973/ruBw3exSmIEBW9iubWvyyZMzp6oWfcHgvlqAe4LtaRyVqPGxgnuorbRqksK03mjOC9PU+Ohz3b0GkQ=="; }; }; "pg-types-1.13.0" = { @@ -58667,13 +58550,13 @@ let sha512 = "IWo0HwnxUEH9OtQ3qEZsKUbpdStRSomS18Gx4UV5JT1fj/E/opYGZMgpcdzC1+3ouBJECV1evzt0778S2RJ+/Q=="; }; }; - "pkg-5.8.0" = { + "pkg-5.8.1" = { name = "pkg"; packageName = "pkg"; - version = "5.8.0"; + version = "5.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/pkg/-/pkg-5.8.0.tgz"; - sha512 = "8h9PUDYFi+LOMLbIyGRdP21g08mAtHidSpofSrf8LWhxUWGHymaRzcopEGiynB5EhQmZUKM6PQ9kCImV2TpdjQ=="; + url = "https://registry.npmjs.org/pkg/-/pkg-5.8.1.tgz"; + sha512 = "CjBWtFStCfIiT4Bde9QpJy0KeH19jCfwZRJqHFDFXfhUklCx8JoFmMj3wgnEYIwGmZVNkhsStPHEOnrtrQhEXA=="; }; }; "pkg-conf-1.1.3" = { @@ -60377,15 +60260,6 @@ let sha512 = "aaLVANlj4HgZweKttFNUVNRxDukytuIuxeK2boIMHjagNJCiVKWFsKF4tCE3ql3GbrD2tExPQ7/pwtEJcHNZeg=="; }; }; - "prebuild-install-6.1.4" = { - name = "prebuild-install"; - packageName = "prebuild-install"; - version = "6.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz"; - sha512 = "Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ=="; - }; - }; "prebuild-install-7.1.1" = { name = "prebuild-install"; packageName = "prebuild-install"; @@ -62303,22 +62177,22 @@ let sha512 = "U1uufzBjz3+PkpCxFrWzh4OrMIdIb2ztzCu0YEPfRHjHswcSwHZswnK+WdsOQJsRV8WeTg3jLhJR4D867+fjsA=="; }; }; - "puppeteer-19.7.2" = { + "puppeteer-19.7.3" = { name = "puppeteer"; packageName = "puppeteer"; - version = "19.7.2"; + version = "19.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-19.7.2.tgz"; - sha512 = "4Lm7Qpe/LU95Svirei/jDLDvR5oMrl9BPGd7HMY5+Q28n+BhvKuW97gKkR+1LlI86bO8J3g8rG/Ll5kv9J1nlQ=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-19.7.3.tgz"; + sha512 = "QEiRHPUAJp8VOK27zE6h2ne4xKVYibKUZpvjCuLYaAe8/2SOLKIgstF8wK3YaLgTkeruMrYfqZo+Qlw4ZkJDAQ=="; }; }; - "puppeteer-core-19.7.2" = { + "puppeteer-core-19.7.3" = { name = "puppeteer-core"; packageName = "puppeteer-core"; - version = "19.7.2"; + version = "19.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.7.2.tgz"; - sha512 = "PvI+fXqgP0uGJxkyZcX51bnzjFA73MODZOAv0fSD35yR7tvbqwtMV3/Y+hxQ0AMMwzxkEebP6c7po/muqxJvmQ=="; + url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.7.3.tgz"; + sha512 = "9Q5HahsstfoTnllcpNkxNu2z9J7V0Si5Mr5q90K6XSXwW1P8iqe8q3HzWViVuBuEYTSMZ2LaXXzTEYeoCzLEWg=="; }; }; "purgecss-2.3.0" = { @@ -62393,13 +62267,13 @@ let sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ=="; }; }; - "pyright-1.1.295" = { + "pyright-1.1.298" = { name = "pyright"; packageName = "pyright"; - version = "1.1.295"; + version = "1.1.298"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.295.tgz"; - sha512 = "nBowWG3qI2+ETtbsPBOnN7S5aNFE2PXn3OfQMM2jNfSh6A9P7z6YOmV9tYt8HYQ8WHX8qcU9b4ALe7nFp0GnBg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.298.tgz"; + sha512 = "lDTIS0a7SJ6TCcACjPl1eXatYbctTgGd/Ji3aZ9oCJTVjZCIpwf4Huj6sSlhC3KmsHFCcLt4t1uFi0z/jm7qYg=="; }; }; "q-1.1.2" = { @@ -62537,6 +62411,15 @@ let sha512 = "MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="; }; }; + "qs-6.11.1" = { + name = "qs"; + packageName = "qs"; + version = "6.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.11.1.tgz"; + sha512 = "0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ=="; + }; + }; "qs-6.3.3" = { name = "qs"; packageName = "qs"; @@ -62798,31 +62681,31 @@ let sha512 = "b3w19IEXnt5auacLAbePVsqPyVQUwmuhJQrrWnVhm4pP8PAMg2U9vFHbAD9XYXXbMDjdLJs0x5NLqwTV8uFK4g=="; }; }; - "quicktype-core-23.0.9" = { + "quicktype-core-23.0.12" = { name = "quicktype-core"; packageName = "quicktype-core"; - version = "23.0.9"; + version = "23.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype-core/-/quicktype-core-23.0.9.tgz"; - sha512 = "RDbv+V3iC8gDwBiROTbpT0s1cHNkG+NYa9+r2gKjROHTkApd4UjT/eUiw5LDdDjbDyYeYIKIKTALG7qLS8tYuQ=="; + url = "https://registry.npmjs.org/quicktype-core/-/quicktype-core-23.0.12.tgz"; + sha512 = "EPCLnAPBw6/WqYW7WsS5Mcpg+U/w6tYnmfphsSes555qltbB9USR6QbBYksuO+JwF04x94an1ziZi9javD0teQ=="; }; }; - "quicktype-graphql-input-23.0.9" = { + "quicktype-graphql-input-23.0.12" = { name = "quicktype-graphql-input"; packageName = "quicktype-graphql-input"; - version = "23.0.9"; + version = "23.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype-graphql-input/-/quicktype-graphql-input-23.0.9.tgz"; - sha512 = "L0MTYTp/Llf6iP8Fm0PoDSCo46RCqpvZpFb3CZnpa26WGMzR6537zdIHErP3HYXbKS18wW2GFH0Jc2RaDw+ffg=="; + url = "https://registry.npmjs.org/quicktype-graphql-input/-/quicktype-graphql-input-23.0.12.tgz"; + sha512 = "7A3/3LuN8h1Pw4F4tdXevnujRUAlMQ+Zi7Q8APXmTQTu85zTUDA/FAQy5giiKt/Y5veoYSL+72jSFRlA3Re2MA=="; }; }; - "quicktype-typescript-input-23.0.9" = { + "quicktype-typescript-input-23.0.12" = { name = "quicktype-typescript-input"; packageName = "quicktype-typescript-input"; - version = "23.0.9"; + version = "23.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype-typescript-input/-/quicktype-typescript-input-23.0.9.tgz"; - sha512 = "pQr4tw2EGscfMgIS6Ik5Y9DsaiMGtzENvtAcoAlK3R/iwUGA4/QbyS+8H9RGHSVLl7ZmLIa9ZjQbepl/mbqw+g=="; + url = "https://registry.npmjs.org/quicktype-typescript-input/-/quicktype-typescript-input-23.0.12.tgz"; + sha512 = "HdW6DwkSE2FnkPaimfebizb4Exb1SKKxE/KLA3oYQFwxyafzwDwEkRFwstTFhI6J3Svn1jE5LLMI3lunSVXMBA=="; }; }; "quotation-1.1.3" = { @@ -63374,6 +63257,15 @@ let sha512 = "nK6kgY28HwrMNwDnMui3dvm3rCFjZrcGiuwLc5COUipBK5hWHLOxMJhSnSomirqWwjPBJKV1QcbkI0VJr7Gl1Q=="; }; }; + "react-refresh-0.14.0" = { + name = "react-refresh"; + packageName = "react-refresh"; + version = "0.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz"; + sha512 = "wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ=="; + }; + }; "react-refresh-0.4.3" = { name = "react-refresh"; packageName = "react-refresh"; @@ -64139,13 +64031,13 @@ let sha512 = "DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A=="; }; }; - "redoc-2.0.0-rc.77" = { + "redoc-2.0.0" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.77"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.77.tgz"; - sha512 = "hiCMNSEl6R9vDkiVBMJSKxyT+wLY0qZdw+UZuOHWDCFm3uV0SELwTUU+spVBFCdzM4fdxjCnvsY2vX6cjcJNNg=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0.tgz"; + sha512 = "rU8iLdAkT89ywOkYk66Mr+IofqaMASlRvTew0dJvopCORMIPUcPMxjlJbJNC6wsn2vvMnpUFLQ/0ISDWn9BWag=="; }; }; "reduce-component-1.0.1" = { @@ -64391,13 +64283,13 @@ let sha512 = "PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg=="; }; }; - "registry-auth-token-5.0.1" = { + "registry-auth-token-5.0.2" = { name = "registry-auth-token"; packageName = "registry-auth-token"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.0.1.tgz"; - sha512 = "UfxVOj8seK1yaIOiieV4FIP01vfBDLsY0H9sQzi9EbbUdJiuuBjJgLa1DpImXMNPnVkBD4eVxTEXcrZA6kfpJA=="; + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.0.2.tgz"; + sha512 = "o/3ikDxtXaA59BmZuZrJZDJv8NMDGSj+6j6XaeBmHw8eY1i1qd9+6H+LjVvQXx3HN6aRCGa1cUdJ9RaJZUugnQ=="; }; }; "registry-url-3.1.0" = { @@ -66245,6 +66137,24 @@ let sha512 = "BlIbgFryTbw3Dz6hyoWFhKk+unCcHMSkZGrTFVAx2WmttdBSonsdtRlwiuTbDqTKr+UlXIUqJVS4QT5tUzGENQ=="; }; }; + "rimraf-4.1.4" = { + name = "rimraf"; + packageName = "rimraf"; + version = "4.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-4.1.4.tgz"; + sha512 = "CoUTSckPOFgu0m8PzkXWlp/e0IHxxv3fUxOivMspXfxcm1rPaNtj6lkkbi5NnFVoGDFj6kX7jPKVccafEf9HoA=="; + }; + }; + "rimraf-4.4.0" = { + name = "rimraf"; + packageName = "rimraf"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-4.4.0.tgz"; + sha512 = "X36S+qpCUR0HjXlkDe4NAOhS//aHH0Z+h8Ckf2auGJk3PTnx5rLmrHkwNdbVQuCSUhOyFrlRvFEllZOYE+yZGQ=="; + }; + }; "ripemd160-2.0.2" = { name = "ripemd160"; packageName = "ripemd160"; @@ -68234,13 +68144,13 @@ let sha512 = "z4qtrRuaAFJS4PUd0g+xy7aN4y+RvEt/QTJpR184lhJguBA1S/LsVlvE/CM95RsYMOFJG3NGGDjqFCzKU19S/A=="; }; }; - "simple-git-3.16.1" = { + "simple-git-3.17.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.16.1"; + version = "3.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.16.1.tgz"; - sha512 = "xzRxMKiy1zEYeHGXgAzvuXffDS0xgsq07Oi4LWEEcVH29vLpcZ2tyQRWyK0NLLlCVaKysZeem5tC1qHEOxsKwA=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.17.0.tgz"; + sha512 = "JozI/s8jr3nvLd9yn2jzPVHnhVzt7t7QWfcIoDcqRIGN+f1IINGv52xoZti2kkYfoRhhRvzMSNPfogHMp97rlw=="; }; }; "simple-markdown-0.4.4" = { @@ -69467,13 +69377,13 @@ let sha512 = "EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg=="; }; }; - "spdx-correct-3.1.1" = { + "spdx-correct-3.2.0" = { name = "spdx-correct"; packageName = "spdx-correct"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"; - sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w=="; + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz"; + sha512 = "kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA=="; }; }; "spdx-exceptions-2.3.0" = { @@ -71817,13 +71727,13 @@ let sha512 = "HFpbb5gr2ypci7Qw+IOhnP2zOU7e77b+rzM+wTzXzfi1PrtBCX0E7Pk4wL4iTLnhzZ+JgEGAhX81ebTg/aYjQw=="; }; }; - "styled-components-5.3.6" = { + "styled-components-5.3.8" = { name = "styled-components"; packageName = "styled-components"; - version = "5.3.6"; + version = "5.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/styled-components/-/styled-components-5.3.6.tgz"; - sha512 = "hGTZquGAaTqhGWldX7hhfzjnIYBZ0IXQXkCYdvF1Sq3DsUaLx6+NTHC5Jj1ooM2F68sBiVz3lvhfwQs/S3l6qg=="; + url = "https://registry.npmjs.org/styled-components/-/styled-components-5.3.8.tgz"; + sha512 = "6jQrlvaJQ16uWVVO0rBfApaTPItkqaG32l3746enNZzpMDxMvzmHzj8rHUg39bvVtom0Y8o8ZzWuchEXKGjVsg=="; }; }; "styled-jsx-3.1.0" = { @@ -72267,13 +72177,13 @@ let sha512 = "0HXyhCoc9rsW4zGOgtInylC6qj259E1hpFnJMJWTf+aIfeqh4O/QHT31KT2hvPEqQfdjmqBR/kO2JDkkciBLrQ=="; }; }; - "svelte2tsx-0.6.2" = { + "svelte2tsx-0.6.3" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.6.2.tgz"; - sha512 = "0ircYY2/jMOfistf+iq8fVHERnu1i90nku56c78+btC8svyafsc3OjOV37LDEOV7buqYY1Rv/uy03eMxhopH2Q=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.6.3.tgz"; + sha512 = "2e0rB9l7oih3CEa5S8OEYm1FvlXKj6c444hAVRMqt7LZgOm6oTu3FqfzIPXViDNh7LmU9Yb3PiYWhS7a7D7zow=="; }; }; "sver-compat-1.5.0" = { @@ -72420,13 +72330,13 @@ let sha512 = "8z18eX8G/jbTXYzyNIaobrnD7PSN7yU/YkSasMmajrXtw0FGS64XjrKn5v37d36qmU3o1xLeuYnktshRr7uIFw=="; }; }; - "swagger-ui-dist-4.16.1" = { + "swagger-ui-dist-4.18.0" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "4.16.1"; + version = "4.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.16.1.tgz"; - sha512 = "4J4XekQG0ol4/TyUzMfksrWsMTbw/7JYlT+SFaX7H0xamd1OeuVlUSb/Cbq4qdDx1lc+uLZQW7u2mlImcE8c+w=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.18.0.tgz"; + sha512 = "PZeF7r+JsAXC8tEGatOARSEeC0n3ChGqTDcbZUzrV+mGnlW2ZEystlpiEyMWfAY4FAT+uxibfMuRahEvnoG3CQ=="; }; }; "swagger2openapi-7.0.8" = { @@ -72564,13 +72474,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-5.17.11" = { + "systeminformation-5.17.12" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.17.11"; + version = "5.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.17.11.tgz"; - sha512 = "JaS/ggJDzMC1oOhCcs2b2wTQlmrnLCHUNHsefbqOcZH/uLYAxaweI5Nyx1tViQqYIxLOsgr6Rl0FDny8MtRj/g=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.17.12.tgz"; + sha512 = "I3pfMW2vue53u+X08BNxaJieaHkRoMMKjWetY9lbYJeWFaeWPO6P4FkNc4XOCX8F9vbQ0HqQ25RJoz3U/B7liw=="; }; }; "sywac-1.3.0" = { @@ -73105,13 +73015,13 @@ let sha512 = "4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw=="; }; }; - "terser-5.16.5" = { + "terser-5.16.6" = { name = "terser"; packageName = "terser"; - version = "5.16.5"; + version = "5.16.6"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.16.5.tgz"; - sha512 = "qcwfg4+RZa3YvlFh0qjifnzBHjKGNbtDo9yivMqMFDy9Q6FSaQWSB/j1xKhsoUFJIqDOM3TsN6D5xbrMrFcHbg=="; + url = "https://registry.npmjs.org/terser/-/terser-5.16.6.tgz"; + sha512 = "IBZ+ZQIA9sMaXmRZCUMDjNH0D5AQQfdn4WUjHL0+1lF4TP1IHRJbrhb6fNaXWikrYQTSkb7SLxkeXAiy1p7mbg=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -73123,13 +73033,13 @@ let sha512 = "04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw=="; }; }; - "terser-webpack-plugin-5.3.6" = { + "terser-webpack-plugin-5.3.7" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "5.3.6"; + version = "5.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz"; - sha512 = "kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz"; + sha512 = "AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw=="; }; }; "test-exclude-6.0.0" = { @@ -73735,22 +73645,22 @@ let sha512 = "Q0TU9zh5hDs2CpRFNM7SOW3K7OSgUgJC/cMrq9t44ei4tu+G3KV8BZyIJuYVvryJHH96mKgc9WXdhgKVvGD7jg=="; }; }; - "tldts-5.7.109" = { + "tldts-5.7.111" = { name = "tldts"; packageName = "tldts"; - version = "5.7.109"; + version = "5.7.111"; src = fetchurl { - url = "https://registry.npmjs.org/tldts/-/tldts-5.7.109.tgz"; - sha512 = "k7uaEspKgUS1yyeQFETYbhh+l7tfGfQCC0pzDsz+fqyvOEptovF5yM+ND2jcxqrlcbrmC7qUY/fZ+2mXg7tdww=="; + url = "https://registry.npmjs.org/tldts/-/tldts-5.7.111.tgz"; + sha512 = "D1iH3Exmw4hNRd9ipv8ZJFtL8V6oCSoE9+8NY7mcEQPMDKHT7kAnOr33cJ1tIATeHNVUejRgqR7I67UecwzSjQ=="; }; }; - "tldts-core-5.7.109" = { + "tldts-core-5.7.111" = { name = "tldts-core"; packageName = "tldts-core"; - version = "5.7.109"; + version = "5.7.111"; src = fetchurl { - url = "https://registry.npmjs.org/tldts-core/-/tldts-core-5.7.109.tgz"; - sha512 = "PGjUhQ8DrwoxpnZch0zrLPGeRPpjPbRy7dzpSChulmLf09jg6QXqfa2W8DXEZLWhcAZ7CxBk+arr/kJT1Dgg9w=="; + url = "https://registry.npmjs.org/tldts-core/-/tldts-core-5.7.111.tgz"; + sha512 = "BU3OOzGbih8zvLiKgDw+wNS311ItfLt3gXi3qSDvAQiI86l+dyEAGSEs2s72ptPJ3KqXgRt7wiE6jTQ2SgoMqw=="; }; }; "tmp-0.0.29" = { @@ -74842,13 +74752,13 @@ let sha512 = "C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="; }; }; - "tuf-js-1.0.0" = { + "tuf-js-1.1.1" = { name = "tuf-js"; packageName = "tuf-js"; - version = "1.0.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/tuf-js/-/tuf-js-1.0.0.tgz"; - sha512 = "1dxsQwESDzACJjTdYHQ4wJ1f/of7jALWKfJEHSBWUQB/5UTJUx9SW6GHXp4mZ1KvdBRJCpGjssoPFGi4hvw8/A=="; + url = "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.1.tgz"; + sha512 = "WTp382/PR96k0dI4GD5RdiRhgOU0rAC7+lnoih/5pZg3cyb3aNMqDozleEEWwyfT3+FOg7Qz9JU3n6A44tLSHw=="; }; }; "tumblr-0.4.1" = { @@ -75184,15 +75094,6 @@ let sha512 = "70T99cpILFk2fzwuljwWxmazSphFrdOe3gRHbp6bqs71pxFBbJwFqnmkLO2lQL6aLHxHmYAnP/sL+AJWpT70jA=="; }; }; - "type-fest-3.6.0" = { - name = "type-fest"; - packageName = "type-fest"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-3.6.0.tgz"; - sha512 = "RqTRtKTzvPpNdDUp1dVkKQRunlPITk4mXeqFlAZoJsS+fLRn8AdPK0TcQDumGayhU7fjlBfiBjsq3pe3rIfXZQ=="; - }; - }; "type-fest-3.6.1" = { name = "type-fest"; packageName = "type-fest"; @@ -75391,15 +75292,6 @@ let sha512 = "IKawLTu4A2xN3aN/cPLxvZ0bhxZHILGDKTZWvWNJ3sLNhJ3PjfMEDQmR2VMpdRPrmWOadgWXRwjLBzSA8AGsaQ=="; }; }; - "typescript-formatter-7.2.2" = { - name = "typescript-formatter"; - packageName = "typescript-formatter"; - version = "7.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript-formatter/-/typescript-formatter-7.2.2.tgz"; - sha512 = "V7vfI9XArVhriOTYHPzMU2WUnm5IMdu9X/CPxs8mIMGxmTBFpDABlbkBka64PZJ9/xgQeRpK8KzzAG4MPzxBDQ=="; - }; - }; "typescript-json-schema-0.45.1" = { name = "typescript-json-schema"; packageName = "typescript-json-schema"; @@ -75490,13 +75382,13 @@ let sha512 = "+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ=="; }; }; - "ua-parser-js-0.7.33" = { + "ua-parser-js-0.7.34" = { name = "ua-parser-js"; packageName = "ua-parser-js"; - version = "0.7.33"; + version = "0.7.34"; src = fetchurl { - url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.33.tgz"; - sha512 = "s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw=="; + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.34.tgz"; + sha512 = "cJMeh/eOILyGu0ejgTKB95yKT3zOenSe9UGE3vj6WfiOwgGYnmATUsnDixMFvdU+rNMvWih83hrUP8VwhF9yXQ=="; }; }; "ua-parser-js-1.0.2" = { @@ -75508,13 +75400,13 @@ let sha512 = "00y/AXhx0/SsnI51fTc0rLRmafiGOM4/O+ny10Ps7f+j/b8p/ZY11ytMgznXkOVo4GQ+KwQG5UQLkLGirsACRg=="; }; }; - "ua-parser-js-1.0.33" = { + "ua-parser-js-1.0.34" = { name = "ua-parser-js"; packageName = "ua-parser-js"; - version = "1.0.33"; + version = "1.0.34"; src = fetchurl { - url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.33.tgz"; - sha512 = "RqshF7TPTE0XLYAqmjlu5cLLuGdKrNu9O1KLA/qp39QtbZwuzwv1dT46DZSopoUMsYgXpB3Cv8a03FI8b74oFQ=="; + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.34.tgz"; + sha512 = "K9mwJm/DaB6mRLZfw6q8IMXipcrmuT6yfhYmwhAkuh+81sChuYstYA+znlgaflUPaYUa3odxKPKGw6Vw/lANew=="; }; }; "uc.micro-1.0.6" = { @@ -77839,274 +77731,274 @@ let sha512 = "Hq72JaTpcTFdWiNA4Y22Amej2GH3BFmBaKPPlDZ4/oC8HNn2ISHLkFrJU4Ds8R3jcUi7oo5Y9jcMHKjES+N9wQ=="; }; }; - "vega-5.22.1" = { + "vega-5.24.0" = { name = "vega"; packageName = "vega"; - version = "5.22.1"; + version = "5.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega/-/vega-5.22.1.tgz"; - sha512 = "KJBI7OWSzpfCPbmWl3GQCqBqbf2TIdpWS0mzO6MmWbvdMhWHf74P9IVnx1B1mhg0ZTqWFualx9ZYhWzMMwudaQ=="; + url = "https://registry.npmjs.org/vega/-/vega-5.24.0.tgz"; + sha512 = "eahZ+4eryPywLuq9BpgcwWMyqiuVD3FAh7eMB3koOp7peQ4scPxAZxWdLwnh0t0kah+oE2QcXi2EHS4BabsMPg=="; }; }; - "vega-canvas-1.2.6" = { + "vega-canvas-1.2.7" = { name = "vega-canvas"; packageName = "vega-canvas"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/vega-canvas/-/vega-canvas-1.2.6.tgz"; - sha512 = "rgeYUpslYn/amIfnuv3Sw6n4BGns94OjjZNtUc9IDji6b+K8LGS/kW+Lvay8JX/oFqtulBp8RLcHN6QjqPLA9Q=="; + url = "https://registry.npmjs.org/vega-canvas/-/vega-canvas-1.2.7.tgz"; + sha512 = "OkJ9CACVcN9R5Pi9uF6MZBF06pO6qFpDYHWSKBJsdHP5o724KrsgR6UvbnXFH82FdsiTOff/HqjuaG8C7FL+9Q=="; }; }; - "vega-crossfilter-4.1.0" = { + "vega-crossfilter-4.1.1" = { name = "vega-crossfilter"; packageName = "vega-crossfilter"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.1.0.tgz"; - sha512 = "aiOJcvVpiEDIu5uNc4Kf1hakkkPaVOO5fw5T4RSFAw6GEDbdqcB6eZ1xePcsLVic1hxYD5SGiUPdiiIs0SMh2g=="; + url = "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.1.1.tgz"; + sha512 = "yesvlMcwRwxrtAd9IYjuxWJJuAMI0sl7JvAFfYtuDkkGDtqfLXUcCzHIATqW6igVIE7tWwGxnbfvQLhLNgK44Q=="; }; }; - "vega-dataflow-5.7.4" = { + "vega-dataflow-5.7.5" = { name = "vega-dataflow"; packageName = "vega-dataflow"; - version = "5.7.4"; + version = "5.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/vega-dataflow/-/vega-dataflow-5.7.4.tgz"; - sha512 = "JGHTpUo8XGETH3b1V892we6hdjzCWB977ybycIu8DPqRoyrZuj6t1fCVImazfMgQD1LAfJlQybWP+alwKDpKig=="; + url = "https://registry.npmjs.org/vega-dataflow/-/vega-dataflow-5.7.5.tgz"; + sha512 = "EdsIl6gouH67+8B0f22Owr2tKDiMPNNR8lEvJDcxmFw02nXd8juimclpLvjPQriqn6ta+3Dn5txqfD117H04YA=="; }; }; - "vega-encode-4.9.0" = { + "vega-encode-4.9.1" = { name = "vega-encode"; packageName = "vega-encode"; - version = "4.9.0"; + version = "4.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-encode/-/vega-encode-4.9.0.tgz"; - sha512 = "etv2BHuCn9bzEc0cxyA2TnbtcAFQGVFmsaqmB4sgBCaqTSEfXMoX68LK3yxBrsdm5LU+y3otJVoewi3qWYCx2g=="; + url = "https://registry.npmjs.org/vega-encode/-/vega-encode-4.9.1.tgz"; + sha512 = "05JB47UZaqIBS9t6rtHI/aKjEuH4EsSIH+wJWItht4BFj33eIl4XRNtlXdE31uuQT2pXWz5ZWW3KboMuaFzKLw=="; }; }; - "vega-event-selector-3.0.0" = { + "vega-event-selector-3.0.1" = { name = "vega-event-selector"; packageName = "vega-event-selector"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-event-selector/-/vega-event-selector-3.0.0.tgz"; - sha512 = "Gls93/+7tEJGE3kUuUnxrBIxtvaNeF01VIFB2Q2Of2hBIBvtHX74jcAdDtkh5UhhoYGD8Q1J30P5cqEBEwtPoQ=="; + url = "https://registry.npmjs.org/vega-event-selector/-/vega-event-selector-3.0.1.tgz"; + sha512 = "K5zd7s5tjr1LiOOkjGpcVls8GsH/f2CWCrWcpKy74gTCp+llCdwz0Enqo013ZlGaRNjfgD/o1caJRt3GSaec4A=="; }; }; - "vega-expression-5.0.0" = { + "vega-expression-5.0.1" = { name = "vega-expression"; packageName = "vega-expression"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-expression/-/vega-expression-5.0.0.tgz"; - sha512 = "y5+c2frq0tGwJ7vYXzZcfVcIRF/QGfhf2e+bV1Z0iQs+M2lI1II1GPDdmOcMKimpoCVp/D61KUJDIGE1DSmk2w=="; + url = "https://registry.npmjs.org/vega-expression/-/vega-expression-5.0.1.tgz"; + sha512 = "atfzrMekrcsuyUgZCMklI5ki8cV763aeo1Y6YrfYU7FBwcQEoFhIV/KAJ1vae51aPDGtfzvwbtVIo3WShFCP2Q=="; }; }; - "vega-force-4.1.0" = { + "vega-force-4.2.0" = { name = "vega-force"; packageName = "vega-force"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-force/-/vega-force-4.1.0.tgz"; - sha512 = "Sssf8iH48vYlz+E7/RpU+SUaJbuLoIL87U4tG2Av4gf/hRiImU49x2TI3EuhFWg1zpaCFxlz0CAaX++Oh/gjdw=="; - }; - }; - "vega-format-1.1.0" = { - name = "vega-format"; - packageName = "vega-format"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-format/-/vega-format-1.1.0.tgz"; - sha512 = "6mgpeWw8yGdG0Zdi8aVkx5oUrpJGOpNxqazC2858RSDPvChM/jDFlgRMTYw52qk7cxU0L08ARp4BwmXaI75j0w=="; - }; - }; - "vega-functions-5.13.0" = { - name = "vega-functions"; - packageName = "vega-functions"; - version = "5.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.13.0.tgz"; - sha512 = "Mf53zNyx+c9fFqagEI0T8zc9nMlx0zozOngr8oOpG1tZDKOgwOnUgN99zQKbLHjyv+UzWrq3LYTnSLyVe0ZmhQ=="; - }; - }; - "vega-geo-4.4.0" = { - name = "vega-geo"; - packageName = "vega-geo"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-geo/-/vega-geo-4.4.0.tgz"; - sha512 = "3YX41y+J5pu0PMjvBCASg0/lgvu9+QXWJZ+vl6FFKa8AlsIopQ67ZL7ObwqjZcoZMolJ4q0rc+ZO8aj1pXCYcw=="; - }; - }; - "vega-hierarchy-4.1.0" = { - name = "vega-hierarchy"; - packageName = "vega-hierarchy"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-hierarchy/-/vega-hierarchy-4.1.0.tgz"; - sha512 = "DWBK39IEt4FiQru12twzKSFUvFFZ7KtlH9+lAaqrJnKuIZFCyQ1XOUfKScfbKIlk4KS+DuCTNLI/pxC/f7Sk9Q=="; - }; - }; - "vega-label-1.2.0" = { - name = "vega-label"; - packageName = "vega-label"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-label/-/vega-label-1.2.0.tgz"; - sha512 = "1prOqkCAfXaUvMqavbGI0nbYGqV8UQR9qvuVwrPJ6Yxm3GIUIOA/JRqNY8eZR8USwMP/kzsqlfVEixj9+Y75VQ=="; - }; - }; - "vega-loader-4.5.0" = { - name = "vega-loader"; - packageName = "vega-loader"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-loader/-/vega-loader-4.5.0.tgz"; - sha512 = "EkAyzbx0pCYxH3v3wghGVCaKINWxHfgbQ2pYDiYv0yo8e04S8Mv/IlRGTt6BAe7cLhrk1WZ4zh20QOppnGG05w=="; - }; - }; - "vega-parser-6.1.4" = { - name = "vega-parser"; - packageName = "vega-parser"; - version = "6.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.1.4.tgz"; - sha512 = "tORdpWXiH/kkXcpNdbSVEvtaxBuuDtgYp9rBunVW9oLsjFvFXbSWlM1wvJ9ZFSaTfx6CqyTyGMiJemmr1QnTjQ=="; - }; - }; - "vega-projection-1.5.0" = { - name = "vega-projection"; - packageName = "vega-projection"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-projection/-/vega-projection-1.5.0.tgz"; - sha512 = "aob7qojh555x3hQWZ/tr8cIJNSWQbm6EoWTJaheZgFOY2x3cDa4Qrg3RJbGw6KwVj/IQk2p40paRzixKZ2kr+A=="; - }; - }; - "vega-regression-1.1.0" = { - name = "vega-regression"; - packageName = "vega-regression"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-regression/-/vega-regression-1.1.0.tgz"; - sha512 = "09K0RemY6cdaXBAyakDUNFfEkRcLkGjkDJyWQPAUqGK59hV2J+G3i4uxkZp18Vu0t8oqU7CgzwWim1s5uEpOcA=="; - }; - }; - "vega-runtime-6.1.3" = { - name = "vega-runtime"; - packageName = "vega-runtime"; - version = "6.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-runtime/-/vega-runtime-6.1.3.tgz"; - sha512 = "gE+sO2IfxMUpV0RkFeQVnHdmPy3K7LjHakISZgUGsDI/ZFs9y+HhBf8KTGSL5pcZPtQsZh3GBQ0UonqL1mp9PA=="; - }; - }; - "vega-scale-7.2.0" = { - name = "vega-scale"; - packageName = "vega-scale"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-scale/-/vega-scale-7.2.0.tgz"; - sha512 = "QYltO/otrZHLrCGGf06Y99XtPtqWXITr6rw7rO9oL+l3d9o5RFl9sjHrVxiM7v+vGoZVWbBd5IPbFhPsXZ6+TA=="; - }; - }; - "vega-scenegraph-4.10.1" = { - name = "vega-scenegraph"; - packageName = "vega-scenegraph"; - version = "4.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.10.1.tgz"; - sha512 = "takIpkmNxYHhJYALOYzhTin3EDzbys6U4g+l1yJZVlXG9YTdiCMuEVAdtaQOCqF9/7qytD6pCrMxJY2HaoN0qQ=="; - }; - }; - "vega-selections-5.4.0" = { - name = "vega-selections"; - packageName = "vega-selections"; - version = "5.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.4.0.tgz"; - sha512 = "Un3JdLDPjIpF9Dh4sw6m1c/QAcfam6m1YXHJ9vJxE/GdJ+sOrPxc7bcEU8VhOmTUN7IQUn4/1ry4JqqOVMbEhw=="; - }; - }; - "vega-statistics-1.8.0" = { - name = "vega-statistics"; - packageName = "vega-statistics"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.8.0.tgz"; - sha512 = "dl+LCRS6qS4jWDme/NEdPVt5r649uB4IK6Kyr2/czmGA5JqjuFmtQ9lHQOnRu8945XLkqLf+JIQQo7vnw+nslA=="; - }; - }; - "vega-time-2.1.0" = { - name = "vega-time"; - packageName = "vega-time"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-time/-/vega-time-2.1.0.tgz"; - sha512 = "Q9/l3S6Br1RPX5HZvyLD/cQ4K6K8DtpR09/1y7D66gxNorg2+HGzYZINH9nUvN3mxoXcBWg4cCUh3+JvmkDaEg=="; - }; - }; - "vega-transforms-4.10.0" = { - name = "vega-transforms"; - packageName = "vega-transforms"; - version = "4.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.10.0.tgz"; - sha512 = "Yk6ByzVq5F2niFfPlSsrU5wi+NZhsF7IBpJCcTfms4U7eoyNepUXagdFEJ3VWBD/Lit6GorLXFgO17NYcyS5gg=="; - }; - }; - "vega-typings-0.22.3" = { - name = "vega-typings"; - packageName = "vega-typings"; - version = "0.22.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.22.3.tgz"; - sha512 = "PREcya3nXT9Tk7xU0IhEpOLVTlqizNtKXV55NhI6ApBjJtqVYbJL7IBh2ckKxGBy3YeUQ37BQZl56UqqiYVWBw=="; - }; - }; - "vega-util-1.17.0" = { - name = "vega-util"; - packageName = "vega-util"; - version = "1.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-util/-/vega-util-1.17.0.tgz"; - sha512 = "HTaydZd9De3yf+8jH66zL4dXJ1d1p5OIFyoBzFiOli4IJbwkL1jrefCKz6AHDm1kYBzDJ0X4bN+CzZSCTvNk1w=="; - }; - }; - "vega-view-5.11.0" = { - name = "vega-view"; - packageName = "vega-view"; - version = "5.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-view/-/vega-view-5.11.0.tgz"; - sha512 = "MI9NTRFmtFX6ADk6KOHhi8bhHjC9pPm42Bj2+74c6l1d3NQZf9Jv7lkiGqKohdkQDNH9LPwz/6slhKwPU9JdkQ=="; - }; - }; - "vega-view-transforms-4.5.8" = { - name = "vega-view-transforms"; - packageName = "vega-view-transforms"; - version = "4.5.8"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-view-transforms/-/vega-view-transforms-4.5.8.tgz"; - sha512 = "966m7zbzvItBL8rwmF2nKG14rBp7q+3sLCKWeMSUrxoG+M15Smg5gWEGgwTG3A/RwzrZ7rDX5M1sRaAngRH25g=="; - }; - }; - "vega-voronoi-4.2.0" = { - name = "vega-voronoi"; - packageName = "vega-voronoi"; version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.2.0.tgz"; - sha512 = "1iuNAVZgUHRlBpdq4gSga3KlQmrgFfwy+KpyDgPLQ8HbLkhcVeT7RDh2L6naluqD7Op0xVLms3clR920WsYryQ=="; + url = "https://registry.npmjs.org/vega-force/-/vega-force-4.2.0.tgz"; + sha512 = "aE2TlP264HXM1r3fl58AvZdKUWBNOGkIvn4EWyqeJdgO2vz46zSU7x7TzPG4ZLuo44cDRU5Ng3I1eQk23Asz6A=="; }; }; - "vega-wordcloud-4.1.3" = { + "vega-format-1.1.1" = { + name = "vega-format"; + packageName = "vega-format"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-format/-/vega-format-1.1.1.tgz"; + sha512 = "Rll7YgpYbsgaAa54AmtEWrxaJqgOh5fXlvM2wewO4trb9vwM53KBv4Q/uBWCLK3LLGeBXIF6gjDt2LFuJAUtkQ=="; + }; + }; + "vega-functions-5.13.1" = { + name = "vega-functions"; + packageName = "vega-functions"; + version = "5.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.13.1.tgz"; + sha512 = "0LhntimnvBl4VzRO/nkCwCTbtaP8bE552galKQbCg88GDxdmcmlsoTCwUzG0vZ/qmNM3IbqnP5k5/um3zwFqLw=="; + }; + }; + "vega-geo-4.4.1" = { + name = "vega-geo"; + packageName = "vega-geo"; + version = "4.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-geo/-/vega-geo-4.4.1.tgz"; + sha512 = "s4WeZAL5M3ZUV27/eqSD3v0FyJz3PlP31XNSLFy4AJXHxHUeXT3qLiDHoVQnW5Om+uBCPDtTT1ROx1smGIf2aA=="; + }; + }; + "vega-hierarchy-4.1.1" = { + name = "vega-hierarchy"; + packageName = "vega-hierarchy"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-hierarchy/-/vega-hierarchy-4.1.1.tgz"; + sha512 = "h5mbrDtPKHBBQ9TYbvEb/bCqmGTlUX97+4CENkyH21tJs7naza319B15KRK0NWOHuhbGhFmF8T0696tg+2c8XQ=="; + }; + }; + "vega-label-1.2.1" = { + name = "vega-label"; + packageName = "vega-label"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-label/-/vega-label-1.2.1.tgz"; + sha512 = "n/ackJ5lc0Xs9PInCaGumYn2awomPjJ87EMVT47xNgk2bHmJoZV1Ve/1PUM6Eh/KauY211wPMrNp/9Im+7Ripg=="; + }; + }; + "vega-loader-4.5.1" = { + name = "vega-loader"; + packageName = "vega-loader"; + version = "4.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-loader/-/vega-loader-4.5.1.tgz"; + sha512 = "qy5x32SaT0YkEujQM2yKqvLGV9XWQ2aEDSugBFTdYzu/1u4bxdUSRDREOlrJ9Km3RWIOgFiCkobPmFxo47SKuA=="; + }; + }; + "vega-parser-6.2.0" = { + name = "vega-parser"; + packageName = "vega-parser"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.2.0.tgz"; + sha512 = "as+QnX8Qxe9q51L1C2sVBd+YYYctP848+zEvkBT2jlI2g30aZ6Uv7sKsq7QTL6DUbhXQKR0XQtzlanckSFdaOQ=="; + }; + }; + "vega-projection-1.6.0" = { + name = "vega-projection"; + packageName = "vega-projection"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-projection/-/vega-projection-1.6.0.tgz"; + sha512 = "LGUaO/kpOEYuTlul+x+lBzyuL9qmMwP1yShdUWYLW+zXoeyGbs5OZW+NbPPwLYqJr5lpXDr/vGztFuA/6g2xvQ=="; + }; + }; + "vega-regression-1.1.1" = { + name = "vega-regression"; + packageName = "vega-regression"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-regression/-/vega-regression-1.1.1.tgz"; + sha512 = "98i/z0vdDhOIEhJUdYoJ2nlfVdaHVp2CKB39Qa7G/XyRw0+QwDFFrp8ZRec2xHjHfb6bYLGNeh1pOsC13FelJg=="; + }; + }; + "vega-runtime-6.1.4" = { + name = "vega-runtime"; + packageName = "vega-runtime"; + version = "6.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-runtime/-/vega-runtime-6.1.4.tgz"; + sha512 = "0dDYXyFLQcxPQ2OQU0WuBVYLRZnm+/CwVu6i6N4idS7R9VXIX5581EkCh3pZ20pQ/+oaA7oJ0pR9rJgJ6rukRQ=="; + }; + }; + "vega-scale-7.3.0" = { + name = "vega-scale"; + packageName = "vega-scale"; + version = "7.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-scale/-/vega-scale-7.3.0.tgz"; + sha512 = "pMOAI2h+e1z7lsqKG+gMfR6NKN2sTcyjZbdJwntooW0uFHwjLGjMSY7kSd3nSEquF0HQ8qF7zR6gs1eRwlGimw=="; + }; + }; + "vega-scenegraph-4.10.2" = { + name = "vega-scenegraph"; + packageName = "vega-scenegraph"; + version = "4.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.10.2.tgz"; + sha512 = "R8m6voDZO5+etwNMcXf45afVM3XAtokMqxuDyddRl9l1YqSJfS+3u8hpolJ50c2q6ZN20BQiJwKT1o0bB7vKkA=="; + }; + }; + "vega-selections-5.4.1" = { + name = "vega-selections"; + packageName = "vega-selections"; + version = "5.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.4.1.tgz"; + sha512 = "EtYc4DvA+wXqBg9tq+kDomSoVUPCmQfS7hUxy2qskXEed79YTimt3Hcl1e1fW226I4AVDBEqTTKebmKMzbSgAA=="; + }; + }; + "vega-statistics-1.8.1" = { + name = "vega-statistics"; + packageName = "vega-statistics"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.8.1.tgz"; + sha512 = "eRR3LZBusnTXUkc/uunAvWi1PjCJK+Ba4vFvEISc5Iv5xF4Aw2cBhEz1obEt6ID5fGVCTAl0E1LOSFxubS89hQ=="; + }; + }; + "vega-time-2.1.1" = { + name = "vega-time"; + packageName = "vega-time"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-time/-/vega-time-2.1.1.tgz"; + sha512 = "z1qbgyX0Af2kQSGFbApwBbX2meenGvsoX8Nga8uyWN8VIbiySo/xqizz1KrP6NbB6R+x5egKmkjdnyNThPeEWA=="; + }; + }; + "vega-transforms-4.10.1" = { + name = "vega-transforms"; + packageName = "vega-transforms"; + version = "4.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.10.1.tgz"; + sha512 = "0uWrUZaYl8kjWrGbvPOQSKk6kcNXQFY9moME+bUmkADAvFptphCGbaEIn/nSsG6uCxj8E3rqKmKfjSWdU5yOqA=="; + }; + }; + "vega-typings-0.24.0" = { + name = "vega-typings"; + packageName = "vega-typings"; + version = "0.24.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.24.0.tgz"; + sha512 = "FFYf67Dn5VNPbYoYHgO2T9Z1I81qcwrXjwKEe0rlJk0MX7CNWPJr9Y3VZEWfxyEx7J9anAm69hGIv0Ehb2G85A=="; + }; + }; + "vega-util-1.17.1" = { + name = "vega-util"; + packageName = "vega-util"; + version = "1.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-util/-/vega-util-1.17.1.tgz"; + sha512 = "ToPkWoBdP6awoK+bnYaFhgdqZhsNwKxWbuMnFell+4K/Cb6Q1st5Pi9I7iI5Y6n5ZICDDsd6eL7/IhBjEg1NUQ=="; + }; + }; + "vega-view-5.11.1" = { + name = "vega-view"; + packageName = "vega-view"; + version = "5.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-view/-/vega-view-5.11.1.tgz"; + sha512 = "RoWxuoEMI7xVQJhPqNeLEHCezudsf3QkVMhH5tCovBqwBADQGqq9iWyax3ZzdyX1+P3eBgm7cnLvpqtN2hU8kA=="; + }; + }; + "vega-view-transforms-4.5.9" = { + name = "vega-view-transforms"; + packageName = "vega-view-transforms"; + version = "4.5.9"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-view-transforms/-/vega-view-transforms-4.5.9.tgz"; + sha512 = "NxEq4ZD4QwWGRrl2yDLnBRXM9FgCI+vvYb3ZC2+nVDtkUxOlEIKZsMMw31op5GZpfClWLbjCT3mVvzO2xaTF+g=="; + }; + }; + "vega-voronoi-4.2.1" = { + name = "vega-voronoi"; + packageName = "vega-voronoi"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.2.1.tgz"; + sha512 = "zzi+fxU/SBad4irdLLsG3yhZgXWZezraGYVQfZFWe8kl7W/EHUk+Eqk/eetn4bDeJ6ltQskX+UXH3OP5Vh0Q0Q=="; + }; + }; + "vega-wordcloud-4.1.4" = { name = "vega-wordcloud"; packageName = "vega-wordcloud"; - version = "4.1.3"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/vega-wordcloud/-/vega-wordcloud-4.1.3.tgz"; - sha512 = "is4zYn9FMAyp9T4SAcz2P/U/wqc0Lx3P5YtpWKCbOH02a05vHjUQrQ2TTPOuvmMfAEDCSKvbMSQIJMOE018lJA=="; + url = "https://registry.npmjs.org/vega-wordcloud/-/vega-wordcloud-4.1.4.tgz"; + sha512 = "oeZLlnjiusLAU5vhk0IIdT5QEiJE0x6cYoGNq1th+EbwgQp153t4r026fcib9oq15glHFOzf81a8hHXHSJm1Jw=="; }; }; "vendors-1.0.4" = { @@ -78613,13 +78505,13 @@ let sha512 = "xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA=="; }; }; - "vscode-json-languageservice-5.3.1" = { + "vscode-json-languageservice-5.3.2" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.3.1.tgz"; - sha512 = "tPRf/2LOBS6uFflFLABdj8T3ol2/QgZ0kpzZHFCs+cbxpnjBNiCo+rfh3th0dtdytq5dSnWo5iFJj99zF6jZWQ=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.3.2.tgz"; + sha512 = "5td6olfoNdtyxnNA4uocq7V9jdTJt63o9mGEntQb6cbD2HiObZW2XgbSj6nRaebWwBCiYdWpFklNjm6Wz6Xy1Q=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -78676,15 +78568,6 @@ let sha512 = "wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg=="; }; }; - "vscode-jsonrpc-8.0.0-next.7" = { - name = "vscode-jsonrpc"; - packageName = "vscode-jsonrpc"; - version = "8.0.0-next.7"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.7.tgz"; - sha512 = "JX/F31LEsims0dAlOTKFE4E+AJMiJvdRSRViifFJSqSN7EzeYyWlfuDchF7g91oRNPZOIWfibTkDf3/UMsQGzQ=="; - }; - }; "vscode-jsonrpc-8.0.2" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; @@ -78712,13 +78595,13 @@ let sha512 = "0fuBZj9pMkeJ8OMyIvSGeRaRVhUaJt+yeFxi7a3sz/AbrngQdcxOovMXPgKuieoBSBKS05gXPS88BsWpJZfBkA=="; }; }; - "vscode-languageclient-8.0.0-next.14" = { + "vscode-languageclient-8.1.0" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; - version = "8.0.0-next.14"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.0.0-next.14.tgz"; - sha512 = "NqjkOuDTMu8uo+PhoMsV72VO9Gd3wBi/ZpOrkRUOrWKQo7yUdiIw183g8wjH8BImgbK9ZP51HM7TI0ZhCnI1Mw=="; + url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.1.0.tgz"; + sha512 = "GL4QdbYUF/XxQlAsvYWZRV3V34kOkpRlvV60/72ghHfsYFnS/v2MANZ9P6sHmxFcZKOse8O+L9G7Czg0NUWing=="; }; }; "vscode-languageserver-3.5.1" = { @@ -78847,15 +78730,6 @@ let sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA=="; }; }; - "vscode-languageserver-protocol-3.17.0-next.16" = { - name = "vscode-languageserver-protocol"; - packageName = "vscode-languageserver-protocol"; - version = "3.17.0-next.16"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.16.tgz"; - sha512 = "tx4DnXw9u3N7vw+bx6n2NKp6FoxoNwiP/biH83AS30I2AnTGyLd7afSeH6Oewn2E8jvB7K15bs12sMppkKOVeQ=="; - }; - }; "vscode-languageserver-protocol-3.17.2" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -78973,15 +78847,6 @@ let sha512 = "VQcXnhKYxUW6OiRMhG++SzmZYMJwusXknJGd+FfdOnS1yHAo734OHyR0e2eEHDlv0/oWc8RZPgx/VKSKyondVg=="; }; }; - "vscode-languageserver-types-3.17.0-next.9" = { - name = "vscode-languageserver-types"; - packageName = "vscode-languageserver-types"; - version = "3.17.0-next.9"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.9.tgz"; - sha512 = "9/PeDNPYduaoXRUzYpqmu4ZV9L01HGo0wH9FUt+sSHR7IXwA7xoXBfNUlv8gB9H0D2WwEmMomSy1NmhjKQyn3A=="; - }; - }; "vscode-languageserver-types-3.17.2" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -79009,13 +78874,13 @@ let sha512 = "D4rUfu/oKYdc9Tmec0nEfedj+uXO2tZHR+eoHs9rE9G/QpRyZaHuug8ZUNGTGdO+ALLGgenL6bRpY8y3J9acHg=="; }; }; - "vscode-markdown-languageservice-0.3.0-alpha.5" = { + "vscode-markdown-languageservice-0.3.0-alpha.6" = { name = "vscode-markdown-languageservice"; packageName = "vscode-markdown-languageservice"; - version = "0.3.0-alpha.5"; + version = "0.3.0-alpha.6"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.3.0-alpha.5.tgz"; - sha512 = "5SEn8hr999N/K8IaY25fdZoW7JPJT4pOm53AQvimGNYiCntb0TWJhMJD1Izbc2DvbyrWAksVkLqzbGKV/zW+Sg=="; + url = "https://registry.npmjs.org/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.3.0-alpha.6.tgz"; + sha512 = "r7rXpsQVrfVdD5KLGkZ2imvR/UeeEZlGickM/jQfe0DLUACjry7kGfHlVKBs1pvluOiC0e2bBv9/I0+uqSn2fA=="; }; }; "vscode-nls-2.0.2" = { @@ -79702,6 +79567,15 @@ let sha512 = "piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ=="; }; }; + "webpack-5.76.0" = { + name = "webpack"; + packageName = "webpack"; + version = "5.76.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-5.76.0.tgz"; + sha512 = "l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA=="; + }; + }; "webpack-bundle-analyzer-3.9.0" = { name = "webpack-bundle-analyzer"; packageName = "webpack-bundle-analyzer"; @@ -81620,15 +81494,6 @@ let sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; }; }; - "yaml-2.0.0-11" = { - name = "yaml"; - packageName = "yaml"; - version = "2.0.0-11"; - src = fetchurl { - url = "https://registry.npmjs.org/yaml/-/yaml-2.0.0-11.tgz"; - sha512 = "5kGSQrzDyjCk0BLuFfjkoUE9vYcoyrwZIZ+GnpOSM9vhkvPjItYiWJ1jpRSo0aU4QmsoNrFwDT4O7XS2UGcBQg=="; - }; - }; "yaml-2.2.1" = { name = "yaml"; packageName = "yaml"; @@ -81800,15 +81665,6 @@ let sha512 = "WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA=="; }; }; - "yargs-17.5.1" = { - name = "yargs"; - packageName = "yargs"; - version = "17.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz"; - sha512 = "t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA=="; - }; - }; "yargs-17.6.2" = { name = "yargs"; packageName = "yargs"; @@ -82286,22 +82142,22 @@ let sha512 = "UzIwO92D0dSFwIRyyqAfRXICITLjF0IP8tRbEK/un7adirMssWZx8xF/1hZNE7t61knWZ+lhEuUvxlu2MO8qqA=="; }; }; - "zod-3.20.5" = { + "zod-3.21.0" = { name = "zod"; packageName = "zod"; - version = "3.20.5"; + version = "3.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/zod/-/zod-3.20.5.tgz"; - sha512 = "BTAAliwfoB9dWf2hC+TXlyWKk/YTqRGZjHQR0WLC2A2pzierWo7KuQ1ebjS4SNaFaxg/lDItzl9/QTgLjcHbgw=="; + url = "https://registry.npmjs.org/zod/-/zod-3.21.0.tgz"; + sha512 = "UYdykTcVxB6lfdyLzAqLyyYAlOcpoluECvjsdoaqfQmz9p+3LRaIqYcNiL/J2kFYp66fBM8wwBvIGVEjq7KtZw=="; }; }; - "zwave-js-10.10.0" = { + "zwave-js-10.11.1" = { name = "zwave-js"; packageName = "zwave-js"; - version = "10.10.0"; + version = "10.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/zwave-js/-/zwave-js-10.10.0.tgz"; - sha512 = "mirnbCz9egAZebFDgycnkxnqAPeZRlWE0t0sH23DxkXWsQMZI+L1qHWHZJUm3+1SDLmOS7pCZk+9cwNSEWGhrA=="; + url = "https://registry.npmjs.org/zwave-js/-/zwave-js-10.11.1.tgz"; + sha512 = "oVqO6l1YNr7rdtl6riO+17QCOGxB0hAv0ydZZw5o8mXHIgVmsD0LBIyeAVM/ZpwC3thSLjU1j3JkPHehAY40yw=="; }; }; "zwitch-1.0.5" = { @@ -82337,15 +82193,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "15.2.0"; + version = "15.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-15.2.0.tgz"; - sha512 = "Zy1kmcvqoQf316eirfxkS5vb8/3B9btZf0YvZH/hDHmAyzAs8cwfirU+ClhwLLb/T9i7HnB0YS+Pdz0XaQa/jQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-15.2.2.tgz"; + sha512 = "r0VrQ+3CHp/y6GHzWDD8CPRqtAuV2iUZ1pbl4AiCnjAlUpPBXJMkJ2kzFn6rTlMoqPeFBnjyhTWyL/azi7GEcw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1502.0" - sources."@angular-devkit/core-15.2.0" - sources."@angular-devkit/schematics-15.2.0" + sources."@angular-devkit/architect-0.1502.2" + sources."@angular-devkit/core-15.2.2" + sources."@angular-devkit/schematics-15.2.2" sources."@gar/promisify-1.1.3" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@npmcli/fs-2.1.2" @@ -82355,12 +82211,18 @@ in sources."@npmcli/node-gyp-3.0.0" sources."@npmcli/promise-spawn-6.0.2" sources."@npmcli/run-script-6.0.0" - sources."@schematics/angular-15.2.0" + sources."@schematics/angular-15.2.2" sources."@tootallnate/once-2.0.0" + (sources."@tufjs/models-1.0.0" // { + dependencies = [ + sources."brace-expansion-2.0.1" + sources."minimatch-6.2.0" + ]; + }) sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.1" + sources."agentkeepalive-4.3.0" sources."aggregate-error-3.1.0" sources."ajv-8.12.0" sources."ajv-formats-2.1.1" @@ -82408,7 +82270,7 @@ in sources."defaults-1.0.4" sources."define-lazy-prop-2.0.0" sources."delegates-1.0.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."emoji-regex-8.0.0" (sources."encoding-0.1.13" // { dependencies = [ @@ -82479,7 +82341,7 @@ in sources."jsonparse-1.3.1" sources."lodash-4.17.21" sources."log-symbols-4.1.0" - sources."lru-cache-7.17.0" + sources."lru-cache-7.18.3" sources."magic-string-0.29.0" (sources."make-fetch-happen-10.2.1" // { dependencies = [ @@ -82606,7 +82468,7 @@ in sources."socks-2.7.1" sources."socks-proxy-agent-7.0.0" sources."source-map-0.7.4" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -82630,11 +82492,9 @@ in sources."tmp-0.0.33" sources."to-regex-range-5.0.1" sources."tslib-1.14.1" - (sources."tuf-js-1.0.0" // { + (sources."tuf-js-1.1.1" // { dependencies = [ - sources."brace-expansion-2.0.1" sources."make-fetch-happen-11.0.3" - sources."minimatch-6.2.0" sources."minipass-fetch-3.0.1" ]; }) @@ -83016,7 +82876,7 @@ in sha512 = "pdfMMKeVEkx045fzBH6exyqbEa7VMcZaygNAj7Dym4FxYNvMEWZzB5WUBlePpNbt5ChhwUkX5vSqK3zNab5UGw=="; }; dependencies = [ - sources."@astrojs/compiler-1.1.2" + sources."@astrojs/compiler-1.2.0" sources."@emmetio/abbreviation-2.2.3" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" @@ -83178,7 +83038,7 @@ in sources."bytes-3.1.2" sources."cache-content-type-1.0.1" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" sources."canvas-2.11.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -83248,7 +83108,7 @@ in ]; }) sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.325" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" (sources."encoding-0.1.13" // { @@ -83394,7 +83254,7 @@ in sources."optionator-0.8.3" sources."os-tmpdir-1.0.2" sources."pako-1.0.11" - sources."papaparse-5.3.2" + sources."papaparse-5.4.0" sources."parse5-6.0.1" sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" @@ -83406,7 +83266,7 @@ in sources."proper-lockfile-4.1.2" sources."psl-1.9.0" sources."punycode-2.3.0" - sources."qs-6.11.0" + sources."qs-6.11.1" sources."querystringify-2.2.0" (sources."raw-body-2.5.2" // { dependencies = [ @@ -83460,8 +83320,8 @@ in ]; }) sources."through-2.3.8" - sources."tldts-5.7.109" - sources."tldts-core-5.7.109" + sources."tldts-5.7.111" + sources."tldts-core-5.7.111" sources."tmp-0.0.33" sources."to-fast-properties-2.0.0" sources."toidentifier-1.0.1" @@ -83554,24 +83414,24 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.36" - sources."@swc/core-darwin-arm64-1.3.36" - sources."@swc/core-darwin-x64-1.3.36" - sources."@swc/core-linux-arm-gnueabihf-1.3.36" - sources."@swc/core-linux-arm64-gnu-1.3.36" - sources."@swc/core-linux-arm64-musl-1.3.36" - sources."@swc/core-linux-x64-gnu-1.3.36" - sources."@swc/core-linux-x64-musl-1.3.36" - sources."@swc/core-win32-arm64-msvc-1.3.36" - sources."@swc/core-win32-ia32-msvc-1.3.36" - sources."@swc/core-win32-x64-msvc-1.3.36" - sources."@swc/wasm-1.3.36" + sources."@swc/core-1.3.38" + sources."@swc/core-darwin-arm64-1.3.38" + sources."@swc/core-darwin-x64-1.3.38" + sources."@swc/core-linux-arm-gnueabihf-1.3.38" + sources."@swc/core-linux-arm64-gnu-1.3.38" + sources."@swc/core-linux-arm64-musl-1.3.38" + sources."@swc/core-linux-x64-gnu-1.3.38" + sources."@swc/core-linux-x64-musl-1.3.38" + sources."@swc/core-win32-arm64-msvc-1.3.38" + sources."@swc/core-win32-ia32-msvc-1.3.38" + sources."@swc/core-win32-x64-msvc-1.3.38" + sources."@swc/wasm-1.3.38" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" sources."@types/minimist-1.2.2" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/normalize-package-data-2.4.1" sources."JSONStream-1.3.5" sources."acorn-8.8.2" @@ -83710,7 +83570,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -83787,10 +83647,10 @@ in "@emacs-eask/cli" = nodeEnv.buildNodePackage { name = "_at_emacs-eask_slash_cli"; packageName = "@emacs-eask/cli"; - version = "0.7.10"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@emacs-eask/cli/-/cli-0.7.10.tgz"; - sha512 = "Gwr5PsyH+JSsM3jaJLW00EqwMD151wu0v3lBa58mnbBVVXOEG6Fnynv9jE9vLzOkhAVcDH9dtCtYlurDH7/YZg=="; + url = "https://registry.npmjs.org/@emacs-eask/cli/-/cli-0.8.0.tgz"; + sha512 = "IZaUBIrjuhN3e7bxqtGsVp8fjdak8eBWrki3YUWXLrDA5Uy51JkAFarBBqHC7abOW9BqDFinbxrWg8cdo/EfzQ=="; }; dependencies = [ sources."ansi-regex-5.0.1" @@ -83922,19 +83782,19 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@polka/url-1.0.0-next.21" - (sources."@sentry/core-7.39.0" // { + (sources."@sentry/core-7.42.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/node-7.39.0" // { + (sources."@sentry/node-7.42.0" // { dependencies = [ sources."cookie-0.4.2" sources."tslib-1.14.1" ]; }) - sources."@sentry/types-7.39.0" - (sources."@sentry/utils-7.39.0" // { + sources."@sentry/types-7.42.0" + (sources."@sentry/utils-7.42.0" // { dependencies = [ sources."tslib-1.14.1" ]; @@ -83957,7 +83817,7 @@ in sources."@types/json-schema-7.0.11" sources."@types/keyv-3.1.4" sources."@types/mime-3.0.1" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/node-fetch-2.6.2" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -83968,15 +83828,15 @@ in sources."@types/sockjs-0.3.33" sources."@types/ws-8.5.4" sources."@types/yauzl-2.10.0" - sources."@typescript-eslint/types-5.54.0" - (sources."@typescript-eslint/typescript-estree-5.54.0" // { + sources."@typescript-eslint/types-5.54.1" + (sources."@typescript-eslint/typescript-estree-5.54.1" // { dependencies = [ sources."lru-cache-6.0.0" sources."semver-7.3.8" sources."yallist-4.0.0" ]; }) - sources."@typescript-eslint/visitor-keys-5.54.0" + sources."@typescript-eslint/visitor-keys-5.54.1" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -84107,7 +83967,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.2" sources."camel-case-4.1.2" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" sources."case-1.6.3" sources."chainsaw-0.1.0" (sources."chalk-2.4.2" // { @@ -84238,7 +84098,7 @@ in }) sources."duplexer3-0.1.5" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.325" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -84440,7 +84300,7 @@ in sources."io-ts-2.2.20" sources."io-ts-reporters-1.2.2" sources."ipaddr.js-1.9.1" - sources."is-array-buffer-3.0.1" + sources."is-array-buffer-3.0.2" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" @@ -84855,12 +84715,12 @@ in ]; }) sources."terminal-link-2.1.1" - (sources."terser-5.16.5" // { + (sources."terser-5.16.6" // { dependencies = [ sources."commander-2.20.3" ]; }) - (sources."terser-webpack-plugin-5.3.6" // { + (sources."terser-webpack-plugin-5.3.7" // { dependencies = [ sources."schema-utils-3.1.1" ]; @@ -85049,7 +84909,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."abort-controller-3.0.0" @@ -85256,7 +85116,7 @@ in sources."picomatch-2.3.1" sources."prepend-http-3.0.1" sources."pump-3.0.0" - sources."qs-6.11.0" + sources."qs-6.11.1" sources."querystringify-2.2.0" sources."quick-lru-5.1.1" (sources."read-pkg-6.0.0" // { @@ -85297,7 +85157,7 @@ in sources."ansi-styles-6.2.1" ]; }) - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -85395,7 +85255,7 @@ in sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" sources."@types/minimatch-5.1.2" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/tough-cookie-2.3.8" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -86285,10 +86145,10 @@ in "@microsoft/rush" = nodeEnv.buildNodePackage { name = "_at_microsoft_slash_rush"; packageName = "@microsoft/rush"; - version = "5.93.1"; + version = "5.93.2"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.93.1.tgz"; - sha512 = "OzdPSA1jis1rYb96ry/dYtJdWSCD7Ao6B71hoiCoOwLtEIoHBbXv5MTxLZb3SvvlWOgrJvHtObSIccfb6DLOEg=="; + url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.93.2.tgz"; + sha512 = "QTBu1++N4i2uuFs9BoFa9HzlxGQiP7j1BTLXFdceiXHUuyr4kAz2bnGtPX/qZvPnS3AHaJbYIQ7sasl6kuq49Q=="; }; dependencies = [ (sources."@azure/abort-controller-1.1.0" // { @@ -86323,7 +86183,7 @@ in sources."tslib-2.5.0" ]; }) - (sources."@azure/core-rest-pipeline-1.10.1" // { + (sources."@azure/core-rest-pipeline-1.10.2" // { dependencies = [ sources."form-data-4.0.0" sources."tslib-2.5.0" @@ -86334,7 +86194,7 @@ in sources."tslib-2.5.0" ]; }) - (sources."@azure/core-util-1.1.1" // { + (sources."@azure/core-util-1.2.0" // { dependencies = [ sources."tslib-2.5.0" ]; @@ -86344,20 +86204,20 @@ in sources."tslib-2.5.0" ]; }) - (sources."@azure/logger-1.0.3" // { + (sources."@azure/logger-1.0.4" // { dependencies = [ sources."tslib-2.5.0" ]; }) - (sources."@azure/msal-browser-2.33.0" // { + (sources."@azure/msal-browser-2.34.0" // { dependencies = [ - sources."@azure/msal-common-10.0.0" + sources."@azure/msal-common-11.0.0" ]; }) sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.15.0" // { + (sources."@azure/msal-node-1.16.0" // { dependencies = [ - sources."@azure/msal-common-10.0.0" + sources."@azure/msal-common-11.0.0" ]; }) (sources."@azure/storage-blob-12.11.0" // { @@ -86393,7 +86253,7 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" - sources."@microsoft/rush-lib-5.93.1" + sources."@microsoft/rush-lib-5.93.2" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -86417,15 +86277,15 @@ in sources."import-lazy-4.0.0" ]; }) - sources."@rushstack/package-deps-hash-4.0.8" + sources."@rushstack/package-deps-hash-4.0.9" (sources."@rushstack/rig-package-0.3.18" // { dependencies = [ sources."strip-json-comments-3.1.1" ]; }) - sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.93.1" - sources."@rushstack/rush-azure-storage-build-cache-plugin-5.93.1" - sources."@rushstack/rush-sdk-5.93.1" + sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.93.2" + sources."@rushstack/rush-azure-storage-build-cache-plugin-5.93.2" + sources."@rushstack/rush-sdk-5.93.2" sources."@rushstack/stream-collator-4.0.227" sources."@rushstack/terminal-0.5.2" (sources."@rushstack/ts-command-line-4.13.2" // { @@ -86440,7 +86300,7 @@ in sources."@types/lodash-4.14.191" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/node-fetch-2.6.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" @@ -86972,7 +86832,7 @@ in sources."source-map-0.6.1" sources."source-map-js-1.0.2" sources."sourcemap-codec-1.4.8" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -87239,7 +87099,7 @@ in sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -87283,7 +87143,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.3" @@ -87302,7 +87162,7 @@ in sources."de-indent-1.0.2" sources."deepmerge-4.3.0" sources."defaults-1.0.4" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.325" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-5.12.0" @@ -87463,12 +87323,12 @@ in sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-observable-4.0.0" sources."tapable-2.2.1" - (sources."terser-5.16.5" // { + (sources."terser-5.16.6" // { dependencies = [ sources."commander-2.20.3" ]; }) - sources."terser-webpack-plugin-5.3.6" + sources."terser-webpack-plugin-5.3.7" sources."through-2.3.8" sources."tmp-0.0.33" sources."to-regex-range-5.0.1" @@ -87582,23 +87442,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.36" - sources."@swc/core-darwin-arm64-1.3.36" - sources."@swc/core-darwin-x64-1.3.36" - sources."@swc/core-linux-arm-gnueabihf-1.3.36" - sources."@swc/core-linux-arm64-gnu-1.3.36" - sources."@swc/core-linux-arm64-musl-1.3.36" - sources."@swc/core-linux-x64-gnu-1.3.36" - sources."@swc/core-linux-x64-musl-1.3.36" - sources."@swc/core-win32-arm64-msvc-1.3.36" - sources."@swc/core-win32-ia32-msvc-1.3.36" - sources."@swc/core-win32-x64-msvc-1.3.36" - sources."@swc/wasm-1.3.36" + sources."@swc/core-1.3.38" + sources."@swc/core-darwin-arm64-1.3.38" + sources."@swc/core-darwin-x64-1.3.38" + sources."@swc/core-linux-arm-gnueabihf-1.3.38" + sources."@swc/core-linux-arm64-gnu-1.3.38" + sources."@swc/core-linux-arm64-musl-1.3.38" + sources."@swc/core-linux-x64-gnu-1.3.38" + sources."@swc/core-linux-x64-musl-1.3.38" + sources."@swc/core-win32-arm64-msvc-1.3.38" + sources."@swc/core-win32-ia32-msvc-1.3.38" + sources."@swc/core-win32-x64-msvc-1.3.38" + sources."@swc/wasm-1.3.38" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" @@ -87636,7 +87496,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."lilconfig-2.0.6" + sources."lilconfig-2.1.0" sources."make-error-1.3.6" sources."merge2-1.4.1" sources."micromatch-4.0.5" @@ -87706,23 +87566,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.36" - sources."@swc/core-darwin-arm64-1.3.36" - sources."@swc/core-darwin-x64-1.3.36" - sources."@swc/core-linux-arm-gnueabihf-1.3.36" - sources."@swc/core-linux-arm64-gnu-1.3.36" - sources."@swc/core-linux-arm64-musl-1.3.36" - sources."@swc/core-linux-x64-gnu-1.3.36" - sources."@swc/core-linux-x64-musl-1.3.36" - sources."@swc/core-win32-arm64-msvc-1.3.36" - sources."@swc/core-win32-ia32-msvc-1.3.36" - sources."@swc/core-win32-x64-msvc-1.3.36" - sources."@swc/wasm-1.3.36" + sources."@swc/core-1.3.38" + sources."@swc/core-darwin-arm64-1.3.38" + sources."@swc/core-darwin-x64-1.3.38" + sources."@swc/core-linux-arm-gnueabihf-1.3.38" + sources."@swc/core-linux-arm64-gnu-1.3.38" + sources."@swc/core-linux-arm64-musl-1.3.38" + sources."@swc/core-linux-x64-gnu-1.3.38" + sources."@swc/core-linux-x64-musl-1.3.38" + sources."@swc/core-win32-arm64-msvc-1.3.38" + sources."@swc/core-win32-ia32-msvc-1.3.38" + sources."@swc/core-win32-x64-msvc-1.3.38" + sources."@swc/wasm-1.3.38" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" @@ -87760,7 +87620,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."lilconfig-2.0.6" + sources."lilconfig-2.1.0" sources."make-error-1.3.6" sources."merge2-1.4.1" sources."micromatch-4.0.5" @@ -87849,23 +87709,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.36" - sources."@swc/core-darwin-arm64-1.3.36" - sources."@swc/core-darwin-x64-1.3.36" - sources."@swc/core-linux-arm-gnueabihf-1.3.36" - sources."@swc/core-linux-arm64-gnu-1.3.36" - sources."@swc/core-linux-arm64-musl-1.3.36" - sources."@swc/core-linux-x64-gnu-1.3.36" - sources."@swc/core-linux-x64-musl-1.3.36" - sources."@swc/core-win32-arm64-msvc-1.3.36" - sources."@swc/core-win32-ia32-msvc-1.3.36" - sources."@swc/core-win32-x64-msvc-1.3.36" - sources."@swc/wasm-1.3.36" + sources."@swc/core-1.3.38" + sources."@swc/core-darwin-arm64-1.3.38" + sources."@swc/core-darwin-x64-1.3.38" + sources."@swc/core-linux-arm-gnueabihf-1.3.38" + sources."@swc/core-linux-arm64-gnu-1.3.38" + sources."@swc/core-linux-arm64-musl-1.3.38" + sources."@swc/core-linux-x64-gnu-1.3.38" + sources."@swc/core-linux-x64-musl-1.3.38" + sources."@swc/core-win32-arm64-msvc-1.3.38" + sources."@swc/core-win32-ia32-msvc-1.3.38" + sources."@swc/core-win32-x64-msvc-1.3.38" + sources."@swc/wasm-1.3.38" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" @@ -87903,7 +87763,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."lilconfig-2.0.6" + sources."lilconfig-2.1.0" sources."make-error-1.3.6" sources."merge2-1.4.1" sources."micromatch-4.0.5" @@ -87973,23 +87833,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.36" - sources."@swc/core-darwin-arm64-1.3.36" - sources."@swc/core-darwin-x64-1.3.36" - sources."@swc/core-linux-arm-gnueabihf-1.3.36" - sources."@swc/core-linux-arm64-gnu-1.3.36" - sources."@swc/core-linux-arm64-musl-1.3.36" - sources."@swc/core-linux-x64-gnu-1.3.36" - sources."@swc/core-linux-x64-musl-1.3.36" - sources."@swc/core-win32-arm64-msvc-1.3.36" - sources."@swc/core-win32-ia32-msvc-1.3.36" - sources."@swc/core-win32-x64-msvc-1.3.36" - sources."@swc/wasm-1.3.36" + sources."@swc/core-1.3.38" + sources."@swc/core-darwin-arm64-1.3.38" + sources."@swc/core-darwin-x64-1.3.38" + sources."@swc/core-linux-arm-gnueabihf-1.3.38" + sources."@swc/core-linux-arm64-gnu-1.3.38" + sources."@swc/core-linux-arm64-musl-1.3.38" + sources."@swc/core-linux-x64-gnu-1.3.38" + sources."@swc/core-linux-x64-musl-1.3.38" + sources."@swc/core-win32-arm64-msvc-1.3.38" + sources."@swc/core-win32-ia32-msvc-1.3.38" + sources."@swc/core-win32-x64-msvc-1.3.38" + sources."@swc/wasm-1.3.38" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" @@ -88027,7 +87887,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."lilconfig-2.0.6" + sources."lilconfig-2.1.0" sources."lodash.castarray-4.4.0" sources."lodash.isplainobject-4.0.6" sources."lodash.merge-4.6.2" @@ -88108,7 +87968,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/responselike-1.0.0" sources."accepts-1.3.8" sources."ansi-styles-4.3.0" @@ -88117,7 +87977,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" - sources."aws-sdk-2.1324.0" + sources."aws-sdk-2.1331.0" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { dependencies = [ @@ -88386,7 +88246,7 @@ in sources."@akryum/winattr-3.0.0" sources."@ampproject/remapping-2.2.0" sources."@apollo/protobufjs-1.2.7" - sources."@apollo/usage-reporting-protobuf-4.0.2" + sources."@apollo/usage-reporting-protobuf-4.1.0" sources."@apollo/utils.dropunuseddefinitions-1.1.0" (sources."@apollo/utils.keyvaluecache-1.0.2" // { dependencies = [ @@ -88548,10 +88408,10 @@ in sources."@babel/traverse-7.21.2" sources."@babel/types-7.21.2" sources."@graphql-tools/merge-8.3.1" - (sources."@graphql-tools/mock-8.7.18" // { + (sources."@graphql-tools/mock-8.7.19" // { dependencies = [ - sources."@graphql-tools/merge-8.3.18" - sources."@graphql-tools/schema-9.0.16" + sources."@graphql-tools/merge-8.4.0" + sources."@graphql-tools/schema-9.0.17" sources."@graphql-tools/utils-9.2.1" sources."value-or-promise-1.0.12" ]; @@ -88601,7 +88461,7 @@ in }) sources."@types/long-4.0.2" sources."@types/mime-3.0.1" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -88630,18 +88490,18 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."apollo-datasource-3.3.2" - (sources."apollo-reporting-protobuf-3.3.3" // { + (sources."apollo-reporting-protobuf-3.4.0" // { dependencies = [ sources."@apollo/protobufjs-1.2.6" sources."@types/node-10.17.60" ]; }) - sources."apollo-server-core-3.11.1" + sources."apollo-server-core-3.12.0" sources."apollo-server-env-4.2.1" sources."apollo-server-errors-3.3.1" - sources."apollo-server-express-3.11.1" - sources."apollo-server-plugin-base-3.7.1" - sources."apollo-server-types-3.7.1" + sources."apollo-server-express-3.12.0" + sources."apollo-server-plugin-base-3.7.2" + sources."apollo-server-types-3.8.0" (sources."archive-type-4.0.0" // { dependencies = [ sources."file-type-4.4.0" @@ -88710,7 +88570,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -88820,7 +88680,7 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.8" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.325" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" @@ -88931,7 +88791,7 @@ in sources."which-2.0.2" ]; }) - sources."flow-parser-0.200.1" + sources."flow-parser-0.201.0" sources."for-in-1.0.2" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" @@ -89342,7 +89202,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-support-0.5.21" sources."source-map-url-0.4.1" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -89727,8 +89587,9 @@ in ]; }) sources."@npmcli/name-from-folder-2.0.0" + sources."@pnpm/config.env-replace-1.0.0" sources."@pnpm/network.ca-file-1.0.2" - sources."@pnpm/npm-conf-1.0.5" + sources."@pnpm/npm-conf-2.1.0" sources."@sindresorhus/is-5.3.0" sources."@szmarczak/http-timer-5.0.1" sources."@types/acorn-4.0.6" @@ -89743,7 +89604,7 @@ in sources."@types/minimist-1.2.2" sources."@types/ms-0.7.31" sources."@types/nlcst-1.0.0" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/normalize-package-data-2.4.1" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" @@ -89761,7 +89622,7 @@ in sources."arrify-1.0.1" sources."bail-2.0.2" sources."balanced-match-1.0.2" - (sources."boxen-7.0.1" // { + (sources."boxen-7.0.2" // { dependencies = [ sources."chalk-5.2.0" sources."type-fest-2.19.0" @@ -89854,7 +89715,7 @@ in sources."ini-2.0.0" ]; }) - sources."got-12.5.3" + sources."got-12.6.0" sources."graceful-fs-4.2.10" sources."hard-rejection-2.1.0" sources."has-1.0.3" @@ -89917,7 +89778,7 @@ in sources."locate-path-7.2.0" sources."longest-streak-3.1.0" sources."lowercase-keys-3.0.0" - sources."lru-cache-7.17.0" + sources."lru-cache-7.18.3" sources."map-obj-4.3.0" sources."map-stream-0.1.0" sources."markdown-table-3.0.3" @@ -90052,7 +89913,7 @@ in }) sources."readable-stream-1.0.34" sources."redent-4.0.0" - sources."registry-auth-token-5.0.1" + sources."registry-auth-token-5.0.2" sources."registry-url-6.0.1" sources."rehype-parse-8.0.4" sources."rehype-retext-3.0.2" @@ -90083,7 +89944,7 @@ in sources."through2-0.4.2" ]; }) - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -90254,7 +90115,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" sources."browserslist-4.21.5" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -90264,7 +90125,7 @@ in sources."convert-source-map-1.9.0" sources."debug-4.3.4" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.325" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -90567,7 +90428,7 @@ in dependencies = [ sources."@types/glob-7.2.0" sources."@types/minimatch-5.1.2" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -90652,8 +90513,8 @@ in }; dependencies = [ sources."browserslist-4.21.5" - sources."caniuse-lite-1.0.30001458" - sources."electron-to-chromium-1.4.313" + sources."caniuse-lite-1.0.30001464" + sources."electron-to-chromium-1.4.325" sources."escalade-3.1.1" sources."fraction.js-4.2.0" sources."nanoid-3.3.4" @@ -90723,7 +90584,7 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/yauzl-2.10.0" sources."acorn-8.8.2" sources."acorn-walk-8.2.0" @@ -90733,7 +90594,7 @@ in sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1324.0" // { + (sources."aws-sdk-2.1331.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -90957,10 +90818,10 @@ in aws-cdk = nodeEnv.buildNodePackage { name = "aws-cdk"; packageName = "aws-cdk"; - version = "2.66.1"; + version = "2.68.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.66.1.tgz"; - sha512 = "exm97/VOH6yZPN2is3UC0acc6KF56AANvCg2gAEhyu6dPBueKxNCzrvsjNg/vmXrA8HqJ2jYJMg88YRNaUfylA=="; + url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.68.0.tgz"; + sha512 = "r+C5M4J3C7RLiixhxsO/W9Kpb5iB0mFshyn5PXT1cGPkDbx23bnWLOab03jG7uHWIWI01DCipHQyTaeXXqvT3A=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -91106,7 +90967,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."inspect-with-kind-1.0.5" - sources."irregular-plurals-3.4.0" + sources."irregular-plurals-3.4.1" sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" @@ -91291,7 +91152,7 @@ in sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."sliced-1.0.1" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -91396,10 +91257,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "13.27.0"; + version = "13.31.2"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-13.27.0.tgz"; - sha512 = "SQD/KN2kNHKW3CfDDEMnmbt6i07Y3Wb8s6L8Y+PvvHxmimoJ/tzKz3yBOIGimCfatAk7bw+SmgNzJyozzYZaEA=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-13.31.2.tgz"; + sha512 = "zoHKus75cLDo82VhWiGTvVNKmchtbDcUuN+1Pe3jlglCPoLS/cBDDNBcNWO6n+qlPV1fPKctuG0zx5/2GReuiA=="; }; dependencies = [ (sources."@alexbosworth/caporal-1.4.4" // { @@ -91451,7 +91312,7 @@ in sources."@types/express-serve-static-core-4.17.33" sources."@types/long-4.0.2" sources."@types/mime-3.0.1" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/request-2.48.8" @@ -91545,7 +91406,7 @@ in sources."cors-2.8.5" sources."create-hash-1.2.0" sources."crypto-js-4.1.1" - sources."csv-parse-5.3.5" + sources."csv-parse-5.3.6" sources."debug-2.6.9" sources."defaults-1.0.4" sources."define-property-1.0.0" @@ -91677,14 +91538,16 @@ in sources."ln-service-54.9.0" ]; }) - (sources."ln-service-54.10.0" // { + (sources."ln-service-54.10.2" // { dependencies = [ - sources."@grpc/grpc-js-1.8.9" + sources."@grpc/grpc-js-1.8.11" sources."@grpc/proto-loader-0.7.5" sources."@types/express-4.17.17" - sources."@types/node-18.13.0" - sources."lightning-7.1.0" - sources."type-fest-3.6.0" + sources."@types/node-18.14.4" + sources."body-parser-1.20.2" + sources."lightning-7.1.2" + sources."raw-body-2.5.2" + sources."type-fest-3.6.1" sources."ws-8.12.1" ]; }) @@ -91922,10 +91785,10 @@ in bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; packageName = "bash-language-server"; - version = "4.7.0"; + version = "4.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.7.0.tgz"; - sha512 = "JLe8bk0/FtOiGIdFWg/2JoAGJctYQyrYpmj24dhCSEAjIq9HHqr9I6L9k32fh9WkWjHcrh6v70Epiv6m+SxvDQ=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.8.2.tgz"; + sha512 = "B/jBGVeRMdQs+fHkEDycxD6L8/nf2WwoH3r+kt+O4GqknZ9AX3gNVE8sGjCOf0iLEvAChi6tqefYRRY2nKM4xw=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -91962,7 +91825,7 @@ in sources."web-tree-sitter-0.20.7" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" - sources."zod-3.20.5" + sources."zod-3.21.0" ]; buildInputs = globalBuildInputs; meta = { @@ -91977,10 +91840,10 @@ in bibtex-tidy = nodeEnv.buildNodePackage { name = "bibtex-tidy"; packageName = "bibtex-tidy"; - version = "1.8.5"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/bibtex-tidy/-/bibtex-tidy-1.8.5.tgz"; - sha512 = "dOcnSb/fn2q3T8rDHLBepPFPBcvWJQJuZthBQgXqMx95+DQOnRDvkjhbeDu9wKItR0lJ4xb5bcHwfiGYWryXpQ=="; + url = "https://registry.npmjs.org/bibtex-tidy/-/bibtex-tidy-1.9.0.tgz"; + sha512 = "GBkLNdvdxEjV+eWUpfRPmBXcVSlVXj9rI9R7OCcO/buvDU5330rHVjx/5hBUagckkkNq2pqW+K/nwI0bPQ7ctQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -92117,7 +91980,7 @@ in 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" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -92361,16 +92224,16 @@ in browser-sync = nodeEnv.buildNodePackage { name = "browser-sync"; packageName = "browser-sync"; - version = "2.28.1"; + version = "2.28.3"; src = fetchurl { - url = "https://registry.npmjs.org/browser-sync/-/browser-sync-2.28.1.tgz"; - sha512 = "XAd+jULGQ6TSdxA8ABnK6E0r4HHClnZn/p11sHOQ9dr5Qn4ay8TsrEkNUOiWlJOgLuf49QxlkwpqS7BvfGdCpQ=="; + url = "https://registry.npmjs.org/browser-sync/-/browser-sync-2.28.3.tgz"; + sha512 = "gublDeevvAuypnc01SQNGL8fkm4RdIkEagnAJ8Tl9mvr2td3Pl4nVIg5S6fcgoMDEWb8IT7nUHG9YwTATn/k2g=="; }; dependencies = [ sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.13" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -92384,8 +92247,8 @@ in sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browser-sync-client-2.28.1" - sources."browser-sync-ui-2.28.1" + sources."browser-sync-client-2.28.3" + sources."browser-sync-ui-2.28.3" sources."bs-recipes-1.3.4" sources."bs-snippet-injector-2.0.1" sources."bufferutil-4.0.7" @@ -92412,7 +92275,7 @@ in sources."destroy-1.0.4" sources."dev-ip-1.0.1" sources."easy-extender-2.3.4" - sources."eazy-logger-4.0.0" + sources."eazy-logger-4.0.1" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" @@ -92486,7 +92349,7 @@ in sources."parseurl-1.3.3" sources."picomatch-2.3.1" sources."portscanner-2.2.0" - sources."qs-6.11.0" + sources."qs-6.11.1" sources."range-parser-1.2.1" sources."raw-body-2.5.2" sources."readdirp-3.6.0" @@ -92540,7 +92403,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."typescript-4.9.5" - sources."ua-parser-js-1.0.33" + sources."ua-parser-js-1.0.34" sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."utf-8-validate-5.0.10" @@ -92958,7 +92821,7 @@ in sources."sha.js-2.4.11" sources."side-channel-1.0.4" sources."simple-git-2.48.0" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -93050,7 +92913,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.2" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -93375,7 +93238,7 @@ in ]; }) sources."single-line-log-0.4.1" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -93935,7 +93798,7 @@ in sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.1" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -94146,18 +94009,18 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "2.1.145"; + version = "2.1.154"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.1.145.tgz"; - sha512 = "l8gSezQ5uUFGPUQykz+A3l5WqlbQ6RPJ/0chP7qDyv/jH6ObnT5r4aWzObrfig1BWW0RFFAuryPJoiZiyeoKNQ=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.1.154.tgz"; + sha512 = "hDL2EkHS/hYLxmi6IvJv3JCR2vLCwvIsThc49NkTzMEJpEAsq72BJC1Es+MOI2q9Me8lGrtlj+63nm/U/Ca3uQ=="; }; dependencies = [ - sources."@jsii/check-node-1.76.0" - sources."@jsii/spec-1.76.0" + sources."@jsii/check-node-1.77.0" + sources."@jsii/spec-1.77.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-14.18.36" + sources."@types/node-14.18.37" sources."@xmldom/xmldom-0.8.6" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" @@ -94167,12 +94030,12 @@ in sources."braces-3.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.7.14" - sources."cdk8s-plus-25-2.4.37" + sources."cdk8s-2.7.25" + sources."cdk8s-plus-25-2.4.47" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.76.0" // { + (sources."codemaker-1.77.0" // { dependencies = [ sources."fs-extra-10.1.0" ]; @@ -94181,7 +94044,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-10.1.263" + sources."constructs-10.1.272" sources."date-format-4.0.14" sources."debug-4.3.4" sources."decamelize-5.0.1" @@ -94212,41 +94075,41 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" sources."is-number-7.0.0" - (sources."jsii-1.76.0" // { + (sources."jsii-1.77.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.76.0" // { + (sources."jsii-pacmak-1.77.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.76.0" // { + (sources."jsii-reflect-1.77.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.76.0" // { + (sources."jsii-rosetta-1.77.0" // { dependencies = [ sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.838" // { + (sources."jsii-srcmak-0.1.847" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.3.290" + sources."json2jsii-0.3.299" sources."jsonfile-6.1.0" sources."locate-path-5.0.0" sources."lodash.truncate-4.4.2" - sources."log4js-6.8.0" + sources."log4js-6.9.1" sources."lower-case-2.0.2" sources."lru-cache-6.0.0" sources."mdurl-1.0.1" @@ -94256,7 +94119,7 @@ in sources."ms-2.1.2" sources."ncp-2.0.0" sources."no-case-3.0.4" - sources."oo-ascii-tree-1.76.0" + sources."oo-ascii-tree-1.77.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -94350,7 +94213,7 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" - (sources."@jsii/check-node-1.76.0" // { + (sources."@jsii/check-node-1.77.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -94360,7 +94223,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."@jsii/spec-1.76.0" + sources."@jsii/spec-1.77.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -94409,7 +94272,7 @@ in sources."cliui-6.0.0" sources."clone-2.1.2" sources."code-excerpt-3.0.0" - (sources."codemaker-1.76.0" // { + (sources."codemaker-1.77.0" // { dependencies = [ sources."decamelize-5.0.1" sources."fs-extra-10.1.0" @@ -94421,7 +94284,7 @@ in sources."color-name-1.1.3" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.1.263" + sources."constructs-10.1.272" sources."convert-to-spaces-1.0.2" sources."cookie-0.4.2" sources."cross-spawn-7.0.3" @@ -94487,7 +94350,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."ink-select-input-4.2.1" + sources."ink-select-input-4.2.2" sources."ink-table-3.0.0" sources."is-ci-2.0.0" sources."is-extglob-2.1.1" @@ -94498,7 +94361,7 @@ in sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - (sources."jsii-1.76.0" // { + (sources."jsii-1.77.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -94516,7 +94379,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-pacmak-1.76.0" // { + (sources."jsii-pacmak-1.77.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -94532,7 +94395,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-reflect-1.76.0" // { + (sources."jsii-reflect-1.77.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -94550,7 +94413,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-rosetta-1.76.0" // { + (sources."jsii-rosetta-1.77.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -94562,7 +94425,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.838" // { + (sources."jsii-srcmak-0.1.847" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -94575,7 +94438,7 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lodash.isequal-4.5.0" - sources."log4js-6.8.0" + sources."log4js-6.9.1" sources."loose-envify-1.4.0" sources."lru-cache-6.0.0" sources."lru_map-0.3.3" @@ -94604,7 +94467,7 @@ in sources."obliterator-2.0.4" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.76.0" + sources."oo-ascii-tree-1.77.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -94860,7 +94723,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -95102,10 +94965,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.26.3"; + version = "0.26.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.26.3.tgz"; - sha512 = "6+Bo47fjBra0G3ESYfBwEcxEuvVK92h/tbYMxiImm3idveWl6InmiAZm2cqHc9vbjm5i1iNrca6b7EdHdPDArA=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.26.4.tgz"; + sha512 = "V31svQPcKBMAyA+DaALTbcRP1zogl5u3kaBSXJn2/XQmmFJzZdOt1ZEEbBA4a8nxdRA9e5J430wNGJq/io4bgw=="; }; dependencies = [ sources."@sindresorhus/chunkify-0.2.0" @@ -95219,10 +95082,10 @@ in coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/coc-go/-/coc-go-1.3.7.tgz"; - sha512 = "gs5BZQUNxFRmff8qMg9ISat86tU9oOrmrEMDGUhr51c4HSbToGQfa3ihrcOorRydw8HwYchKvpIYrrcq/bUihQ=="; + url = "https://registry.npmjs.org/coc-go/-/coc-go-1.3.8.tgz"; + sha512 = "7nqJShsXTODYp33bAvNo5PVWn71p1HEBfPbbBgC8sJLreQ2JF8A2Wa1QCO6MG1BVgZ7t8Id5007uvFZQbUYVjA=="; }; dependencies = [ sources."isexe-2.0.0" @@ -95534,7 +95397,7 @@ in sources."ini-1.3.8" sources."int64-buffer-0.1.10" sources."internal-slot-1.0.5" - sources."is-array-buffer-3.0.1" + sources."is-array-buffer-3.0.2" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" @@ -95562,7 +95425,7 @@ in ]; }) sources."lodash-4.17.21" - sources."log4js-6.8.0" + sources."log4js-6.9.1" sources."lru-cache-6.0.0" sources."metals-languageclient-0.4.2" sources."minimatch-3.1.2" @@ -95706,13 +95569,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.295"; + version = "1.1.296"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.295.tgz"; - sha512 = "0GIGhNh7VokXpAxJC5YbWJrZ8Cb4jqmdpP4fpQq9ZZp0+m5UaSPLZhI5RO0yjiMQ+ctX6wurBqrV9NFreNI3GQ=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.296.tgz"; + sha512 = "uRUtbH0SuyLV9iMs7nh9zkzsxHvQ9K9V4LarPQW3oNNplkCh+5+As/NTqKZexj0C3so3IAN5wdyQyFrvrBjF7Q=="; }; dependencies = [ - sources."pyright-1.1.295" + sources."pyright-1.1.298" ]; buildInputs = globalBuildInputs; meta = { @@ -95804,16 +95667,16 @@ in coc-sh = nodeEnv.buildNodePackage { name = "coc-sh"; packageName = "coc-sh"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-sh/-/coc-sh-1.0.2.tgz"; - sha512 = "qnRVGp+om7DEd/vUoGyxyY0CW5DULEVbx9D/sEStvhWG5l/ZKqubPk3LP4mgOw6C/bCLvWL3+bhJ+lf2jsI6SQ=="; + url = "https://registry.npmjs.org/coc-sh/-/coc-sh-1.1.0.tgz"; + sha512 = "EenkJ/ZPay+WCXCAmBV1agM/ntNNBAw/XMJ0KOkltFrgYOQ+yjLAIMYs5dcOuL8eh8skABQILv1Wq6e6Ff/qvQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."bash-language-server-4.7.0" + sources."bash-language-server-4.8.2" sources."braces-3.0.2" sources."domino-2.1.6" sources."encoding-0.1.13" @@ -95846,7 +95709,7 @@ in sources."web-tree-sitter-0.20.7" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" - sources."zod-3.20.5" + sources."zod-3.21.0" ]; buildInputs = globalBuildInputs; meta = { @@ -96122,7 +95985,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -96159,7 +96022,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.325" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -96340,7 +96203,7 @@ in ]; }) sources."source-map-0.6.1" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -96706,7 +96569,7 @@ in ]; }) sources."esprima-4.0.1" - (sources."esquery-1.4.2" // { + (sources."esquery-1.5.0" // { dependencies = [ sources."estraverse-5.3.0" ]; @@ -97449,7 +97312,7 @@ in sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."source-map-0.6.1" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -97518,7 +97381,7 @@ in sources."abbrev-1.1.1" sources."accepts-1.3.8" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.1" + sources."agentkeepalive-4.3.0" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ajv-formats-2.1.1" // { @@ -97560,7 +97423,6 @@ in dependencies = [ sources."bytes-3.1.2" sources."debug-2.6.9" - sources."depd-2.0.0" sources."iconv-lite-0.4.24" sources."ms-2.0.0" sources."qs-6.11.0" @@ -97670,7 +97532,7 @@ in sources."underscore-1.2.1" ]; }) - sources."depd-1.1.2" + sources."depd-2.0.0" sources."destroy-1.2.0" sources."detect-indent-6.1.0" sources."detect-newline-3.1.0" @@ -97696,7 +97558,6 @@ in (sources."express-4.18.2" // { dependencies = [ sources."debug-2.6.9" - sources."depd-2.0.0" sources."ms-2.0.0" sources."qs-6.11.0" sources."safe-buffer-5.2.1" @@ -97755,11 +97616,7 @@ in sources."has-yarn-2.1.0" sources."hosted-git-info-4.1.0" sources."http-cache-semantics-4.1.1" - (sources."http-errors-2.0.0" // { - dependencies = [ - sources."depd-2.0.0" - ]; - }) + sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.1" @@ -98003,7 +97860,6 @@ in sources."ms-2.0.0" ]; }) - sources."depd-2.0.0" sources."ms-2.1.3" ]; }) @@ -98018,7 +97874,7 @@ in sources."smart-buffer-4.2.0" sources."socks-2.7.1" sources."socks-proxy-agent-6.2.1" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -98034,7 +97890,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.17.11" + sources."systeminformation-5.17.12" (sources."tar-6.1.13" // { dependencies = [ sources."minipass-4.2.4" @@ -98227,7 +98083,7 @@ in sources."run-parallel-1.2.0" sources."semver-6.3.0" sources."slash-4.0.0" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -98270,7 +98126,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -98367,7 +98223,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."qs-6.11.0" + sources."qs-6.11.1" sources."quicktask-1.1.0" sources."raf-3.3.2" sources."readable-stream-2.3.8" @@ -98535,10 +98391,10 @@ in cspell = nodeEnv.buildNodePackage { name = "cspell"; packageName = "cspell"; - version = "6.27.0"; + version = "6.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell/-/cspell-6.27.0.tgz"; - sha512 = "BhDzXJIRFcpswOy32tgnoOw2OdSM91pQuUpRxfZvRxdM4HBxUrodDYJ5HbBz7D0vNBrXFidFX/157KNX4m1gmg=="; + url = "https://registry.npmjs.org/cspell/-/cspell-6.28.0.tgz"; + sha512 = "HPw7bO0H6l8vXyUF0Ybp9IucVt15Og8YsOfQ4RIaCLU9uJP4RgwjwHVPnCJiQvhC5s4Zbw1WzX/+J8PP83oIUg=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -98553,14 +98409,14 @@ in sources."supports-color-5.5.0" ]; }) - sources."@cspell/cspell-bundled-dicts-6.27.0" - sources."@cspell/cspell-pipe-6.27.0" - sources."@cspell/cspell-service-bus-6.27.0" - sources."@cspell/cspell-types-6.27.0" + sources."@cspell/cspell-bundled-dicts-6.28.0" + sources."@cspell/cspell-pipe-6.28.0" + sources."@cspell/cspell-service-bus-6.28.0" + sources."@cspell/cspell-types-6.28.0" sources."@cspell/dict-ada-4.0.1" sources."@cspell/dict-aws-3.0.0" sources."@cspell/dict-bash-4.1.1" - sources."@cspell/dict-companies-3.0.8" + sources."@cspell/dict-companies-3.0.9" sources."@cspell/dict-cpp-4.0.3" sources."@cspell/dict-cryptocurrencies-3.0.1" sources."@cspell/dict-csharp-4.0.2" @@ -98592,7 +98448,7 @@ in sources."@cspell/dict-php-3.0.4" sources."@cspell/dict-powershell-4.0.2" sources."@cspell/dict-public-licenses-2.0.1" - sources."@cspell/dict-python-4.0.1" + sources."@cspell/dict-python-4.0.2" sources."@cspell/dict-r-2.0.1" sources."@cspell/dict-ruby-4.0.2" sources."@cspell/dict-rust-4.0.1" @@ -98603,8 +98459,8 @@ in sources."@cspell/dict-swift-2.0.1" sources."@cspell/dict-typescript-3.1.1" sources."@cspell/dict-vue-3.0.0" - sources."@cspell/dynamic-import-6.27.0" - sources."@cspell/strong-weak-map-6.27.0" + sources."@cspell/dynamic-import-6.28.0" + sources."@cspell/strong-weak-map-6.28.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -98625,15 +98481,15 @@ in sources."concat-map-0.0.1" sources."configstore-5.0.1" sources."core-util-is-1.0.3" - sources."cosmiconfig-8.0.0" + sources."cosmiconfig-8.1.0" sources."crypto-random-string-2.0.0" - sources."cspell-dictionary-6.27.0" - sources."cspell-gitignore-6.27.0" - sources."cspell-glob-6.27.0" - sources."cspell-grammar-6.27.0" - sources."cspell-io-6.27.0" - sources."cspell-lib-6.27.0" - sources."cspell-trie-lib-6.27.0" + sources."cspell-dictionary-6.28.0" + sources."cspell-gitignore-6.28.0" + sources."cspell-glob-6.28.0" + sources."cspell-grammar-6.28.0" + sources."cspell-io-6.28.0" + sources."cspell-lib-6.28.0" + sources."cspell-trie-lib-6.28.0" sources."dot-prop-5.3.0" sources."encoding-0.1.13" sources."error-ex-1.3.2" @@ -98649,7 +98505,7 @@ in sources."flat-cache-3.0.4" sources."flatted-3.2.7" sources."fs.realpath-1.0.0" - sources."gensequence-4.0.3" + sources."gensequence-5.0.2" sources."get-stdin-8.0.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" @@ -98808,7 +98664,7 @@ in sources."atomic-batcher-1.0.2" sources."aws-sign2-0.7.0" sources."aws4-1.12.0" - sources."b4a-1.6.1" + sources."b4a-1.6.2" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { dependencies = [ @@ -99551,7 +99407,7 @@ in dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.18.36" + sources."@types/node-14.18.37" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.6" @@ -99744,12 +99600,12 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" sources."@types/minimatch-5.1.2" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.10.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.1" + sources."agentkeepalive-4.3.0" sources."aggregate-error-3.1.0" sources."ansi-colors-4.1.3" (sources."ansi-escapes-4.3.2" // { @@ -99822,7 +99678,7 @@ in sources."defer-to-connect-2.0.1" sources."define-properties-1.2.0" sources."delegates-1.0.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."detect-libc-2.0.1" sources."detect-node-2.1.0" sources."dir-compare-3.3.0" @@ -99961,7 +99817,7 @@ in ]; }) sources."lowercase-keys-2.0.0" - sources."lru-cache-7.17.0" + sources."lru-cache-7.18.3" sources."lzma-native-8.0.6" sources."make-fetch-happen-10.2.1" sources."map-age-cleaner-0.1.3" @@ -100089,7 +99945,7 @@ in sources."socks-proxy-agent-7.0.0" sources."source-map-0.6.1" sources."source-map-support-0.5.21" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -100814,7 +100670,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -100844,7 +100700,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.325" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -101010,7 +100866,7 @@ in sources."color-name-1.1.4" ]; }) - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -101087,7 +100943,7 @@ in sources."@azure/core-http-compat-1.3.0" sources."@azure/core-lro-2.5.1" sources."@azure/core-paging-1.5.0" - (sources."@azure/core-rest-pipeline-1.10.1" // { + (sources."@azure/core-rest-pipeline-1.10.2" // { dependencies = [ sources."@tootallnate/once-2.0.0" sources."debug-4.3.4" @@ -101097,23 +100953,23 @@ in ]; }) sources."@azure/core-tracing-1.0.1" - sources."@azure/core-util-1.1.1" + sources."@azure/core-util-1.2.0" (sources."@azure/identity-2.1.0" // { dependencies = [ sources."uuid-8.3.2" ]; }) sources."@azure/keyvault-keys-4.6.0" - sources."@azure/logger-1.0.3" - (sources."@azure/msal-browser-2.33.0" // { + sources."@azure/logger-1.0.4" + (sources."@azure/msal-browser-2.34.0" // { dependencies = [ - sources."@azure/msal-common-10.0.0" + sources."@azure/msal-common-11.0.0" ]; }) sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.15.0" // { + (sources."@azure/msal-node-1.16.0" // { dependencies = [ - sources."@azure/msal-common-10.0.0" + sources."@azure/msal-common-11.0.0" sources."uuid-8.3.2" ]; }) @@ -101151,19 +101007,19 @@ in }) sources."@fluentui/date-time-utilities-8.5.5" sources."@fluentui/dom-utilities-2.2.5" - sources."@fluentui/font-icons-mdl2-8.5.9" - sources."@fluentui/foundation-legacy-8.2.29" + sources."@fluentui/font-icons-mdl2-8.5.12" + sources."@fluentui/foundation-legacy-8.2.32" sources."@fluentui/keyboard-key-0.4.5" sources."@fluentui/merge-styles-8.5.6" - sources."@fluentui/react-8.106.1" - sources."@fluentui/react-focus-8.8.15" - sources."@fluentui/react-hooks-8.6.17" + sources."@fluentui/react-8.106.4" + sources."@fluentui/react-focus-8.8.18" + sources."@fluentui/react-hooks-8.6.18" sources."@fluentui/react-portal-compat-context-9.0.4" - sources."@fluentui/react-window-provider-2.2.6" + sources."@fluentui/react-window-provider-2.2.7" sources."@fluentui/set-version-8.2.5" - sources."@fluentui/style-utilities-8.9.2" - sources."@fluentui/theme-2.6.23" - sources."@fluentui/utilities-8.13.7" + sources."@fluentui/style-utilities-8.9.5" + sources."@fluentui/theme-2.6.24" + sources."@fluentui/utilities-8.13.8" sources."@gar/promisify-1.1.3" (sources."@gulp-sourcemaps/identity-map-2.0.1" // { dependencies = [ @@ -101196,20 +101052,20 @@ in sources."@js-joda/core-5.5.2" sources."@mapbox/node-pre-gyp-1.0.10" sources."@microsoft/load-themed-styles-1.10.295" - sources."@node-rs/crc32-1.6.0" - sources."@node-rs/crc32-android-arm-eabi-1.6.0" - sources."@node-rs/crc32-android-arm64-1.6.0" - sources."@node-rs/crc32-darwin-arm64-1.6.0" - sources."@node-rs/crc32-darwin-x64-1.6.0" - sources."@node-rs/crc32-freebsd-x64-1.6.0" - sources."@node-rs/crc32-linux-arm-gnueabihf-1.6.0" - sources."@node-rs/crc32-linux-arm64-gnu-1.6.0" - sources."@node-rs/crc32-linux-arm64-musl-1.6.0" - sources."@node-rs/crc32-linux-x64-gnu-1.6.0" - sources."@node-rs/crc32-linux-x64-musl-1.6.0" - sources."@node-rs/crc32-win32-arm64-msvc-1.6.0" - sources."@node-rs/crc32-win32-ia32-msvc-1.6.0" - sources."@node-rs/crc32-win32-x64-msvc-1.6.0" + sources."@node-rs/crc32-1.6.1" + sources."@node-rs/crc32-android-arm-eabi-1.6.1" + sources."@node-rs/crc32-android-arm64-1.6.1" + sources."@node-rs/crc32-darwin-arm64-1.6.1" + sources."@node-rs/crc32-darwin-x64-1.6.1" + sources."@node-rs/crc32-freebsd-x64-1.6.1" + sources."@node-rs/crc32-linux-arm-gnueabihf-1.6.1" + sources."@node-rs/crc32-linux-arm64-gnu-1.6.1" + sources."@node-rs/crc32-linux-arm64-musl-1.6.1" + sources."@node-rs/crc32-linux-x64-gnu-1.6.1" + sources."@node-rs/crc32-linux-x64-musl-1.6.1" + sources."@node-rs/crc32-win32-arm64-msvc-1.6.1" + sources."@node-rs/crc32-win32-ia32-msvc-1.6.1" + sources."@node-rs/crc32-win32-x64-msvc-1.6.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -101228,18 +101084,18 @@ in }) sources."@sindresorhus/is-0.14.0" sources."@sqltools/formatter-1.2.5" - sources."@swc/core-1.3.36" - sources."@swc/core-darwin-arm64-1.3.36" - sources."@swc/core-darwin-x64-1.3.36" - sources."@swc/core-linux-arm-gnueabihf-1.3.36" - sources."@swc/core-linux-arm64-gnu-1.3.36" - sources."@swc/core-linux-arm64-musl-1.3.36" - sources."@swc/core-linux-x64-gnu-1.3.36" - sources."@swc/core-linux-x64-musl-1.3.36" - sources."@swc/core-win32-arm64-msvc-1.3.36" - sources."@swc/core-win32-ia32-msvc-1.3.36" - sources."@swc/core-win32-x64-msvc-1.3.36" - sources."@swc/wasm-1.3.37" + sources."@swc/core-1.3.38" + sources."@swc/core-darwin-arm64-1.3.38" + sources."@swc/core-darwin-x64-1.3.38" + sources."@swc/core-linux-arm-gnueabihf-1.3.38" + sources."@swc/core-linux-arm64-gnu-1.3.38" + sources."@swc/core-linux-arm64-musl-1.3.38" + sources."@swc/core-linux-x64-gnu-1.3.38" + sources."@swc/core-linux-x64-musl-1.3.38" + sources."@swc/core-win32-arm64-msvc-1.3.38" + sources."@swc/core-win32-ia32-msvc-1.3.38" + sources."@swc/core-win32-x64-msvc-1.3.38" + sources."@swc/wasm-1.3.38" sources."@szmarczak/http-timer-1.1.2" sources."@tediousjs/connection-string-0.4.2" sources."@tokenizer/token-0.3.0" @@ -101336,9 +101192,10 @@ in sources."ms-2.1.2" ]; }) - (sources."agentkeepalive-4.2.1" // { + (sources."agentkeepalive-4.3.0" // { dependencies = [ sources."debug-4.3.4" + sources."depd-2.0.0" sources."ms-2.1.2" ]; }) @@ -101443,7 +101300,7 @@ in sources."base64-js-1.5.1" sources."base64id-2.0.0" sources."basic-auth-2.0.1" - sources."better-sqlite3-8.1.0" + sources."better-sqlite3-8.2.0" sources."bignumber.js-9.0.0" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" @@ -101489,7 +101346,7 @@ in sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-3.0.0" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" sources."chalk-4.1.2" sources."chardet-0.7.0" (sources."chokidar-2.1.8" // { @@ -101649,7 +101506,7 @@ in sources."each-props-1.3.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.325" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" (sources."encoding-0.1.13" // { @@ -101714,7 +101571,7 @@ in ]; }) sources."esprima-4.0.1" - (sources."esquery-1.4.2" // { + (sources."esquery-1.5.0" // { dependencies = [ sources."estraverse-5.3.0" ]; @@ -101844,7 +101701,7 @@ in sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" sources."github-from-package-0.0.0" - sources."glob-9.0.1" + sources."glob-9.2.1" sources."glob-parent-5.1.2" (sources."glob-stream-6.1.0" // { dependencies = [ @@ -102041,7 +101898,7 @@ in sources."ipaddr.js-1.9.1" sources."is-absolute-1.0.0" sources."is-accessor-descriptor-1.0.0" - sources."is-array-buffer-3.0.1" + sources."is-array-buffer-3.0.2" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.4" sources."is-binary-path-1.0.1" @@ -102152,7 +102009,7 @@ in sources."long-5.2.1" sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-7.17.0" + sources."lru-cache-7.18.3" sources."lru-queue-0.1.0" (sources."make-dir-3.1.0" // { dependencies = [ @@ -102195,7 +102052,7 @@ in sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-7.3.0" + sources."minimatch-7.4.2" sources."minimist-1.2.5" sources."minipass-4.2.4" (sources."minipass-collect-1.0.2" // { @@ -102284,7 +102141,7 @@ in ]; }) sources."openapi-types-7.2.3" - sources."swagger-ui-dist-4.16.1" + sources."swagger-ui-dist-4.18.0" ]; }) (sources."mixin-deep-1.3.2" // { @@ -102331,7 +102188,7 @@ in sources."string_decoder-1.1.1" ]; }) - (sources."mysql2-3.1.2" // { + (sources."mysql2-3.2.0" // { dependencies = [ sources."iconv-lite-0.6.3" sources."sqlstring-2.3.3" @@ -102485,13 +102342,13 @@ in sources."path-parse-1.0.7" sources."path-root-0.1.1" sources."path-root-regex-0.1.2" - sources."path-scurry-1.5.0" + sources."path-scurry-1.6.1" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."peek-readable-4.1.0" - sources."pg-8.9.0" + sources."pg-8.10.0" sources."pg-connection-string-2.5.0" - sources."pg-cursor-2.8.0" + sources."pg-cursor-2.9.0" sources."pg-int8-1.0.1" (sources."pg-native-3.0.1" // { dependencies = [ @@ -102501,9 +102358,9 @@ in sources."string_decoder-0.10.31" ]; }) - sources."pg-pool-3.5.2" + sources."pg-pool-3.6.0" sources."pg-protocol-1.6.0" - sources."pg-query-stream-4.3.0" + sources."pg-query-stream-4.4.0" sources."pg-types-2.2.0" sources."pgpass-1.0.5" sources."picocolors-0.2.1" @@ -102722,7 +102579,7 @@ in sources."source-map-url-0.4.1" sources."sparkles-1.0.1" sources."sparse-bitfield-3.0.3" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -102806,13 +102663,13 @@ in sources."sprintf-js-1.1.2" ]; }) - (sources."terser-5.16.5" // { + (sources."terser-5.16.6" // { dependencies = [ sources."acorn-8.8.2" sources."commander-2.20.3" ]; }) - sources."terser-webpack-plugin-5.3.6" + sources."terser-webpack-plugin-5.3.7" sources."text-table-0.2.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" @@ -102934,7 +102791,7 @@ in }) sources."watchpack-2.4.0" sources."webidl-conversions-3.0.1" - (sources."webpack-5.75.0" // { + (sources."webpack-5.76.0" // { dependencies = [ sources."acorn-8.8.2" ]; @@ -103060,7 +102917,7 @@ in sources."@types/mime-3.0.1" sources."@types/minimatch-5.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" @@ -103412,7 +103269,7 @@ in sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -103689,7 +103546,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.313" + sources."electron-to-chromium-1.4.325" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -103802,7 +103659,7 @@ in ]; }) sources."esprima-4.0.1" - (sources."esquery-1.4.2" // { + (sources."esquery-1.5.0" // { dependencies = [ sources."estraverse-5.3.0" ]; @@ -104112,7 +103969,7 @@ in sources."is-absolute-url-2.1.0" sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.1" + sources."is-array-buffer-3.0.2" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" @@ -104914,7 +104771,7 @@ in sources."source-map-url-0.4.1" sources."sourcemap-codec-1.4.8" sources."spark-md5-3.0.2" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -105381,7 +105238,7 @@ in }) sources."eslint-visitor-keys-3.3.0" sources."espree-9.4.1" - sources."esquery-1.4.2" + sources."esquery-1.5.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."esutils-2.0.3" @@ -105507,7 +105364,7 @@ in }) sources."eslint-visitor-keys-3.3.0" sources."espree-9.4.1" - sources."esquery-1.4.2" + sources."esquery-1.5.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."esutils-2.0.3" @@ -105974,7 +105831,7 @@ in sources."@types/keyv-3.1.4" sources."@types/mime-3.0.1" sources."@types/minimatch-5.1.2" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/responselike-1.0.0" @@ -106103,7 +105960,7 @@ in sources."camel-case-4.1.2" sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -106249,7 +106106,7 @@ in sources."dot-case-3.0.4" sources."duplexer3-0.1.5" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.325" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" @@ -106286,7 +106143,7 @@ in sources."is-stream-1.1.0" ]; }) - (sources."expo-48.0.4" // { + (sources."expo-48.0.6" // { dependencies = [ sources."@babel/runtime-7.21.0" (sources."@expo/config-8.0.2" // { @@ -106304,7 +106161,7 @@ in ]; }) sources."expo-application-5.1.1" - sources."expo-asset-8.9.0" + sources."expo-asset-8.9.1" (sources."expo-constants-14.2.1" // { dependencies = [ sources."@expo/config-8.0.2" @@ -106327,7 +106184,7 @@ in sources."fs-extra-9.1.0" ]; }) - sources."expo-modules-core-1.2.3" + sources."expo-modules-core-1.2.4" (sources."expo-pwa-0.0.124" // { dependencies = [ sources."@expo/image-utils-0.3.23" @@ -106539,7 +106396,7 @@ in sources."kleur-3.0.3" sources."latest-version-5.1.0" sources."leven-3.1.0" - sources."lilconfig-2.0.6" + sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."loader-runner-4.3.0" (sources."loader-utils-2.0.4" // { @@ -106585,7 +106442,7 @@ in sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" - (sources."mini-css-extract-plugin-2.7.2" // { + (sources."mini-css-extract-plugin-2.7.3" // { dependencies = [ sources."ajv-keywords-5.1.0" sources."schema-utils-4.0.0" @@ -106994,13 +106851,13 @@ in ]; }) sources."terminal-link-2.1.1" - (sources."terser-5.16.5" // { + (sources."terser-5.16.6" // { dependencies = [ sources."commander-2.20.3" sources."source-map-support-0.5.21" ]; }) - (sources."terser-webpack-plugin-5.3.6" // { + (sources."terser-webpack-plugin-5.3.7" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" @@ -107026,7 +106883,7 @@ in sources."type-fest-0.12.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."ua-parser-js-0.7.33" + sources."ua-parser-js-0.7.34" sources."unicode-canonical-property-names-ecmascript-2.0.0" sources."unicode-match-property-ecmascript-2.0.0" sources."unicode-match-property-value-ecmascript-2.1.0" @@ -107059,7 +106916,7 @@ in sources."wbuf-1.7.3" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" - (sources."webpack-5.75.0" // { + (sources."webpack-5.76.0" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" @@ -107204,7 +107061,7 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" sources."@types/minimist-1.2.2" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/normalize-package-data-2.4.1" sources."@types/prop-types-15.7.5" sources."@types/react-18.0.28" @@ -107235,7 +107092,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -107261,7 +107118,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.981744" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.326" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -107402,7 +107259,7 @@ in sources."color-name-1.1.4" ]; }) - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -107601,7 +107458,7 @@ in sources."semver-5.7.1" ]; }) - sources."csv-parse-5.3.5" + sources."csv-parse-5.3.6" sources."csv-stream-0.2.0" sources."dashdash-1.14.1" sources."debug-4.3.4" @@ -107856,10 +107713,10 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "11.24.0"; + version = "11.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-11.24.0.tgz"; - sha512 = "fqwI6rBCvMs3E2pLYEzJYPIB+cmLxV9l+bX7VZHpxhUvbZZrM7271C8sjiBdIh97ue+BvgXHqTDlsW88ZZXt1g=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-11.24.1.tgz"; + sha512 = "X9p15dZLaR3jbMKvtQgj364khq9EEeC3+PXK0Bo8lwe0XasFmq3d5XsD7XS+a5iziCC7sqzhIiuiUfn5yjYgAg=="; }; dependencies = [ (sources."@apidevtools/json-schema-ref-parser-9.1.2" // { @@ -107875,15 +107732,15 @@ in sources."@google-cloud/precise-date-3.0.1" sources."@google-cloud/projectify-3.0.0" sources."@google-cloud/promisify-2.0.4" - (sources."@google-cloud/pubsub-3.3.0" // { + (sources."@google-cloud/pubsub-3.4.1" // { dependencies = [ sources."google-auth-library-8.7.0" ]; }) - sources."@grpc/grpc-js-1.8.11" + sources."@grpc/grpc-js-1.8.12" sources."@grpc/proto-loader-0.7.5" sources."@jsdevtools/ono-7.1.3" - sources."@jsdoc/salty-0.2.3" + sources."@jsdoc/salty-0.2.5" (sources."@npmcli/fs-2.1.2" // { dependencies = [ sources."semver-7.3.8" @@ -107892,8 +107749,9 @@ in sources."@npmcli/move-file-2.0.1" sources."@opentelemetry/api-1.4.0" sources."@opentelemetry/semantic-conventions-1.3.1" + sources."@pnpm/config.env-replace-1.0.0" sources."@pnpm/network.ca-file-1.0.2" - sources."@pnpm/npm-conf-1.0.5" + sources."@pnpm/npm-conf-2.1.0" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -107913,7 +107771,7 @@ in sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" sources."@types/minimatch-5.1.2" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/rimraf-3.0.2" sources."@types/triple-beam-1.3.2" sources."abbrev-1.1.1" @@ -107923,11 +107781,7 @@ in sources."acorn-jsx-5.3.2" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" - (sources."agentkeepalive-4.2.1" // { - dependencies = [ - sources."depd-1.1.2" - ]; - }) + sources."agentkeepalive-4.3.0" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ajv-formats-2.1.1" // { @@ -108002,7 +107856,7 @@ in (sources."cacache-16.1.3" // { dependencies = [ sources."glob-8.1.0" - sources."lru-cache-7.17.0" + sources."lru-cache-7.18.3" sources."minimatch-5.1.6" ]; }) @@ -108092,7 +107946,7 @@ in ]; }) sources."crypto-random-string-2.0.0" - sources."csv-parse-5.3.5" + sources."csv-parse-5.3.6" sources."dashdash-1.14.1" sources."data-uri-to-buffer-3.0.1" sources."debug-4.3.4" @@ -108218,7 +108072,7 @@ in }) sources."function-bind-1.1.1" sources."gauge-4.0.4" - sources."gaxios-5.0.2" + sources."gaxios-5.1.0" sources."gcp-metadata-5.2.0" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.2.0" @@ -108369,7 +108223,7 @@ in dependencies = [ sources."@tootallnate/once-2.0.0" sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.17.0" + sources."lru-cache-7.18.3" sources."socks-proxy-agent-7.0.0" ]; }) @@ -108516,7 +108370,7 @@ in }) sources."readdirp-3.6.0" sources."redeyed-2.1.1" - sources."registry-auth-token-5.0.1" + sources."registry-auth-token-5.0.2" sources."registry-url-5.1.0" (sources."request-2.88.2" // { dependencies = [ @@ -108926,7 +108780,7 @@ in sources."ansi-styles-6.2.1" ]; }) - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -108981,7 +108835,7 @@ in sources."@types/atob-2.1.2" sources."@types/bn.js-5.1.1" sources."@types/inquirer-6.5.0" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/pbkdf2-3.1.0" sources."@types/secp256k1-4.0.3" sources."@types/through-0.0.30" @@ -109395,7 +109249,7 @@ in sources."internal-slot-1.0.5" sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.1" + sources."is-array-buffer-3.0.2" sources."is-arrayish-0.3.2" sources."is-bigint-1.0.4" sources."is-binary-path-1.0.1" @@ -109698,15 +109552,15 @@ in ganache = nodeEnv.buildNodePackage { name = "ganache"; packageName = "ganache"; - version = "7.7.5"; + version = "7.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/ganache/-/ganache-7.7.5.tgz"; - sha512 = "H8ybC7l9hhvor61uS4wvQ7UOYpgc4OcqZvFb3XGutPwbxQL4yYDoNjOumfUcq4JalYZF9ojzy95ss7lOvrw76w=="; + url = "https://registry.npmjs.org/ganache/-/ganache-7.7.6.tgz"; + sha512 = "1ba5CERykZijw1kIRGUKKPEUqTDU+sEMElYemAS42w1kunu+/3OS5v+eQsJQ+fCVMEmspploA7S9rEWBcyVsLg=="; }; dependencies = [ sources."@types/bn.js-5.1.1" sources."@types/lru-cache-5.1.1" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/seedrandom-3.0.1" sources."abstract-level-1.0.3" (sources."abstract-leveldown-7.2.0" // { @@ -109813,12 +109667,12 @@ in sources."@lmdb/lmdb-linux-arm64-2.5.3" sources."@lmdb/lmdb-linux-x64-2.5.3" sources."@lmdb/lmdb-win32-x64-2.5.3" - sources."@msgpackr-extract/msgpackr-extract-darwin-arm64-3.0.1" - sources."@msgpackr-extract/msgpackr-extract-darwin-x64-3.0.1" - sources."@msgpackr-extract/msgpackr-extract-linux-arm-3.0.1" - sources."@msgpackr-extract/msgpackr-extract-linux-arm64-3.0.1" - sources."@msgpackr-extract/msgpackr-extract-linux-x64-3.0.1" - sources."@msgpackr-extract/msgpackr-extract-win32-x64-3.0.1" + sources."@msgpackr-extract/msgpackr-extract-darwin-arm64-3.0.2" + sources."@msgpackr-extract/msgpackr-extract-darwin-x64-3.0.2" + sources."@msgpackr-extract/msgpackr-extract-linux-arm-3.0.2" + sources."@msgpackr-extract/msgpackr-extract-linux-arm64-3.0.2" + sources."@msgpackr-extract/msgpackr-extract-linux-x64-3.0.2" + sources."@msgpackr-extract/msgpackr-extract-win32-x64-3.0.2" sources."@sideway/address-4.1.4" sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" @@ -109831,7 +109685,7 @@ in sources."@types/common-tags-1.8.1" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/node-fetch-2.6.2" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -109858,7 +109712,7 @@ in ]; }) sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -109919,7 +109773,7 @@ in sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.326" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -110021,8 +109875,8 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."ms-2.1.2" - sources."msgpackr-1.8.4" - (sources."msgpackr-extract-3.0.1" // { + sources."msgpackr-1.8.5" + (sources."msgpackr-extract-3.0.2" // { dependencies = [ sources."node-gyp-build-optional-packages-5.0.7" ]; @@ -110232,7 +110086,7 @@ in sources."@types/vinyl-2.0.7" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.1" + sources."agentkeepalive-4.3.0" sources."aggregate-error-3.1.0" (sources."ansi-escapes-4.3.2" // { dependencies = [ @@ -110313,7 +110167,7 @@ in ]; }) sources."delegates-1.0.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."deprecation-2.3.1" sources."dezalgo-1.0.4" sources."diff-5.1.0" @@ -110443,7 +110297,7 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."mimic-fn-2.1.0" - sources."minimatch-7.3.0" + sources."minimatch-7.4.2" sources."minimist-1.2.8" sources."minipass-3.3.6" sources."minipass-collect-1.0.2" @@ -110498,7 +110352,7 @@ in sources."cacache-16.1.3" sources."glob-8.1.0" sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.17.0" + sources."lru-cache-7.18.3" (sources."make-fetch-happen-10.2.1" // { dependencies = [ sources."minipass-fetch-2.1.2" @@ -110596,7 +110450,7 @@ in sources."socks-2.7.1" sources."socks-proxy-agent-6.2.1" sources."sort-keys-4.2.0" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -110999,7 +110853,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/responselike-1.0.0" sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" @@ -111069,7 +110923,7 @@ in }) sources."p-cancelable-2.1.1" sources."pump-3.0.0" - sources."qs-6.11.0" + sources."qs-6.11.1" sources."query-string-7.1.3" sources."quick-lru-5.1.1" sources."readable-stream-3.6.1" @@ -111118,8 +110972,9 @@ in sources."escape-string-regexp-1.0.5" ]; }) + sources."@pnpm/config.env-replace-1.0.0" sources."@pnpm/network.ca-file-1.0.2" - sources."@pnpm/npm-conf-1.0.5" + sources."@pnpm/npm-conf-2.1.0" sources."@sindresorhus/is-5.3.0" sources."@szmarczak/http-timer-5.0.1" sources."@tootallnate/once-1.1.2" @@ -111151,7 +111006,7 @@ in sources."atomically-2.0.1" sources."base64-js-1.5.1" sources."bl-5.1.0" - sources."boxen-7.0.1" + sources."boxen-7.0.2" sources."buffer-6.0.3" sources."bytes-3.1.2" sources."cacheable-lookup-7.0.0" @@ -111244,7 +111099,7 @@ in ]; }) sources."global-dirs-3.0.1" - sources."got-12.5.3" + sources."got-12.6.0" sources."graceful-fs-4.2.10" sources."hard-rejection-2.1.0" sources."has-1.0.3" @@ -111252,7 +111107,7 @@ in sources."has-yarn-3.0.0" (sources."hosted-git-info-5.2.1" // { dependencies = [ - sources."lru-cache-7.17.0" + sources."lru-cache-7.18.3" ]; }) sources."http-cache-semantics-4.1.1" @@ -111372,7 +111227,7 @@ in sources."read-pkg-up-9.1.0" sources."readable-stream-3.6.1" sources."redent-4.0.0" - sources."registry-auth-token-5.0.1" + sources."registry-auth-token-5.0.2" sources."registry-url-6.0.1" sources."require-from-string-2.0.2" sources."resolve-alpn-1.2.1" @@ -111401,7 +111256,7 @@ in }) sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -111458,19 +111313,19 @@ in glob = nodeEnv.buildNodePackage { name = "glob"; packageName = "glob"; - version = "9.0.1"; + version = "9.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-9.0.1.tgz"; - sha512 = "psRdn8MI0gRcH0xow0VOhYxXD/6ZaRGmgtfN0oWN/hCgjxpRQBMCl7wE4JRJSAUTdJsW+FmD0EtE0CgJhKqSVw=="; + url = "https://registry.npmjs.org/glob/-/glob-9.2.1.tgz"; + sha512 = "Pxxgq3W0HyA3XUvSXcFhRSs+43Jsx0ddxcFrbjxNGkL2Ak5BAUBxLqI5G6ADDeCHLfzzXFhe0b1yYcctGmytMA=="; }; dependencies = [ sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" sources."fs.realpath-1.0.0" - sources."lru-cache-7.17.0" - sources."minimatch-7.3.0" + sources."lru-cache-7.18.3" + sources."minimatch-7.4.2" sources."minipass-4.2.4" - sources."path-scurry-1.5.0" + sources."path-scurry-1.6.1" ]; buildInputs = globalBuildInputs; meta = { @@ -111729,7 +111584,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@exodus/schemasafe-1.0.0-rc.9" + sources."@exodus/schemasafe-1.0.0-rc.11" sources."@graphql-cli/common-4.1.0" (sources."@graphql-cli/init-4.1.0" // { dependencies = [ @@ -111826,7 +111681,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-18.14.2" + sources."@types/node-18.14.6" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -112016,7 +111871,7 @@ in }) sources."internal-slot-1.0.5" sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.1" + sources."is-array-buffer-3.0.2" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" @@ -112298,10 +112153,10 @@ in graphql-language-service-cli = nodeEnv.buildNodePackage { name = "graphql-language-service-cli"; packageName = "graphql-language-service-cli"; - version = "3.3.15"; + version = "3.3.16"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-cli/-/graphql-language-service-cli-3.3.15.tgz"; - sha512 = "YIWyxOxvrvcXb+IzkmMEtH22Uor4SKGl6E27xaMS2IkVpZtaEgwXeN7kEPFVeSn6I3fCahdMVtfz70IL4tWGxw=="; + url = "https://registry.npmjs.org/graphql-language-service-cli/-/graphql-language-service-cli-3.3.16.tgz"; + sha512 = "0oZzCte2gpP53+8kuQcRXkPK8gAzvmXTd/kE+6imyJUIvwezZIge2S1L55W0nMeTowov4iMRoE41ncp9ioK83w=="; }; dependencies = [ sources."@ardatan/sync-fetch-0.0.1" @@ -112316,18 +112171,18 @@ in sources."@graphql-tools/batch-execute-8.5.18" sources."@graphql-tools/delegate-9.0.28" sources."@graphql-tools/executor-0.0.15" - sources."@graphql-tools/executor-graphql-ws-0.0.11" + sources."@graphql-tools/executor-graphql-ws-0.0.12" sources."@graphql-tools/executor-http-0.1.9" sources."@graphql-tools/executor-legacy-ws-0.0.9" sources."@graphql-tools/graphql-file-loader-7.5.16" sources."@graphql-tools/import-6.7.17" sources."@graphql-tools/json-file-loader-7.4.17" - sources."@graphql-tools/load-7.8.12" - sources."@graphql-tools/merge-8.3.18" - sources."@graphql-tools/schema-9.0.16" - sources."@graphql-tools/url-loader-7.17.13" + sources."@graphql-tools/load-7.8.13" + sources."@graphql-tools/merge-8.4.0" + sources."@graphql-tools/schema-9.0.17" + sources."@graphql-tools/url-loader-7.17.14" sources."@graphql-tools/utils-9.2.1" - sources."@graphql-tools/wrap-9.3.7" + sources."@graphql-tools/wrap-9.3.8" sources."@graphql-typed-document-node/core-3.1.2" sources."@iarna/toml-2.2.5" sources."@nodelib/fs.scandir-2.1.5" @@ -112337,7 +112192,7 @@ in sources."@peculiar/json-schema-1.1.12" sources."@peculiar/webcrypto-1.4.1" sources."@repeaterjs/repeater-3.0.4" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/parse-json-4.0.0" sources."@types/ws-8.5.4" sources."@vue/compiler-core-3.2.47" @@ -112347,8 +112202,8 @@ in sources."@vue/reactivity-transform-3.2.47" sources."@vue/shared-3.2.47" sources."@whatwg-node/events-0.0.2" - sources."@whatwg-node/fetch-0.8.1" - sources."@whatwg-node/node-fetch-0.3.0" + sources."@whatwg-node/fetch-0.8.2" + sources."@whatwg-node/node-fetch-0.3.1" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."arg-4.1.3" @@ -112400,9 +112255,9 @@ in sources."minimatch-4.2.1" ]; }) - sources."graphql-language-service-5.1.1" - sources."graphql-language-service-server-2.9.5" - sources."graphql-ws-5.11.3" + sources."graphql-language-service-5.1.2" + sources."graphql-language-service-server-2.9.6" + sources."graphql-ws-5.12.0" sources."has-flag-3.0.0" sources."iconv-lite-0.6.3" sources."ignore-5.2.4" @@ -112535,11 +112390,10 @@ in ]; }) sources."@cronvel/get-pixels-3.4.1" - sources."@cspotcode/source-map-support-0.8.1" sources."@graphql-tools/batch-execute-8.5.18" sources."@graphql-tools/delegate-9.0.28" sources."@graphql-tools/executor-0.0.15" - (sources."@graphql-tools/executor-graphql-ws-0.0.11" // { + (sources."@graphql-tools/executor-graphql-ws-0.0.12" // { dependencies = [ sources."isomorphic-ws-5.0.0" sources."ws-8.12.1" @@ -112555,22 +112409,19 @@ in sources."@graphql-tools/graphql-file-loader-7.5.16" sources."@graphql-tools/import-6.7.17" sources."@graphql-tools/json-file-loader-7.4.17" - sources."@graphql-tools/load-7.8.12" - sources."@graphql-tools/merge-8.3.18" - sources."@graphql-tools/schema-9.0.16" - (sources."@graphql-tools/url-loader-7.17.13" // { + sources."@graphql-tools/load-7.8.13" + sources."@graphql-tools/merge-8.4.0" + sources."@graphql-tools/schema-9.0.17" + (sources."@graphql-tools/url-loader-7.17.14" // { dependencies = [ sources."isomorphic-ws-5.0.0" sources."ws-8.12.1" ]; }) sources."@graphql-tools/utils-9.2.1" - sources."@graphql-tools/wrap-9.3.7" + sources."@graphql-tools/wrap-9.3.8" sources."@graphql-typed-document-node/core-3.1.2" sources."@iarna/toml-2.2.5" - sources."@jridgewell/resolve-uri-3.1.0" - sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.9" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -112607,36 +112458,17 @@ in sources."@peculiar/json-schema-1.1.12" sources."@peculiar/webcrypto-1.4.1" sources."@repeaterjs/repeater-3.0.4" - sources."@swc/core-1.3.36" - sources."@swc/core-darwin-arm64-1.3.36" - sources."@swc/core-darwin-x64-1.3.36" - sources."@swc/core-linux-arm-gnueabihf-1.3.36" - sources."@swc/core-linux-arm64-gnu-1.3.36" - sources."@swc/core-linux-arm64-musl-1.3.36" - sources."@swc/core-linux-x64-gnu-1.3.36" - sources."@swc/core-linux-x64-musl-1.3.36" - sources."@swc/core-win32-arm64-msvc-1.3.36" - sources."@swc/core-win32-ia32-msvc-1.3.36" - sources."@swc/core-win32-x64-msvc-1.3.36" - sources."@swc/wasm-1.3.37" - sources."@tsconfig/node10-1.0.9" - sources."@tsconfig/node12-1.0.11" - sources."@tsconfig/node14-1.0.3" - sources."@tsconfig/node16-1.0.3" sources."@types/json-schema-7.0.9" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/ws-8.5.4" sources."@whatwg-node/events-0.0.2" - sources."@whatwg-node/fetch-0.8.1" - sources."@whatwg-node/node-fetch-0.3.0" + sources."@whatwg-node/fetch-0.8.2" + sources."@whatwg-node/node-fetch-0.3.1" sources."accepts-1.3.8" - sources."acorn-8.8.2" - sources."acorn-walk-8.2.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ansicolors-0.3.2" - sources."arg-4.1.3" sources."argparse-2.0.1" sources."array-flatten-1.1.1" sources."array-union-2.1.0" @@ -112688,8 +112520,6 @@ in sources."cookie-signature-1.0.6" sources."cosmiconfig-8.0.0" sources."cosmiconfig-toml-loader-1.0.0" - sources."cosmiconfig-typescript-loader-4.3.0" - sources."create-require-1.1.1" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -112700,7 +112530,6 @@ in sources."debug-4.3.4" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."diff-4.0.2" sources."dir-glob-3.0.1" sources."dset-3.1.2" sources."ee-first-1.1.1" @@ -112744,7 +112573,7 @@ in sources."globby-11.1.0" sources."graceful-fs-4.2.10" sources."graphql-15.4.0" - sources."graphql-config-4.4.1" + sources."graphql-config-4.5.0" (sources."graphql-language-service-interface-2.10.2" // { dependencies = [ sources."graphql-16.6.0" @@ -112762,7 +112591,7 @@ in ]; }) sources."graphql-language-service-utils-2.5.1" - sources."graphql-ws-5.11.3" + sources."graphql-ws-5.12.0" sources."has-flag-4.0.0" sources."http-errors-1.6.3" sources."hyperlinker-1.0.0" @@ -112789,6 +112618,7 @@ in sources."isomorphic-fetch-3.0.0" sources."isomorphic-ws-4.0.1" sources."iterall-1.3.0" + sources."jiti-1.17.1" sources."jpeg-js-0.4.4" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" @@ -112801,7 +112631,6 @@ in sources."lodash.template-4.5.0" sources."lodash.templatesettings-4.2.0" sources."lru-cache-6.0.0" - sources."make-error-1.3.6" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."merge2-1.4.1" @@ -112811,7 +112640,7 @@ in sources."mime-1.4.1" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."minimatch-4.2.1" + sources."minimatch-4.2.3" sources."ms-2.1.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" @@ -112899,10 +112728,8 @@ in sources."tr46-0.0.3" sources."tree-kit-0.7.4" sources."treeify-1.1.0" - sources."ts-node-10.9.1" sources."tslib-2.5.0" sources."type-is-1.6.18" - sources."typescript-4.9.5" sources."uniq-1.0.1" sources."universalify-0.1.2" sources."unixify-1.0.0" @@ -112910,7 +112737,6 @@ in sources."urlpattern-polyfill-6.0.2" sources."utf-8-validate-6.0.3" sources."utils-merge-1.0.1" - sources."v8-compile-cache-lib-3.0.1" sources."value-or-promise-1.0.12" sources."vary-1.1.2" sources."vscode-languageserver-types-3.17.3" @@ -112928,7 +112754,6 @@ in ]; }) sources."yallist-4.0.0" - sources."yn-3.1.1" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -113241,7 +113066,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.17.11" + sources."systeminformation-5.17.12" sources."term-canvas-0.0.5" sources."type-fest-1.4.0" sources."wordwrap-0.0.3" @@ -113641,7 +113466,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.1" sources."sparkles-1.0.1" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -114040,7 +113865,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.1" sources."sparkles-1.0.1" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -114241,7 +114066,7 @@ in sources."object-inspect-1.12.3" sources."opener-1.5.2" sources."portfinder-1.0.32" - sources."qs-6.11.0" + sources."qs-6.11.1" sources."requires-port-1.0.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -114271,7 +114096,7 @@ in sha512 = "G+4iLhKHEEOHYbk/VEvkVO4oNn1rVlH8N3LdsbH+sYZQo8qJTVP5Zwtz1pMa4vWLzA3mjrFSGG3nBFYoIJHpMQ=="; }; dependencies = [ - sources."bcfg-0.1.7" + sources."bcfg-0.1.8" (sources."bcrypto-5.4.0" // { dependencies = [ sources."bufio-1.0.7" @@ -114308,7 +114133,7 @@ in sources."buffer-map-0.0.7" sources."bufio-1.2.0" sources."bupnp-0.2.6" - sources."bval-0.1.7" + sources."bval-0.1.8" sources."bweb-0.1.12" sources."goosig-0.10.0" sources."hs-client-0.0.13" @@ -114364,7 +114189,7 @@ in sha512 = "3Vm/4S0TDstbOW+OfdTeP2EQ4dolPNqMulTSr31RihwX8cX1DyT4il1Fc9STXXToXTsZuFro2WD/+1m0MWi5Ag=="; }; dependencies = [ - sources."bcfg-0.1.7" + sources."bcfg-0.1.8" sources."bcurl-0.2.0" sources."brq-0.1.8" sources."bsert-0.0.10" @@ -114452,7 +114277,7 @@ in sources."@colors/colors-1.5.0" sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.18.36" + sources."@types/node-14.18.37" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -114462,7 +114287,7 @@ in sources."async-2.6.4" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - sources."aws-sdk-2.1324.0" + sources."aws-sdk-2.1332.0" sources."aws-sign2-0.7.0" sources."aws4-1.12.0" sources."base64-js-1.5.1" @@ -115051,7 +114876,7 @@ in sources."strip-ansi-6.0.1" sources."strip-final-newline-2.0.0" sources."supports-color-5.5.0" - sources."systeminformation-5.17.11" + sources."systeminformation-5.17.12" sources."util-deprecate-1.0.2" sources."which-2.0.2" sources."wrappy-1.0.2" @@ -115128,7 +114953,7 @@ in sources."is-stream-1.1.0" sources."is-wsl-2.2.0" sources."isexe-2.0.0" - sources."jquery-3.6.3" + sources."jquery-3.6.4" sources."jquery.terminal-2.35.3" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -115173,8 +114998,8 @@ in sources."@azure/core-auth-1.4.0" sources."@azure/core-http-2.3.1" sources."@azure/core-tracing-1.0.0-preview.13" - sources."@azure/core-util-1.1.1" - sources."@azure/logger-1.0.3" + sources."@azure/core-util-1.2.0" + sources."@azure/logger-1.0.4" sources."@bmewburn/js-beautify-1.14.7" sources."@bmewburn/vscode-html-languageserver-1.9.0" (sources."@mapbox/node-pre-gyp-1.0.10" // { @@ -115202,7 +115027,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@selderee/plugin-htmlparser2-0.10.0" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" (sources."@types/node-fetch-2.6.2" // { dependencies = [ sources."form-data-3.0.1" @@ -115215,7 +115040,7 @@ in sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."applicationinsights-2.3.6" - sources."applicationinsights-native-metrics-0.0.8" + sources."applicationinsights-native-metrics-0.0.9" sources."aproba-2.0.0" sources."are-we-there-yet-2.0.0" sources."asn1-0.2.6" @@ -115681,7 +115506,7 @@ in sources."proxy-agent-4.0.1" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."qs-6.11.0" + sources."qs-6.11.1" sources."raw-body-2.5.2" sources."readable-stream-3.6.1" sources."restore-cursor-2.0.0" @@ -116032,9 +115857,9 @@ in sources."@aws-sdk/service-error-classification-3.229.0" sources."@aws-sdk/shared-ini-file-loader-3.226.0" sources."@aws-sdk/signature-v4-3.226.0" - (sources."@aws-sdk/signature-v4-crt-3.272.0" // { + (sources."@aws-sdk/signature-v4-crt-3.282.0" // { dependencies = [ - sources."@aws-sdk/signature-v4-3.272.0" + sources."@aws-sdk/signature-v4-3.282.0" sources."@aws-sdk/types-3.272.0" sources."@aws-sdk/util-middleware-3.272.0" ]; @@ -116111,7 +115936,7 @@ in }) sources."@tootallnate/once-2.0.0" sources."@types/nanoid-3.0.0" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/ws-8.5.4" sources."abab-2.0.6" sources."abbrev-1.1.1" @@ -116119,7 +115944,11 @@ in sources."acorn-globals-7.0.1" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.1" + (sources."agentkeepalive-4.3.0" // { + dependencies = [ + sources."depd-2.0.0" + ]; + }) sources."aggregate-error-3.1.0" sources."ajv-6.12.6" sources."ansi-0.3.1" @@ -117095,7 +116924,7 @@ in }; dependencies = [ sources."@babel/parser-7.21.2" - sources."@jsdoc/salty-0.2.3" + sources."@jsdoc/salty-0.2.5" sources."@types/linkify-it-3.0.2" sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" @@ -117272,7 +117101,7 @@ in sources."once-1.4.0" sources."path-loader-1.0.12" sources."punycode-2.3.0" - sources."qs-6.11.0" + sources."qs-6.11.1" sources."readable-stream-3.6.1" sources."safe-buffer-5.2.1" sources."semver-7.3.8" @@ -117442,7 +117271,7 @@ in }) sources."eslint-visitor-keys-3.3.0" sources."espree-9.4.1" - sources."esquery-1.4.2" + sources."esquery-1.5.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."esutils-2.0.3" @@ -117502,7 +117331,7 @@ in sources."inherits-2.0.4" sources."internal-slot-1.0.5" sources."ipaddr.js-1.9.1" - sources."is-array-buffer-3.0.1" + sources."is-array-buffer-3.0.2" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" @@ -118195,7 +118024,7 @@ in sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.1" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -118478,7 +118307,7 @@ in sources."picomatch-2.3.1" sources."pkg-up-3.1.0" sources."punycode-2.3.0" - sources."qs-6.11.0" + sources."qs-6.11.1" sources."queue-microtask-1.2.3" sources."redeyed-2.1.1" sources."restore-cursor-3.1.0" @@ -118563,7 +118392,7 @@ in sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.13" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -118641,7 +118470,7 @@ in sources."isbinaryfile-4.0.10" sources."jsonfile-4.0.0" sources."lodash-4.17.21" - (sources."log4js-6.8.0" // { + (sources."log4js-6.9.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -118704,7 +118533,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."type-is-1.6.18" - sources."ua-parser-js-0.7.33" + sources."ua-parser-js-0.7.34" sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."utf-8-validate-5.0.10" @@ -118843,7 +118672,7 @@ in sources."acorn-walk-7.2.0" sources."agent-base-6.0.2" sources."ansi-colors-4.1.3" - sources."ansi-regex-2.1.1" + sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."aproba-2.0.0" sources."are-we-there-yet-2.0.0" @@ -118881,7 +118710,7 @@ in sources."bufferutil-4.0.7" sources."bytes-3.1.2" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" sources."canvas-2.11.0" sources."chalk-2.4.2" sources."chardet-1.5.1" @@ -118889,7 +118718,6 @@ in sources."cipher-base-1.0.4" sources."cliui-7.0.4" sources."clone-deep-4.0.1" - sources."code-point-at-1.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-support-1.1.3" @@ -118942,7 +118770,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.326" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" @@ -119054,7 +118882,7 @@ in sources."ipaddr.js-1.9.1" sources."irc-colors-1.5.0" sources."irc-upd-0.11.0" - sources."is-array-buffer-3.0.1" + sources."is-array-buffer-3.0.2" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" @@ -119133,7 +118961,13 @@ in sources."nan-2.17.0" sources."napi-build-utils-1.0.2" sources."negotiator-0.6.3" - sources."node-abi-2.30.1" + (sources."node-abi-3.33.0" // { + dependencies = [ + sources."lru-cache-6.0.0" + sources."semver-7.3.8" + sources."yallist-4.0.0" + ]; + }) sources."node-environment-flags-1.0.6" sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" @@ -119147,7 +118981,6 @@ in sources."node-releases-2.0.10" sources."nopt-5.0.0" sources."npmlog-5.0.1" - sources."number-is-nan-1.0.1" sources."nwsapi-2.2.2" sources."object-assign-4.1.1" sources."object-inspect-1.12.3" @@ -119174,11 +119007,11 @@ in sources."picomatch-2.3.1" sources."pify-4.0.1" sources."pirates-4.0.5" - (sources."pkg-5.8.0" // { + (sources."pkg-5.8.1" // { dependencies = [ sources."@babel/generator-7.18.2" sources."@babel/parser-7.18.4" - sources."@babel/types-7.18.4" + sources."@babel/types-7.19.0" sources."@jridgewell/gen-mapping-0.3.2" sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -119202,19 +119035,11 @@ in sources."yallist-4.0.0" ]; }) - (sources."prebuild-install-6.1.4" // { + (sources."prebuild-install-7.1.1" // { dependencies = [ - sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.7" - sources."detect-libc-1.0.3" - sources."gauge-2.7.4" - sources."is-fullwidth-code-point-1.0.0" - sources."npmlog-4.1.2" - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string-width-1.0.2" - sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" + sources."decompress-response-6.0.0" + sources."mimic-response-3.1.0" + sources."simple-get-4.0.1" ]; }) sources."prelude-ls-1.1.2" @@ -119294,11 +119119,7 @@ in sources."string.prototype.trimend-1.0.6" sources."string.prototype.trimstart-1.0.6" sources."string_decoder-1.3.0" - (sources."strip-ansi-6.0.1" // { - dependencies = [ - sources."ansi-regex-5.0.1" - ]; - }) + sources."strip-ansi-6.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" @@ -119382,10 +119203,10 @@ in lcov-result-merger = nodeEnv.buildNodePackage { name = "lcov-result-merger"; packageName = "lcov-result-merger"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-4.0.0.tgz"; - sha512 = "xgyipRVKEASBjJ7urBdx4VW+ofcIoatmMBueHy2i/rt3P9MrOvv1CZ7+cVqOfWIB74RvGMGZE4MiXnWLbFwQEA=="; + url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-4.1.0.tgz"; + sha512 = "31FISg2iX5I8oRY9MpIRoBvH+VYZ4D1799yFBlrupduhYoPuQEWOf6FeSvaNwIbNB/lJo5MpDPysOKvUOcgbwA=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -119981,7 +119802,7 @@ in }) (sources."@npmcli/git-3.0.2" // { dependencies = [ - sources."lru-cache-7.17.0" + sources."lru-cache-7.18.3" (sources."semver-7.3.8" // { dependencies = [ sources."lru-cache-6.0.0" @@ -120006,18 +119827,18 @@ in sources."@npmcli/package-json-2.0.0" sources."@npmcli/promise-spawn-3.0.0" sources."@npmcli/run-script-4.1.7" - sources."@nrwl/cli-15.7.2" - sources."@nrwl/devkit-15.7.2" - sources."@nrwl/nx-darwin-arm64-15.7.2" - sources."@nrwl/nx-darwin-x64-15.7.2" - sources."@nrwl/nx-linux-arm-gnueabihf-15.7.2" - sources."@nrwl/nx-linux-arm64-gnu-15.7.2" - sources."@nrwl/nx-linux-arm64-musl-15.7.2" - sources."@nrwl/nx-linux-x64-gnu-15.7.2" - sources."@nrwl/nx-linux-x64-musl-15.7.2" - sources."@nrwl/nx-win32-arm64-msvc-15.7.2" - sources."@nrwl/nx-win32-x64-msvc-15.7.2" - sources."@nrwl/tao-15.7.2" + sources."@nrwl/cli-15.8.5" + sources."@nrwl/devkit-15.8.5" + sources."@nrwl/nx-darwin-arm64-15.8.5" + sources."@nrwl/nx-darwin-x64-15.8.5" + sources."@nrwl/nx-linux-arm-gnueabihf-15.8.5" + sources."@nrwl/nx-linux-arm64-gnu-15.8.5" + sources."@nrwl/nx-linux-arm64-musl-15.8.5" + sources."@nrwl/nx-linux-x64-gnu-15.8.5" + sources."@nrwl/nx-linux-x64-musl-15.8.5" + sources."@nrwl/nx-win32-arm64-msvc-15.8.5" + sources."@nrwl/nx-win32-x64-msvc-15.8.5" + sources."@nrwl/tao-15.8.5" sources."@octokit/auth-token-3.0.3" sources."@octokit/core-4.2.0" sources."@octokit/endpoint-7.0.5" @@ -120046,24 +119867,24 @@ in sources."@swc-node/core-1.10.1" sources."@swc-node/register-1.6.2" sources."@swc-node/sourcemap-support-0.3.0" - sources."@swc/core-1.3.36" - sources."@swc/core-darwin-arm64-1.3.36" - sources."@swc/core-darwin-x64-1.3.36" - sources."@swc/core-linux-arm-gnueabihf-1.3.36" - sources."@swc/core-linux-arm64-gnu-1.3.36" - sources."@swc/core-linux-arm64-musl-1.3.36" - sources."@swc/core-linux-x64-gnu-1.3.36" - sources."@swc/core-linux-x64-musl-1.3.36" - sources."@swc/core-win32-arm64-msvc-1.3.36" - sources."@swc/core-win32-ia32-msvc-1.3.36" - sources."@swc/core-win32-x64-msvc-1.3.36" + sources."@swc/core-1.3.38" + sources."@swc/core-darwin-arm64-1.3.38" + sources."@swc/core-darwin-x64-1.3.38" + sources."@swc/core-linux-arm-gnueabihf-1.3.38" + sources."@swc/core-linux-arm64-gnu-1.3.38" + sources."@swc/core-linux-arm64-musl-1.3.38" + sources."@swc/core-linux-x64-gnu-1.3.38" + sources."@swc/core-linux-x64-musl-1.3.38" + sources."@swc/core-win32-arm64-msvc-1.3.38" + sources."@swc/core-win32-ia32-msvc-1.3.38" + sources."@swc/core-win32-x64-msvc-1.3.38" sources."@tootallnate/once-2.0.0" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@yarnpkg/lockfile-1.1.0" - (sources."@yarnpkg/parsers-3.0.0-rc.39" // { + (sources."@yarnpkg/parsers-3.0.0-rc.40" // { dependencies = [ sources."argparse-1.0.10" sources."js-yaml-3.14.1" @@ -120074,7 +119895,7 @@ in sources."abbrev-1.1.1" sources."add-stream-1.0.0" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.1" + sources."agentkeepalive-4.3.0" sources."aggregate-error-3.1.0" sources."ansi-colors-4.1.3" (sources."ansi-escapes-4.3.2" // { @@ -120113,7 +119934,7 @@ in sources."byte-size-7.0.0" (sources."cacache-16.1.3" // { dependencies = [ - sources."lru-cache-7.17.0" + sources."lru-cache-7.18.3" ]; }) sources."callsites-3.1.0" @@ -120184,7 +120005,7 @@ in sources."define-lazy-prop-2.0.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."deprecation-2.3.1" sources."detect-indent-5.0.0" sources."dezalgo-1.0.4" @@ -120208,13 +120029,14 @@ in sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - sources."esquery-1.4.2" + sources."esquery-1.5.0" sources."estraverse-5.3.0" sources."eventemitter3-4.0.7" sources."execa-5.0.0" (sources."external-editor-3.1.0" // { dependencies = [ sources."iconv-lite-0.4.24" + sources."tmp-0.0.33" ]; }) sources."fast-glob-3.2.12" @@ -120277,7 +120099,7 @@ in sources."has-unicode-2.0.1" (sources."hosted-git-info-5.2.1" // { dependencies = [ - sources."lru-cache-7.17.0" + sources."lru-cache-7.18.3" ]; }) sources."http-cache-semantics-4.1.1" @@ -120384,7 +120206,7 @@ in }) (sources."make-fetch-happen-10.2.1" // { dependencies = [ - sources."lru-cache-7.17.0" + sources."lru-cache-7.18.3" ]; }) sources."map-obj-4.3.0" @@ -120482,14 +120304,13 @@ in }) sources."npm-run-path-4.0.1" sources."npmlog-6.0.2" - (sources."nx-15.7.2" // { + (sources."nx-15.8.5" // { dependencies = [ sources."cli-spinners-2.6.1" sources."fast-glob-3.2.7" sources."fs-extra-11.1.0" sources."glob-7.1.4" sources."lines-and-columns-2.0.3" - sources."tmp-0.2.1" (sources."yargs-17.7.1" // { dependencies = [ sources."cliui-8.0.1" @@ -120615,7 +120436,7 @@ in sources."sort-keys-2.0.0" sources."source-map-0.6.1" sources."source-map-support-0.5.21" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -120638,7 +120459,7 @@ in sources."text-extensions-1.9.0" sources."through-2.3.8" sources."through2-4.0.2" - sources."tmp-0.0.33" + sources."tmp-0.2.1" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."treeverse-2.0.0" @@ -121689,7 +121510,7 @@ in sources."@types/commander-2.12.2" sources."@types/diff-3.5.5" sources."@types/get-stdin-5.0.1" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -122381,7 +122202,7 @@ in }) sources."cache-base-1.0.1" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" sources."case-sensitive-paths-webpack-plugin-2.1.2" sources."chalk-2.4.2" sources."chart.js-2.9.4" @@ -122468,7 +122289,7 @@ in sources."domain-browser-1.2.0" sources."duplexify-3.7.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.326" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -122656,7 +122477,7 @@ in sources."internal-slot-1.0.5" sources."invariant-2.2.4" sources."is-accessor-descriptor-1.0.0" - sources."is-array-buffer-3.0.1" + sources."is-array-buffer-3.0.2" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" @@ -122719,7 +122540,7 @@ in sources."locate-path-3.0.0" sources."lodash-4.17.21" sources."log-update-2.3.0" - sources."log4js-6.8.0" + sources."log4js-6.9.1" sources."loose-envify-1.4.0" sources."lru-cache-5.1.1" sources."make-dir-1.3.0" @@ -123008,7 +122829,7 @@ in ]; }) sources."source-map-url-0.4.1" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -123301,7 +123122,7 @@ in sources."eslint-3.19.0" sources."espree-3.5.4" sources."esprima-4.0.1" - (sources."esquery-1.4.2" // { + (sources."esquery-1.5.0" // { dependencies = [ sources."estraverse-5.3.0" ]; @@ -123573,10 +123394,10 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "9.4.0"; + version = "10.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-9.4.0.tgz"; - sha512 = "/Nqs8Xtasw5wvop1PPiqmSx5SUxq/yARH+0EhEHAx8MVdbZXtUnzuK+Yv6NgpD2/Fb84/N3jF08zmIiJSyT5Lg=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-10.0.2.tgz"; + sha512 = "dz5ye9wWJjL3jtWtL6pYeKwo74CeCbn8SpvxKEH4Wuc0esDvSpxC+J/Wlsbd6BKvMzLN2J+5voy03kto0J7mOg=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -123586,15 +123407,13 @@ in sources."chalk-2.4.2" ]; }) - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/yauzl-2.10.0" sources."agent-base-6.0.2" sources."ansi-styles-3.2.1" sources."argparse-2.0.1" - sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bl-4.1.0" - sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."bufferutil-4.0.7" @@ -123605,8 +123424,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."commander-10.0.0" - sources."concat-map-0.0.1" - sources."cosmiconfig-8.0.0" + sources."cosmiconfig-8.1.0" sources."cross-fetch-3.1.5" sources."debug-4.3.4" sources."devtools-protocol-0.0.1094867" @@ -123617,22 +123435,18 @@ in sources."extract-zip-2.0.1" sources."fd-slicer-1.1.0" sources."fs-constants-1.0.0" - sources."fs.realpath-1.0.0" sources."get-stream-5.2.0" - sources."glob-7.2.3" sources."has-flag-3.0.0" sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" sources."import-fresh-3.3.0" - sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-arrayish-0.2.1" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."json-parse-even-better-errors-2.3.1" sources."lines-and-columns-1.2.4" - sources."minimatch-3.1.2" sources."mitt-3.0.0" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" @@ -123641,17 +123455,15 @@ in sources."once-1.4.0" sources."parent-module-1.0.1" sources."parse-json-5.2.0" - sources."path-is-absolute-1.0.1" sources."path-type-4.0.0" sources."pend-1.2.0" sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-19.7.2" - sources."puppeteer-core-19.7.2" + sources."puppeteer-19.7.3" + sources."puppeteer-core-19.7.3" sources."readable-stream-3.6.1" sources."resolve-from-4.0.0" - sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."string_decoder-1.3.0" @@ -123662,12 +123474,12 @@ in sources."tr46-0.0.3" sources."typescript-4.9.5" sources."unbzip2-stream-1.4.3" - sources."utf-8-validate-5.0.10" + sources."utf-8-validate-6.0.3" sources."util-deprecate-1.0.2" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."wrappy-1.0.2" - sources."ws-8.11.0" + sources."ws-8.12.1" sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; @@ -123838,7 +123650,7 @@ in sources."once-1.4.0" sources."path-loader-1.0.12" sources."punycode-2.3.0" - sources."qs-6.11.0" + sources."qs-6.11.1" sources."readable-stream-3.6.1" sources."safe-buffer-5.2.1" sources."semver-7.3.8" @@ -124007,7 +123819,7 @@ in sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/stack-utils-2.0.1" sources."@types/yargs-16.0.5" sources."@types/yargs-parser-21.0.0" @@ -124394,7 +124206,7 @@ in sources."@tootallnate/once-2.0.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.1" + sources."agentkeepalive-4.3.0" sources."aggregate-error-3.1.0" sources."ansi-regex-5.0.1" sources."aproba-2.0.0" @@ -124415,7 +124227,7 @@ in sources."console-control-strings-1.1.0" sources."debug-4.3.4" sources."delegates-1.0.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."env-paths-2.2.1" @@ -124440,7 +124252,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-lambda-1.0.1" sources."isexe-2.0.0" - sources."lru-cache-7.17.0" + sources."lru-cache-7.18.3" sources."make-fetch-happen-10.2.1" sources."minimatch-3.1.2" sources."minipass-3.3.6" @@ -124747,7 +124559,7 @@ in sources."side-channel-1.0.4" sources."signal-exit-3.0.7" sources."sntp-1.0.9" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -124951,7 +124763,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" @@ -125473,7 +125285,7 @@ in sources."signal-exit-3.0.7" sources."slasp-0.0.4" sources."slide-1.1.6" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -125531,10 +125343,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "2.0.20"; + version = "2.0.21"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz"; - sha512 = "Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.21.tgz"; + sha512 = "djN/n2549DUtY33S7o1djRCd7dEm0kBnj9c7S9XVXqRUbuggN1MZH/Nqa+5RFQr63Fbefq37nFXAE9VU86yL1A=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -125619,7 +125431,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" sources."@types/minimist-1.2.2" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -126047,7 +125859,7 @@ in sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."slice-ansi-0.0.4" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -126113,10 +125925,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "9.5.1"; + version = "9.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-9.5.1.tgz"; - sha512 = "MzULm9eEWPuPyHmRBxjcKm47KKYYT1gteVOXPlNJbfdaXNtp+sO4y2X3v5g375KudEAGJVDVCoFuk7bFnuuvNg=="; + url = "https://registry.npmjs.org/npm/-/npm-9.6.1.tgz"; + sha512 = "0H8CVfQmclQydUfM+WNhx4WY4sGNFC2+JsFMyaludklz8vL+tWqIB1oAXh+12yb8uta9y5p8fbc2f1d18aU6cQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -126131,10 +125943,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "16.7.10"; + version = "16.7.12"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.7.10.tgz"; - sha512 = "sLDgYD8ebkH9Jd6mPIq7UDGLr3DAxkHl6ZuJrEF4rauLv6DqHBxtnF16MHUPN+/eBt5QbH4GL/+nxfSAFm3TfQ=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.7.12.tgz"; + sha512 = "ejYl/BiWhkUxDs1ISQd/6blgTIfHabSdsfR5JWoA7PK+cGn8hCqVKO5p+nNI2PqX+0F21ExGqkt8b7cg2yxuYg=="; }; dependencies = [ sources."@gar/promisify-1.1.3" @@ -126152,15 +125964,21 @@ in sources."@npmcli/node-gyp-3.0.0" sources."@npmcli/promise-spawn-6.0.2" sources."@npmcli/run-script-6.0.0" + sources."@pnpm/config.env-replace-1.0.0" sources."@pnpm/network.ca-file-1.0.2" - sources."@pnpm/npm-conf-1.0.5" + sources."@pnpm/npm-conf-2.1.0" sources."@sindresorhus/is-5.3.0" sources."@szmarczak/http-timer-5.0.1" sources."@tootallnate/once-2.0.0" + (sources."@tufjs/models-1.0.0" // { + dependencies = [ + sources."minimatch-6.2.0" + ]; + }) sources."@types/http-cache-semantics-4.0.1" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.1" + sources."agentkeepalive-4.3.0" sources."aggregate-error-3.1.0" sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" @@ -126170,7 +125988,7 @@ in sources."argparse-2.0.1" sources."array-union-2.1.0" sources."balanced-match-1.0.2" - (sources."boxen-7.0.1" // { + (sources."boxen-7.0.2" // { dependencies = [ sources."ansi-regex-6.0.1" sources."emoji-regex-9.2.2" @@ -126230,7 +126048,7 @@ in sources."deep-extend-0.6.0" sources."defer-to-connect-2.0.1" sources."delegates-1.0.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."dir-glob-3.0.1" sources."dot-prop-6.0.1" sources."eastasianwidth-0.2.0" @@ -126265,7 +126083,7 @@ in ]; }) sources."globby-11.1.0" - sources."got-12.5.3" + sources."got-12.6.0" sources."graceful-fs-4.2.10" sources."has-1.0.3" sources."has-unicode-2.0.1" @@ -126319,7 +126137,7 @@ in sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."lowercase-keys-3.0.0" - sources."lru-cache-7.17.0" + sources."lru-cache-7.18.3" (sources."make-fetch-happen-10.2.1" // { dependencies = [ sources."brace-expansion-1.1.11" @@ -126340,7 +126158,7 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."mimic-response-4.0.0" - sources."minimatch-7.3.0" + sources."minimatch-7.4.2" sources."minimist-1.2.8" sources."minipass-4.2.4" (sources."minipass-collect-1.0.2" // { @@ -126422,6 +126240,7 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" + sources."path-scurry-1.6.1" sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."proc-log-3.0.0" @@ -126448,7 +126267,7 @@ in }) sources."read-package-json-fast-3.0.2" sources."readable-stream-3.6.1" - sources."registry-auth-token-5.0.1" + sources."registry-auth-token-5.0.2" sources."registry-url-6.0.1" sources."remote-git-tags-3.0.0" sources."require-from-string-2.0.2" @@ -126456,7 +126275,11 @@ in sources."responselike-3.0.0" sources."retry-0.12.0" sources."reusify-1.0.4" - sources."rimraf-4.1.2" + (sources."rimraf-4.4.0" // { + dependencies = [ + sources."glob-9.2.1" + ]; + }) sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -126485,7 +126308,7 @@ in sources."source-map-0.6.1" sources."source-map-support-0.5.21" sources."spawn-please-2.0.1" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -126504,10 +126327,9 @@ in ]; }) sources."to-regex-range-5.0.1" - (sources."tuf-js-1.0.0" // { + (sources."tuf-js-1.1.1" // { dependencies = [ sources."make-fetch-happen-11.0.3" - sources."minimatch-6.2.0" sources."minipass-fetch-3.0.1" ]; }) @@ -126696,33 +126518,34 @@ in orval = nodeEnv.buildNodePackage { name = "orval"; packageName = "orval"; - version = "6.12.0"; + version = "6.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/orval/-/orval-6.12.0.tgz"; - sha512 = "H5iErtFRhXdl09LuWJwCNJz4iaqA4azplZXuJUC1SiSjO3jiIXypxTuuMvZ0126VzhlObUv+gVPiKk1zYwVKAw=="; + url = "https://registry.npmjs.org/orval/-/orval-6.12.1.tgz"; + sha512 = "suMe4eQpSJWEecPoimT0tDroDUGrfHu+yTNEW8GHIKx5HEDDxB2aJFJ47/9EimdD50ABebQ2y3yz8hRIFih5ug=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-9.0.6" sources."@apidevtools/openapi-schemas-2.1.0" sources."@apidevtools/swagger-methods-3.0.2" sources."@apidevtools/swagger-parser-10.1.0" - sources."@asyncapi/specs-4.1.1" + sources."@asyncapi/specs-4.1.2" sources."@esbuild/android-arm-0.15.18" sources."@esbuild/linux-loong64-0.15.18" - sources."@exodus/schemasafe-1.0.0-rc.9" - sources."@ibm-cloud/openapi-ruleset-0.37.3" + sources."@exodus/schemasafe-1.0.0-rc.11" + sources."@ibm-cloud/openapi-ruleset-0.45.5" + sources."@ibm-cloud/openapi-ruleset-utilities-0.0.1" sources."@jsdevtools/ono-7.1.3" sources."@jsep-plugin/regex-1.0.3" sources."@jsep-plugin/ternary-1.1.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@orval/angular-6.12.0" - sources."@orval/axios-6.12.0" - sources."@orval/core-6.12.0" - sources."@orval/msw-6.12.0" - sources."@orval/query-6.12.0" - sources."@orval/swr-6.12.0" + sources."@orval/angular-6.12.1" + sources."@orval/axios-6.12.1" + sources."@orval/core-6.12.1" + sources."@orval/msw-6.12.1" + sources."@orval/query-6.12.1" + sources."@orval/swr-6.12.1" sources."@rollup/plugin-commonjs-22.0.2" (sources."@rollup/pluginutils-3.1.0" // { dependencies = [ @@ -126768,7 +126591,7 @@ in sources."@types/es-aggregate-error-1.0.2" sources."@types/estree-0.0.39" sources."@types/json-schema-7.0.11" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."@types/urijs-1.19.19" sources."abort-controller-3.0.0" sources."acorn-8.8.2" @@ -126926,7 +126749,7 @@ in sources."http2-client-1.3.5" sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" - (sources."ibm-openapi-validator-0.88.3" // { + (sources."ibm-openapi-validator-0.97.5" // { dependencies = [ sources."find-up-3.0.0" ]; @@ -126938,7 +126761,7 @@ in sources."inherits-2.0.4" sources."internal-slot-1.0.5" sources."ip-1.1.8" - sources."is-array-buffer-3.0.1" + sources."is-array-buffer-3.0.2" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" @@ -127415,7 +127238,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -127548,7 +127371,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.313" + sources."electron-to-chromium-1.4.326" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -127666,7 +127489,7 @@ in sources."acorn-8.8.2" sources."posthtml-0.15.2" sources."posthtml-parser-0.7.2" - sources."terser-5.16.5" + sources."terser-5.16.6" ]; }) (sources."htmlparser2-6.1.0" // { @@ -127693,7 +127516,7 @@ in sources."kind-of-6.0.3" ]; }) - sources."is-array-buffer-3.0.1" + sources."is-array-buffer-3.0.2" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.4" sources."is-binary-path-1.0.1" @@ -128232,12 +128055,12 @@ in sources."@lmdb/lmdb-linux-x64-2.5.2" sources."@lmdb/lmdb-win32-x64-2.5.2" sources."@mischnic/json-sourcemap-0.1.0" - sources."@msgpackr-extract/msgpackr-extract-darwin-arm64-3.0.1" - sources."@msgpackr-extract/msgpackr-extract-darwin-x64-3.0.1" - sources."@msgpackr-extract/msgpackr-extract-linux-arm-3.0.1" - sources."@msgpackr-extract/msgpackr-extract-linux-arm64-3.0.1" - sources."@msgpackr-extract/msgpackr-extract-linux-x64-3.0.1" - sources."@msgpackr-extract/msgpackr-extract-win32-x64-3.0.1" + sources."@msgpackr-extract/msgpackr-extract-darwin-arm64-3.0.2" + sources."@msgpackr-extract/msgpackr-extract-darwin-x64-3.0.2" + sources."@msgpackr-extract/msgpackr-extract-linux-arm-3.0.2" + sources."@msgpackr-extract/msgpackr-extract-linux-arm64-3.0.2" + sources."@msgpackr-extract/msgpackr-extract-linux-x64-3.0.2" + sources."@msgpackr-extract/msgpackr-extract-win32-x64-3.0.2" sources."@parcel/bundler-default-2.8.3" sources."@parcel/cache-2.8.3" sources."@parcel/codeframe-2.8.3" @@ -128337,7 +128160,7 @@ in sources."buffer-from-1.1.2" sources."callsites-3.1.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -128386,7 +128209,7 @@ in sources."dotenv-7.0.0" sources."dotenv-expand-5.1.0" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.326" sources."entities-3.0.1" sources."error-ex-1.3.2" sources."escalade-3.1.1" @@ -128453,7 +128276,7 @@ in sources."lightningcss-linux-x64-gnu-1.19.0" sources."lightningcss-linux-x64-musl-1.19.0" sources."lightningcss-win32-x64-msvc-1.19.0" - sources."lilconfig-2.0.6" + sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."lmdb-2.5.2" sources."lodash-4.17.21" @@ -128465,8 +128288,8 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-5.1.6" - sources."msgpackr-1.8.4" - (sources."msgpackr-extract-3.0.1" // { + sources."msgpackr-1.8.5" + (sources."msgpackr-extract-3.0.2" // { dependencies = [ sources."node-gyp-build-optional-packages-5.0.7" ]; @@ -128559,7 +128382,7 @@ in sources."svgo-2.8.0" sources."symbol-tree-3.2.4" sources."term-size-2.2.1" - (sources."terser-5.16.5" // { + (sources."terser-5.16.6" // { dependencies = [ sources."commander-2.20.3" ]; @@ -129238,7 +129061,7 @@ in ]; }) sources."single-line-log-1.1.2" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -129699,16 +129522,17 @@ in pkg = nodeEnv.buildNodePackage { name = "pkg"; packageName = "pkg"; - version = "5.8.0"; + version = "5.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/pkg/-/pkg-5.8.0.tgz"; - sha512 = "8h9PUDYFi+LOMLbIyGRdP21g08mAtHidSpofSrf8LWhxUWGHymaRzcopEGiynB5EhQmZUKM6PQ9kCImV2TpdjQ=="; + url = "https://registry.npmjs.org/pkg/-/pkg-5.8.1.tgz"; + sha512 = "CjBWtFStCfIiT4Bde9QpJy0KeH19jCfwZRJqHFDFXfhUklCx8JoFmMj3wgnEYIwGmZVNkhsStPHEOnrtrQhEXA=="; }; dependencies = [ sources."@babel/generator-7.18.2" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/parser-7.18.4" - sources."@babel/types-7.18.4" + sources."@babel/types-7.19.0" sources."@jridgewell/gen-mapping-0.3.2" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -129720,8 +129544,6 @@ in sources."agent-base-6.0.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.7" sources."array-union-2.1.0" sources."at-least-node-1.0.0" sources."base64-js-1.5.1" @@ -129735,16 +129557,13 @@ in sources."chalk-4.1.2" sources."chownr-1.1.4" sources."cliui-7.0.4" - sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."console-control-strings-1.1.0" sources."core-util-is-1.0.3" sources."debug-4.3.4" - sources."decompress-response-4.2.1" + sources."decompress-response-6.0.0" sources."deep-extend-0.6.0" - sources."delegates-1.0.0" - sources."detect-libc-1.0.3" + sources."detect-libc-2.0.1" sources."dir-glob-3.0.1" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" @@ -129758,14 +129577,6 @@ in sources."fs-constants-1.0.0" sources."fs-extra-9.1.0" sources."function-bind-1.1.1" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."ansi-regex-2.1.1" - 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" sources."github-from-package-0.0.0" sources."glob-parent-5.1.2" @@ -129774,7 +129585,6 @@ in sources."growly-1.3.0" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-unicode-2.0.1" sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" @@ -129796,7 +129606,7 @@ in sources."lru-cache-6.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" - sources."mimic-response-2.1.0" + sources."mimic-response-3.1.0" sources."minimist-1.2.8" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" @@ -129806,23 +129616,16 @@ in ]; }) sources."napi-build-utils-1.0.2" - (sources."node-abi-2.30.1" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."node-abi-3.33.0" sources."node-fetch-2.6.9" sources."node-notifier-10.0.1" - sources."npmlog-4.1.2" - sources."number-is-nan-1.0.1" - sources."object-assign-4.1.1" sources."once-1.4.0" sources."p-is-promise-3.0.0" sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."pkg-fetch-3.4.2" - sources."prebuild-install-6.1.4" + sources."prebuild-install-7.1.1" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."pump-3.0.0" @@ -129836,11 +129639,9 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-7.3.8" - sources."set-blocking-2.0.0" sources."shellwords-0.1.1" - sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" - sources."simple-get-3.1.1" + sources."simple-get-4.0.1" sources."slash-3.0.0" sources."stream-meter-1.0.4" sources."string-width-4.2.3" @@ -129865,7 +129666,6 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-2.0.2" - sources."wide-align-1.1.5" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."y18n-5.0.8" @@ -130095,7 +129895,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.17.11" + sources."systeminformation-5.17.12" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tslib-2.5.0" @@ -130132,10 +129932,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "7.28.0"; + version = "7.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-7.28.0.tgz"; - sha512 = "nbuY07S2519jEjaV9KLjSFmOwh0b6KIViIdc/RCJkgco8SZa2+ikQQe4N3CfNn5By5BH0dKVbZ8Ox1Mw8wItSA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-7.29.1.tgz"; + sha512 = "dn+65B2XpMIin7sQZvBIJ2Zyx8Z7LK95qyAvgEPE8qXkWYL/LuwpfMfK9Muc7+zNnpPwiQgtGEsxgOtuabFibQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -130214,23 +130014,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.36" - sources."@swc/core-darwin-arm64-1.3.36" - sources."@swc/core-darwin-x64-1.3.36" - sources."@swc/core-linux-arm-gnueabihf-1.3.36" - sources."@swc/core-linux-arm64-gnu-1.3.36" - sources."@swc/core-linux-arm64-musl-1.3.36" - sources."@swc/core-linux-x64-gnu-1.3.36" - sources."@swc/core-linux-x64-musl-1.3.36" - sources."@swc/core-win32-arm64-msvc-1.3.36" - sources."@swc/core-win32-ia32-msvc-1.3.36" - sources."@swc/core-win32-x64-msvc-1.3.36" - sources."@swc/wasm-1.3.37" + sources."@swc/core-1.3.38" + sources."@swc/core-darwin-arm64-1.3.38" + sources."@swc/core-darwin-x64-1.3.38" + sources."@swc/core-linux-arm-gnueabihf-1.3.38" + sources."@swc/core-linux-arm64-gnu-1.3.38" + sources."@swc/core-linux-arm64-musl-1.3.38" + sources."@swc/core-linux-x64-gnu-1.3.38" + sources."@swc/core-linux-x64-musl-1.3.38" + sources."@swc/core-win32-arm64-msvc-1.3.38" + sources."@swc/core-win32-ia32-msvc-1.3.38" + sources."@swc/core-win32-x64-msvc-1.3.38" + sources."@swc/wasm-1.3.38" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ansi-regex-5.0.1" @@ -130270,7 +130070,7 @@ in sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."jsonfile-6.1.0" - sources."lilconfig-2.0.6" + sources."lilconfig-2.1.0" sources."make-error-1.3.6" sources."merge2-1.4.1" sources."micromatch-4.0.5" @@ -130451,13 +130251,13 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "4.10.1"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-4.10.1.tgz"; - sha512 = "0jDxgg+DruB1kHVNlcspXQB9au62IFfVg9drkhzXudszHNUAQn0lVuu+T8np0uC2z1nKD5S3qPeCyR8u5YFLnA=="; + url = "https://registry.npmjs.org/prisma/-/prisma-4.11.0.tgz"; + sha512 = "4zZmBXssPUEiX+GeL0MUq/Yyie4ltiKmGu7jCJFnYMamNrrulTBc+D+QwAQSJ01tyzeGHlD13kOnqPwRipnlNw=="; }; dependencies = [ - sources."@prisma/engines-4.10.1" + sources."@prisma/engines-4.11.0" ]; buildInputs = globalBuildInputs; meta = { @@ -130472,10 +130272,10 @@ in "@prisma/language-server" = nodeEnv.buildNodePackage { name = "_at_prisma_slash_language-server"; packageName = "@prisma/language-server"; - version = "4.10.1"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-4.10.1.tgz"; - sha512 = "8cMYi37R/wjRfgBB+R24NbHpsdHgF1JhYTDHgxl041fFllW6d0JQCyCdc0nHXgh0QqZs30qYpKQWHzY1dc9e4Q=="; + url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-4.11.0.tgz"; + sha512 = "c/q9ehPjft0QYTXh+b3FFlo2yChR2cd/OsbrK/MvMe7hneEd9pqoIutao9o0OLbhTJay/oXZiCeHBdX2B3fK6Q=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" @@ -130511,7 +130311,7 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" - sources."@prisma/prisma-fmt-wasm-4.10.1-2.aead147aa326ccb985dcfed5b065b4fdabd44b19" + sources."@prisma/prisma-fmt-wasm-4.11.0-57.8fde8fef4033376662cad983758335009d522acb" sources."@types/js-levenshtein-1.1.1" sources."aggregate-error-3.1.0" sources."ansi-regex-5.0.1" @@ -130524,7 +130324,7 @@ in sources."browserslist-4.21.5" sources."caching-transform-4.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" sources."chalk-2.4.2" sources."clean-stack-2.2.0" sources."cliui-6.0.0" @@ -130537,7 +130337,7 @@ in sources."debug-4.3.4" sources."decamelize-1.2.0" sources."default-require-extensions-3.0.1" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.326" sources."emoji-regex-8.0.0" sources."es6-error-4.1.1" sources."escalade-3.1.1" @@ -131029,10 +130829,10 @@ in purs-tidy = nodeEnv.buildNodePackage { name = "purs-tidy"; packageName = "purs-tidy"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/purs-tidy/-/purs-tidy-0.9.2.tgz"; - sha512 = "v7Do4E9Tx2OqEhJXKl5tJxjRcmDilMObm0+XgYphpbMelkUQ+CfhtetIk294byhaL18OpEHqmO6BUkyNCBJDpQ=="; + url = "https://registry.npmjs.org/purs-tidy/-/purs-tidy-0.9.3.tgz"; + sha512 = "SrJLOXmlwmMuO1FbjxlyJfcl5sZY7tiS3ky7mvgrb/jYKsyNZwe+XABQlo+uOXQ9OhfytDyB68zabr78hKQ/IA=="; }; buildInputs = globalBuildInputs; meta = { @@ -131137,7 +130937,7 @@ in sources."prepend-http-2.0.0" sources."prompts-2.4.2" sources."pump-3.0.0" - sources."qs-6.11.0" + sources."qs-6.11.1" sources."rc-1.2.8" sources."readline-sync-1.4.10" sources."register-protocol-win32-1.1.0" @@ -131170,10 +130970,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.295"; + version = "1.1.298"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.295.tgz"; - sha512 = "nBowWG3qI2+ETtbsPBOnN7S5aNFE2PXn3OfQMM2jNfSh6A9P7z6YOmV9tYt8HYQ8WHX8qcU9b4ALe7nFp0GnBg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.298.tgz"; + sha512 = "lDTIS0a7SJ6TCcACjPl1eXatYbctTgGd/Ji3aZ9oCJTVjZCIpwf4Huj6sSlhC3KmsHFCcLt4t1uFi0z/jm7qYg=="; }; buildInputs = globalBuildInputs; meta = { @@ -131188,10 +130988,10 @@ in quicktype = nodeEnv.buildNodePackage { name = "quicktype"; packageName = "quicktype"; - version = "23.0.9"; + version = "23.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype/-/quicktype-23.0.9.tgz"; - sha512 = "seufowo6TLgUcbguGyqUs9K6ey6PR1OMVAlZH8VHndoKMNE9zK2T9n/suY9dN16zXTNxNpxlonkR30cX8aeCTg=="; + url = "https://registry.npmjs.org/quicktype/-/quicktype-23.0.12.tgz"; + sha512 = "g8NIN7MyJG9/Lh+2NdQ8vv8tHUNXKNZT0zjFyAVuch7NweuCRA67NLoePSkSbolRq0YmnWbEA/a54VW15dtO+A=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" @@ -131204,24 +131004,24 @@ in sources."typescript-4.9.4" ]; }) - sources."@swc/core-1.3.36" - sources."@swc/core-darwin-arm64-1.3.36" - sources."@swc/core-darwin-x64-1.3.36" - sources."@swc/core-linux-arm-gnueabihf-1.3.36" - sources."@swc/core-linux-arm64-gnu-1.3.36" - sources."@swc/core-linux-arm64-musl-1.3.36" - sources."@swc/core-linux-x64-gnu-1.3.36" - sources."@swc/core-linux-x64-musl-1.3.36" - sources."@swc/core-win32-arm64-msvc-1.3.36" - sources."@swc/core-win32-ia32-msvc-1.3.36" - sources."@swc/core-win32-x64-msvc-1.3.36" - sources."@swc/wasm-1.3.37" + sources."@swc/core-1.3.38" + sources."@swc/core-darwin-arm64-1.3.38" + sources."@swc/core-darwin-x64-1.3.38" + sources."@swc/core-linux-arm-gnueabihf-1.3.38" + sources."@swc/core-linux-arm64-gnu-1.3.38" + sources."@swc/core-linux-arm64-musl-1.3.38" + sources."@swc/core-linux-x64-gnu-1.3.38" + sources."@swc/core-linux-x64-musl-1.3.38" + sources."@swc/core-win32-arm64-msvc-1.3.38" + sources."@swc/core-win32-ia32-msvc-1.3.38" + sources."@swc/core-win32-x64-msvc-1.3.38" + sources."@swc/wasm-1.3.38" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" sources."@types/json-schema-7.0.11" - sources."@types/node-16.18.13" + sources."@types/node-16.18.14" sources."@types/urijs-1.19.19" sources."abort-controller-3.0.0" sources."acorn-8.8.2" @@ -131290,9 +131090,9 @@ in sources."path-is-absolute-1.0.1" sources."pluralize-8.0.0" sources."process-0.11.10" - sources."quicktype-core-23.0.9" - sources."quicktype-graphql-input-23.0.9" - sources."quicktype-typescript-input-23.0.9" + sources."quicktype-core-23.0.12" + sources."quicktype-graphql-input-23.0.12" + sources."quicktype-typescript-input-23.0.12" sources."readable-stream-4.3.0" sources."reduce-flatten-2.0.0" sources."require-directory-2.1.1" @@ -131399,7 +131199,7 @@ in sources."inherits-2.0.4" sources."internal-slot-1.0.5" sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.1" + sources."is-array-buffer-3.0.2" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" @@ -131618,7 +131418,7 @@ in sources."@types/glob-7.2.0" sources."@types/json-schema-7.0.11" sources."@types/minimatch-5.1.2" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."@types/parse-json-4.0.0" sources."@types/prop-types-15.7.5" sources."@types/q-1.5.5" @@ -131809,7 +131609,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -132030,7 +131830,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.326" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -132330,7 +132130,7 @@ in sources."is-absolute-url-2.1.0" sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.1" + sources."is-array-buffer-3.0.2" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" @@ -133381,7 +133181,7 @@ in sources."delegates-1.0.0" sources."detect-libc-2.0.1" sources."domexception-4.0.0" - sources."dompurify-2.4.4" + sources."dompurify-2.4.5" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."escalade-3.1.1" @@ -133506,10 +133306,10 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.13.20"; + version = "0.13.21"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.13.20.tgz"; - sha512 = "mmaJFyaAS+kzh2GwX7pi1x4K/zbQynJFv9S4mp3Ra5Rw611XxKjWmuVF3ccPV+TAGEe0rU3fYkMuOQg1pA8RWw=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.13.21.tgz"; + sha512 = "pjuPf0HkKqo9qtoHxMK4x5dhC/lJ08O0hO0rJISbSRCf19bPBjQ5lb2mHRu9j6vypTMltyaLtFIfVNveuyF5fQ=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -133522,7 +133322,16 @@ in sources."@babel/helper-split-export-declaration-7.18.6" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" - sources."@babel/highlight-7.18.6" + (sources."@babel/highlight-7.18.6" // { + 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."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) sources."@babel/parser-7.21.2" sources."@babel/runtime-7.21.0" sources."@babel/template-7.20.7" @@ -133532,7 +133341,7 @@ in sources."@emotion/memoize-0.8.0" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" - sources."@exodus/schemasafe-1.0.0-rc.9" + sources."@exodus/schemasafe-1.0.0-rc.11" sources."@jridgewell/gen-mapping-0.3.2" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -133541,13 +133350,11 @@ in sources."@jridgewell/trace-mapping-0.3.17" sources."@redocly/ajv-8.11.0" sources."@redocly/openapi-core-1.0.0-beta.123" - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" sources."@types/eslint-8.21.1" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-14.18.36" + sources."@types/node-14.18.37" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -133575,7 +133382,7 @@ in sources."ajv-keywords-3.5.2" sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.3.0" sources."anymatch-3.1.3" sources."argparse-2.0.1" (sources."asn1.js-5.4.1" // { @@ -133594,15 +133401,7 @@ in sources."base64-js-1.5.1" sources."binary-extensions-2.2.0" sources."bn.js-5.2.1" - (sources."boxen-5.1.2" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."supports-color-7.2.0" - ]; - }) + sources."boxen-5.1.2" sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."brorand-1.1.0" @@ -133618,44 +133417,26 @@ in }) sources."browserify-zlib-0.2.0" sources."browserslist-4.21.5" - (sources."buffer-4.9.2" // { - dependencies = [ - sources."isarray-1.0.0" - ]; - }) + sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - ]; - }) sources."call-me-maybe-1.0.2" sources."camelcase-6.3.0" sources."camelize-1.0.1" - sources."caniuse-lite-1.0.30001458" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) + sources."caniuse-lite-1.0.30001464" + sources."chalk-4.1.2" sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" - sources."ci-info-2.0.0" sources."cipher-base-1.0.4" sources."classnames-2.3.2" sources."cli-boxes-2.2.1" sources."cliui-8.0.1" - sources."clone-response-1.0.3" sources."clsx-1.2.1" - 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."colorette-1.4.0" sources."commander-2.20.3" - sources."configstore-5.0.1" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" sources."core-js-3.29.0" @@ -133668,14 +133449,10 @@ in sources."create-hash-1.2.0" sources."create-hmac-1.1.7" sources."crypto-browserify-3.12.0" - sources."crypto-random-string-2.0.0" sources."css-color-keywords-1.0.0" sources."css-to-react-native-3.2.0" sources."debug-4.3.4" sources."decko-1.2.0" - sources."decompress-response-3.3.0" - sources."deep-extend-0.6.0" - sources."defer-to-connect-1.1.3" sources."des.js-1.0.1" (sources."diffie-hellman-5.0.3" // { dependencies = [ @@ -133683,10 +133460,8 @@ in ]; }) sources."domain-browser-1.2.0" - sources."dompurify-2.4.4" - sources."dot-prop-5.3.0" - sources."duplexer3-0.1.5" - sources."electron-to-chromium-1.4.313" + sources."dompurify-2.4.5" + sources."electron-to-chromium-1.4.326" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -133695,12 +133470,10 @@ in }) sources."emoji-regex-8.0.0" sources."encoding-0.1.13" - sources."end-of-stream-1.4.4" sources."enhanced-resolve-5.12.0" sources."es-module-lexer-0.9.3" sources."es6-promise-3.3.1" sources."escalade-3.1.1" - sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { @@ -133719,16 +133492,12 @@ in sources."foreach-2.0.6" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" - sources."get-stream-4.1.0" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" - sources."global-dirs-3.0.1" sources."globals-11.12.0" - sources."got-9.6.0" sources."graceful-fs-4.2.10" sources."handlebars-4.7.7" sources."has-flag-4.0.0" - sources."has-yarn-2.1.0" (sources."hash-base-3.1.0" // { dependencies = [ sources."inherits-2.0.4" @@ -133742,51 +133511,34 @@ in }) sources."hmac-drbg-1.0.1" sources."hoist-non-react-statics-3.3.2" - sources."http-cache-semantics-4.1.1" sources."http2-client-1.3.5" sources."https-browserify-1.0.0" sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" - sources."import-lazy-2.1.0" - sources."imurmurhash-0.1.4" sources."inherits-2.0.1" - sources."ini-2.0.0" sources."is-binary-path-2.1.0" - sources."is-ci-2.0.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" - sources."is-installed-globally-0.4.0" - sources."is-npm-5.0.0" sources."is-number-7.0.0" - sources."is-obj-2.0.0" - sources."is-path-inside-3.0.3" - sources."is-typedarray-1.0.0" - sources."is-yarn-global-0.3.0" - sources."isarray-2.0.5" - sources."jest-worker-27.5.1" + sources."isarray-1.0.0" + (sources."jest-worker-27.5.1" // { + dependencies = [ + sources."supports-color-8.1.1" + ]; + }) sources."js-levenshtein-1.1.6" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsesc-2.5.2" - sources."json-buffer-3.0.0" sources."json-parse-even-better-errors-2.3.1" sources."json-pointer-0.6.2" sources."json-schema-traverse-1.0.0" - sources."keyv-3.1.0" - sources."latest-version-5.1.0" sources."loader-runner-4.3.0" sources."lodash-4.17.21" sources."lodash.isequal-4.5.0" sources."loose-envify-1.4.0" - sources."lowercase-keys-1.0.1" - sources."lru-cache-6.0.0" sources."lunr-2.3.9" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) sources."mark.js-8.11.1" sources."marked-4.2.12" sources."md5.js-1.3.5" @@ -133798,7 +133550,6 @@ in }) sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-5.1.6" @@ -133806,7 +133557,7 @@ in sources."mkdirp-1.0.4" sources."mobx-6.8.0" sources."mobx-react-7.6.0" - sources."mobx-react-lite-3.4.0" + sources."mobx-react-lite-3.4.3" sources."ms-2.1.2" sources."neo-async-2.6.2" sources."node-fetch-2.6.9" @@ -133815,22 +133566,14 @@ in sources."node-readfiles-0.2.0" sources."node-releases-2.0.10" sources."normalize-path-3.0.0" - sources."normalize-url-4.5.1" sources."oas-kit-common-1.0.8" sources."oas-linter-3.2.2" sources."oas-resolver-2.5.6" sources."oas-schema-walker-1.1.5" sources."oas-validator-5.0.8" sources."object-assign-4.1.1" - sources."once-1.4.0" sources."openapi-sampler-1.3.1" sources."os-browserify-0.3.0" - sources."p-cancelable-1.1.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) sources."pako-1.0.11" sources."parse-asn1-5.1.6" sources."path-browserify-0.0.1" @@ -133841,7 +133584,6 @@ in sources."pluralize-8.0.0" sources."polished-4.2.2" sources."postcss-value-parser-4.2.0" - sources."prepend-http-2.0.0" sources."prismjs-1.29.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" @@ -133851,18 +133593,11 @@ in sources."bn.js-4.12.0" ]; }) - sources."pump-3.0.0" sources."punycode-1.4.1" - sources."pupa-2.1.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."randombytes-2.1.0" sources."randomfill-1.0.4" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) sources."react-17.0.2" sources."react-dom-17.0.2" sources."react-is-16.13.1" @@ -133870,35 +133605,25 @@ in (sources."readable-stream-2.3.8" // { dependencies = [ sources."inherits-2.0.4" - sources."isarray-1.0.0" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) sources."readdirp-3.6.0" - (sources."redoc-2.0.0-rc.77" // { + (sources."redoc-2.0.0" // { dependencies = [ sources."path-browserify-1.0.1" ]; }) sources."reftools-1.1.9" sources."regenerator-runtime-0.13.11" - sources."registry-auth-token-4.2.2" - sources."registry-url-5.1.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."responselike-1.0.2" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."scheduler-0.20.2" sources."schema-utils-3.1.1" - sources."semver-7.3.8" - (sources."semver-diff-3.1.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) sources."serialize-javascript-6.0.1" sources."setimmediate-1.0.5" sources."sha.js-2.4.11" @@ -133909,7 +133634,6 @@ in sources."should-type-1.4.0" sources."should-type-adaptors-1.1.0" sources."should-util-1.0.1" - sources."signal-exit-3.0.7" sources."slugify-1.4.7" sources."source-map-0.6.1" sources."source-map-support-0.5.21" @@ -133919,40 +133643,27 @@ in sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" - sources."strip-json-comments-2.0.1" sources."style-loader-3.3.1" - (sources."styled-components-5.3.6" // { + (sources."styled-components-5.3.8" // { dependencies = [ sources."has-flag-3.0.0" sources."supports-color-5.5.0" ]; }) - sources."supports-color-8.1.1" + sources."supports-color-7.2.0" sources."swagger2openapi-7.0.8" sources."tapable-2.2.1" - sources."terser-5.16.5" - sources."terser-webpack-plugin-5.3.6" + sources."terser-5.16.6" + sources."terser-webpack-plugin-5.3.7" sources."timers-browserify-2.0.12" sources."to-arraybuffer-1.0.1" sources."to-fast-properties-2.0.0" - sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tty-browserify-0.0.0" sources."type-fest-0.20.2" - sources."typedarray-to-buffer-3.1.5" sources."uglify-js-3.17.4" - sources."unique-string-2.0.0" sources."update-browserslist-db-1.0.10" - (sources."update-notifier-5.1.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."supports-color-7.2.0" - ]; - }) (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.3.0" @@ -133963,7 +133674,6 @@ in sources."punycode-1.3.2" ]; }) - sources."url-parse-lax-3.0.0" sources."url-template-2.0.8" (sources."util-0.11.1" // { dependencies = [ @@ -133974,24 +133684,14 @@ in sources."vm-browserify-1.1.2" sources."watchpack-2.4.0" sources."webidl-conversions-3.0.1" - sources."webpack-5.75.0" + sources."webpack-5.76.0" sources."webpack-sources-3.2.3" sources."whatwg-url-5.0.0" sources."widest-line-3.1.0" sources."wordwrap-1.0.0" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."xdg-basedir-4.0.0" + sources."wrap-ansi-7.0.0" sources."xtend-4.0.2" sources."y18n-5.0.8" - sources."yallist-4.0.0" sources."yaml-1.10.2" sources."yaml-ast-parser-0.0.43" sources."yargs-17.7.1" @@ -134118,7 +133818,7 @@ in sources."semver-5.7.1" sources."signal-exit-3.0.7" sources."slice-ansi-3.0.0" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -134173,10 +133873,10 @@ in reveal-md = nodeEnv.buildNodePackage { name = "reveal-md"; packageName = "reveal-md"; - version = "5.4.0"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/reveal-md/-/reveal-md-5.4.0.tgz"; - sha512 = "dbVA4qylRP14g0s2QSiPlxUgDFsvpQhUsT0QiNKEYDWvkgS6kVtA/XPbKSp55NuUXJ66qnrsNKKa4QRWaLxLaw=="; + url = "https://registry.npmjs.org/reveal-md/-/reveal-md-5.4.1.tgz"; + sha512 = "pSNiE7ryND/yopuIktKaESTahSMPI2dLPIYLUCAksan6M4v8V5b1GjDaFCgF1wC0qcTZqUS34I8HBYoMStb/AQ=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -134271,13 +133971,13 @@ in }) sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."fs-extra-10.1.0" + sources."fs-extra-11.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" - sources."glob-8.0.3" + sources."glob-8.1.0" sources."glob-parent-5.1.2" sources."global-dirs-3.0.1" sources."got-9.6.0" @@ -134350,7 +134050,7 @@ in sources."object-inspect-1.12.3" sources."on-finished-2.4.1" sources."once-1.4.0" - sources."open-8.4.0" + sources."open-8.4.2" sources."opts-2.0.2" sources."p-cancelable-1.1.0" (sources."package-json-6.5.0" // { @@ -134481,11 +134181,21 @@ in rimraf = nodeEnv.buildNodePackage { name = "rimraf"; packageName = "rimraf"; - version = "4.1.2"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-4.1.2.tgz"; - sha512 = "BlIbgFryTbw3Dz6hyoWFhKk+unCcHMSkZGrTFVAx2WmttdBSonsdtRlwiuTbDqTKr+UlXIUqJVS4QT5tUzGENQ=="; + url = "https://registry.npmjs.org/rimraf/-/rimraf-4.4.0.tgz"; + sha512 = "X36S+qpCUR0HjXlkDe4NAOhS//aHH0Z+h8Ckf2auGJk3PTnx5rLmrHkwNdbVQuCSUhOyFrlRvFEllZOYE+yZGQ=="; }; + dependencies = [ + sources."balanced-match-1.0.2" + sources."brace-expansion-2.0.1" + sources."fs.realpath-1.0.0" + sources."glob-9.2.1" + sources."lru-cache-7.18.3" + sources."minimatch-7.4.2" + sources."minipass-4.2.4" + sources."path-scurry-1.6.1" + ]; buildInputs = globalBuildInputs; meta = { description = "A deep deletion module for node (like `rm -rf`)"; @@ -134499,10 +134209,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "3.17.3"; + version = "3.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-3.17.3.tgz"; - sha512 = "p5LaCXiiOL/wrOkj8djsIDFmyU9ysUxcyW+EKRLHb6TKldJzXpImjcRSR+vgo09DBdofGcOoLOsRyxxG2n5/qQ=="; + url = "https://registry.npmjs.org/rollup/-/rollup-3.19.0.tgz"; + sha512 = "xZzJZlH9Ca6cosfdNGPwl2z7Pby8dTi9TrYLPeg6/j7aUoDOhBd706tCUFvbiBj45h/cS7z/a4gS8xd5Yg0jBw=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -134520,13 +134230,23 @@ in "rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-analyzer/build-deps" = nodeEnv.buildNodePackage { name = "rust-analyzer"; packageName = "rust-analyzer"; - version = "0.3.1059"; + version = "0.3.1426"; src = ../../applications/editors/vscode/extensions/rust-analyzer/build-deps; dependencies = [ - sources."@eslint/eslintrc-2.0.0" + (sources."@eslint/eslintrc-2.0.0" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."minimatch-3.1.2" + ]; + }) sources."@eslint/js-8.35.0" - sources."@hpcc-js/wasm-1.16.6" - sources."@humanwhocodes/config-array-0.11.8" + sources."@hpcc-js/wasm-2.5.0" + (sources."@humanwhocodes/config-array-0.11.8" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."minimatch-3.1.2" + ]; + }) sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" sources."@nodelib/fs.scandir-2.1.5" @@ -134534,22 +134254,23 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@tootallnate/once-1.1.2" sources."@types/json-schema-7.0.11" - sources."@types/node-14.17.34" + sources."@types/node-16.11.68" sources."@types/semver-7.3.13" sources."@types/vscode-1.66.0" - sources."@typescript-eslint/eslint-plugin-5.54.0" - sources."@typescript-eslint/parser-5.54.0" - sources."@typescript-eslint/scope-manager-5.54.0" - sources."@typescript-eslint/type-utils-5.54.0" - sources."@typescript-eslint/types-5.54.0" - sources."@typescript-eslint/typescript-estree-5.54.0" - sources."@typescript-eslint/utils-5.54.0" - sources."@typescript-eslint/visitor-keys-5.54.0" - sources."@vscode/test-electron-2.2.3" + sources."@typescript-eslint/eslint-plugin-5.54.1" + sources."@typescript-eslint/parser-5.54.1" + sources."@typescript-eslint/scope-manager-5.54.1" + sources."@typescript-eslint/type-utils-5.54.1" + sources."@typescript-eslint/types-5.54.1" + sources."@typescript-eslint/typescript-estree-5.54.1" + sources."@typescript-eslint/utils-5.54.1" + sources."@typescript-eslint/visitor-keys-5.54.1" + sources."@vscode/test-electron-2.3.0" sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" sources."agent-base-6.0.2" sources."ajv-6.12.6" + sources."anser-2.1.1" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."argparse-2.0.1" @@ -134557,33 +134278,27 @@ in sources."azure-devops-node-api-11.2.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" - sources."big-integer-1.6.51" - sources."binary-0.3.0" (sources."bl-4.1.0" // { dependencies = [ sources."readable-stream-3.6.1" ]; }) - sources."bluebird-3.4.7" sources."boolbase-1.0.0" - sources."brace-expansion-1.1.11" + sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" - sources."buffer-indexof-polyfill-1.0.2" - sources."buffers-0.1.1" sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."chainsaw-0.1.0" sources."chalk-4.1.2" sources."cheerio-1.0.0-rc.12" sources."cheerio-select-2.1.0" sources."chownr-1.1.4" - sources."cliui-7.0.4" + sources."ci-info-2.0.0" + sources."cliui-8.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-7.2.0" - sources."commandpost-1.4.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.3" sources."cross-env-7.0.3" @@ -134606,21 +134321,7 @@ in sources."d3-force-3.0.0" sources."d3-format-3.1.0" sources."d3-geo-3.1.0" - (sources."d3-graphviz-4.5.0" // { - dependencies = [ - sources."d3-color-2.0.0" - sources."d3-dispatch-2.0.0" - sources."d3-drag-2.0.0" - sources."d3-ease-2.0.0" - sources."d3-format-2.0.0" - sources."d3-interpolate-2.0.1" - sources."d3-path-2.0.0" - sources."d3-selection-2.0.0" - sources."d3-timer-2.0.0" - sources."d3-transition-2.0.0" - sources."d3-zoom-2.0.0" - ]; - }) + sources."d3-graphviz-5.0.2" sources."d3-hierarchy-3.1.2" sources."d3-interpolate-3.0.1" sources."d3-path-3.1.0" @@ -134648,15 +134349,6 @@ in sources."domelementtype-2.3.0" sources."domhandler-5.0.3" sources."domutils-3.0.1" - sources."duplexer2-0.1.4" - (sources."editorconfig-0.15.3" // { - dependencies = [ - sources."commander-2.20.3" - sources."lru-cache-4.1.5" - sources."semver-5.7.1" - sources."yallist-2.1.2" - ]; - }) sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-4.4.0" @@ -134664,11 +134356,14 @@ in sources."escape-string-regexp-4.0.0" (sources."eslint-8.35.0" // { dependencies = [ + sources."brace-expansion-1.1.11" sources."eslint-scope-7.1.1" sources."estraverse-5.3.0" sources."glob-parent-6.0.2" + sources."minimatch-3.1.2" ]; }) + sources."eslint-config-prettier-8.7.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ @@ -134677,7 +134372,7 @@ in }) sources."eslint-visitor-keys-3.3.0" sources."espree-9.4.1" - (sources."esquery-1.4.2" // { + (sources."esquery-1.5.0" // { dependencies = [ sources."estraverse-5.3.0" ]; @@ -134701,22 +134396,22 @@ in sources."find-up-5.0.0" sources."flat-cache-3.0.4" sources."flatted-3.2.7" + sources."follow-redirects-1.15.2" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" - (sources."fstream-1.0.12" // { - dependencies = [ - sources."rimraf-2.7.1" - ]; - }) sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.2.0" sources."github-from-package-0.0.0" - sources."glob-7.2.3" + (sources."glob-7.2.3" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."minimatch-3.1.2" + ]; + }) sources."glob-parent-5.1.2" sources."globals-13.20.0" sources."globby-11.1.0" - sources."graceful-fs-4.2.10" sources."grapheme-splitter-1.0.4" sources."has-1.0.3" sources."has-flag-4.0.0" @@ -134728,12 +134423,14 @@ in sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" sources."ignore-5.2.4" + sources."immediate-3.0.6" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" sources."internmap-2.0.3" + sources."is-ci-2.0.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -134745,11 +134442,12 @@ in sources."js-yaml-4.1.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" + sources."jszip-3.10.1" sources."keytar-7.9.0" sources."leven-3.1.0" sources."levn-0.4.1" + sources."lie-3.3.0" sources."linkify-it-3.0.3" - sources."listenercount-1.0.1" sources."locate-path-6.0.0" sources."lodash.merge-4.6.2" sources."lru-cache-6.0.0" @@ -134763,9 +134461,8 @@ in sources."micromatch-4.0.5" sources."mime-1.6.0" sources."mimic-response-3.1.0" - sources."minimatch-3.1.2" + sources."minimatch-5.1.6" sources."minimist-1.2.8" - sources."mkdirp-0.5.6" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."mute-stream-0.0.8" @@ -134778,8 +134475,14 @@ in sources."object-inspect-1.12.3" sources."once-1.4.0" sources."optionator-0.9.1" + (sources."ovsx-0.5.2" // { + dependencies = [ + sources."commander-6.2.1" + ]; + }) sources."p-limit-3.1.0" sources."p-locate-5.0.0" + sources."pako-1.0.11" sources."parent-module-1.0.1" (sources."parse-semver-1.1.1" // { dependencies = [ @@ -134796,11 +134499,11 @@ in sources."picomatch-2.3.1" sources."prebuild-install-7.1.1" sources."prelude-ls-1.2.1" + sources."prettier-2.8.4" sources."process-nextick-args-2.0.1" - sources."pseudomap-1.0.2" sources."pump-3.0.0" sources."punycode-2.3.0" - sources."qs-6.11.0" + sources."qs-6.11.1" sources."queue-microtask-1.2.3" (sources."rc-1.2.8" // { dependencies = [ @@ -134825,7 +134528,6 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" - sources."sigmund-1.0.1" sources."simple-concat-1.0.1" sources."simple-get-4.0.1" sources."slash-3.0.0" @@ -134843,7 +134545,6 @@ in sources."text-table-0.2.0" sources."tmp-0.2.1" sources."to-regex-range-5.0.1" - sources."traverse-0.3.9" sources."tslib-2.5.0" (sources."tsutils-3.21.0" // { dependencies = [ @@ -134856,30 +134557,30 @@ in sources."type-fest-0.20.2" sources."typed-rest-client-1.8.9" sources."typescript-4.9.5" - sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.13.6" - sources."unzipper-0.10.11" sources."uri-js-4.4.1" sources."url-join-4.0.1" sources."util-deprecate-1.0.2" (sources."vsce-2.15.0" // { dependencies = [ sources."ansi-styles-3.2.1" + sources."brace-expansion-1.1.11" 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."has-flag-3.0.0" + sources."minimatch-3.1.2" sources."semver-5.7.1" sources."supports-color-5.5.0" ]; }) - sources."vscode-jsonrpc-8.0.0-next.7" - sources."vscode-languageclient-8.0.0-next.14" - sources."vscode-languageserver-protocol-3.17.0-next.16" - sources."vscode-languageserver-types-3.17.0-next.9" + sources."vscode-jsonrpc-8.1.0" + sources."vscode-languageclient-8.1.0" + sources."vscode-languageserver-protocol-3.17.3" + sources."vscode-languageserver-types-3.17.3" sources."which-2.0.2" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" @@ -134888,7 +134589,7 @@ in sources."xmlbuilder-11.0.1" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-17.5.1" + sources."yargs-17.6.2" sources."yargs-parser-21.1.1" sources."yauzl-2.10.0" sources."yazl-2.5.1" @@ -134996,7 +134697,7 @@ in sources."object-inspect-1.12.3" (sources."openid-2.0.10" // { dependencies = [ - sources."qs-6.11.0" + sources."qs-6.11.1" ]; }) sources."pause-0.0.1" @@ -135213,10 +134914,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "3.27.0"; + version = "3.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-3.27.0.tgz"; - sha512 = "+8EDo7x8IJxTj4KqQG71qpX7oq+EZy0NGm/04q3M5jK7L8rLowEtnzq82s93yeNSgmJSMopd3pTzuH9CCWkNMw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-3.28.1.tgz"; + sha512 = "zC+8ItbRYtJkIY5YZkU5RrCGd+JPkn8DUeGpHX6C9NKV/555DppiaMXURcNWJqN6VFV3fhmZrtefTzDF/B6+Rg=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -135251,7 +134952,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" sources."@types/lodash-4.14.191" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."@types/responselike-1.0.0" sources."adm-zip-0.5.10" sources."agent-base-6.0.2" @@ -135279,7 +134980,7 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1324.0" // { + (sources."aws-sdk-2.1332.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -135614,7 +135315,7 @@ in sources."promise-queue-2.2.5" sources."pump-3.0.0" sources."punycode-2.3.0" - sources."qs-6.11.0" + sources."qs-6.11.1" sources."querystring-0.2.1" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" @@ -135650,7 +135351,7 @@ in sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" - sources."simple-git-3.16.1" + sources."simple-git-3.17.0" sources."slash-3.0.0" sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" @@ -136380,11 +136081,47 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.1109.0"; + version = "1.1116.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.1109.0.tgz"; - sha512 = "sBcibkAfcq6nXr6t0GieDjdc8kQfEf429+M1VKavGfLaJPQNIqSjtOhQJ5FcZqaB/mCWa1szektkHeyAiB4m9A=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.1116.0.tgz"; + sha512 = "xe14nvgfY4bMC0VZU9Q+0IF4CPNceEaK4R8mqjTvvRjINu0MfV66lhXJnYRU/oaxAWCoAIPYR0J9LpG45r04yg=="; }; + dependencies = [ + sources."@sentry/core-7.42.0" + sources."@sentry/node-7.42.0" + sources."@sentry/types-7.42.0" + sources."@sentry/utils-7.42.0" + sources."agent-base-6.0.2" + sources."boolean-3.2.0" + sources."cookie-0.4.2" + sources."debug-4.3.4" + sources."define-properties-1.2.0" + sources."detect-node-2.1.0" + sources."es6-error-4.1.1" + sources."escape-string-regexp-4.0.0" + sources."function-bind-1.1.1" + sources."get-intrinsic-1.2.0" + sources."global-agent-3.0.0" + sources."globalthis-1.0.3" + sources."has-1.0.3" + sources."has-property-descriptors-1.0.0" + sources."has-symbols-1.0.3" + sources."https-proxy-agent-5.0.1" + sources."json-stringify-safe-5.0.1" + sources."lru-cache-6.0.0" + sources."lru_map-0.3.3" + sources."matcher-3.0.0" + sources."ms-2.1.2" + sources."object-keys-1.1.1" + sources."roarr-2.15.4" + sources."semver-7.3.8" + sources."semver-compare-1.0.0" + sources."serialize-error-7.0.1" + sources."sprintf-js-1.1.2" + sources."tslib-1.14.1" + sources."type-fest-0.13.1" + sources."yallist-4.0.0" + ]; buildInputs = globalBuildInputs; meta = { description = "snyk library and cli utility"; @@ -136406,7 +136143,7 @@ in sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.13" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."accepts-1.3.8" sources."base64id-2.0.0" sources."bufferutil-4.0.7" @@ -136554,7 +136291,7 @@ in sources."ansi-styles-6.2.1" ]; }) - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -136602,10 +136339,10 @@ in sql-formatter = nodeEnv.buildNodePackage { name = "sql-formatter"; packageName = "sql-formatter"; - version = "12.1.2"; + version = "12.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-12.1.2.tgz"; - sha512 = "SoFn+9ZflUt8+HYZ/PaifXt1RptcDUn8HXqsWmfXdPV3WeHPgT0qOSJXxHU24d7NOVt9X40MLqf263fNk79XqA=="; + url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-12.1.3.tgz"; + sha512 = "9UnqbunqDVrgyB9A1DLTBH+nzk6GpxTUw7pk9ys07PEF1vADwQN7GmzIWTABcKPOhUmKC6u2lgCI92F2RhdO4g=="; }; dependencies = [ sources."argparse-2.0.1" @@ -136670,7 +136407,7 @@ in sources."atomic-file-rw-0.2.2" sources."attach-ware-1.1.1" sources."available-typed-arrays-1.0.5" - sources."b4a-1.6.1" + sources."b4a-1.6.2" sources."bail-1.0.5" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { @@ -136818,7 +136555,7 @@ in sources."extglob-0.3.2" sources."fast-varint-1.0.1" sources."fastintcompression-0.0.4" - sources."fastpriorityqueue-0.7.2" + sources."fastpriorityqueue-0.7.3" sources."file-uri-to-path-1.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" @@ -136924,7 +136661,7 @@ in sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.1" + sources."is-array-buffer-3.0.2" sources."is-bigint-1.0.4" sources."is-binary-path-1.0.1" sources."is-boolean-object-1.1.2" @@ -137676,7 +137413,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1324.0" // { + (sources."aws-sdk-2.1332.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -138087,7 +137824,7 @@ in sources."once-1.4.0" (sources."openid-2.0.10" // { dependencies = [ - sources."qs-6.11.0" + sources."qs-6.11.1" ]; }) sources."options-0.0.6" @@ -138104,7 +137841,7 @@ in sources."parseuri-0.0.6" sources."parseurl-1.3.3" sources."passport-0.3.2" - sources."passport-oauth2-1.6.1" + sources."passport-oauth2-1.7.0" (sources."passport-saml-0.15.0" // { dependencies = [ sources."lodash-3.2.0" @@ -138249,7 +137986,7 @@ in ]; }) sources."source-map-0.6.1" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -138293,7 +138030,7 @@ in sources."lru-cache-6.0.0" sources."mime-2.6.0" sources."ms-2.1.2" - sources."qs-6.11.0" + sources."qs-6.11.1" sources."readable-stream-3.6.1" sources."safe-buffer-5.2.1" sources."semver-7.3.8" @@ -138310,7 +138047,7 @@ in sources."esprima-4.0.1" sources."js-yaml-3.14.1" sources."lodash-3.10.1" - sources."qs-6.11.0" + sources."qs-6.11.1" ]; }) sources."swagger-schema-official-2.0.0-bab6bed" @@ -138650,7 +138387,7 @@ in ]; }) sources."source-map-js-1.0.2" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -138831,10 +138568,10 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "3.0.4"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.0.4.tgz"; - sha512 = "feIyBAA5cSIxq4vq6mwGvGQTHy/wBVQbs5b+/VvE21WN8X7nonAuSqwvZv0UDBowzRka3Rh4gmLPH8rPePz3/w=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.1.0.tgz"; + sha512 = "aSdnsGtndfqtb0dmN5qm9Zjl7wGpqh3cWF35WVCcK96TmGn2NEar4M40QW6bvaPPu089mrkZdpeD3Yar2SERBg=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" @@ -138876,25 +138613,25 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.37" - sources."@swc/core-darwin-arm64-1.3.37" - sources."@swc/core-darwin-x64-1.3.37" - sources."@swc/core-linux-arm-gnueabihf-1.3.37" - sources."@swc/core-linux-arm64-gnu-1.3.37" - sources."@swc/core-linux-arm64-musl-1.3.37" - sources."@swc/core-linux-x64-gnu-1.3.37" - sources."@swc/core-linux-x64-musl-1.3.37" - sources."@swc/core-win32-arm64-msvc-1.3.37" - sources."@swc/core-win32-ia32-msvc-1.3.37" - sources."@swc/core-win32-x64-msvc-1.3.37" - sources."@swc/wasm-1.3.37" + sources."@swc/core-1.3.38" + sources."@swc/core-darwin-arm64-1.3.38" + sources."@swc/core-darwin-x64-1.3.38" + sources."@swc/core-linux-arm-gnueabihf-1.3.38" + sources."@swc/core-linux-arm64-gnu-1.3.38" + sources."@swc/core-linux-arm64-musl-1.3.38" + sources."@swc/core-linux-x64-gnu-1.3.38" + sources."@swc/core-linux-x64-musl-1.3.38" + sources."@swc/core-win32-arm64-msvc-1.3.38" + sources."@swc/core-win32-ia32-msvc-1.3.38" + sources."@swc/core-win32-x64-msvc-1.3.38" + sources."@swc/wasm-1.3.38" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."@types/pug-2.0.6" - sources."@types/sass-1.43.1" + sources."@types/sass-1.45.0" sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ansi-styles-3.2.1" @@ -138912,7 +138649,7 @@ in sources."buffer-crc32-0.2.13" sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -138930,7 +138667,7 @@ in sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.326" sources."errno-0.1.8" sources."es6-promise-3.3.1" sources."escalade-3.1.1" @@ -138976,7 +138713,7 @@ in sources."json5-2.2.3" sources."jstransformer-1.0.0" sources."less-4.1.3" - sources."lilconfig-2.0.6" + sources."lilconfig-2.1.0" sources."lru-cache-5.1.1" sources."magic-string-0.27.0" (sources."make-dir-2.1.0" // { @@ -139086,10 +138823,10 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.15.5"; + version = "0.15.6"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.15.5.tgz"; - sha512 = "UGhMIv+oMQeDEE5fu2buhvDjcuSnW5GzHd9QtOpR11a3wqW7SjINvJQy3MzOSH35+8tQM6fvmj0HQsrTtnR4SA=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.15.6.tgz"; + sha512 = "jvzTRy2AFcSx6MJLJFZBK9wrLfLkNMhlL4Gwt2wU81fpZ5Hq6yg64pvQP4spRU8O/OfH6glZ66Wh1dQv4Jhpuw=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" @@ -139134,25 +138871,25 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.37" - sources."@swc/core-darwin-arm64-1.3.37" - sources."@swc/core-darwin-x64-1.3.37" - sources."@swc/core-linux-arm-gnueabihf-1.3.37" - sources."@swc/core-linux-arm64-gnu-1.3.37" - sources."@swc/core-linux-arm64-musl-1.3.37" - sources."@swc/core-linux-x64-gnu-1.3.37" - sources."@swc/core-linux-x64-musl-1.3.37" - sources."@swc/core-win32-arm64-msvc-1.3.37" - sources."@swc/core-win32-ia32-msvc-1.3.37" - sources."@swc/core-win32-x64-msvc-1.3.37" - sources."@swc/wasm-1.3.37" + sources."@swc/core-1.3.38" + sources."@swc/core-darwin-arm64-1.3.38" + sources."@swc/core-darwin-x64-1.3.38" + sources."@swc/core-linux-arm-gnueabihf-1.3.38" + sources."@swc/core-linux-arm64-gnu-1.3.38" + sources."@swc/core-linux-arm64-musl-1.3.38" + sources."@swc/core-linux-x64-gnu-1.3.38" + sources."@swc/core-linux-x64-musl-1.3.38" + sources."@swc/core-win32-arm64-msvc-1.3.38" + sources."@swc/core-win32-ia32-msvc-1.3.38" + sources."@swc/core-win32-x64-msvc-1.3.38" + sources."@swc/wasm-1.3.38" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."@types/pug-2.0.6" - sources."@types/sass-1.43.1" + sources."@types/sass-1.45.0" (sources."@vscode/emmet-helper-2.8.6" // { dependencies = [ sources."vscode-uri-2.1.2" @@ -139175,7 +138912,7 @@ in sources."browserslist-4.21.5" sources."buffer-crc32-0.2.13" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -139194,7 +138931,7 @@ in sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.326" sources."emmet-2.3.6" sources."errno-0.1.8" sources."es6-promise-3.3.1" @@ -139242,7 +138979,7 @@ in sources."jsonc-parser-2.3.1" sources."jstransformer-1.0.0" sources."less-4.1.3" - sources."lilconfig-2.0.6" + sources."lilconfig-2.1.0" sources."lodash-4.17.21" sources."lower-case-2.0.2" sources."lru-cache-5.1.1" @@ -139326,7 +139063,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" sources."svelte-3.55.1" sources."svelte-preprocess-5.0.1" - sources."svelte2tsx-0.6.2" + sources."svelte2tsx-0.6.3" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."token-stream-1.0.0" @@ -139600,7 +139337,7 @@ in sources."form-data-4.0.0" (sources."formidable-2.1.2" // { dependencies = [ - sources."qs-6.11.0" + sources."qs-6.11.1" ]; }) sources."fragment-cache-0.2.1" @@ -139825,7 +139562,7 @@ in sources."lru-cache-6.0.0" sources."mime-2.6.0" sources."ms-2.1.2" - sources."qs-6.11.0" + sources."qs-6.11.1" sources."readable-stream-3.6.1" sources."semver-7.3.8" sources."superagent-7.1.6" @@ -140080,23 +139817,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.37" - sources."@swc/core-darwin-arm64-1.3.37" - sources."@swc/core-darwin-x64-1.3.37" - sources."@swc/core-linux-arm-gnueabihf-1.3.37" - sources."@swc/core-linux-arm64-gnu-1.3.37" - sources."@swc/core-linux-arm64-musl-1.3.37" - sources."@swc/core-linux-x64-gnu-1.3.37" - sources."@swc/core-linux-x64-musl-1.3.37" - sources."@swc/core-win32-arm64-msvc-1.3.37" - sources."@swc/core-win32-ia32-msvc-1.3.37" - sources."@swc/core-win32-x64-msvc-1.3.37" - sources."@swc/wasm-1.3.37" + sources."@swc/core-1.3.38" + sources."@swc/core-darwin-arm64-1.3.38" + sources."@swc/core-darwin-x64-1.3.38" + sources."@swc/core-linux-arm-gnueabihf-1.3.38" + sources."@swc/core-linux-arm64-gnu-1.3.38" + sources."@swc/core-linux-arm64-musl-1.3.38" + sources."@swc/core-linux-x64-gnu-1.3.38" + sources."@swc/core-linux-x64-musl-1.3.38" + sources."@swc/core-win32-arm64-msvc-1.3.38" + sources."@swc/core-win32-ia32-msvc-1.3.38" + sources."@swc/core-win32-x64-msvc-1.3.38" + sources."@swc/wasm-1.3.38" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" @@ -140134,7 +139871,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."lilconfig-2.0.6" + sources."lilconfig-2.1.0" sources."make-error-1.3.6" sources."merge2-1.4.1" sources."micromatch-4.0.5" @@ -140515,10 +140252,10 @@ in terser = nodeEnv.buildNodePackage { name = "terser"; packageName = "terser"; - version = "5.16.5"; + version = "5.16.6"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.16.5.tgz"; - sha512 = "qcwfg4+RZa3YvlFh0qjifnzBHjKGNbtDo9yivMqMFDy9Q6FSaQWSB/j1xKhsoUFJIqDOM3TsN6D5xbrMrFcHbg=="; + url = "https://registry.npmjs.org/terser/-/terser-5.16.6.tgz"; + sha512 = "IBZ+ZQIA9sMaXmRZCUMDjNH0D5AQQfdn4WUjHL0+1lF4TP1IHRJbrhb6fNaXWikrYQTSkb7SLxkeXAiy1p7mbg=="; }; dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" @@ -140715,7 +140452,7 @@ in sources."rimraf-2.6.3" sources."semver-5.7.1" sources."slice-ansi-4.0.0" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -141099,7 +140836,7 @@ in sources."xtend-2.1.2" ]; }) - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -141504,7 +141241,7 @@ in sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.5" - sources."is-array-buffer-3.0.1" + sources."is-array-buffer-3.0.2" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" @@ -141638,7 +141375,7 @@ in }) sources."eslint-visitor-keys-3.3.0" sources."espree-9.4.1" - sources."esquery-1.4.2" + sources."esquery-1.5.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."esutils-2.0.3" @@ -141677,7 +141414,7 @@ in sources."inherits-2.0.4" sources."internal-slot-1.0.5" sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.1" + sources."is-array-buffer-3.0.2" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" @@ -141817,7 +141554,7 @@ in sources."@types/cors-2.8.13" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -142219,7 +141956,7 @@ in sources."@types/cors-2.8.13" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -142915,7 +142652,7 @@ in sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.3.0" - sources."qs-6.11.0" + sources."qs-6.11.1" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" @@ -143291,7 +143028,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -143759,7 +143496,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -144658,7 +144395,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."@types/responselike-1.0.0" sources."@xmldom/xmldom-0.8.6" sources."ajv-6.12.6" @@ -145063,23 +144800,23 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.37" - sources."@swc/core-darwin-arm64-1.3.37" - sources."@swc/core-darwin-x64-1.3.37" - sources."@swc/core-linux-arm-gnueabihf-1.3.37" - sources."@swc/core-linux-arm64-gnu-1.3.37" - sources."@swc/core-linux-arm64-musl-1.3.37" - sources."@swc/core-linux-x64-gnu-1.3.37" - sources."@swc/core-linux-x64-musl-1.3.37" - sources."@swc/core-win32-arm64-msvc-1.3.37" - sources."@swc/core-win32-ia32-msvc-1.3.37" - sources."@swc/core-win32-x64-msvc-1.3.37" - sources."@swc/wasm-1.3.37" + sources."@swc/core-1.3.38" + sources."@swc/core-darwin-arm64-1.3.38" + sources."@swc/core-darwin-x64-1.3.38" + sources."@swc/core-linux-arm-gnueabihf-1.3.38" + sources."@swc/core-linux-arm64-gnu-1.3.38" + sources."@swc/core-linux-arm64-musl-1.3.38" + sources."@swc/core-linux-x64-gnu-1.3.38" + sources."@swc/core-linux-x64-musl-1.3.38" + sources."@swc/core-win32-arm64-msvc-1.3.38" + sources."@swc/core-win32-ia32-msvc-1.3.38" + sources."@swc/core-win32-x64-msvc-1.3.38" + sources."@swc/wasm-1.3.38" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."arg-4.1.3" @@ -145203,8 +144940,9 @@ in dependencies = [ sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" + sources."@pnpm/config.env-replace-1.0.0" sources."@pnpm/network.ca-file-1.0.2" - sources."@pnpm/npm-conf-1.0.5" + sources."@pnpm/npm-conf-2.1.0" sources."@primer/octicons-17.10.2" sources."@sindresorhus/is-5.3.0" sources."@socket.io/component-emitter-3.1.0" @@ -145212,7 +144950,7 @@ in sources."@types/cookie-0.4.1" sources."@types/cors-2.8.13" sources."@types/http-cache-semantics-4.0.1" - sources."@types/node-16.18.13" + sources."@types/node-16.18.14" sources."@types/triple-beam-1.3.2" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" @@ -145326,7 +145064,7 @@ in sources."destroy-1.2.0" sources."detective-5.2.1" sources."diff-5.1.0" - sources."diff2html-3.4.31" + sources."diff2html-3.4.33" (sources."diffie-hellman-5.0.3" // { dependencies = [ sources."bn.js-4.12.0" @@ -145387,7 +145125,7 @@ in sources."getmac-5.20.0" sources."glob-7.2.3" sources."gopd-1.0.1" - sources."got-12.5.3" + sources."got-12.6.0" sources."graceful-fs-4.2.10" sources."has-1.0.3" sources."has-symbols-1.0.3" @@ -145432,7 +145170,7 @@ in sources."is-utf8-0.2.1" sources."is-wsl-2.2.0" sources."isarray-1.0.0" - sources."jquery-3.6.3" + sources."jquery-3.6.4" sources."jquery-ui-1.13.2" sources."json-buffer-3.0.1" sources."jsonparse-1.3.1" @@ -145474,7 +145212,7 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.8" - sources."mkdirp-2.1.3" + sources."mkdirp-2.1.5" sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.3" sources."moment-2.29.4" @@ -145540,13 +145278,13 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."registry-auth-token-5.0.1" + sources."registry-auth-token-5.0.2" sources."registry-url-6.0.1" sources."require-directory-2.1.1" sources."resolve-1.22.1" sources."resolve-alpn-1.2.1" sources."responselike-3.0.0" - sources."rimraf-4.1.2" + sources."rimraf-4.1.4" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.4.2" @@ -145703,7 +145441,7 @@ in sources."@types/debug-4.1.7" sources."@types/is-empty-1.2.1" sources."@types/ms-0.7.31" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" sources."abbrev-2.0.0" @@ -145808,14 +145546,15 @@ in vega-cli = nodeEnv.buildNodePackage { name = "vega-cli"; packageName = "vega-cli"; - version = "5.22.1"; + version = "5.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.22.1.tgz"; - sha512 = "gX4TrHLo1nsBiLC/bZkWnZANp1ib4b4+3drekhCkJv0ne+Ti9Xuf5b2G8yqYv4pmT/sB5/ClvxFKmm1Ol0tFIQ=="; + url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.24.0.tgz"; + sha512 = "sAkOdSVlZx51N0Eyz3EQUsWSfoTTlszeUl9QMRvEVVetxQcj/7V4LyXitXjJ4Spx2Ado1csiYHlS1lMvXb9gDA=="; }; dependencies = [ sources."@mapbox/node-pre-gyp-1.0.10" - sources."@types/estree-0.0.50" + sources."@types/estree-1.0.0" + sources."@types/geojson-7946.0.10" sources."abbrev-1.1.1" sources."agent-base-6.0.2" sources."ansi-regex-5.0.1" @@ -145921,40 +145660,36 @@ in }) sources."tr46-0.0.3" sources."util-deprecate-1.0.2" - sources."vega-5.22.1" - sources."vega-canvas-1.2.6" - sources."vega-crossfilter-4.1.0" - sources."vega-dataflow-5.7.4" - sources."vega-encode-4.9.0" - sources."vega-event-selector-3.0.0" - sources."vega-expression-5.0.0" - sources."vega-force-4.1.0" - sources."vega-format-1.1.0" - sources."vega-functions-5.13.0" - sources."vega-geo-4.4.0" - sources."vega-hierarchy-4.1.0" - sources."vega-label-1.2.0" - sources."vega-loader-4.5.0" - sources."vega-parser-6.1.4" - sources."vega-projection-1.5.0" - sources."vega-regression-1.1.0" - sources."vega-runtime-6.1.3" - sources."vega-scale-7.2.0" - sources."vega-scenegraph-4.10.1" - (sources."vega-selections-5.4.0" // { - dependencies = [ - sources."d3-array-3.1.1" - ]; - }) - sources."vega-statistics-1.8.0" - sources."vega-time-2.1.0" - sources."vega-transforms-4.10.0" - sources."vega-typings-0.22.3" - sources."vega-util-1.17.0" - sources."vega-view-5.11.0" - sources."vega-view-transforms-4.5.8" - sources."vega-voronoi-4.2.0" - sources."vega-wordcloud-4.1.3" + sources."vega-5.24.0" + sources."vega-canvas-1.2.7" + sources."vega-crossfilter-4.1.1" + sources."vega-dataflow-5.7.5" + sources."vega-encode-4.9.1" + sources."vega-event-selector-3.0.1" + sources."vega-expression-5.0.1" + sources."vega-force-4.2.0" + sources."vega-format-1.1.1" + sources."vega-functions-5.13.1" + sources."vega-geo-4.4.1" + sources."vega-hierarchy-4.1.1" + sources."vega-label-1.2.1" + sources."vega-loader-4.5.1" + sources."vega-parser-6.2.0" + sources."vega-projection-1.6.0" + sources."vega-regression-1.1.1" + sources."vega-runtime-6.1.4" + sources."vega-scale-7.3.0" + sources."vega-scenegraph-4.10.2" + sources."vega-selections-5.4.1" + sources."vega-statistics-1.8.1" + sources."vega-time-2.1.1" + sources."vega-transforms-4.10.1" + sources."vega-typings-0.24.0" + sources."vega-util-1.17.1" + sources."vega-view-5.11.1" + sources."vega-view-transforms-4.5.9" + sources."vega-voronoi-4.2.1" + sources."vega-wordcloud-4.1.4" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."wide-align-1.1.5" @@ -145985,7 +145720,8 @@ in }; dependencies = [ sources."@types/clone-2.1.1" - sources."@types/estree-0.0.50" + sources."@types/estree-1.0.0" + sources."@types/geojson-7946.0.10" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."cliui-8.0.1" @@ -146036,40 +145772,36 @@ in }) sources."tr46-0.0.3" sources."tslib-2.5.0" - sources."vega-5.22.1" - sources."vega-canvas-1.2.6" - sources."vega-crossfilter-4.1.0" - sources."vega-dataflow-5.7.4" - sources."vega-encode-4.9.0" - sources."vega-event-selector-3.0.0" - sources."vega-expression-5.0.0" - sources."vega-force-4.1.0" - sources."vega-format-1.1.0" - sources."vega-functions-5.13.0" - sources."vega-geo-4.4.0" - sources."vega-hierarchy-4.1.0" - sources."vega-label-1.2.0" - sources."vega-loader-4.5.0" - sources."vega-parser-6.1.4" - sources."vega-projection-1.5.0" - sources."vega-regression-1.1.0" - sources."vega-runtime-6.1.3" - sources."vega-scale-7.2.0" - sources."vega-scenegraph-4.10.1" - (sources."vega-selections-5.4.0" // { - dependencies = [ - sources."d3-array-3.1.1" - ]; - }) - sources."vega-statistics-1.8.0" - sources."vega-time-2.1.0" - sources."vega-transforms-4.10.0" - sources."vega-typings-0.22.3" - sources."vega-util-1.17.0" - sources."vega-view-5.11.0" - sources."vega-view-transforms-4.5.8" - sources."vega-voronoi-4.2.0" - sources."vega-wordcloud-4.1.3" + sources."vega-5.24.0" + sources."vega-canvas-1.2.7" + sources."vega-crossfilter-4.1.1" + sources."vega-dataflow-5.7.5" + sources."vega-encode-4.9.1" + sources."vega-event-selector-3.0.1" + sources."vega-expression-5.0.1" + sources."vega-force-4.2.0" + sources."vega-format-1.1.1" + sources."vega-functions-5.13.1" + sources."vega-geo-4.4.1" + sources."vega-hierarchy-4.1.1" + sources."vega-label-1.2.1" + sources."vega-loader-4.5.1" + sources."vega-parser-6.2.0" + sources."vega-projection-1.6.0" + sources."vega-regression-1.1.1" + sources."vega-runtime-6.1.4" + sources."vega-scale-7.3.0" + sources."vega-scenegraph-4.10.2" + sources."vega-selections-5.4.1" + sources."vega-statistics-1.8.1" + sources."vega-time-2.1.1" + sources."vega-transforms-4.10.1" + sources."vega-typings-0.24.0" + sources."vega-util-1.17.1" + sources."vega-view-5.11.1" + sources."vega-view-transforms-4.5.9" + sources."vega-voronoi-4.2.1" + sources."vega-wordcloud-4.1.4" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."wrap-ansi-7.0.0" @@ -146090,10 +145822,10 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "28.16.7"; + version = "28.16.15"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-28.16.7.tgz"; - sha512 = "IEplmvPAhsMtAapp3MUMWYS5UNaS55ZO1ZkWPYCIIFyhMufmtyomlUbfzNYtNhTinf0L3hbELNvIp/ReEM5IYw=="; + url = "https://registry.npmjs.org/vercel/-/vercel-28.16.15.tgz"; + sha512 = "BMf/PYgJ5Tz5q9w/poWCKIQ2XHPiFpU1gdMpujOFlBwNHXp2XbOiIJkoEKSSNzYIJibrpBha/KE93qw4bgFN/w=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" @@ -146284,7 +146016,7 @@ in }) sources."@npmcli/move-file-1.1.2" sources."@npmcli/package-json-2.0.0" - (sources."@remix-run/dev-1.13.0" // { + (sources."@remix-run/dev-1.14.0" // { dependencies = [ sources."@esbuild/android-arm-0.16.3" sources."@esbuild/android-arm64-0.16.3" @@ -146311,7 +146043,7 @@ in sources."arg-5.0.2" sources."esbuild-0.16.3" sources."fast-glob-3.2.11" - sources."lru-cache-7.17.0" + sources."lru-cache-7.18.3" (sources."semver-7.3.8" // { dependencies = [ sources."lru-cache-6.0.0" @@ -146319,34 +146051,35 @@ in }) ]; }) - sources."@remix-run/express-1.13.0" - (sources."@remix-run/node-1.13.0" // { + sources."@remix-run/express-1.14.0" + (sources."@remix-run/node-1.14.0" // { dependencies = [ sources."cookie-signature-1.2.1" ]; }) - sources."@remix-run/router-1.3.2" - sources."@remix-run/serve-1.13.0" - sources."@remix-run/server-runtime-1.13.0" + sources."@remix-run/router-1.3.3" + sources."@remix-run/serve-1.14.0" + sources."@remix-run/server-runtime-1.14.0" sources."@remix-run/web-blob-3.0.4" sources."@remix-run/web-fetch-4.3.2" sources."@remix-run/web-file-3.0.2" sources."@remix-run/web-form-data-3.0.4" sources."@remix-run/web-stream-1.0.3" sources."@rollup/pluginutils-4.2.1" + sources."@sinclair/typebox-0.25.24" sources."@sindresorhus/is-4.6.0" - sources."@swc/core-1.3.37" - sources."@swc/core-darwin-arm64-1.3.37" - sources."@swc/core-darwin-x64-1.3.37" - sources."@swc/core-linux-arm-gnueabihf-1.3.37" - sources."@swc/core-linux-arm64-gnu-1.3.37" - sources."@swc/core-linux-arm64-musl-1.3.37" - sources."@swc/core-linux-x64-gnu-1.3.37" - sources."@swc/core-linux-x64-musl-1.3.37" - sources."@swc/core-win32-arm64-msvc-1.3.37" - sources."@swc/core-win32-ia32-msvc-1.3.37" - sources."@swc/core-win32-x64-msvc-1.3.37" - sources."@swc/wasm-1.3.37" + sources."@swc/core-1.3.38" + sources."@swc/core-darwin-arm64-1.3.38" + sources."@swc/core-darwin-x64-1.3.38" + sources."@swc/core-linux-arm-gnueabihf-1.3.38" + sources."@swc/core-linux-arm64-gnu-1.3.38" + sources."@swc/core-linux-arm64-musl-1.3.38" + sources."@swc/core-linux-x64-gnu-1.3.38" + sources."@swc/core-linux-x64-musl-1.3.38" + sources."@swc/core-win32-arm64-msvc-1.3.38" + sources."@swc/core-win32-ia32-msvc-1.3.38" + sources."@swc/core-win32-x64-msvc-1.3.38" + sources."@swc/wasm-1.3.38" sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-1.1.2" sources."@ts-morph/common-0.11.1" @@ -146375,47 +146108,46 @@ in sources."@types/responselike-1.0.0" sources."@types/scheduler-0.16.2" sources."@types/unist-2.0.6" - sources."@vanilla-extract/babel-plugin-debug-ids-1.0.1" + sources."@vanilla-extract/babel-plugin-debug-ids-1.0.2" sources."@vanilla-extract/css-1.9.5" - (sources."@vanilla-extract/integration-6.1.0" // { + (sources."@vanilla-extract/integration-6.1.2" // { dependencies = [ sources."esbuild-0.16.17" ]; }) sources."@vanilla-extract/private-1.0.3" - sources."@vercel/build-utils-6.3.1" - (sources."@vercel/gatsby-plugin-vercel-analytics-1.0.7" // { + sources."@vercel/build-utils-6.3.4" + (sources."@vercel/gatsby-plugin-vercel-analytics-1.0.8" // { dependencies = [ sources."@babel/runtime-7.12.1" ]; }) - (sources."@vercel/gatsby-plugin-vercel-builder-1.1.9" // { + (sources."@vercel/gatsby-plugin-vercel-builder-1.2.1" // { dependencies = [ - sources."ajv-8.12.0" sources."fs-extra-11.1.0" ]; }) - sources."@vercel/go-2.3.8" - sources."@vercel/hydrogen-0.0.54" - sources."@vercel/next-3.6.1" + sources."@vercel/go-2.3.11" + sources."@vercel/hydrogen-0.0.57" + sources."@vercel/next-3.6.6" sources."@vercel/nft-0.22.5" - sources."@vercel/node-2.9.8" - sources."@vercel/node-bridge-3.1.12" - sources."@vercel/python-3.1.50" - sources."@vercel/redwood-1.1.6" - (sources."@vercel/remix-1.4.1" // { + sources."@vercel/node-2.9.12" + sources."@vercel/node-bridge-3.1.14" + sources."@vercel/python-3.1.53" + sources."@vercel/redwood-1.1.9" + (sources."@vercel/remix-1.6.2" // { dependencies = [ sources."path-to-regexp-6.2.1" ]; }) - (sources."@vercel/routing-utils-2.1.9" // { + (sources."@vercel/routing-utils-2.1.10" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" ]; }) - sources."@vercel/ruby-1.3.67" - sources."@vercel/static-build-1.3.12" + sources."@vercel/ruby-1.3.70" + sources."@vercel/static-build-1.3.16" sources."@vercel/static-config-2.0.13" sources."@web3-storage/multipart-parser-1.0.0" sources."@zxing/text-encoding-0.9.0" @@ -146486,7 +146218,7 @@ in ]; }) sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -146572,7 +146304,7 @@ in }) sources."edge-runtime-2.0.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.326" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" @@ -146779,7 +146511,7 @@ in sources."keyv-4.5.2" sources."kleur-4.1.5" sources."levn-0.3.0" - sources."lilconfig-2.0.6" + sources."lilconfig-2.1.0" sources."loader-utils-3.2.1" sources."locate-path-6.0.0" sources."lodash-4.17.21" @@ -146981,6 +146713,7 @@ in sources."iconv-lite-0.4.24" ]; }) + sources."react-refresh-0.14.0" sources."readable-stream-3.6.1" sources."readdirp-3.6.0" (sources."recast-0.21.5" // { @@ -147286,7 +147019,7 @@ in sources."eslint-visitor-keys-3.3.0" sources."espree-9.4.1" sources."esprima-4.0.1" - sources."esquery-1.4.2" + sources."esquery-1.5.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."esutils-2.0.3" @@ -147591,13 +147324,13 @@ in sources."typescript-4.9.5" sources."vscode-css-languageservice-6.2.4" sources."vscode-html-languageservice-5.0.4" - sources."vscode-json-languageservice-5.3.1" + sources."vscode-json-languageservice-5.3.2" sources."vscode-jsonrpc-8.1.0" sources."vscode-languageserver-8.1.0" sources."vscode-languageserver-protocol-3.17.3" sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-languageserver-types-3.17.3" - (sources."vscode-markdown-languageservice-0.3.0-alpha.5" // { + (sources."vscode-markdown-languageservice-0.3.0-alpha.6" // { dependencies = [ sources."@vscode/l10n-0.0.10" ]; @@ -147922,7 +147655,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-18.14.2" + sources."@types/node-18.15.0" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -148142,7 +147875,7 @@ in sources."eslint-visitor-keys-1.3.0" sources."espree-5.0.1" sources."esprima-4.0.1" - (sources."esquery-1.4.2" // { + (sources."esquery-1.5.0" // { dependencies = [ sources."estraverse-5.3.0" ]; @@ -148607,7 +148340,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.1" sources."space-separated-tokens-1.1.5" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -149059,13 +148792,14 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" + sources."@pnpm/config.env-replace-1.0.0" sources."@pnpm/network.ca-file-1.0.2" - sources."@pnpm/npm-conf-1.0.5" + sources."@pnpm/npm-conf-2.1.0" sources."@sindresorhus/is-5.3.0" sources."@szmarczak/http-timer-5.0.1" sources."@types/http-cache-semantics-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."@types/yauzl-2.10.0" sources."abort-controller-3.0.0" sources."accepts-1.3.8" @@ -149111,7 +148845,7 @@ in ]; }) sources."boolbase-1.0.0" - (sources."boxen-7.0.1" // { + (sources."boxen-7.0.2" // { dependencies = [ sources."chalk-5.2.0" sources."type-fest-2.19.0" @@ -149248,7 +148982,7 @@ in sources."eslint-visitor-keys-3.3.0" sources."espree-9.4.1" sources."esprima-4.0.1" - sources."esquery-1.4.2" + sources."esquery-1.5.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."esutils-2.0.3" @@ -149323,7 +149057,7 @@ in sources."glob-to-regexp-0.4.1" sources."global-dirs-3.0.1" sources."globals-13.20.0" - (sources."got-12.5.3" // { + (sources."got-12.6.0" // { dependencies = [ sources."get-stream-6.0.1" ]; @@ -149530,7 +149264,7 @@ in sources."real-require-0.2.0" sources."regenerator-runtime-0.13.11" sources."regexpp-3.2.0" - sources."registry-auth-token-5.0.1" + sources."registry-auth-token-5.0.2" sources."registry-url-6.0.1" (sources."relaxed-json-1.0.3" // { dependencies = [ @@ -149707,10 +149441,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.75.0"; + version = "5.76.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz"; - sha512 = "piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.76.0.tgz"; + sha512 = "l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA=="; }; dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" @@ -149723,7 +149457,7 @@ in sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -149747,10 +149481,10 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.21.5" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.326" sources."enhanced-resolve-5.12.0" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -149786,12 +149520,12 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.16.5" - sources."terser-webpack-plugin-5.3.6" + sources."terser-5.16.6" + sources."terser-webpack-plugin-5.3.7" sources."update-browserslist-db-1.0.10" sources."uri-js-4.4.1" sources."watchpack-2.4.0" - sources."webpack-5.75.0" + sources."webpack-5.76.0" sources."webpack-sources-3.2.3" ]; buildInputs = globalBuildInputs; @@ -149824,7 +149558,7 @@ in sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -149851,13 +149585,13 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.21.5" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" sources."chrome-trace-event-1.0.3" sources."clone-deep-4.0.1" sources."colorette-2.0.19" sources."commander-9.5.0" sources."cross-spawn-7.0.3" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.326" sources."enhanced-resolve-5.12.0" sources."envinfo-7.8.1" sources."es-module-lexer-0.9.3" @@ -149921,16 +149655,16 @@ in sources."supports-color-8.1.1" sources."supports-preserve-symlinks-flag-1.0.0" sources."tapable-2.2.1" - (sources."terser-5.16.5" // { + (sources."terser-5.16.6" // { dependencies = [ sources."commander-2.20.3" ]; }) - sources."terser-webpack-plugin-5.3.6" + sources."terser-webpack-plugin-5.3.7" sources."update-browserslist-db-1.0.10" sources."uri-js-4.4.1" sources."watchpack-2.4.0" - sources."webpack-5.75.0" + sources."webpack-5.76.0" sources."webpack-cli-5.0.1" sources."webpack-merge-5.8.0" sources."webpack-sources-3.2.3" @@ -149975,7 +149709,7 @@ in sources."@types/http-proxy-1.17.10" sources."@types/json-schema-7.0.11" sources."@types/mime-3.0.1" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/retry-0.12.0" @@ -150025,7 +149759,7 @@ in sources."bufferutil-4.0.7" sources."bytes-3.0.0" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" sources."colorette-2.0.19" @@ -150053,7 +149787,7 @@ in sources."dns-equal-1.0.0" sources."dns-packet-5.4.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.326" sources."encodeurl-1.0.2" sources."enhanced-resolve-5.12.0" sources."es-module-lexer-0.9.3" @@ -150230,8 +149964,8 @@ in sources."strip-final-newline-2.0.0" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.16.5" - (sources."terser-webpack-plugin-5.3.6" // { + sources."terser-5.16.6" + (sources."terser-webpack-plugin-5.3.7" // { dependencies = [ sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -150253,7 +149987,7 @@ in sources."vary-1.1.2" sources."watchpack-2.4.0" sources."wbuf-1.7.3" - (sources."webpack-5.75.0" // { + (sources."webpack-5.76.0" // { dependencies = [ sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -150301,7 +150035,7 @@ in sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -150327,11 +150061,11 @@ in sources."braces-3.0.2" sources."browserslist-4.21.5" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001464" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" sources."dir-glob-3.0.1" - sources."electron-to-chromium-1.4.313" + sources."electron-to-chromium-1.4.326" sources."enhanced-resolve-5.12.0" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -150390,8 +150124,8 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.16.5" - (sources."terser-webpack-plugin-5.3.6" // { + sources."terser-5.16.6" + (sources."terser-webpack-plugin-5.3.7" // { dependencies = [ sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -150403,7 +150137,7 @@ in sources."update-browserslist-db-1.0.10" sources."uri-js-4.4.1" sources."watchpack-2.4.0" - (sources."webpack-5.75.0" // { + (sources."webpack-5.76.0" // { dependencies = [ sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -150444,14 +150178,14 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.2" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."@webtorrent/http-node-1.3.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."b4a-1.6.1" + sources."b4a-1.6.2" sources."base64-js-1.5.1" sources."bencode-2.0.3" sources."bep53-range-1.1.1" @@ -150909,10 +150643,10 @@ in wrangler = nodeEnv.buildNodePackage { name = "wrangler"; packageName = "wrangler"; - version = "2.12.0"; + version = "2.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/wrangler/-/wrangler-2.12.0.tgz"; - sha512 = "yAqv3JbJqkB1oaciI2CGEiEscQ98BXaFN+Z7VbWuepMqVL2UV2wUjA2mJLjWuoZOwSmC74MsDzZ+5hzDs/2Nkg=="; + url = "https://registry.npmjs.org/wrangler/-/wrangler-2.12.2.tgz"; + sha512 = "pjdZvcjiFD6mI3Nncsw3hBv3rxjMx0n4Mtp+Tsql/hvr0LpOmHKlW/aMeYx/fVUmjEKfWBSULc1vgM02O2UTWQ=="; }; dependencies = [ sources."@cloudflare/kv-asset-handler-0.2.0" @@ -150961,7 +150695,7 @@ in sources."@miniflare/watcher-2.12.1" sources."@miniflare/web-sockets-2.12.1" sources."@types/better-sqlite3-7.6.3" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."@types/stack-trace-0.0.29" sources."anymatch-3.1.3" sources."binary-extensions-2.2.0" @@ -151183,7 +150917,7 @@ in }) sources."eslint-visitor-keys-3.3.0" sources."espree-9.4.1" - sources."esquery-1.4.2" + sources."esquery-1.5.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."esutils-2.0.3" @@ -151222,7 +150956,7 @@ in sources."inherits-2.0.4" sources."internal-slot-1.0.5" sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.1" + sources."is-array-buffer-3.0.2" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" @@ -151357,16 +151091,17 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.11.0.tgz"; - sha512 = "1TBlhK1nMSpDiq3iZfAyDOg4xwagozZAnqr0AOrZG5UteMt3zbfhOVqhRuAunRIZ8kktfGMjsKxDjO+utGAJaA=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.12.0.tgz"; + sha512 = "cEQeHVqSH0+UgNNvVGrv3xu+NBTscBSmOS/vNfi7r5JPThgp3hIUVzjj0vxeXFj5swOxnpod0hD99tCkPGiikw=="; }; dependencies = [ sources."ajv-8.12.0" sources."fast-deep-equal-3.1.3" sources."json-schema-traverse-1.0.0" sources."jsonc-parser-3.2.0" + sources."lodash-4.17.21" sources."punycode-2.3.0" sources."request-light-0.5.8" sources."require-from-string-2.0.2" @@ -151383,7 +151118,7 @@ in sources."vscode-languageserver-types-3.17.3" sources."vscode-nls-5.2.0" sources."vscode-uri-3.0.7" - sources."yaml-2.0.0-11" + sources."yaml-2.2.1" ]; buildInputs = globalBuildInputs; meta = { @@ -151556,7 +151291,7 @@ in sources."ms-2.1.2" ]; }) - (sources."agentkeepalive-4.2.1" // { + (sources."agentkeepalive-4.3.0" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -151692,7 +151427,7 @@ in sources."define-lazy-prop-2.0.0" sources."define-properties-1.2.0" sources."delegates-1.0.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."detect-node-2.1.0" sources."dezalgo-1.0.4" sources."diff-5.1.0" @@ -151951,7 +151686,7 @@ in sources."micromatch-4.0.5" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-7.3.0" + sources."minimatch-7.4.2" sources."minimist-1.2.8" (sources."minimist-options-3.0.2" // { dependencies = [ @@ -152049,7 +151784,7 @@ in sources."debug-4.3.4" sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.17.0" + sources."lru-cache-7.18.3" (sources."make-fetch-happen-10.2.1" // { dependencies = [ sources."minipass-fetch-2.1.2" @@ -152270,7 +152005,7 @@ in sources."sort-keys-2.0.0" sources."sort-on-4.1.1" sources."spawn-sync-1.0.15" - sources."spdx-correct-3.1.1" + sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" @@ -152521,23 +152256,23 @@ in sources."@esm2cjs/p-timeout-5.1.0" sources."@esm2cjs/responselike-3.0.0" sources."@homebridge/ciao-1.1.5" - (sources."@sentry/core-7.39.0" // { + (sources."@sentry/core-7.42.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/integrations-7.39.0" // { + (sources."@sentry/integrations-7.42.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/node-7.39.0" // { + (sources."@sentry/node-7.42.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - sources."@sentry/types-7.39.0" - (sources."@sentry/utils-7.39.0" // { + sources."@sentry/types-7.42.0" + (sources."@sentry/utils-7.42.0" // { dependencies = [ sources."tslib-1.14.1" ]; @@ -152558,14 +152293,14 @@ in sources."@serialport/stream-10.5.0" sources."@types/http-cache-semantics-4.0.1" sources."@types/triple-beam-1.3.2" - sources."@zwave-js/cc-10.10.0" - sources."@zwave-js/config-10.10.0" - sources."@zwave-js/core-10.10.0" - sources."@zwave-js/host-10.10.0" - sources."@zwave-js/nvmedit-10.10.0" - sources."@zwave-js/serial-10.10.0" - sources."@zwave-js/shared-10.10.0" - sources."@zwave-js/testing-10.10.0" + sources."@zwave-js/cc-10.11.1" + sources."@zwave-js/config-10.11.1" + sources."@zwave-js/core-10.11.1" + sources."@zwave-js/host-10.11.1" + sources."@zwave-js/nvmedit-10.11.1" + sources."@zwave-js/serial-10.11.1" + sources."@zwave-js/shared-10.11.1" + sources."@zwave-js/testing-10.11.1" sources."agent-base-6.0.2" sources."alcalzone-shared-4.0.8" sources."ansi-colors-4.1.3" @@ -152682,7 +152417,7 @@ in sources."yallist-4.0.0" sources."yargs-17.7.1" sources."yargs-parser-21.1.1" - sources."zwave-js-10.10.0" + sources."zwave-js-10.11.1" ]; buildInputs = globalBuildInputs; meta = { @@ -152709,7 +152444,7 @@ in sources."@types/fs-extra-11.0.1" sources."@types/jsonfile-6.1.1" sources."@types/minimist-1.2.2" - sources."@types/node-18.14.2" + sources."@types/node-18.15.0" sources."@types/ps-tree-1.1.2" sources."@types/which-2.0.2" sources."braces-3.0.2" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix b/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix index 2b48536e09..44c3eca659 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix @@ -340,14 +340,22 @@ final: prev: { }; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = let - # Needed to fix Node.js 16+ - PR svanderburg/node2nix#302 - npmPatch = fetchpatch { - name = "emit-lockfile-v2-and-fix-bin-links-with-npmv7.patch"; - url = "https://github.com/svanderburg/node2nix/commit/375a055041b5ee49ca5fb3f74a58ca197c90c7d5.patch"; - hash = "sha256-uVYrXptJILojeur9s2O+J/f2vyPNCaZMn1GM/NoC5n8="; - }; + patches = [ + # Needed to fix Node.js 16+ - PR svanderburg/node2nix#302 + (fetchpatch { + name = "emit-lockfile-v2-and-fix-bin-links-with-npmv7.patch"; + url = "https://github.com/svanderburg/node2nix/commit/375a055041b5ee49ca5fb3f74a58ca197c90c7d5.patch"; + hash = "sha256-uVYrXptJILojeur9s2O+J/f2vyPNCaZMn1GM/NoC5n8="; + }) + # Needed to fix packages with DOS line-endings after above patch - PR svanderburg/node2nix#314 + (fetchpatch { + name = "convert-crlf-for-script-bin-files.patch"; + url = "https://github.com/svanderburg/node2nix/commit/91aa511fe7107938b0409a02ab8c457a6de2d8ca.patch"; + hash = "sha256-ISiKYkur/o8enKDzJ8mQndkkSC4yrTNlheqyH+LiXlU="; + }) + ]; in '' - patch -d $out/lib/node_modules/node2nix -p1 < ${npmPatch} + ${lib.concatStringsSep "\n" (map (patch: "patch -d $out/lib/node_modules/node2nix -p1 < ${patch}") patches)} wrapProgram "$out/bin/node2nix" --prefix PATH : ${lib.makeBinPath [ pkgs.nix ]} ''; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/alcotest/mirage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/alcotest/mirage.nix index dcf6533cda..e27889b404 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/alcotest/mirage.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/alcotest/mirage.nix @@ -5,6 +5,8 @@ buildDunePackage { inherit (alcotest) version src; + duneVersion = "3"; + propagatedBuildInputs = [ alcotest lwt logs mirage-clock duration ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix index fd0bf82df3..e8ff5df1a9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix @@ -8,14 +8,14 @@ buildDunePackage rec { pname = "awa"; - version = "0.1.1"; + version = "0.1.2"; minimalOCamlVersion = "4.08"; duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-${version}.tbz"; - hash = "sha256-ae1gTx3Emmkof/2Gnhq0d5RyfkFx21hHkVEVgyPdXuo="; + hash = "sha256-HfIqvmvmdizPSfSHthj2syszVZXVhju7tI8yNEetc38="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/chacha/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/chacha/default.nix index ebd73b519f..28aaad1c46 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/chacha/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/chacha/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { owner = "abeaumont"; repo = "ocaml-chacha"; rev = version; - sha256 = "sha256-PmeiFloU0k3SqOK1VjaliiCEzDzrzyMSasgnO5fJS1k="; + hash = "sha256-PmeiFloU0k3SqOK1VjaliiCEzDzrzyMSasgnO5fJS1k="; }; # Ensure compatibility with cstruct ≥ 6.1.0 @@ -27,6 +27,7 @@ buildDunePackage rec { })]; minimalOCamlVersion = "4.02"; + duneVersion = "3"; propagatedBuildInputs = [ cstruct mirage-crypto ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix index 99f3df4933..ada502aaf0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix @@ -5,14 +5,14 @@ buildDunePackage rec { pname = "conduit"; - version = "6.1.0"; + version = "6.2.0"; minimalOCamlVersion = "4.08"; duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz"; - sha256 = "sha256-ouKQiGMLvvksGpAhkqCVSKtKaz91p+7mciQm7KHvwF8="; + sha256 = "sha256-PtRAsO3aGyEt12K9skgx85TcoFmF3RtKxPlFgdFFI5Q="; }; propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ppx_sexp_conv ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/mirage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/mirage.nix index 09c7df5eda..9123c235dd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/mirage.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/mirage.nix @@ -1,7 +1,7 @@ { buildDunePackage, conduit-lwt , ppx_sexp_conv, sexplib, uri, cstruct, mirage-flow , mirage-flow-combinators, mirage-random, mirage-time, mirage-clock -, dns-client, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp +, dns-client-mirage, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp , tcpip, ca-certs-nss }: @@ -16,7 +16,7 @@ buildDunePackage { propagatedBuildInputs = [ sexplib uri cstruct mirage-clock mirage-flow mirage-flow-combinators mirage-random mirage-time - dns-client conduit-lwt vchan xenstore tls tls-mirage + dns-client-mirage conduit-lwt vchan xenstore tls tls-mirage ipaddr ipaddr-sexp tcpip ca-certs-nss ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/cli.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/cli.nix index 6e23eeecba..8c1ff57bc9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/cli.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/cli.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, dns, dns-tsig, dns-client, dns-server, dns-certify, dnssec +{ buildDunePackage, dns, dns-tsig, dns-client-lwt, dns-server, dns-certify, dnssec , bos, cmdliner, fpath, x509, mirage-crypto, mirage-crypto-pk , mirage-crypto-rng, hex, ptime, mtime, logs, fmt, ipaddr, lwt , randomconv, alcotest @@ -17,7 +17,7 @@ buildDunePackage { buildInputs = [ dns dns-tsig - dns-client + dns-client-lwt dns-server dns-certify dnssec diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client-lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client-lwt.nix new file mode 100644 index 0000000000..f17b8ed075 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client-lwt.nix @@ -0,0 +1,30 @@ +{ lib, buildDunePackage, dns, dns-client, lwt, mirage-clock, mirage-time +, mirage-random, mirage-crypto-rng, mtime, randomconv +, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest +, ca-certs, ca-certs-nss +, happy-eyeballs +, tcpip +, tls-lwt +}: + +buildDunePackage { + pname = "dns-client-lwt"; + inherit (dns) src version; + duneVersion = "3"; + + propagatedBuildInputs = [ + dns + dns-client + ipaddr + lwt + ca-certs + happy-eyeballs + tls-lwt + mtime + mirage-crypto-rng + ]; + checkInputs = [ alcotest ]; + doCheck = true; + + meta = dns-client.meta; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client-mirage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client-mirage.nix new file mode 100644 index 0000000000..2e0768d2b7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client-mirage.nix @@ -0,0 +1,32 @@ +{ lib, buildDunePackage, dns, dns-client, lwt, mirage-clock, mirage-time +, mirage-random, mirage-crypto-rng, mtime, randomconv +, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest +, ca-certs, ca-certs-nss +, happy-eyeballs +, tcpip +, tls, tls-mirage +}: + +buildDunePackage { + pname = "dns-client-mirage"; + inherit (dns) src version; + duneVersion = "3"; + + propagatedBuildInputs = [ + dns-client + domain-name + ipaddr + lwt + mirage-random + mirage-time + mirage-clock + ca-certs-nss + happy-eyeballs + tcpip + tls + tls-mirage + ]; + doCheck = true; + + meta = dns-client.meta; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client.nix index e8bd210dcd..bc859945e4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client.nix @@ -13,23 +13,9 @@ buildDunePackage { duneVersion = "3"; propagatedBuildInputs = [ - cstruct - fmt - logs dns randomconv domain-name - ipaddr - lwt - mirage-random - mirage-time - mirage-clock - ca-certs - ca-certs-nss - happy-eyeballs - tcpip - tls - tls-mirage mtime mirage-crypto-rng ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix index 81bc741d97..9012b9d821 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix @@ -17,14 +17,14 @@ buildDunePackage rec { pname = "dns"; - version = "6.4.1"; + version = "7.0.1"; minimalOCamlVersion = "4.08"; duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz"; - hash = "sha256-omG0fKZAHGc+4ERC8cyK47jeEkiBZkB+1fz46j6SDno="; + hash = "sha256-vDe1U1NbbIPcD1AmMG265ke7651C64mds7KcFHUN4fU="; }; propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics base64 ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/stub.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/stub.nix index 943d28a57c..343f4925b1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/stub.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/stub.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, dns, dns-client, dns-mirage, dns-resolver, dns-tsig +{ buildDunePackage, dns, dns-client-mirage, dns-mirage, dns-resolver, dns-tsig , dns-server, duration, randomconv, lwt, mirage-time, mirage-clock , mirage-random, tcpip, metrics }: @@ -11,7 +11,7 @@ buildDunePackage { propagatedBuildInputs = [ dns - dns-client + dns-client-mirage dns-mirage dns-resolver dns-tsig diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/duration/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/duration/default.nix index 1a1f9b0776..34326c8a11 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/duration/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/duration/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "duration"; - version = "0.2.0"; + version = "0.2.1"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { - url = "https://github.com/hannesm/duration/releases/download/${version}/duration-${version}.tbz"; - sha256 = "sha256-rRT7daWm9z//fvFyEXiSXuVVzw8jsj46sykYS8DBzmk="; + url = "https://github.com/hannesm/duration/releases/download/v${version}/duration-${version}.tbz"; + hash = "sha256-xzjB84z7mYIMEhzT3fgZ3ksiKPDVDqy9HMPOmefHHis="; }; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix index 64ebc1affe..b2537bd25b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix @@ -1,6 +1,7 @@ { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage , AppKit , AudioToolbox +, AVFoundation , Cocoa , CoreImage , ForceFeedback @@ -20,7 +21,17 @@ buildDunePackage { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] - ++ lib.optionals stdenv.isDarwin [ AppKit AudioToolbox Cocoa CoreImage ForceFeedback OpenGL VideoToolbox ]; + ++ lib.optionals stdenv.isDarwin [ + AppKit + AudioToolbox + AVFoundation + Cocoa + CoreImage + ForceFeedback + OpenGL + VideoToolbox + ]; + propagatedBuildInputs = [ ffmpeg-av ffmpeg.dev ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix index f5e8337382..680c77dfa3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, git +{ buildDunePackage, fetchpatch, git , rresult, result, bigstringaf , fmt, bos, fpath, uri, digestif, logs, lwt , mirage-clock, mirage-clock-unix, astring, awa, cmdliner @@ -14,6 +14,13 @@ buildDunePackage { pname = "git-unix"; inherit (git) version src; + patches = [ + (fetchpatch { + url = "https://github.com/mirage/ocaml-git/commit/b708db8319cc456a5640618210d740a1e00468e9.patch"; + hash = "sha256-Fe+eDhU/beZT/8br8XmOhHYJowaVEha16eGqyuu2Zr4="; + }) + ]; + minimalOCamlVersion = "4.08"; duneVersion = "3"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix deleted file mode 100644 index 4985459248..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{stdenv, lib, fetchurl, ocaml, findlib, gdome2, libxslt, pkg-config}: - -let - pname = "gmetadom"; -in - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "0.2.6"; - - src = fetchurl { - url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "0skmlv0pnqvg99wzzzi1h4zhwzd82xg7xpkj1kwpfy7bzinjh7ig"; - }; - - patches = [ ./gcc-4.3.patch ]; - - dontDisableStatic = true; - - preConfigure='' - configureFlags="--with-ocaml-lib-prefix=$out/lib/ocaml/${ocaml.version}/site-lib" - ''; - - nativeBuildInputs = [ pkg-config ocaml findlib ]; - buildInputs = [ libxslt ]; - propagatedBuildInputs = [ gdome2 ]; - - strictDeps = true; - - meta = { - homepage = "https://gmetadom.sourceforge.net/"; - description = "A collection of librares, each library providing a DOM implementation"; - license = lib.licenses.lgpl21Plus; - maintainers = [ lib.maintainers.roconnor ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gmetadom/gcc-4.3.patch b/third_party/nixpkgs/pkgs/development/ocaml-modules/gmetadom/gcc-4.3.patch deleted file mode 100644 index d8d1d46316..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gmetadom/gcc-4.3.patch +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## gcc-4.3.dpatch by Stefano Zacchiroli -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: ensure sources build with gcc-4.3 - -@DPATCH@ -diff -urNad trunk~/src/shared/Traits.hh.in trunk/src/shared/Traits.hh.in ---- trunk~/src/shared/Traits.hh.in 2003-01-14 12:41:55.000000000 +0100 -+++ trunk/src/shared/Traits.hh.in 2008-05-01 15:45:39.000000000 +0200 -@@ -26,6 +26,7 @@ - */ - - #include -+#include - - #include "@DOM_NAMESPACE@Char.hh" - diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/default.nix index a3a2a3cff1..79b1a30d61 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/default.nix @@ -4,13 +4,14 @@ buildDunePackage rec { pname = "happy-eyeballs"; - version = "0.4.0"; + version = "0.5.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/roburio/happy-eyeballs/releases/download/v${version}/happy-eyeballs-${version}.tbz"; - hash = "sha256-gR9q4J/DnYJz8oYmk/wy17h4F6wxbllba/gkor5i1nQ="; + hash = "sha256-T4BOFlSj3xfUFhP9v8UaCHgmhvGrMyeqNUQf79bdBh4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix index 50f1f94557..6d2ef3b805 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix @@ -1,7 +1,7 @@ { buildDunePackage , happy-eyeballs , cmdliner -, dns-client +, dns-client-lwt , duration , domain-name , ipaddr @@ -29,7 +29,7 @@ buildDunePackage { ]; propagatedBuildInputs = [ - dns-client + dns-client-lwt happy-eyeballs logs lwt diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix index eb15706efa..bc3341a422 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix @@ -1,7 +1,7 @@ { buildDunePackage , happy-eyeballs , duration -, dns-client +, dns-client-mirage , domain-name , ipaddr , fmt @@ -32,7 +32,7 @@ buildDunePackage { ]; propagatedBuildInputs = [ - dns-client + dns-client-mirage happy-eyeballs logs lwt diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/http-mirage-client/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/http-mirage-client/default.nix new file mode 100644 index 0000000000..08b3758d53 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/http-mirage-client/default.nix @@ -0,0 +1,63 @@ +{ lib +, fetchurl +, fetchpatch +, buildDunePackage +, h2 +, httpaf +, mimic-happy-eyeballs +, mirage-clock +, paf +, tcpip +, x509 +, alcotest-lwt +, mirage-clock-unix +, mirage-crypto-rng +, mirage-time-unix +}: + +buildDunePackage rec { + pname = "http-mirage-client"; + version = "0.0.2"; + + duneVersion = "3"; + minimalOCamlVersion = "4.08"; + + src = fetchurl { + url = "https://github.com/roburio/http-mirage-client/releases/download/v${version}/http-mirage-client-${version}.tbz"; + hash = "sha256-stom13t3Kn1ehkeURem39mxhd3Lmlz8z9m3tHGcp5vY="; + }; + + # Make tests use mirage-crypto + patches = lib.lists.map fetchpatch [ + { url = "https://github.com/roburio/http-mirage-client/commit/c6cd38db9c23ac23e7c3e4cf2d41420f58034e8d.patch"; + hash = "sha256-b3rurqF0DxLpVQEhVfROwc7qyul0Fjfl3zhD8AkzemU="; } + { url = "https://github.com/roburio/http-mirage-client/commit/0a5367e7c6d9b7f45c88493f7a596f7a83e8c7d5.patch"; + hash = "sha256-Q6YlfuiAfsyhty9EvoBetvekuU25KjrH5wwGwYTAAiA="; } + ]; + + propagatedBuildInputs = [ + h2 + httpaf + mimic-happy-eyeballs + mirage-clock + paf + tcpip + x509 + ]; + + doCheck = true; + checkInputs = [ + alcotest-lwt + mirage-clock-unix + mirage-crypto-rng + mirage-time-unix + ]; + + meta = { + description = "HTTP client for MirageOS"; + homepage = "https://github.com/roburio/http-mirage-client"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix index 13875147a4..9fdff45b6a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -21,11 +21,11 @@ buildDunePackage rec { pname = "letsencrypt"; - version = "0.4.1"; + version = "0.5.0"; src = fetchurl { - url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-v${version}.tbz"; - hash = "sha256-+Qh19cm9yrTIvl7H6+nqdjAw+nCOAoVzAJlrsW58IHA="; + url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-${version}.tbz"; + hash = "sha256-XGroZiNyP0ItOMrXK07nrVqT4Yz9RKXYvZuRkDp089M="; }; minimalOCamlVersion = "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/mirage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/mirage.nix new file mode 100644 index 0000000000..f43ab9812c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/mirage.nix @@ -0,0 +1,20 @@ +{ buildDunePackage +, letsencrypt +, emile +, http-mirage-client +, paf +}: + +buildDunePackage { + pname = "letsencrypt-mirage"; + + inherit (letsencrypt) version src; + + duneVersion = "3"; + + propagatedBuildInputs = [ emile http-mirage-client letsencrypt paf ]; + + meta = letsencrypt.meta // { + description = "ACME implementation in OCaml for MirageOS"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix index 5fcf7cf511..c82e77adb5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix @@ -5,6 +5,7 @@ buildDunePackage rec { version = "0.4.0"; minimalOCamlVersion = "4.04"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/metrics/releases/download/v${version}/metrics-${version}.tbz"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/influx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/influx.nix index cca344f991..f004c1042a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/influx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/influx.nix @@ -6,6 +6,8 @@ buildDunePackage rec { pname = "metrics-influx"; inherit (metrics) version src; + duneVersion = "3"; + propagatedBuildInputs = [ duration fmt lwt metrics ]; meta = metrics.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/lwt.nix index 088a4e586c..465f4adc5c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/lwt.nix @@ -5,6 +5,8 @@ buildDunePackage { inherit (metrics) version src; + duneVersion = "3"; + propagatedBuildInputs = [ logs lwt metrics ]; meta = metrics.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/rusage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/rusage.nix index 8e93823c21..ed944fb6df 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/rusage.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/rusage.nix @@ -7,6 +7,7 @@ buildDunePackage { inherit (metrics) src version; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ fmt logs metrics ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix index 5df5e14982..3816dfa8ff 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix @@ -6,6 +6,8 @@ buildDunePackage rec { inherit (metrics) version src; + duneVersion = "3"; + # Fixes https://github.com/mirage/metrics/issues/57 postPatch = '' substituteInPlace src/unix/dune --replace "mtime mtime.clock" "mtime" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix index d5f110948d..73d0c4fee7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -5,13 +5,14 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; + duneVersion = "3"; pname = "mirage-crypto"; - version = "0.10.7"; + version = "0.11.0"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-${version}.tbz"; - sha256 = "sha256-PoGKdgwjXFtoTHtrQ7HN0qfdBOAQW2gNUk+DbrmIppw="; + sha256 = "sha256-A5SCuVmcIJo3dL0Tu//fQqEV0v3FuCxuANWnBo7hUeQ="; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/ec.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/ec.nix index 3afe582413..b17182a5ef 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/ec.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/ec.nix @@ -24,6 +24,8 @@ buildDunePackage rec { src version; + duneVersion = "3"; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/pk.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/pk.nix index b79f49c64b..e50838e50b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/pk.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/pk.nix @@ -6,6 +6,8 @@ buildDunePackage rec { inherit (mirage-crypto) version src; + duneVersion = "3"; + buildInputs = [ gmp ]; propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng zarith eqaf sexplib0 ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix index 5752507f9e..b9979b446d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix @@ -8,6 +8,8 @@ buildDunePackage { inherit (mirage-crypto) version src; + duneVersion = "3"; + buildInputs = [ dune-configurator ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-lwt.nix new file mode 100644 index 0000000000..bcaac601c9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-lwt.nix @@ -0,0 +1,17 @@ +{ buildDunePackage, mirage-crypto, mirage-crypto-rng, dune-configurator +, duration, logs, mtime, lwt }: + +buildDunePackage rec { + pname = "mirage-crypto-rng-lwt"; + + inherit (mirage-crypto) version src; + + duneVersion = "3"; + + doCheck = true; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ mirage-crypto mirage-crypto-rng duration logs mtime lwt ]; + + meta = mirage-crypto-rng.meta; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix index c3703a5a60..3e0cde29c5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix @@ -7,6 +7,7 @@ buildDunePackage rec { pname = "mirage-crypto-rng-mirage"; inherit (mirage-crypto-rng) version src; + duneVersion = "3"; doCheck = true; checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix index 044b8ed27b..bbc7823e1f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix @@ -5,12 +5,13 @@ buildDunePackage rec { pname = "mirage-crypto-rng"; inherit (mirage-crypto) version src; + duneVersion = "3"; doCheck = true; checkInputs = [ ounit2 randomconv ]; buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt ]; + propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-fs/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-fs/default.nix index 23c79c4a77..f880a71d41 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-fs/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-fs/default.nix @@ -1,19 +1,19 @@ { lib, fetchurl, buildDunePackage -, cstruct, fmt, lwt, mirage-device, mirage-kv +, cstruct, fmt, lwt, mirage-kv }: buildDunePackage rec { pname = "mirage-fs"; version = "4.0.0"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-fs/releases/download/v${version}/mirage-fs-v${version}.tbz"; - sha256 = "sha256-PYZ2HCPuxOv4FU7EHymsa1oIZU7q8TSzzRvlngYdZ3s="; + hash = "sha256-PYZ2HCPuxOv4FU7EHymsa1oIZU7q8TSzzRvlngYdZ3s="; }; - propagatedBuildInputs = [ cstruct fmt lwt mirage-device mirage-kv ]; + propagatedBuildInputs = [ cstruct fmt lwt mirage-kv ]; meta = { description = "MirageOS signatures for filesystem devices"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-kv/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-kv/default.nix index 20d83e1664..d32a9e3935 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-kv/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-kv/default.nix @@ -1,20 +1,22 @@ { lib, fetchurl, buildDunePackage -, fmt, mirage-device +, fmt +, lwt , alcotest }: buildDunePackage rec { pname = "mirage-kv"; - version = "3.0.1"; + version = "4.0.1"; - useDune2 = true; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mirage/mirage-kv/releases/download/v${version}/mirage-kv-v${version}.tbz"; - sha256 = "1n736sjvdd8rkbc2b5jm9sn0w6hvhjycma5328r0l03v24vk5cki"; + url = "https://github.com/mirage/mirage-kv/releases/download/v${version}/mirage-kv-${version}.tbz"; + hash = "sha256-p6i4zUVgxtTnUiBIjb8W6u9xRTczVl4WwfFcl5tVqnE="; }; - propagatedBuildInputs = [ fmt mirage-device ]; + propagatedBuildInputs = [ fmt lwt ]; doCheck = true; checkInputs = [ alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-time/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-time/default.nix index 1780ba05ac..6b4b5f9ac7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-time/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-time/default.nix @@ -1,19 +1,19 @@ -{ lib, buildDunePackage, fetchurl, ocaml_lwt }: +{ lib, buildDunePackage, fetchurl, lwt }: buildDunePackage rec { - minimumOCamlVersion = "4.06"; + minimalOCamlVersion = "4.08"; pname = "mirage-time"; version = "3.0.0"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-time/releases/download/v${version}/mirage-time-v${version}.tbz"; - sha256 = "sha256-DUCUm1jix+i3YszIzgZjRQRiM8jJXQ49F6JC/yicvXw="; + hash = "sha256-DUCUm1jix+i3YszIzgZjRQRiM8jJXQ49F6JC/yicvXw="; }; - propagatedBuildInputs = [ ocaml_lwt ]; + propagatedBuildInputs = [ lwt ]; meta = with lib; { homepage = "https://github.com/mirage/mirage-time"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-time/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-time/unix.nix index c19ca30fe0..9678815edf 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-time/unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-time/unix.nix @@ -1,11 +1,12 @@ -{ buildDunePackage, fetchurl, mirage-time, ocaml_lwt, duration }: +{ buildDunePackage, fetchurl, mirage-time, lwt, duration }: buildDunePackage { pname = "mirage-time-unix"; - inherit (mirage-time) src useDune2 version minimumOCamlVersion; + inherit (mirage-time) src version; + duneVersion = "3"; - propagatedBuildInputs = [ mirage-time ocaml_lwt duration ]; + propagatedBuildInputs = [ mirage-time lwt duration ]; meta = mirage-time.meta // { description = "Time operations for MirageOS on Unix"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-unix/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-unix/default.nix index 3663e4b9cb..c0ce9fec10 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-unix/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-unix/default.nix @@ -4,9 +4,11 @@ buildDunePackage rec { pname = "mirage-unix"; version = "5.0.1"; + duneVersion = "3"; + src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "sha256-U1oLznUDBcJLcVygfSiyl5qRLDM27cm/WrjT0vSGhPg="; + hash = "sha256-U1oLznUDBcJLcVygfSiyl5qRLDM27cm/WrjT0vSGhPg="; }; propagatedBuildInputs = [ lwt duration mirage-runtime ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-vnetif/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-vnetif/default.nix index 22955018bd..94b5f39820 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-vnetif/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-vnetif/default.nix @@ -9,10 +9,11 @@ buildDunePackage rec { version = "0.6.0"; minimalOCamlVersion = "4.06"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "sha256-fzRoNFqdnj4Ke+eNdo5crvbnKDx6/+dQyu+K3rD5dYw="; + hash = "sha256-fzRoNFqdnj4Ke+eNdo5crvbnKDx6/+dQyu+K3rD5dYw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/cohttp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/cohttp.nix index 2f28914930..e7e0273e52 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/cohttp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/cohttp.nix @@ -22,6 +22,7 @@ buildDunePackage { inherit (paf) version src + patches ; duneVersion = "3"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix index 974c981f57..6345499ca2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix @@ -32,6 +32,14 @@ buildDunePackage rec { hash = "sha256-ux8fk4XDdih4Ua9NGOJVSuPseJBPv6+6ND/esHrluQE="; }; + patches = [ + # Compatibility with mirage-crypto 0.11.0 + (fetchpatch { + url = "https://github.com/dinosaure/paf-le-chien/commit/2f308c1c4d3ff49d42136f8ff86a4385661e4d1b.patch"; + hash = "sha256-jmSeUpoRoUMPUNEH3Av2LxgRZs+eAectK+CpoH+SdpY="; + }) + ]; + minimalOCamlVersion = "4.08"; duneVersion = "3"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/le.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/le.nix index 429cd0a4d8..a31575d469 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/le.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/le.nix @@ -1,7 +1,7 @@ { lib , buildDunePackage , paf -, dns-client +, dns-client-mirage , duration , emile , httpaf @@ -18,13 +18,14 @@ buildDunePackage { inherit (paf) version src + patches ; duneVersion = "3"; propagatedBuildInputs = [ paf - dns-client + dns-client-mirage duration emile httpaf diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/routes/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/routes/default.nix index 36476e587f..584e287bba 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/routes/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/routes/default.nix @@ -2,14 +2,14 @@ buildDunePackage rec { pname = "routes"; - version = "1.0.0"; + version = "2.0.0"; - useDune2 = true; + duneVersion = "3"; minimalOCamlVersion = "4.05"; src = fetchurl { url = "https://github.com/anuragsoni/routes/releases/download/${version}/routes-${version}.tbz"; - sha256 = "sha256-WSlASDTA1UX+NhW38/XuLkOkdwjIxz0OUkX6Nd2iROg="; + hash = "sha256-O2KdaYwrAOUEwTtM14NUgGNxnc8BWAycP1EEuB6w1og="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix index b68edba272..18506b611f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix @@ -6,11 +6,11 @@ buildDunePackage rec { pname = "tls"; - version = "0.15.4"; + version = "0.16.0"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-${version}.tbz"; - sha256 = "sha256-X40dVrBvYGnv0dCj3gxFy0iNPRPrfxMshOx7o/DRw4I="; + sha256 = "sha256-uvIDZLNy6E/ce7YmzUUVaOeGRaHqPSUzuEPQDMu09tM="; }; minimalOCamlVersion = "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/lwt.nix new file mode 100644 index 0000000000..90eefa4347 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/lwt.nix @@ -0,0 +1,19 @@ +{ lib, buildDunePackage, tls, lwt, mirage-crypto-rng-lwt, cmdliner, x509 }: + +buildDunePackage rec { + pname = "tls-lwt"; + + inherit (tls) src meta version; + + minimalOCamlVersion = "4.11"; + duneVersion = "3"; + + doCheck = true; + + propagatedBuildInputs = [ + lwt + mirage-crypto-rng-lwt + tls + x509 + ]; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix index bd7a7a0fa4..7607603951 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix @@ -8,13 +8,13 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; pname = "x509"; - version = "0.16.2"; + version = "0.16.4"; duneVersion = "3"; src = fetchurl { url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-${version}.tbz"; - hash = "sha256-Zf/ZZjUAkeWe04XLmqMKgbxN/qe/Z1mpKM82veXVf2I="; + hash = "sha256-XegxhdASQK/I7Xd0gJSLumTGbCYFpWsjR7PlZSWqaVo="; }; checkInputs = [ alcotest cstruct-unix ]; diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix b/third_party/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix index 3689122805..99c100455a 100644 --- a/third_party/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix +++ b/third_party/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, docbook_xsl, docbook_xsl_ns, gettext, libxslt, glibcLocales, docbook_xml_dtd_412, docbook_sgml_dtd_41, texlive, opensp +{ stdenv, lib, fetchurl, docbook_xsl, docbook_xsl_ns, gettext, libxslt, glibcLocales, docbook_xml_dtd_412, docbook_sgml_dtd_41, texlive, opensp, bash , perl, buildPerlPackage, ModuleBuild, TextWrapI18N, LocaleGettext, TermReadKey, SGMLSpm, UnicodeLineBreak, PodParser, YAMLTiny , fetchpatch }: @@ -18,10 +18,12 @@ buildPerlPackage rec { sha256 = "9MVkYiItR2P3PBCUc4OhEOUHQuLqTWUYtYlZ3L8miC8="; }) ]; - nativeBuildInputs = [ docbook_xsl docbook_xsl_ns ModuleBuild ]; + + strictDeps = true; + nativeBuildInputs = [ gettext libxslt docbook_xsl docbook_xsl_ns ModuleBuild docbook_xml_dtd_412 docbook_sgml_dtd_41 opensp texlive.combined.scheme-basic glibcLocales ]; propagatedBuildInputs = lib.optional (!stdenv.hostPlatform.isMusl) TextWrapI18N ++ [ LocaleGettext SGMLSpm UnicodeLineBreak PodParser YAMLTiny ]; # TODO: TermReadKey was temporarily removed from propagatedBuildInputs to unfreeze the build - buildInputs = [ gettext libxslt glibcLocales docbook_xml_dtd_412 docbook_sgml_dtd_41 texlive.combined.scheme-basic opensp ]; + buildInputs = [ bash ]; LC_ALL = "en_US.UTF-8"; SGML_CATALOG_FILES = "${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml"; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/third_party/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix index 806ad65b73..f867e84374 100644 --- a/third_party/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix +++ b/third_party/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix @@ -40,17 +40,25 @@ buildPerlPackage rec { postBuild = '' patchShebangs ./bin - '' + lib.optionalString stdenv.isDarwin '' - shortenPerlShebang bin/strip-nondeterminism ''; postInstall = '' # we don’t need the debhelper script rm $out/bin/dh_strip_nondeterminism rm $out/share/man/man1/dh_strip_nondeterminism.1 + '' + lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/strip-nondeterminism ''; - doCheck = true; + installCheckPhase = '' + runHook preInstallCheck + ($out/bin/strip-nondeterminism --help 2>&1 | grep -q "verbose") || (echo "'$out/bin/strip-nondeterminism --help' failed" && exit 1) + runHook postInstallCheck + ''; + + # running shortenPerlShebang in postBuild results in non-functioning binary 'exec format error' + doCheck = !stdenv.isDarwin; + doInstallCheck = true; meta = with lib; { description = "A Perl module for stripping bits of non-deterministic information"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/msgpack/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/msgpack/default.nix new file mode 100644 index 0000000000..282fefa947 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/php-packages/msgpack/default.nix @@ -0,0 +1,16 @@ +{ buildPecl, lib }: + +buildPecl rec { + version = "2.2.0RC2"; + pname = "msgpack"; + + sha256 = "sha256-bVV043knbk7rionXqB70RKa1zlJ5K/Nw0oTXZllmJOg="; + + meta = with lib; { + changelog = "https://pecl.php.net/package-info.php?package=msgpack&version=${version}"; + description = "PHP extension for interfacing with MessagePack"; + license = licenses.bsd3; + homepage = "https://github.com/msgpack/msgpack-php"; + maintainers = teams.php.members ++ [ maintainers.ostrolucky ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/php-packages/ssh2/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/ssh2/default.nix new file mode 100644 index 0000000000..058702d65c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/php-packages/ssh2/default.nix @@ -0,0 +1,19 @@ +{ buildPecl, lib, libssh2 }: + +buildPecl rec { + version = "1.3.1"; + pname = "ssh2"; + + sha256 = "sha256-kJOh+NJNxlg2AnsOI5xQ3o1err+DlrwzMf3TjF1pr9k="; + + buildInputs = [ libssh2 ]; + configureFlags = [ "--with-ssh2=${libssh2.dev}" ]; + + meta = with lib; { + changelog = "https://pecl.php.net/package-info.php?package=ssh2&version=${version}"; + description = "PHP bindings for the libssh2 library"; + license = licenses.php301; + homepage = "https://github.com/php/pecl-networking-ssh2"; + maintainers = teams.php.members ++ [ maintainers.ostrolucky ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Cython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Cython/default.nix index 5366fb0786..a6e836b9ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Cython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Cython/default.nix @@ -57,7 +57,7 @@ in buildPythonPackage rec { (fetchpatch { name = "disable-trashcan.patch"; url = "https://github.com/cython/cython/commit/e337825cdcf5e94d38ba06a0cb0188e99ce0cc92.patch"; - sha256 = "sha256-q0f63eetKrDpmP5Z4v8EuGxg26heSyp/62OYqhRoSso="; + hash = "sha256-q0f63eetKrDpmP5Z4v8EuGxg26heSyp/62OYqhRoSso="; }) ]; 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 8ce782aedc..00846838b2 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 = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Rjw4oI0uTO9sSYt2ulvUhY5MbvUdoaWh8nE5oCLiAkg="; + hash = "sha256-0sJE0BBIukdufAgL0sbfXhQdIR3oAiNGDVs7iipYQz0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/acoustics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/acoustics/default.nix index e0354b58de..d38f67d8c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/acoustics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/acoustics/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-0CvMhCUc+i7dPiHH+IXdlj+OjFh/l1wvnU4dmxQrzFI="; + hash = "sha256-0CvMhCUc+i7dPiHH+IXdlj+OjFh/l1wvnU4dmxQrzFI="; }; format = "pyproject"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/actdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/actdiag/default.nix index 60131fcb9d..2f3549efb0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/actdiag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/actdiag/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "blockdiag"; repo = pname; rev = version; - sha256 = "sha256-WmprkHOgvlsOIg8H77P7fzEqxGnj6xaL7Df7urRkg3o="; + hash = "sha256-WmprkHOgvlsOIg8H77P7fzEqxGnj6xaL7Df7urRkg3o="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-nrfutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-nrfutil/default.nix index ec61902034..43071fa93f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-nrfutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-nrfutil/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "adafruit"; repo = "Adafruit_nRF52_nrfutil"; rev = version; - sha256 = "sha256-mHHKOQE9AGBX8RAyaPOy+JS3fTs98+AFdq9qsVy7go4="; + hash = "sha256-mHHKOQE9AGBX8RAyaPOy+JS3fTs98+AFdq9qsVy7go4="; }; patches = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { (fetchpatch { name = "fix-tests.patch"; url = "https://github.com/adafruit/Adafruit_nRF52_nrfutil/commit/e5fbcc8ee5958041db38c04139ba686bf7d1b845.patch"; - sha256 = "sha256-0tbJldGtYcDdUzA3wZRv0lenXVn6dqV016U9nMpQ6/w="; + hash = "sha256-0tbJldGtYcDdUzA3wZRv0lenXVn6dqV016U9nMpQ6/w="; }) ]; 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 147e5805b8..20853b1339 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.40.3"; + version = "3.41.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-phG9DEl4JlrIN3zil0SQRZ+DnktpunK094nxVQ9Cksw="; + hash = "sha256-NWdY1ykuF8mYxXPCwaVq6mEkQXHrUmhEy/BXDFYn2V0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adax/default.nix index c7b0dcb45b..e424002863 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adax/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyadax"; rev = version; - sha256 = "sha256-EMSX2acklwWOYiEeLHYG5mwdiGnWAUo5dGMiHCmZrko="; + hash = "sha256-EMSX2acklwWOYiEeLHYG5mwdiGnWAUo5dGMiHCmZrko="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix index 3fb15671ec..fef0d6eea9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/dA3OwBBMjykSYaIbvhJZj9Z8/0+mfL5pW4GqgMgops="; + hash = "sha256-/dA3OwBBMjykSYaIbvhJZj9Z8/0+mfL5pW4GqgMgops="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix index 3aa50cc101..ca9fab212c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "Phlya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-N+eCDwK5E9zGKG7uruuhnpTlJeiXG2a15PKW0gJFAqw="; + hash = "sha256-N+eCDwK5E9zGKG7uruuhnpTlJeiXG2a15PKW0gJFAqw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/advocate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/advocate/default.nix index 7462dfb868..e0062be35c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/advocate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/advocate/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "JordanMilne"; repo = pname; rev = "v${version}"; - sha256 = "sha256-opObkjkad+yrLE2b7DULHjGuNeVhu4fEmSavgA39YPw="; + hash = "sha256-opObkjkad+yrLE2b7DULHjGuNeVhu4fEmSavgA39YPw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix index 8789bd0fa1..64e3cfa7b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "AEMET-OpenData"; rev = "refs/tags/${version}"; - sha256 = "sha256-3f3hvui00oItu6t9rKecoCquqsD1Eeqz+SEsLBqGt48="; + hash = "sha256-3f3hvui00oItu6t9rKecoCquqsD1Eeqz+SEsLBqGt48="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aeppl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aeppl/default.nix index 039abb2fb6..7be777cef0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aeppl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aeppl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aeppl"; - version = "0.0.50"; + version = "0.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "aesara-devs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cc41MspG2mXlNwLz7ViPPqXH/ayskVmms5SXqBo9g3Y="; + hash = "sha256-SxMuYKnV4VBv38CcAI7NCvHutSEB+coHnw5b1RPEpzY="; }; propagatedBuildInputs = [ @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for an Aesara-based PPL"; homepage = "https://github.com/aesara-devs/aeppl"; + changelog = "https://github.com/aesara-devs/aeppl/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix index a739ce0d52..9e05354783 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aesara"; - version = "2.8.9"; + version = "2.8.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "aesara-devs"; repo = "aesara"; rev = "refs/tags/rel-${version}"; - hash = "sha256-xHh7u0NDMjQiu0TdjmiHQebfpXJkuAF7dUAAtXrmrPo="; + hash = "sha256-lRc0IGpxkSnVeziFOYX7f99P7WNvz1KHy73qMPrU24I="; }; nativeBuildInputs = [ 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 397ad4e17b..c1413ea565 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { pname = "afdko"; - version = "3.9.2"; + version = "3.9.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3JEnQbS4CtZEqAb+/ngqkO+nv9SZ0Zi8sPJLyW+tQ9w="; + hash = "sha256-v0fIhf3P5Xjdn5/ryRNj0Q2YHAisMqi5RTmJQabaUO0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/affine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/affine/default.nix index 85991ac755..d474caa938 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/affine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/affine/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "affine"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1nbeZhV61q+Z/9lOD1Tonfw1sPtyUurS7QrS3KQxvdA="; + hash = "sha256-ok2BjWqDbBMZdtIvjCe408oy0K9kwdjSnet7r6TaHuo="; }; nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix index 5c6cf00cd2..2b5863d198 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-MLZCoypbZxFhq++ejsNjUvLniiTOhJBU7axpRti53cY="; + hash = "sha256-MLZCoypbZxFhq++ejsNjUvLniiTOhJBU7axpRti53cY="; }; propagatedBuildInputs = [ agate sqlalchemy ]; @@ -27,6 +27,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "agatesql" ]; meta = with lib; { + # https://github.com/wireservice/agate-sql/commit/74af1badd85408909ea72cb6ca8c0b223d178c6f + broken = lib.versionAtLeast sqlalchemy.version "2.0"; description = "Adds SQL read/write support to agate."; homepage = "https://github.com/wireservice/agate-sql"; license = with licenses; [ mit ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/agate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/agate/default.nix index 4b5ac20113..ad757b100e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/agate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/agate/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "wireservice"; repo = pname; rev = version; - sha256 = "sha256-tuUoLvztCYHIPJTBgw1eByM0zfaHDyc+h7SWsxutKos="; + hash = "sha256-tuUoLvztCYHIPJTBgw1eByM0zfaHDyc+h7SWsxutKos="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix index 89b998bee6..5aa8b9dcb4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "pytroll"; repo = pname; rev = "v${version}"; - sha256 = "sha256-w3HlnsHYB0R+HZOXtzygC2RST3gllPI7SYtwSCVXhTU="; + hash = "sha256-w3HlnsHYB0R+HZOXtzygC2RST3gllPI7SYtwSCVXhTU="; }; nativeCheckInputs = [ 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 0bcd1360e2..0f1163d184 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.41"; + version = "9.2.42"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-KXbHD0CsQotHjc/Pbo4/y/uhCvGkbPDGn1BF8A68xBY="; + hash = "sha256-45wEnYx2/XvyVlew8rwPFSHZtj6NdZWPEEomkqBLNIw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix index 3b61a49a4e..fed8b6374a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-volcano"; rev = "refs/tags/v${version}"; - sha256 = "sha256-wJVFjy6QgYb6GX9pZTylYFvCRWmD2lAFZKnodsa8Yqo="; + hash = "sha256-wJVFjy6QgYb6GX9pZTylYFvCRWmD2lAFZKnodsa8Yqo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix index 73f77b517a..6a08ba9e81 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.5.2"; + version = "0.5.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-x4OtYUJjRDSDd0FzlbMf7syjUIVxKsqgEfRWS1wgvPo="; + hash = "sha256-A2jk8gXqKeQ3b2p9/bkPat1NdhUOFdJCZeSFg//D/hA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioapns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioapns/default.nix index a083a0c2f1..9cebf5f1eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioapns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioapns/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-3FMNIhIZrstPKTfHVmN+K28UR2G26HZ5S/JtXmaFk1c="; + hash = "sha256-3FMNIhIZrstPKTfHVmN+K28UR2G26HZ5S/JtXmaFk1c="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioazuredevops/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioazuredevops/default.nix index 4c8cd7a45d..2054b49b7c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioazuredevops/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioazuredevops/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-vNTvSQYjjptdPsHz0zM9paq3iodZrhcEralPm6YRZJE="; + hash = "sha256-vNTvSQYjjptdPsHz0zM9paq3iodZrhcEralPm6YRZJE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiobroadlink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiobroadlink/default.nix index d921f3c080..4be5376978 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiobroadlink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiobroadlink/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-uTUtDhL9VtWZE+Y6ZJY4prmlE+Yh2UrCg5+eSyAQzMk="; + hash = "sha256-uTUtDhL9VtWZE+Y6ZJY4prmlE+Yh2UrCg5+eSyAQzMk="; }; propagatedBuildInputs = [ 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 9451bcd92b..090b98b9ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-XR79o65jZFR9jr9ubw7wdxCWNH8ANMrBDTVpLnetsuU="; + hash = "sha256-XR79o65jZFR9jr9ubw7wdxCWNH8ANMrBDTVpLnetsuU="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiocron/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiocron/default.nix index d7fee0d0a3..2b3f6e595d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiocron/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiocron/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SFRlE/ry63kB5lpk66e2U8gBBu0A7ZyjQZw9ELZVWgE="; + hash = "sha256-SFRlE/ry63kB5lpk66e2U8gBBu0A7ZyjQZw9ELZVWgE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix index 4b805b5b1d..893e8ddcdb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Tinche"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2itjGYusJT6sbCAgvKsI9IXeAOP7VQV0bpifFBZmnAo="; + hash = "sha256-2itjGYusJT6sbCAgvKsI9IXeAOP7VQV0bpifFBZmnAo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioflo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioflo/default.nix index 52649e9603..34bb4895ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioflo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioflo/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-7NrOoc1gi8YzZaKvCnHnzAKPlMnMhqxjdyZGN5H/8TQ="; + hash = "sha256-7NrOoc1gi8YzZaKvCnHnzAKPlMnMhqxjdyZGN5H/8TQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix index 224877efb9..7cb4fec4a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-KLsm1GFsfDgaFUMoH5hwUbjS0dW/rwI9nn4sIQXFG7k="; + hash = "sha256-KLsm1GFsfDgaFUMoH5hwUbjS0dW/rwI9nn4sIQXFG7k="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioharmony/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioharmony/default.nix index 6e77c5589e..b1f19dc260 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioharmony/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioharmony/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-T30pLzPWD+5pb0ShkpNdiBFO45RdiMYgCOSg8rx+t+Y="; + hash = "sha256-T30pLzPWD+5pb0ShkpNdiBFO45RdiMYgCOSg8rx+t+Y="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-openmetrics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-openmetrics/default.nix index ed6568ac7b..eab5d1801f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-openmetrics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-openmetrics/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-GIVUkjyn+iQSMZZ6dNmmimvbt+t+uxOYv2QEDk/dA+g="; + hash = "sha256-GIVUkjyn+iQSMZZ6dNmmimvbt+t+uxOYv2QEDk/dA+g="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix index 2a6e8b2c1b..ec91f0bd0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.7.1"; + version = "0.8.0"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - sha256 = "2215cac4891ef3fa14b7d600ed343ed0f0a670c23b10e4142aa862b3db20341a"; + hash = "sha256-knsdOzR0SPhv9SRcnKGeQPOX65OQZoK+WSeQZ4yYLzc="; }; propagatedBuildInputs = [ aiohttp attrs python-socks ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-wsgi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-wsgi/default.nix index a3b8334b99..298b8b00b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-wsgi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-wsgi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "etianen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3Q00FidZWV1KueuHyHKQf1PsDJGOaRW6v/kBy7lzD4Q="; + hash = "sha256-3Q00FidZWV1KueuHyHKQf1PsDJGOaRW6v/kBy7lzD4Q="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix index 86cc7e308e..9fcca373c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix @@ -14,7 +14,7 @@ , aiosignal , aiodns , brotli -, cchardet +, faust-cchardet , asynctest , typing-extensions , idna-ssl @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.8.3"; + version = "3.8.4"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3828fb41b7203176b82fe5d699e0d845435f2374750a44b480ea6b930f6be269"; + hash = "sha256-vy4akWLB5EG/gFof0WbiSdV0ygTgOzT5fikodp6Rq1w="; }; patches = [ @@ -66,7 +66,7 @@ buildPythonPackage rec { aiosignal aiodns brotli - cchardet + faust-cchardet ] ++ lib.optionals (pythonOlder "3.8") [ asynctest typing-extensions @@ -119,6 +119,7 @@ buildPythonPackage rec { ''; meta = with lib; { + changelog = "https://github.com/aio-libs/aiohttp/blob/v${version}/CHANGES.rst"; description = "Asynchronous HTTP Client/Server for Python and asyncio"; license = licenses.asl20; homepage = "https://github.com/aio-libs/aiohttp"; 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 3e7c4c7b85..fb4d89adab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohwenergy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohwenergy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "DCSBL"; repo = pname; rev = version; - sha256 = "sha256-WfkwIxyDzLNzhWNWST/V3iN9Bhu2oXDwGiA5UXCq5ho="; + hash = "sha256-WfkwIxyDzLNzhWNWST/V3iN9Bhu2oXDwGiA5UXCq5ho="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiolimiter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiolimiter/default.nix index 04a2c6c46b..be2e8f7e23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiolimiter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiolimiter/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mjpieters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4wByVZoOLhrXFx9oK19GBmRcjGoJolQ3Gwx9vQV/n8s="; + hash = "sha256-4wByVZoOLhrXFx9oK19GBmRcjGoJolQ3Gwx9vQV/n8s="; }; nativeBuildInputs = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { (fetchpatch { name = "switch-to-peotry-core.patch"; url = "https://github.com/mjpieters/aiolimiter/commit/84a85eff42621b0daff8fcf6bb485db313faae0b.patch"; - sha256 = "sha256-xUfJwLvMF2Xt/V1bKBFn/fjn1uyw7bGNo9RpWxtyr50="; + hash = "sha256-xUfJwLvMF2Xt/V1bKBFn/fjn1uyw7bGNo9RpWxtyr50="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomodernforms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomodernforms/default.nix index bbf3190e57..dd8cbde722 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomodernforms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomodernforms/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "wonderslug"; repo = "aiomodernforms"; rev = "v${version}"; - sha256 = "sha256-Vx51WBjjNPIfLlwMnAuwHnGNljhnjKkU0tWB9M9rjsw="; + hash = "sha256-Vx51WBjjNPIfLlwMnAuwHnGNljhnjKkU0tWB9M9rjsw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomultiprocess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomultiprocess/default.nix index 4fc0f7781f..579ea497fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomultiprocess/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomultiprocess/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "omnilib"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yOP69FXDb2Grmtszx7oa6uiJGUar8su3KwqQPI+xjrw="; + hash = "sha256-yOP69FXDb2Grmtszx7oa6uiJGUar8su3KwqQPI+xjrw="; }; nativeBuildInputs = [ flit-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix index 14c061a2fc..c2f06c5833 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiomysensors"; - version = "0.3.5"; + version = "0.3.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jVqOOQLu/vL0L5WWtfU2rL4gNhPX+9HvchBp29aw+qA="; + hash = "sha256-oYYr7LuTvw7e99930vF7odl2dWA/QPOTEW02l8cqXlc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiopulse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiopulse/default.nix index c2d4add41d..df93e9f8e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiopulse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiopulse/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aiopulse"; - version = "0.4.3"; + version = "0.4.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Wp8NUjRlO+6ASqIt3C0YJRh0EKcEukXVMp4I+TCTElo="; + hash = "sha256-JbdJbkzd55KeM3Sf1ExvMuHRKNu5VAvGG4y+wkMS0Wo="; }; propagatedBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { binary protocol to issues commands to the Pulse Hub. ''; homepage = "https://github.com/atmurray/aiopulse"; + changelog = "https://github.com/atmurray/aiopulse/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix index 0f44a49a39..14f3a83481 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiopvpc"; - version = "4.0.1"; + version = "4.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "azogue"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-E5z74/5VuFuOyAfeT4PQlHUNOiVT4sPgOdxoAIIymxU="; + hash = "sha256-ixHLFVPlDZKQkPMrOt8PG5z+e84UlygQutkyS8wCZR4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiopyarr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiopyarr/default.nix index c728da8b55..65ce5e4adb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiopyarr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiopyarr/default.nix @@ -24,6 +24,11 @@ buildPythonPackage rec { hash = "sha256-8/ixL4ByaBYoPbB4g+Rgx+5OM6vjrFTUEPR42wBKyyg="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'version="master"' 'version="${version}"' + ''; + propagatedBuildInputs = [ aiohttp ciso8601 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiopylgtv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiopylgtv/default.nix index ad089ef708..3039f57667 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiopylgtv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiopylgtv/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "bendavid"; repo = pname; rev = version; - sha256 = "sha256-NkWJGy5QUrhpbARoscrXy/ilCjAz01YxeVTH0I+IjNM="; + hash = "sha256-NkWJGy5QUrhpbARoscrXy/ilCjAz01YxeVTH0I+IjNM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioquic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioquic/default.nix index 1b8dbb995e..5b18a77edd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioquic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioquic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-7ENqqs6Ze4RrAeUgDtv34+VrkYJqFE77l0j9jd0zK74="; + hash = "sha256-7ENqqs6Ze4RrAeUgDtv34+VrkYJqFE77l0j9jd0zK74="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix index 7da03f051f..259e7f6d53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-JIh6jr4pFXGZTUi6K7VsymaCxCrTNBevk9xo9TsrFnM="; + hash = "sha256-JIh6jr4pFXGZTUi6K7VsymaCxCrTNBevk9xo9TsrFnM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix index a5936a6a9b..5287b9944e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-m4wQizY1TARjO60Op1K1XZVqdgL+PjI0uTn8RK+W8dg="; + hash = "sha256-m4wQizY1TARjO60Op1K1XZVqdgL+PjI0uTn8RK+W8dg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiorwlock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiorwlock/default.nix index cffaed5655..f959ec734e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiorwlock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiorwlock/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-g/Eth99LlyiguP2hdWWFqw1lKxB7q1nGCE4bGtaSq0U="; + hash = "sha256-g/Eth99LlyiguP2hdWWFqw1lKxB7q1nGCE4bGtaSq0U="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosenz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosenz/default.nix index 3aab4e1451..cddb2f3707 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosenz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosenz/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "milanmeu"; repo = pname; rev = version; - sha256 = "sha256-ODdWPS14zzptxuS6mff51f0s1SYnIqjF40DmvT0sL0w="; + hash = "sha256-ODdWPS14zzptxuS6mff51f0s1SYnIqjF40DmvT0sL0w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioserial/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioserial/default.nix index 2d15e2794d..1a02f7acd3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioserial/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioserial/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-cCvwOw64S47y2NrFy5JeHmhdzpj3exJVabxv0rO1gig="; + hash = "sha256-cCvwOw64S47y2NrFy5JeHmhdzpj3exJVabxv0rO1gig="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioshutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioshutil/default.nix index 6a68e3e21c..0fc144ac6f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioshutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioshutil/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioshutil"; - version = "1.2"; + version = "1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "kumaraditya303"; repo = pname; rev = "v${version}"; - hash = "sha256-HDN170lKxMj5vK94dn0sNXNDKoksg1tJ8G+vZEU7g/4="; + hash = "sha256-XIGjiLjoyS/7vUDIyBPvHNMyHOBa0gsg/c/vGgrhZAg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioskybell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioskybell/default.nix index 30f5740fbe..4fd3afe9de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioskybell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioskybell/default.nix @@ -23,6 +23,11 @@ buildPythonPackage rec { hash = "sha256-aBT1fDFtq1vasTvCnAXKV2vmZ6LBLZqRCiepv1HDJ+Q="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'version="master",' 'version="${version}",' + ''; + propagatedBuildInputs = [ aiohttp aiofiles diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioslimproto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioslimproto/default.nix index 59dca9a346..c790d12b1b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioslimproto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioslimproto/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioslimproto"; - version = "2.1.1"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Er7UsJDBDXD8CQSkUIOeO78HQaCsrRycU18LOjBpv/w="; + hash = "sha256-3aLAAUaoGkdzjUHFb6aiyVv0fzO8DojN0Y3DTf6h2Ow="; }; nativeCheckInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to control Squeezebox players"; homepage = "https://github.com/home-assistant-libs/aioslimproto"; + changelog = "https://github.com/home-assistant-libs/aioslimproto/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosmtpd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosmtpd/default.nix index 8f16230b2e..fa66e0ca53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosmtpd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosmtpd/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiosmtpd"; - version = "1.4.3"; + version = "1.4.4.post2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-QtLtw+2jEPLOxa45vDEbWEaSZ8RIyxf1zkZjR34Wu+8="; + hash = "sha256-iWKOxXtOBmszDBgeSHNY4a74D00p/9Pf7h/n+ohpTqs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix index b6f316bf9a..e9047034c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiosomecomfort"; - version = "0.0.11"; + version = "0.0.14"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mkmer"; repo = "AIOSomecomfort"; rev = "refs/tags/${version}"; - hash = "sha256-Mn7SQnnWVYh92Ogih6nRYHAf9DiVh1zCuGw5N4r6G8E="; + hash = "sha256-YVZSqTynlAH7y6vH07wsFCLMWnde/cBx4jjfJ4ZV3LA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix index 27588320fb..5d6b5436db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-WOtscg02Dq5YNSAfq4pIyH3oUP/5G+cjBwKB6c+SUVA="; + hash = "sha256-WOtscg02Dq5YNSAfq4pIyH3oUP/5G+cjBwKB6c+SUVA="; }; nativeCheckInputs = [ pytestCheckHook pytest-cov pytest-asyncio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosyncthing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosyncthing/default.nix index 73c512cb65..e45ddb5dec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosyncthing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosyncthing/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zhulik"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vn8S2/kRW5C2Hbes9oLM4LGm1jWWK0zeLdujR14y6EI="; + hash = "sha256-vn8S2/kRW5C2Hbes9oLM4LGm1jWWK0zeLdujR14y6EI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiotractive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiotractive/default.nix index cb560d88c7..a39130c383 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiotractive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiotractive/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "zhulik"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VCwIAeSAN4tMwB8TXN/ukrws0qYv/jHHeEu++m56AHA="; + hash = "sha256-VCwIAeSAN4tMwB8TXN/ukrws0qYv/jHHeEu++m56AHA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix index bdbdbb41c9..e890ed7e20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "kwarunek"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-7lDOI1SHPpRZLTHRTmfbKlZH18T73poJdFyVmb+HKms="; + hash = "sha256-7lDOI1SHPpRZLTHRTmfbKlZH18T73poJdFyVmb+HKms="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiowatttime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiowatttime/default.nix index 54279db457..85d6076ad2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiowatttime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiowatttime/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-rqmsUvVwXC/XkR/v2d9d3t7u6Poms4ORiOci41ajXIo="; + hash = "sha256-rqmsUvVwXC/XkR/v2d9d3t7u6Poms4ORiOci41ajXIo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioxmpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioxmpp/default.nix index 133d9ffc72..edc9b8def3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioxmpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioxmpp/default.nix @@ -10,6 +10,7 @@ , pyasn1 , pyasn1-modules , pyopenssl +, pytz , sortedcollections , tzlocal , pytestCheckHook @@ -38,6 +39,7 @@ buildPythonPackage rec { pyasn1 pyasn1-modules pyopenssl + pytz sortedcollections tzlocal ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioymaps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioymaps/default.nix index e1da7baaa6..fb57614be9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioymaps/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioymaps/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-pW8FoMdA8XdQZmLRwk5SBBgFhYhgEMJPA9+b+8aicuE="; + hash = "sha256-pW8FoMdA8XdQZmLRwk5SBBgFhYhgEMJPA9+b+8aicuE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/airly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/airly/default.nix index 95c7aba8e0..b83cdefd8a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/airly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/airly/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ak-ambi"; repo = "python-airly"; rev = "v${version}"; - sha256 = "sha256-weliT/FYnRX+pzVAyRWFly7lfj2z7P+hpq5SIhyIgmI="; + hash = "sha256-weliT/FYnRX+pzVAyRWFly7lfj2z7P+hpq5SIhyIgmI="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/airthings-cloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/airthings-cloud/default.nix index 8315847683..c7560d6ec9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/airthings-cloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/airthings-cloud/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyAirthings"; rev = version; - sha256 = "sha256-sqHNK6biSWso4uOYimzU7PkEn0uP5sHAaPGsS2vSMNY="; + hash = "sha256-sqHNK6biSWso4uOYimzU7PkEn0uP5sHAaPGsS2vSMNY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alabaster/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alabaster/default.nix index 72eda332f9..31f9e14f6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/alabaster/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/alabaster/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "alabaster"; - version = "0.7.12"; + version = "0.7.13"; src = fetchPypi { inherit pname version; - sha256 = "a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"; + hash = "sha256-onpKCE1eaQ4W4B4DrSsuVSxhplRpQZuQckMZPeGoSuI="; }; propagatedBuildInputs = [ pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alarmdecoder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alarmdecoder/default.nix index f06fc819bb..3e9bdffdad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/alarmdecoder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/alarmdecoder/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "nutechsoftware"; repo = "alarmdecoder"; rev = version; - sha256 = "sha256-q2s+wngDKtWm5mxGHNAc63Ed6tiQD9gLHVoQZNWFB0w="; + hash = "sha256-q2s+wngDKtWm5mxGHNAc63Ed6tiQD9gLHVoQZNWFB0w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ale-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ale-py/default.nix index 3a256e6746..0b5d9649f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ale-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ale-py/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "ale-py"; - version = "0.8.0"; + version = "0.8.1"; format = "pyproject"; src = fetchFromGitHub { owner = "mgbellemare"; repo = "Arcade-Learning-Environment"; - rev = "v${version}"; - sha256 = "sha256-OPAtCc2RapK1lALTKHd95bkigxcZ9bcONu32I/91HIg="; + rev = "refs/tags/v${version}"; + hash = "sha256-B2AxhlzvBy1lJ3JttJjImgTjMtEUyZBv+xHU2IC7BVE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix index a759dc226f..4a60bfca20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder -, Mako +, mako , python-dateutil , sqlalchemy , importlib-metadata @@ -13,18 +13,18 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.9.1"; + version = "1.9.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+fduQQYfXr4n1P6SYA353WElIadoP5BNqzKLoCz/paI="; + hash = "sha256-TTvTLs27e7+0ip/p5tb9aoMaG1nQPibikiECNzc+fbU="; }; propagatedBuildInputs = [ - Mako + mako python-dateutil sqlalchemy ] ++ lib.optionals (pythonOlder "3.9") [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/allure-behave/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/allure-behave/default.nix index 4463be9997..2dc57281e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/allure-behave/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/allure-behave/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-CxdB1gliajS6dUUhnD+yRMVj0zglGEwZC6RDmirH+pg="; + hash = "sha256-CxdB1gliajS6dUUhnD+yRMVj0zglGEwZC6RDmirH+pg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/allure-pytest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/allure-pytest/default.nix index d19805366f..a08f4bc93a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/allure-pytest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/allure-pytest/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-hbc7Hb6ZCLpPhLgBGKk+EEnALdWTIJJg2MHJUM8ob2w="; + hash = "sha256-hbc7Hb6ZCLpPhLgBGKk+EEnALdWTIJJg2MHJUM8ob2w="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons-test/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons-test/default.nix index a68cf5a908..aaba8d9fcc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons-test/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons-test/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-TaeQF9EZ5tLMmVSwnWgrxsRz5lh0O3BZLLEUawd8BeI="; + hash = "sha256-TaeQF9EZ5tLMmVSwnWgrxsRz5lh0O3BZLLEUawd8BeI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons/default.nix index 4142713585..b92ee139b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1cNi3QEWfwhjMYIumxkS1Ob9bLwtGgBt0EjnfoKnrnM="; + hash = "sha256-1cNi3QEWfwhjMYIumxkS1Ob9bLwtGgBt0EjnfoKnrnM="; }; nativeBuildInputs = [ 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 63ee77d221..b939e508bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/altair/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/altair/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-OTmaJnxJsw0QLBBBHmerJjdBVqhLGuufzRUUBCm6ScU="; + hash = "sha256-OTmaJnxJsw0QLBBBHmerJjdBVqhLGuufzRUUBCm6ScU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amaranth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amaranth/default.nix index 3e7aae7f3d..713f886d7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amaranth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amaranth/default.nix @@ -58,6 +58,7 @@ buildPythonPackage rec { nativeBuildInputs = [ git + setuptools setuptools-scm ]; @@ -79,7 +80,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "Jinja2~=2.11" "Jinja2>=2.11" \ - --replace "pyvcd~=0.2.2" "pyvcd" + --replace "pyvcd~=0.2.2" "pyvcd" \ + --replace "amaranth-yosys>=0.10.*" "amaranth-yosys>=0.10" # jinja2.contextfunction was removed in jinja2 v3.1 substituteInPlace amaranth/build/plat.py \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix index 7394606965..3de930cfa4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "amazon_kclpy"; - version = "2.0.6"; + version = "2.1.1"; src = fetchFromGitHub { owner = "awslabs"; repo = "amazon-kinesis-client-python"; - rev = "v${version}"; - sha256 = "0gbpwhpd9i13vi0cch48qqrma90p230psqrkbfcjvdah69w434l4"; + rev = "refs/tags/v${version}"; + hash = "sha256-Z0MC4SbZS82beMA7UunEfs4KvrmhW5xAhFeb7WXA7DM="; }; # argparse is just required for python2.6 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ambee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ambee/default.nix index ccc05d2ab3..3e3f719b7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ambee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ambee/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-ambee"; rev = "v${version}"; - sha256 = "sha256-2wX2CLr6kdVw2AGPW6DmYI2OBfQFI/iWVorok2d3wx4="; + hash = "sha256-2wX2CLr6kdVw2AGPW6DmYI2OBfQFI/iWVorok2d3wx4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amberelectric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amberelectric/default.nix index ae02eaec0b..1f1422a6b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amberelectric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amberelectric/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-5SWJnTxRm6mzP0RxrgA+jnV+Gp23WjqQA57wbT2V9Dk="; + hash = "sha256-5SWJnTxRm6mzP0RxrgA+jnV+Gp23WjqQA57wbT2V9Dk="; }; propagatedBuildInputs = [ 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 30808ee3f0..83ccc797cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amcrest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amcrest/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tchellomello"; repo = "python-amcrest"; rev = version; - sha256 = "sha256-An7MnGtZsmEZU/y6E0sivdexFD6HJRTB1juXqHfbDzE="; + hash = "sha256-An7MnGtZsmEZU/y6E0sivdexFD6HJRTB1juXqHfbDzE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amply/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amply/default.nix index 2298b57cb1..64aa0ad76b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amply/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amply/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-rXF7SQtrcFWQn6oZXoKkQytwb4+VhUBQFy9Ckx5HhCY="; + hash = "sha256-rXF7SQtrcFWQn6oZXoKkQytwb4+VhUBQFy9Ckx5HhCY="; }; nativeBuildInputs = [ setuptools-scm ]; 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 9997ab09fd..d726a0a27a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.41"; + version = "9.2.42"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-HikfqU2k7w/IO51vOKNzCLWd+MphG1hXkJal5usQZOA="; + hash = "sha256-EbOGAY7aqpWngy8ImdDt8dmJhc1UEiX0I8KY8TSump0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix index b78ff31f82..5e22e6f87a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-cuMRdmfu32aVG7LZP0KWpWuUsHioqVkFoFJhH7PxuXM="; + hash = "sha256-cuMRdmfu32aVG7LZP0KWpWuUsHioqVkFoFJhH7PxuXM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix index a1aceb5372..97553b1b31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-OLgqKYSCofomE/D5yb6z23Ko+DLurFjrLke/Ms039tU="; + hash = "sha256-OLgqKYSCofomE/D5yb6z23Ko+DLurFjrLke/Ms039tU="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix index da022c1e7f..a079dbda6a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-19xeS3+t6bc3XFaKJEdbe+gQJMrCogyu8yYO8LUSh7Q="; + hash = "sha256-19xeS3+t6bc3XFaKJEdbe+gQJMrCogyu8yYO8LUSh7Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-kernel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-kernel/default.nix index 5901e8f56a..3a8c871ea5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-kernel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-kernel/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-UJjm9FpmXSznXtaIR2rVv5YJS/H83FvRkNz09vwoe0c="; + hash = "sha256-UJjm9FpmXSznXtaIR2rVv5YJS/H83FvRkNz09vwoe0c="; }; propagatedBuildInputs = [ ipywidgets six docopt tqdm jupyter psutil pyyaml ansible-runner ansible ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix index ebb30630ee..c556b8dabe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.14.0"; + version = "6.14.2"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-5VFXrBi7Pj3+9CQ4HAKZxnqsYz3lqhH3+A/gpQgEHXo="; + hash = "sha256-3ofvEEMCwsb8tDeYp1xC1PClwH6IfCodB6C1qft3TeA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix index 558ce409d4..c4a355d648 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-YOLBpY8c6zShkLfDgPezOG0ec2kGGVSx+LjKPfdgY8w="; + hash = "sha256-YOLBpY8c6zShkLfDgPezOG0ec2kGGVSx+LjKPfdgY8w="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansimarkup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansimarkup/default.nix index 9de4e19d47..d249dddd1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansimarkup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansimarkup/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "gvalkov"; repo = "python-ansimarkup"; rev = "v${version}"; - sha256 = "sha256-HGeVapv2Z5GtPwSp3+dvUwAH0bFqu+Bmk5E6SRr7NO4="; + hash = "sha256-HGeVapv2Z5GtPwSp3+dvUwAH0bFqu+Bmk5E6SRr7NO4="; }; propagatedBuildInputs = [ colorama ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anyascii/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anyascii/default.nix index 4af2a68ccb..d810b50304 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anyascii/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anyascii/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-3t9XcoIG4obJHu18dZUFpeRcjNATZ91Awvcki7FcEfY="; + hash = "sha256-3t9XcoIG4obJHu18dZUFpeRcjNATZ91Awvcki7FcEfY="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anyconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anyconfig/default.nix index 0b6d0280d3..7f1855ad6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anyconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anyconfig/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-A/8uF2KvOI+7vtHBq3+fHsAGqR2n2zpouWPabneV0qw="; + hash = "sha256-A/8uF2KvOI+7vtHBq3+fHsAGqR2n2zpouWPabneV0qw="; }; postPatch = '' 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 49cb938005..0a7f8e7280 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 @@ -77,7 +77,7 @@ , enabledProviders ? [] }: let - version = "2.5.0"; + version = "2.5.1"; airflow-src = fetchFromGitHub rec { owner = "apache"; @@ -86,7 +86,7 @@ let # Download using the git protocol rather than using tarballs, because the # GitHub archive tarballs don't appear to include tests forceFetchGit = true; - hash = "sha256-QWUXSG+RSHkF5kP1ZYtx+tHjO0n7hfya9CFA3lBhJHk="; + hash = "sha256-BuJfE6SONTNonUvacOAIdZe0QicdBtx7k186TJZpQOs="; }; # 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-airflow/providers.nix b/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/providers.nix index ca9d291c91..5a7a464be7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/providers.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/providers.nix @@ -129,7 +129,7 @@ imports = [ "airflow.providers.ftp.hooks.ftp" ]; }; github = { - deps = [ "PyGithub" ]; + deps = [ "pygithub" ]; imports = [ "airflow.providers.github.hooks.github" "airflow.providers.github.operators.github" ]; }; google = { @@ -157,7 +157,7 @@ imports = [ "airflow.providers.influxdb.hooks.influxdb" "airflow.providers.influxdb.operators.influxdb" ]; }; jdbc = { - deps = [ "JayDeBeApi" ]; + deps = [ "jaydebeapi" ]; imports = [ "airflow.providers.jdbc.hooks.jdbc" "airflow.providers.jdbc.operators.jdbc" ]; }; jenkins = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apcaccess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apcaccess/default.nix index 75cde6f4bf..fd4627b558 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apcaccess/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apcaccess/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "flyte"; repo = "apcaccess"; rev = version; - sha256 = "sha256-XLoNRh6MgXCfRtWD9NpVZSyroW6E9nRYw6Grxa+AQkc="; + hash = "sha256-XLoNRh6MgXCfRtWD9NpVZSyroW6E9nRYw6Grxa+AQkc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/appnope/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/appnope/default.nix index b83b1b54bb..ea358f96e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/appnope/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/appnope/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Ar2RxN6Gn7seHFCq/ECYgnp6VKsvOdncumyVR+2SDiQ="; + hash = "sha256-Ar2RxN6Gn7seHFCq/ECYgnp6VKsvOdncumyVR+2SDiQ="; }; meta = { 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 671f4714ff..1cc11426b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.2.1"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Z+DCJ+7O4mAACYDbv4uh5e69vklPRzCAgpfJ5kXANXk="; + hash = "sha256-LFDBml3UExex9lnFKyGpkP6+bBXghGQiihzo5gmPEb8="; }; nativeBuildInputs = [ @@ -73,7 +73,7 @@ buildPythonPackage rec { description = "Push Notifications that work with just about every platform"; homepage = "https://github.com/caronc/apprise"; changelog = "https://github.com/caronc/apprise/releases/tag/v${version}"; - license = licenses.mit; + license = licenses.bsd3; maintainers = with maintainers; [ marsam ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apptools/default.nix index d7b2db71c7..0905100a2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apptools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apptools/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { # https://github.com/enthought/apptools/issues/303 (fetchpatch { url = "https://github.com/enthought/apptools/commit/10fb73916124f7ae7edf6c6688a05ad95678488f.patch"; - sha256 = "sha256-izAcP5RWobLvnk2PQx31SX/TUGkw+prbYbjamYVmtjY="; + hash = "sha256-izAcP5RWobLvnk2PQx31SX/TUGkw+prbYbjamYVmtjY="; name = "fix_python310_tests.patch"; }) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apscheduler/default.nix similarity index 93% rename from third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/apscheduler/default.nix index 2359eea7a0..7beaa6b934 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apscheduler/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "apscheduler"; - version = "3.9.1.post1"; + version = "3.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "APScheduler"; inherit version; - hash = "sha256-sr6gMJVp2lOnJhv6DOGcZ92/4VG9p3amqQdXn9vT6yo="; + hash = "sha256-pJ/CMmkhhBbw5BiQ7qenXtayhPEGMNz+hmq2WWIaNpY="; }; buildInputs = [ 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 f8fdf16121..4da1eea51c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.40.0.0"; + version = "3.41.0.0"; format = "setuptools"; disabled = isPyPy; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = "refs/tags/${version}"; - hash = "sha256-Bi2pW+8vFLcYnatlqsfnwqfCpV2cjannYaTqgIlfNNM="; + hash = "sha256-U7NhC83wBaUONLsQbL+j9866u4zs58O6AQxwzS3e0qM="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix index a1b302dd9f..8a6037213f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "swilson"; repo = pname; rev = version; - sha256 = "sha256-6YvkSUtBc3Nl/Ap3LjU0IKY2bE4k86XdSoLo+/c8dDs="; + hash = "sha256-6YvkSUtBc3Nl/Ap3LjU0IKY2bE4k86XdSoLo+/c8dDs="; }; propagatedBuildInputs = [ 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 9042269a46..eca1ca4524 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.41"; + version = "9.2.42"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-O2Tj5rwev5tWnaHq/GJV5/9fAlk5np7S3Yw+ehmofks="; + hash = "sha256-jDC4nmHg7OCo7mQ7iLeG7OFB1xAQxkKw1WZTyY2FBoY="; }; nativeBuildInputs = [ 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 06c7b1a9da..01b0c3c44a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aresponses/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aresponses/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "CircleUp"; repo = pname; rev = version; - sha256 = "sha256-Ui9ZpWaVBfCbDlZH3EgHX32FIZtyTHnc/UXqtoEyFcw="; + hash = "sha256-Ui9ZpWaVBfCbDlZH3EgHX32FIZtyTHnc/UXqtoEyFcw="; }; propagatedBuildInputs = [ 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 5bf20d82b2..9725d8b92b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix @@ -1,38 +1,44 @@ -{ buildPythonPackage, fetchPypi, lib -, dicttoxml -, importlib-metadata +{ lib +, buildPythonPackage +, fetchPypi , pexpect -, prettytable -, requests-toolbelt +, pythonOlder }: + buildPythonPackage rec { pname = "argcomplete"; - version = "2.0.0"; + version = "2.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "6372ad78c89d662035101418ae253668445b391755cfe94ea52f1b9d22425b20"; + hash = "sha256-cuCDQIUtMlREWcDBmq0bSKosOpbejG5XQkVrT1OMpS8="; }; - doCheck = false; # meant to be ran with interactive interpreter - - # re-enable if we are able to make testing work - # nativeCheckInputs = [ bashInteractive coverage flake8 ]; + postPatch = '' + substituteInPlace setup.py \ + --replace '"coverage",' "" \ + --replace " + lint_require" "" + ''; propagatedBuildInputs = [ - dicttoxml - importlib-metadata pexpect - prettytable - requests-toolbelt ]; - pythonImportsCheck = [ "argcomplete" ]; + # tries to build and install test packages which fails + doCheck = false; + + pythonImportsCheck = [ + "argcomplete" + ]; meta = with lib; { description = "Bash tab completion for argparse"; homepage = "https://kislyuk.github.io/argcomplete/"; - maintainers = [ maintainers.womfoo ]; - license = [ licenses.asl20 ]; + changelog = "https://github.com/kislyuk/argcomplete/blob/v${version}/Changes.rst"; + license = licenses.asl20; + maintainers = with maintainers; [ womfoo ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argh/default.nix index 55da36c71c..556d26b29f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/argh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/argh/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , fetchpatch +, flit-core , iocapture , mock , pytestCheckHook @@ -9,13 +10,18 @@ buildPythonPackage rec { pname = "argh"; - version = "0.27.2"; + version = "0.28.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-AMkCf29GG88kr+WZooG72ly9Xe5LZwW+++opOkyn0iE="; + hash = "sha256-sgkwhvDoCaPswktkohRTCe6PVtA0k2zVnlfFWKNXMp0="; }; + nativeBuildInputs = [ + flit-core + ]; + nativeCheckInputs = [ iocapture mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argparse-addons/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argparse-addons/default.nix index 1116ff3c30..1d50820d4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/argparse-addons/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/argparse-addons/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "argparse-addons"; - version = "0.8.0"; + version = "0.12.0"; src = fetchPypi { pname = "argparse_addons"; inherit version; - sha256 = "sha256-uwiBB5RNM56NLnCnYwXd41FUTixb3rrxwttWrS5tzeg="; + hash = "sha256-YyKg3NcGiH52MI0jE21bhtoOq3WigtxklnAdEhC0YK8="; }; pythonImportsCheck = [ "argparse_addons" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ariadne/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ariadne/default.nix index d88b199600..9397cd7765 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ariadne/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ariadne/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ariadne"; - version = "0.17.0"; + version = "0.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "mirumee"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LRsijp2N0L4QCvPt0vWBX0qE4yqDDKtMcTBQ/eAkljA="; + hash = "sha256-E7uC+l0Yjol8UPLF4CV+PN49tOUJXNUS5yYdF1oyfwU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arnparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arnparse/default.nix index 96f2fb3f6d..5da008aa65 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/arnparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/arnparse/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "PokaInc"; repo = "arnparse"; rev = version; - sha256 = "sha256-2+wxzYoS/KJXjYM6lZguxbr2Oxobo0eFNnzWZHLi0WM="; + hash = "sha256-2+wxzYoS/KJXjYM6lZguxbr2Oxobo0eFNnzWZHLi0WM="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix index 7add80472c..96a42b68a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Arpeggio"; inherit version; - sha256 = "sha256-1rA4OQGbuKaHhfkpLuajaxlU64S5JbhKa4peHibT7T0="; + hash = "sha256-1rA4OQGbuKaHhfkpLuajaxlU64S5JbhKa4peHibT7T0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arris-tg2492lg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arris-tg2492lg/default.nix index 9f6d8f6db1..78239b1a4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/arris-tg2492lg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/arris-tg2492lg/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vanbalken"; repo = pname; rev = version; - sha256 = "sha256-C1o9HWWJ/G/7Pp6I0FbRmX2PQvUJx71L9wHRkUMtnL4="; + hash = "sha256-C1o9HWWJ/G/7Pp6I0FbRmX2PQvUJx71L9wHRkUMtnL4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arrow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arrow/default.nix index 71ce479f2c..db8124a98a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/arrow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/arrow/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-OTSzDKG58pI3bZ2xWxlEYIjRLsWGKbw/DaKP1V+2M6E="; + hash = "sha256-OTSzDKG58pI3bZ2xWxlEYIjRLsWGKbw/DaKP1V+2M6E="; }; postPatch = '' 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 12b09b3bfc..bf8c08664f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/arviz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/arviz/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "arviz"; - version = "0.14.0"; + version = "0.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,8 +39,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "arviz-devs"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-YLNczcgVmcctNc620Ap9yQtQTwF1LREtL57JIWS/DKQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-LcdITCT9Bvycfj/taXhzkjn4IfZrxWX9MYXD6+MifOs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix index 6be8a76dec..7fa9e1a966 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "asana"; - version = "3.1.0"; + version = "3.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "asana"; repo = "python-asana"; rev = "refs/tags/v${version}"; - hash = "sha256-aYWojS+SeAnFvSqyb9ceyRKhG1Hpn6/eK9xrXxQbVeA="; + hash = "sha256-7POA3r3PqJ/PcyG7GFugg5p8o0h3OIA8zEIfsTwPxFI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asciimatics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asciimatics/default.nix index ea6c513e18..5d138ae856 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asciimatics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asciimatics/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-FtIM5CIQtDTrBbpGns24KTrH7TwM4N1PcOMNctdgIic="; + hash = "sha256-FtIM5CIQtDTrBbpGns24KTrH7TwM4N1PcOMNctdgIic="; }; nativeBuildInputs = [ 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 4ce55b4d48..406a7ee619 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { (fetchpatch { name = "default-validation.patch"; url = "https://github.com/asdf-format/asdf/commit/6f79f620b4632e20178d9bd53528702605d3e976.patch"; - sha256 = "sha256-h/dYhXRCf5oIIC+u6+8C91mJnmEzuNmlEzqc0UEhLy0="; + hash = "sha256-h/dYhXRCf5oIIC+u6+8C91mJnmEzuNmlEzqc0UEhLy0="; excludes = [ "CHANGES.rst" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix index c3ec514844..058bfe8f34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-AE32sOoEsRFMeQ+t/kXUEl6w5TElxmqTQlr4U9gqtDI="; + hash = "sha256-AE32sOoEsRFMeQ+t/kXUEl6w5TElxmqTQlr4U9gqtDI="; }; propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asf-search/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asf-search/default.nix index 686a9e92ce..6b5cfc6196 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asf-search/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asf-search/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "6.0.2"; + version = "6.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; rev = "refs/tags/v${version}"; - hash = "sha256-kbeIGIn8HMXROPiQSmwx3lo7wEX8SDuHYgxh4ws89Mo="; + hash = "sha256-3CnarUqW7/hEo4zvRGLJ+VAY5X+aacBdY1Epef523vY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix index 506fbc46f2..062d3259b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = version; - sha256 = "sha256-mmOsN2mW6eGtapq3xLqHK8hhSD0Gjzp3DsY5AGUlI8g="; + hash = "sha256-mmOsN2mW6eGtapq3xLqHK8hhSD0Gjzp3DsY5AGUlI8g="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix index 923ee6bd81..c4e19328f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "django"; repo = pname; rev = version; - sha256 = "sha256-56suF63ePRDprqODhVIPCEGiO8UGgWrpwg2wYEs6OOE="; + hash = "sha256-56suF63ePRDprqODhVIPCEGiO8UGgWrpwg2wYEs6OOE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asn1crypto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asn1crypto/default.nix index 8e649ed7cd..4822c5a16a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asn1crypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asn1crypto/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "wbond"; repo = "asn1crypto"; rev = version; - sha256 = "sha256-M8vASxhaJPgkiTrAckxz7gk/QHkrFlNz7fFbnLEBT+M="; + hash = "sha256-M8vASxhaJPgkiTrAckxz7gk/QHkrFlNz7fFbnLEBT+M="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix index d9747450a3..9bda0a9e66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "asn1tools"; - version = "0.165.0"; + version = "0.166.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "eerimoq"; repo = "asn1tools"; rev = version; - hash = "sha256-E9ns4xBDHkmIET2rXsMP9/9knXZ9H0D24w5QISQrYlc="; + hash = "sha256-TWAOML6nsLX3TYqoQ9fcSjrUmC4byXOfczfkmSaSa0k="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/assay/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/assay/default.nix index b019e24579..37c4ccc939 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/assay/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/assay/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "brandon-rhodes"; repo = pname; rev = "bb62d1f7d51d798b05a88045fff3a2ff92c299c3"; - sha256 = "sha256-FuAD74mFJ9F9AMgB3vPmODAlZKgPR7FQ4yn7HEBS5Rw="; + hash = "sha256-FuAD74mFJ9F9AMgB3vPmODAlZKgPR7FQ4yn7HEBS5Rw="; }; pythonImportsCheck = [ "assay" ]; 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 21b4948fb6..a3ce19b4fb 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.12.13"; # Check whether the version is compatible with pylint + version = "2.14.2"; # Check whether the version is compatible with pylint format = "pyproject"; disabled = pythonOlder "3.7.2"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-C4A/JOFdIRgaZuV/YOLc4nC05XTtRCC1i0BcGBEG5ps="; + hash = "sha256-SIBzn57UNn/sLuDWt391M/kcCyjCocHmL5qi2cSX2iA="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ lazy-object-proxy wrapt - ] ++ lib.optionals (pythonOlder "3.10") [ + ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ] ++ lib.optionals (!isPyPy && pythonOlder "3.8") [ typed-ast @@ -44,11 +44,17 @@ buildPythonPackage rec { typing-extensions ]; + disabledTests = [ + # DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('tests.testdata.python3.data.path_pkg_resources_1.package')`. + "test_identify_old_namespace_package_protocol" + ]; + passthru.tests = { inherit pylint; }; meta = with lib; { + changelog = "https://github.com/PyCQA/astroid/blob/${src.rev}/ChangeLog"; description = "An abstract syntax tree for Python with inference support"; homepage = "https://github.com/PyCQA/astroid"; license = licenses.lgpl21Plus; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix index 02f1a951d1..35871bff21 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = lib.replaceStrings ["-"] ["_"] pname; - sha256 = "sha256-iMOE60MimXpY3ok46RrJ/5D2orbLKuI+IWnHQFrdOtg="; + hash = "sha256-iMOE60MimXpY3ok46RrJ/5D2orbLKuI+IWnHQFrdOtg="; }; nativeBuildInputs = [ 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 9b80f780b8..a222dbe92e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astropy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astropy/default.nix @@ -19,7 +19,7 @@ let pname = "astropy"; - version = "5.2"; + version = "5.2.1"; in buildPythonPackage { inherit pname version; @@ -29,7 +29,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-0zVgQCX24W98m/gtW6KOXbR0WoLlgjqdF73Zub1GsqI="; + hash = "sha256-9q4noHf46oSQPvp2x5C5hWFzQaAISw0hw5H3o/MyrCM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; 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 418b9e1cb1..67bee933c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astroquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astroquery/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-MHylVMtzSgypoi+G9e/+fkE6+ROuZeFXiXLYR7H+E+4="; + hash = "sha256-MHylVMtzSgypoi+G9e/+fkE6+ROuZeFXiXLYR7H+E+4="; }; disabled = !isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncclick/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncclick/default.nix index 716dd2ffca..832b87c774 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncclick/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncclick/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "python-trio"; repo = pname; rev = version; - sha256 = "sha256-by1clF+WAfN/gjOg/F60O1tCZ3qAhWqiiJJY04iMzQ8="; + hash = "sha256-by1clF+WAfN/gjOg/F60O1tCZ3qAhWqiiJJY04iMzQ8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncmy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncmy/default.nix index c5888f000e..c7e4f1c442 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncmy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncmy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "long2ice"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-mkYh1fmhtBZ2DyL7a2RduTm+ig4Xnk5Ps1Tm0DS/OEc="; + hash = "sha256-mkYh1fmhtBZ2DyL7a2RduTm+ig4Xnk5Ps1Tm0DS/OEc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix index d088563aae..1266019371 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-X+bJyzQxWJaS1/KNOE/3zQKSbwUpm9XN35HYf6s+BPs="; + hash = "sha256-X+bJyzQxWJaS1/KNOE/3zQKSbwUpm9XN35HYf6s+BPs="; }; propagatedBuildInputs = [ 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 c5666af7c1..0e95beec83 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , bcrypt , buildPythonPackage , cryptography @@ -31,23 +31,38 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - bcrypt cryptography - fido2 - gssapi - libnacl libsodium nettle - pyopenssl - python-pkcs11 typing-extensions ]; + passthru.optional-dependencies = { + bcrypt = [ + bcrypt + ]; + fido2 = [ + fido2 + ]; + gssapi = [ + gssapi + ]; + libnacl = [ + libnacl + ]; + pkcs11 = [ + python-pkcs11 + ]; + pyOpenSSL = [ + pyopenssl + ]; + }; + nativeCheckInputs = [ openssh openssl pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); patches = [ # Reverts https://github.com/ronf/asyncssh/commit/4b3dec994b3aa821dba4db507030b569c3a32730 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 81994ce985..2fee3f307f 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 @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-en+4EKkmTQWMgnGZaGs+O9Yh2TI03xW111wbp9O8dYE="; + hash = "sha256-en+4EKkmTQWMgnGZaGs+O9Yh2TI03xW111wbp9O8dYE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atom/default.nix index c1fce70c7d..13a3a81573 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atom/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atom/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "atom"; - version = "0.8.2"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "nucleic"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-45c17lewJPo39ZWMaE8kyOo6n0A9f0m58TbMAiNAqeg="; + hash = "sha256-zxFYsINlDyGQGGh+u7vwyzAitRXe3OM1//HvCtuZ/p8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix index 7aa6d889ea..26187a0078 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-gbLJBxpJNnp/dwFw5e7Iy2ZWfPu8jHPSDOXKSo1xzxE="; + hash = "sha256-gbLJBxpJNnp/dwFw5e7Iy2ZWfPu8jHPSDOXKSo1xzxE="; }; # Tests depend on pytest but atomicwrites is a dependency of pytest 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 952892f78f..d856aa544c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-MJjuEtAQfMUAnWH06A5e3PrEzaK9qgRkSvdYJ8sSGxg="; + hash = "sha256-MJjuEtAQfMUAnWH06A5e3PrEzaK9qgRkSvdYJ8sSGxg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix index 71423d907d..b47621730b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mjdrushton"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-G7lNqwEUwAT0f7M2nUTCxpXOAl6FWKlh7tcsvbur1eM="; + hash = "sha256-G7lNqwEUwAT0f7M2nUTCxpXOAl6FWKlh7tcsvbur1eM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/audible/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/audible/default.nix index 8769cdedea..ddb80eec05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/audible/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/audible/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "mkb79"; repo = "Audible"; rev = "refs/tags/v${version}"; - sha256 = "sha256-SIEDBuMCC/Hap2mGVbKEFic96ClN369SEsV06Sg+poY="; + hash = "sha256-SIEDBuMCC/Hap2mGVbKEFic96ClN369SEsV06Sg+poY="; }; propagatedBuildInputs = [ beautifulsoup4 httpx pbkdf2 pillow pyaes rsa ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/audioread/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/audioread/default.nix index ee34134152..bdee5ba6cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/audioread/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/audioread/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-EhmVvSB+sf2j1Wa+uFHTU0J1klvDWk+22gyxHeD3JRo="; + hash = "sha256-EhmVvSB+sf2j1Wa+uFHTU0J1klvDWk+22gyxHeD3JRo="; }; # No tests, need to disable or py3k breaks diff --git a/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix index 74b03a413c..15ffe7af8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tuffy"; repo = "python-audio-tools"; rev = "v${version}"; - sha256 = "sha256-y+EiK9BktyTWowOiJvOb2YjtbPa7R62Wb5zinkyt1OM="; + hash = "sha256-y+EiK9BktyTWowOiJvOb2YjtbPa7R62Wb5zinkyt1OM="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/auroranoaa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/auroranoaa/default.nix index d9162d704b..bab39ebd64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/auroranoaa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/auroranoaa/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "djtimca"; repo = "aurora-api"; rev = version; - sha256 = "sha256-ho0O5aEHCKaTuWh2eW2kY5a7dVGIGBLm4nKxAMq0bZ4="; + hash = "sha256-ho0O5aEHCKaTuWh2eW2kY5a7dVGIGBLm4nKxAMq0bZ4="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix index 3486e78711..8edbbfb705 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "3.24.0"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iNe86UcjQud/LyX9iwYIGbNVcADjpD4mGM16D+UhLHE="; + hash = "sha256-gza5HYtxgmTfC+u+WlBiuOinBNXYIfVBa5IX8lr0Hj8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix index fde3d34880..82444d0d72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "alandtse"; repo = "auth_capture_proxy"; rev = "refs/tags/v${version}"; - sha256 = "sha256-4IPBulzRoAAplyM/1MPE40IW4IXBIGYLydzpY64Gl0c="; + hash = "sha256-4IPBulzRoAAplyM/1MPE40IW4IXBIGYLydzpY64Gl0c="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/authheaders/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/authheaders/default.nix index dfcb7527d9..96a035f4a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/authheaders/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/authheaders/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-90rOvu+CbHtammrMDZpPx7rIboIT2X/jL1GtfjpmuOk="; + hash = "sha256-90rOvu+CbHtammrMDZpPx7rIboIT2X/jL1GtfjpmuOk="; }; propagatedBuildInputs = [ authres dnspython dkimpy publicsuffix2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix index 9a464955aa..d3b024ef71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix @@ -58,13 +58,13 @@ buildPythonPackage rec { (fetchpatch { # https://github.com/crossbario/autobahn-python/pull/1604 url = "https://github.com/crossbario/autobahn-python/commit/ffe679fae4ebcdde964d4ee88cb82a9c65c40529.patch"; - sha256 = "sha256-QNnQkxMZJsFbiYUp4Os+dWo7jdCa96+kyb/2HxSMU8k="; + hash = "sha256-QNnQkxMZJsFbiYUp4Os+dWo7jdCa96+kyb/2HxSMU8k="; }) ]; src = fetchPypi { inherit pname version; - sha256 = "sha256-i0Yuouaq1rTcDtRfuAC2y/6wMl5/5pg5B/Ei8r5KH+k="; + hash = "sha256-i0Yuouaq1rTcDtRfuAC2y/6wMl5/5pg5B/Ei8r5KH+k="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autocommand/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autocommand/default.nix index 7e4893e98a..009c0992bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autocommand/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autocommand/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "Lucretiel"; repo = "autocommand"; rev = version; - sha256 = "sha256-bjoVGfP57qhvPuHHcMP8JQddAaW4/fEyatElk1UEPZo="; + hash = "sha256-bjoVGfP57qhvPuHHcMP8JQddAaW4/fEyatElk1UEPZo="; }; # fails with: SyntaxError: invalid syntax diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autofaiss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autofaiss/default.nix index 46f360cfef..aad226fa74 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autofaiss/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autofaiss/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "autofaiss"; - version = "2.15.4"; + version = "2.15.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "criteo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-OnDHwJxJcXx3DGxrkk2D2Ljs4CqPoYx7avdo9C8sDrU="; + hash = "sha256-IcAlvFlCERnw1UQWPRpSWpscOuPx0wd1MXOfoXZhvCU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autoflake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autoflake/default.nix index 2280c33f80..6cb03e00de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autoflake/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autoflake/default.nix @@ -1,19 +1,25 @@ { lib , buildPythonPackage , fetchPypi +, hatchling , pyflakes , pytestCheckHook }: buildPythonPackage rec { pname = "autoflake"; - version = "1.4"; + version = "2.0.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-YaNTASz/arlMoGKCPR+y9pLErNpRx2/4Oo13kV+6Ueo="; + hash = "sha256-HOUgExt/OWkVJC/pHlciH01CQIUpu+Ouk62v7ShlkeA="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ pyflakes ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autograd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autograd/default.nix index 1939dcbc74..f0b82fa67a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autograd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autograd/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-2AvSJRVNHbE8tOrM96GMNYvnIJJkG2hxf5b88dFqzQs="; + hash = "sha256-2AvSJRVNHbE8tOrM96GMNYvnIJJkG2hxf5b88dFqzQs="; }; propagatedBuildInputs = [ numpy future ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autoit-ripper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autoit-ripper/default.nix index 420322a323..b1145ff332 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autoit-ripper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autoit-ripper/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-fluG/2XlUh3kPtYtSotrP02c7kdmem92Hy1R93SaTzk="; + hash = "sha256-fluG/2XlUh3kPtYtSotrP02c7kdmem92Hy1R93SaTzk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/automate-home/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/automate-home/default.nix index c51283f4b7..c13395aa42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/automate-home/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/automate-home/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytestCheckHook , pythonOlder -, APScheduler +, apscheduler , hiredis , aioredis , ephem @@ -20,11 +20,11 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-41qd+KPSrOrczkovwXht3irbcYlYehBZ1HZ44yZe4cM="; + hash = "sha256-41qd+KPSrOrczkovwXht3irbcYlYehBZ1HZ44yZe4cM="; }; propagatedBuildInputs = [ - APScheduler + apscheduler hiredis aioredis ephem diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autopage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autopage/default.nix index e7bdc0d240..0973220438 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autopage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autopage/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Ab4+5hu3FOkJD8xcEPTPVGw5YzHGIMauUKIyGyjtMZk="; + hash = "sha256-Ab4+5hu3FOkJD8xcEPTPVGw5YzHGIMauUKIyGyjtMZk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix index 81ea5127ee..0f01045a6f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-8SNiPsxkjQ4gzhT47YUWIUDBPMSxCIZdGyUp+/oGwAg="; + hash = "sha256-8SNiPsxkjQ4gzhT47YUWIUDBPMSxCIZdGyUp+/oGwAg="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ 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 3f842173bc..fd2f0aa77b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-OQArggd7210OyFpZKm3kr3fFbakIDG7U3WBNImAAobw="; + hash = "sha256-OQArggd7210OyFpZKm3kr3fFbakIDG7U3WBNImAAobw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix index 4dcf509af1..3609a1db67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "6"; + version = "9"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WOMq+oqkTDZedk9LXQdjfHmnm+LafPuqNGnYvSawv6I="; + hash = "sha256-2xyRwh+IuJo5tGF27cZ6CLN/coPBai7VFZ48h0YTxho="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix index a577e6c8a6..b7052b8f32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.0.5"; + version = "2.0.8"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Kge7BAlBF4L+oibeXIF+tuSNsG1kMjl3WB5PME+RECk="; + hash = "sha256-MqV8KeE6KuO8HmrFNjeCW70ixChmlhY71Bod7ChKjuU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix index b4daad5c24..28c1c2c7fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.25.0"; + version = "1.27.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-XdWrEJL/u+B15jAzxS7UZBhFBCVfSlnBtUcKcA0iUOw="; + hash = "sha256-axg1kwzH6ZRQwyI80oNPjP8ApjAEZ5u0iCIadkEP/Ps="; }; propagatedBuildInputs = [ 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 5a8191f293..3494ce92dd 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 @@ -2,6 +2,7 @@ , boto3 , buildPythonPackage , fetchFromGitHub +, fetchpatch , jsonschema , mock , parameterized @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.55.0"; + version = "1.60.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "aws"; repo = "serverless-application-model"; rev = "refs/tags/v${version}"; - sha256 = "sha256-YDqdd4zKInttHDl04kvAgHKtc1vBryW12QfE0wiLU54="; + hash = "sha256-exVB1STX8OsFnQ0pzSuR3O/FrvG2GR5MdZa8tZ9IJvI="; }; propagatedBuildInputs = [ @@ -36,6 +37,14 @@ buildPythonPackage rec { typing-extensions ]; + patches = [ + (fetchpatch { + # relax typing-extenions dependency + url = "https://github.com/aws/serverless-application-model/commit/d1c26f7ad9510a238ba570d511d5807a81379d0a.patch"; + hash = "sha256-nh6MtRgi0RrC8xLkLbU6/Ec0kYtxIG/fgjn/KLiAM0E="; + }) + ]; + postPatch = '' substituteInPlace requirements/base.txt \ --replace "jsonschema~=3.2" "jsonschema>=3.2" @@ -44,7 +53,6 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ - mock parameterized pytest-env pytest-rerunfailures @@ -53,20 +61,7 @@ buildPythonPackage rec { pyyaml ]; - disabledTests = [ - # AssertionError: Expected 7 errors, found 9: - "test_errors_13_error_definitionuri" - ]; - - pytestFlagsArray = [ - # samtranslator.translator.arn_generator.NoRegionFound: AWS Region cannot be found - "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_success_one_app" - "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_throttling_doesnt_stop_processing" - "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sleep_between_sar_checks" - "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_unexpected_sar_error_stops_processing" - "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_and_on_after_transform_template::test_time_limit_exceeds_between_combined_sar_calls" - "--deselect tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2" - ]; + doCheck = false; # tests fail in weird ways pythonImportsCheck = [ "samtranslator" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aws-xray-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aws-xray-sdk/default.nix index d851cd0560..3be1c09b5f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-eINfyEHwPlUIWPGKmXPquGGPR/ItL1nt8TBXj6VFqGc="; + hash = "sha256-eINfyEHwPlUIWPGKmXPquGGPR/ItL1nt8TBXj6VFqGc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awsiotpythonsdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awsiotpythonsdk/default.nix index 7ec8b9008f..5907b74ba2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awsiotpythonsdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awsiotpythonsdk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-iot-device-sdk-python"; rev = "refs/tags/v${version}"; - sha256 = "sha256-GHMnDRxXkaKDTaawwPtMqa7EZJ8Y35+ScgtfEP9PJGs="; + hash = "sha256-GHMnDRxXkaKDTaawwPtMqa7EZJ8Y35+ScgtfEP9PJGs="; }; # Module has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix index e44dd89291..db43d7770d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-fzZyT6j3K90FClJawf3o0F2TSMSu5pVqZvP8yJwTdBc="; + hash = "sha256-fzZyT6j3K90FClJawf3o0F2TSMSu5pVqZvP8yJwTdBc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-applicationinsights/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-applicationinsights/default.nix index f3f395b6f7..1d4e17edc6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-applicationinsights/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-applicationinsights/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-qIRbgDZbfyALrR9xqA0NMfO+wB7f1GfftsE+or1xupY="; + hash = "sha256-qIRbgDZbfyALrR9xqA0NMfO+wB7f1GfftsE+or1xupY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-common/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-common/default.nix index a540ebf0be..504748f033 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-common/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-SsDNMhTja2obakQmhnIqXYzESWA6qDPz8PQL2oNnBKM="; + hash = "sha256-SsDNMhTja2obakQmhnIqXYzESWA6qDPz8PQL2oNnBKM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-containerregistry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-containerregistry/default.nix index bc1aaf5f8b..9da12c53e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-containerregistry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-containerregistry/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-DIZCHZM5aeKtmJrgwAk5J26ltaxNxKUn3rR+FbmuyZc="; + hash = "sha256-DIZCHZM5aeKtmJrgwAk5J26ltaxNxKUn3rR+FbmuyZc="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix index 4fca1b356a..1206bf4871 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-rL0NqpZ1zohiPaNcgNgZza+pFzHe5rJpXGTXyp2oLbQ="; + hash = "sha256-rL0NqpZ1zohiPaNcgNgZza+pFzHe5rJpXGTXyp2oLbQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix index 351a870750..6c7fb17c63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-Oz1dFbKpY+CbSTSx/iuiF/Kd2axRghwXVJ/K+HRwJDQ="; + hash = "sha256-Oz1dFbKpY+CbSTSx/iuiF/Kd2axRghwXVJ/K+HRwJDQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-eventhub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-eventhub/default.nix index 6e8dbf6aad..02f79f3aee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-eventhub/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-Z1tekAHjO2kVe5g/MpB1U9m38pBQ8J03+pDZdJgzcgE="; + hash = "sha256-Z1tekAHjO2kVe5g/MpB1U9m38pBQ8J03+pDZdJgzcgE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix index 51f5985e84..70f3205f53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-R2COS22pCtFp3oV98LLn/X2LkPOVUCasEONhFIhEdBQ="; + hash = "sha256-R2COS22pCtFp3oV98LLn/X2LkPOVUCasEONhFIhEdBQ="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index f547c7fe2b..9578143553 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-mFUKupq4IXywGs6aQQYFYSNNH9PCNxicS1mRneSdhHU="; + hash = "sha256-mFUKupq4IXywGs6aQQYFYSNNH9PCNxicS1mRneSdhHU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix index 05d7398b59..4aaee3f68f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-Cl1/aDvzNyI2uEHNvUZ39rCO185BuZnD5kTUKGJSBX0="; + hash = "sha256-Cl1/aDvzNyI2uEHNvUZ39rCO185BuZnD5kTUKGJSBX0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-botservice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-botservice/default.nix index e4172f9aae..6bc3b2c7c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-botservice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-botservice/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-hsBNJ8UnwZ2WAKiCFfriulJNxnRFU4ew0OUXIrWm1ro="; + hash = "sha256-hsBNJ8UnwZ2WAKiCFfriulJNxnRFU4ew0OUXIrWm1ro="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix index af3a30a117..85220841e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0="; + hash = "sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-consumption/default.nix index 0f8adb56ad..c910587a61 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-consumption/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-consumption/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-BqCGQ2wXN/d6uGiU1R9Zc7bg+l7fVlWOTCllieurkTA="; + hash = "sha256-BqCGQ2wXN/d6uGiU1R9Zc7bg+l7fVlWOTCllieurkTA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix index b2e9c6e3ad..13834d56d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-TDGrC7YO05Ywa8uEINqqw4Wxag65aklIUwS+2aVMHwA="; + hash = "sha256-TDGrC7YO05Ywa8uEINqqw4Wxag65aklIUwS+2aVMHwA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix index c250246af2..7be6bf9b93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-B/Sv6COlXXBLBI1h7f3BMYwFHtWfJEAyEmNQvpXp1QE="; + hash = "sha256-B/Sv6COlXXBLBI1h7f3BMYwFHtWfJEAyEmNQvpXp1QE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix index 18665f4dbb..95cbb7bb89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-GrmVK97M+iojevPLVTuLmfQRLxvrHtr9DRHymJvLYHE="; + hash = "sha256-GrmVK97M+iojevPLVTuLmfQRLxvrHtr9DRHymJvLYHE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix index 32e4bc0ebb..a0b942e6de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-jRo6EFP8Dg3i9U8HLfjED9QFfWbdg+X3o9PSf4eus9o="; + hash = "sha256-jRo6EFP8Dg3i9U8HLfjED9QFfWbdg+X3o9PSf4eus9o="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix index b00b496943..8b92d97dd2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-2EWfTsl5y3Sw4P8d5X7TKxYmO4PagUTNv/SFKdjY2Ss="; + hash = "sha256-2EWfTsl5y3Sw4P8d5X7TKxYmO4PagUTNv/SFKdjY2Ss="; extension = "zip"; }; 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 feefdabc1e..5539fe1036 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 @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-ml+koj52l5o0toAcnsGtsw0tGnO5F/LKq56ovzdmx/A="; + hash = "sha256-ml+koj52l5o0toAcnsGtsw0tGnO5F/LKq56ovzdmx/A="; }; 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 dfd8581af1..7b75fdbde5 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 @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-04OoJuff93L62G6IozpmHpEaUbHHHD6nKlkMHVoJvJ4="; + hash = "sha256-04OoJuff93L62G6IozpmHpEaUbHHHD6nKlkMHVoJvJ4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix index 4c61b55b66..f1effb72b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-kmL1TtOH6wg9ja5m0yqN81ZHMZuQK9SYzcN29QoS0VQ="; + hash = "sha256-kmL1TtOH6wg9ja5m0yqN81ZHMZuQK9SYzcN29QoS0VQ="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index 6ff2d91c98..b4321d50db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-dkuVCFR+w3Yr764izDqxGfKtDvgRmAuziSPpkKDWcxc="; + hash = "sha256-dkuVCFR+w3Yr764izDqxGfKtDvgRmAuziSPpkKDWcxc="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-msi/default.nix index 1f4568f3b7..8351622cd4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-msi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-msi/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-ctRsmmJ4PsTqthm+nRt4/+u9qhZNQG/TA/FjA/NyVrI="; + hash = "sha256-ctRsmmJ4PsTqthm+nRt4/+u9qhZNQG/TA/FjA/NyVrI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix index 68cf99fa0d..b24c6ea69b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-qH1AHIdshHNM3UiIr1UeShRhtLMo2YFq9gy4rFl58DU="; + hash = "sha256-qH1AHIdshHNM3UiIr1UeShRhtLMo2YFq9gy4rFl58DU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix index 266be13685..37d74abc72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-ZU4mKTzny9tsKDrFSU+lll5v6oDivYJlXDriWJLAYec="; + hash = "sha256-ZU4mKTzny9tsKDrFSU+lll5v6oDivYJlXDriWJLAYec="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix index 3a69eec97a..1790922d82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-LO92Wc2+VvsEKiOjVSHXw2o3D69NQlL58m+YqWl6+ig="; + hash = "sha256-LO92Wc2+VvsEKiOjVSHXw2o3D69NQlL58m+YqWl6+ig="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix index 55739e868e..d3a52e76a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-EJyjolHrt92zWg+IKWFKTapwZaFrwTtSyEIu5/mZXOg="; + hash = "sha256-EJyjolHrt92zWg+IKWFKTapwZaFrwTtSyEIu5/mZXOg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix index f574b32286..83916038d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-QVw6Y9HachwBRwCbF0cSGLCAkSJtNnXBvsj5YX1TmJU="; + hash = "sha256-QVw6Y9HachwBRwCbF0cSGLCAkSJtNnXBvsj5YX1TmJU="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix index 5094dc3ec6..9c244435c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-TiVbTOm5JDV7uMUAmzyIogFNMgOySV4iVvoCe/hOgA4="; + hash = "sha256-TiVbTOm5JDV7uMUAmzyIogFNMgOySV4iVvoCe/hOgA4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix index 68d14c49ef..a0da387c62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-R0F2HoA0bE7dTLPycTaOqYBj+ATQFeJFwv4EjtK1lqg="; + hash = "sha256-R0F2HoA0bE7dTLPycTaOqYBj+ATQFeJFwv4EjtK1lqg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix index ddaa89d916..ce4caf8e41 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-WvyNgfiliEt6qawqy8Le8eifhxusMkoZbf6YcyY1SBA="; + hash = "sha256-WvyNgfiliEt6qawqy8Le8eifhxusMkoZbf6YcyY1SBA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix index 331c0e1e2e..933d04a478 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-x5v3e3/poSm+JMt0SWI1lcM6YAUcP+o2Sn8TluXOyIg="; + hash = "sha256-x5v3e3/poSm+JMt0SWI1lcM6YAUcP+o2Sn8TluXOyIg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix index 9957f87f76..2b2d22ec13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.10.1"; + version = "12.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-Vnm72cdg/9P+J3Scnj5jcG6kLCdIVMGnxnU9an2oxGQ="; + hash = "sha256-RlKL2q3O2gazyK7kCZLjgZZJ1K6vD0H2jpUV8epuhmQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix index aa69731809..c98609a6df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "azure-storage-queue"; - version = "12.5.0"; + version = "12.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OzdEJK9y0y2v+Lr5tkYwB0w6iz/VMypFIWs7yWvHsXI="; + hash = "sha256-GaAfHYYLXll4nhcnzmrsTwkDrFYwelZMT6d3+zi2tQ0="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index a632ec9668..1aeefcb160 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-XxryuN5HVuY9h6ioSEv9nwzkK6wYLupvFOCJqX82eWE="; + hash = "sha256-XxryuN5HVuY9h6ioSEv9nwzkK6wYLupvFOCJqX82eWE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/babel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/babel/default.nix index e9f9f7bdfc..09fb69a765 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/babel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/babel/default.nix @@ -2,16 +2,16 @@ buildPythonPackage rec { pname = "babel"; - version = "2.11.0"; + version = "2.12.1"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Babel"; inherit version; - sha256 = "sha256-XvSzImsBgN7d7UIpZRyLDho6aig31FoHMnLzE+TPl/Y="; + hash = "sha256-zC2ZmZzQHURCCuclohyeNxGzqtx5dtYUf2IthYGWNFU="; }; - propagatedBuildInputs = [ pytz ]; + propagatedBuildInputs = lib.optional (pythonOlder "3.9") pytz; nativeCheckInputs = [ pytestCheckHook freezegun ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backoff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backoff/default.nix index 71c39395a4..000f024476 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backoff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backoff/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "litl"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-g8bYGJ6Kw6y3BUnuoP1IAye5CL0geH5l7pTb3xxq7jI="; + hash = "sha256-g8bYGJ6Kw6y3BUnuoP1IAye5CL0geH5l7pTb3xxq7jI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports-cached-property/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports-cached-property/default.nix index a4a9f30719..27ad572370 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports-cached-property/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backports-cached-property/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "penguinolog"; repo = "backports.cached_property"; rev = version; - sha256 = "sha256-rdgKbVQaELilPrN4ve8RbbaLiT14Xex0esy5vUX2ZBc="; + hash = "sha256-rdgKbVQaELilPrN4ve8RbbaLiT14Xex0esy5vUX2ZBc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix index b7337d8e15..faed6af9cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pganssle"; repo = "zoneinfo"; rev = version; - sha256 = "sha256-00xdDOVdDanfsjQTd3yjMN2RFGel4cWRrAA3CvSnl24="; + hash = "sha256-00xdDOVdDanfsjQTd3yjMN2RFGel4cWRrAA3CvSnl24="; }; # Make sure test data update patch applies diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix index 20c1288ba4..3bedc03329 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix @@ -2,15 +2,15 @@ , wheel, pytestCheckHook, pytest-runner, pythonAtLeast }: buildPythonPackage rec { - version = "0.18.4"; + version = "0.18.6"; pname = "bacpypes"; disabled = pythonAtLeast "3.9"; src = fetchFromGitHub { owner = "JoelBender"; repo = "bacpypes"; - rev = version; - sha256 = "1z5v0i7ms8na062wxd5ki43yy5z2d9cns0p4vdmkx2drwsbzlav2"; + rev = "refs/tags/v${version}"; + hash = "sha256-BHCHI36nTqBj2dkHB/Y5qkC4uJCmzbHGzSFWKNsIdbc="; }; propagatedBuildInputs = [ wheel ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bambi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bambi/default.nix index 2999eadd67..b6c2b0de75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bambi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bambi/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "bambi"; - version = "0.9.3"; + version = "0.10.0"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bambinos"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-f/4CrFmma+Lc6wZm+YyDupDWfPAtuRsZdRf28sYUWTk="; + hash = "sha256-D04eTAlckEqgKA+59BRljlyneHYoqqZvLYmt/gBLHcU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bandit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bandit/default.nix index 73de9a4688..79c19ba765 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bandit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bandit/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "bandit"; - version = "1.7.4"; + version = "1.7.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LWOoxXNBe64ziWLUubBvvGCA907NlVoJKEnh5lxxe9I="; + hash = "sha256-vfxzm6oDuIDC0V0EMbMcZY/8NI6Qf+GX5U4Did1Z4R4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix index 3ca0d9f450..82b8738285 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { # https://github.com/fmfn/BayesianOptimization/issues/300 (fetchpatch { url = "https://github.com/fmfn/BayesianOptimization/commit/b4e09a25842985a4a0acea0c0f5c8789b7be125e.patch"; - sha256 = "sha256-PfcifCFd4GRNTA+4+T+6A760QAgyZxhDCTyzNn2crdM="; + hash = "sha256-PfcifCFd4GRNTA+4+T+6A760QAgyZxhDCTyzNn2crdM="; name = "scipy_18_fix.patch"; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bayespy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bayespy/default.nix index d3954e52bb..ff3d8cfce2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bayespy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bayespy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { (fetchpatch { name = "locally-defined-epsilon.patch"; url = "https://github.com/bayespy/bayespy/commit/9be53bada763e19c2b6086731a6aa542ad33aad0.patch"; - sha256 = "sha256-KYt/0GcaNWR9K9/uS2OXgK7g1Z+Bayx9+IQGU75Mpuo="; + hash = "sha256-KYt/0GcaNWR9K9/uS2OXgK7g1Z+Bayx9+IQGU75Mpuo="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bbox/default.nix index a07551197b..88a019dda8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bbox/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ucR7mg9eubEefjC7ratEgrb9h++a26z8KV38n3N2kcw="; + hash = "sha256-ucR7mg9eubEefjC7ratEgrb9h++a26z8KV38n3N2kcw="; }; propagatedBuildInputs = [ pyquaternion numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bc-detect-secrets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bc-detect-secrets/default.nix new file mode 100644 index 0000000000..8efa3f375a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -0,0 +1,80 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, gibberish-detector +, mock +, pkgs +, pyahocorasick +, pytestCheckHook +, pythonOlder +, pyyaml +, requests +, responses +, unidiff +}: + +buildPythonPackage rec { + pname = "bc-detect-secrets"; + version = "1.4.14"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bridgecrewio"; + repo = "detect-secrets"; + rev = "refs/tags/${version}"; + hash = "sha256-WgUbVpn5KoayiWv3sYp+hZxqfQg73k0pXkxgUK8wrPg="; + }; + + propagatedBuildInputs = [ + pyyaml + requests + unidiff + ]; + + passthru.optional-dependencies = { + word_list = [ + pyahocorasick + ]; + gibberish = [ + gibberish-detector + ]; + }; + + nativeCheckInputs = [ + mock + pkgs.gitMinimal + pytestCheckHook + responses + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + preCheck = '' + export HOME=$(mktemp -d); + ''; + + disabledTests = [ + # Tests are failing for various reasons (missing git repo, missing test data, etc.) + "test_baseline_filters_out_known_secrets" + "test_make_decisions" + "test_saves_to_baseline" + "test_start_halfway" + "TestCreate" + "TestDiff" + "TestGetFilesToScan" + "TestLineNumberChanges" + "TestModifiesBaselineFromVersionChange" + ]; + + pythonImportsCheck = [ + "detect_secrets" + ]; + + meta = with lib; { + description = "Tool to detect secrets in the code"; + homepage = "https://github.com/bridgecrewio/detect-secrets"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bc-jsonpath-ng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bc-jsonpath-ng/default.nix new file mode 100644 index 0000000000..bc16a809b5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bc-jsonpath-ng/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, decorator +, fetchFromGitHub +, ply +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "bc-jsonpath-ng"; + version = "1.5.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bridgecrewio"; + repo = "jsonpath-ng"; + rev = "refs/tags/${version}"; + hash = "sha256-Uho+slKmKkTrcJBKi+9GJv1JrvDrTP4/6uqmMn3qptU="; + }; + + propagatedBuildInputs = [ + decorator + ply + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # Exclude tests that require oslotest + "tests/test_jsonpath_rw_ext.py" + ]; + + pythonImportsCheck = [ + "bc_jsonpath_ng" + ]; + + meta = with lib; { + description = "JSONPath implementation for Python"; + homepage = "https://github.com/bridgecrewio/jsonpath-ng"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beancount-black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beancount-black/default.nix index 103574a243..014b01439f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beancount-black/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beancount-black/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "beancount-black"; - version = "0.1.14"; + version = "0.2.0"; disabled = pythonOlder "3.9"; format = "pyproject"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beancount-black"; rev = version; - hash = "sha256-4ooMskwPJJLJBfPikaHJ4xuwR1x478ecYWZdIE0UAK8="; + hash = "sha256-1n+IADiGUsi69XoxO4Tjio2QdkJyoYZHgvYc646TuF4="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beancount/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beancount/default.nix index 6ba700cc6e..bff59de425 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beancount/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beancount/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-FONWJaLpy9Q8rmF42gjLPxIk9iYeVBymcm3zXZjpw2o="; + hash = "sha256-FONWJaLpy9Q8rmF42gjLPxIk9iYeVBymcm3zXZjpw2o="; }; # Tests require files not included in the PyPI archive. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beancount_docverif/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beancount_docverif/default.nix index 3ca6542f8f..521652f842 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beancount_docverif/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beancount_docverif/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-CFBv1FZP5JO+1MPnD86ttrO42zZlvE157zqig7s4HOg="; + hash = "sha256-CFBv1FZP5JO+1MPnD86ttrO42zZlvE157zqig7s4HOg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix index 53d869db45..09d2e90e16 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -12,15 +12,16 @@ buildPythonPackage rec { pname = "beautifulsoup4"; - version = "4.11.1"; + version = "4.11.2"; format = "setuptools"; + outputs = ["out" "doc"]; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-rZqlW2XvKAjrQF9Gz3Tff8twRNXLwmSH+W6y7y5DZpM="; + hash = "sha256-vEvdpnF95aKYdDb7jXL0XckN2Fa9/VEqExTOkDSaAQY="; }; nativeBuildInputs = [ @@ -43,6 +44,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://git.launchpad.net/beautifulsoup/tree/CHANGELOG?h=${version}"; homepage = "http://crummy.com/software/BeautifulSoup/bs4/"; description = "HTML and XML parser"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bech32/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bech32/default.nix index 33b9044d75..43fc00ee01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bech32/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bech32/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-fW24IUYDvXhx/PpsCCbvaLhbCr2Q+iHChanF4h0r2Jk="; + hash = "sha256-fW24IUYDvXhx/PpsCCbvaLhbCr2Q+iHChanF4h0r2Jk="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix index 437bf9cf6b..e82df58832 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.34.9"; + version = "0.34.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-2QTY6mZkhaXHeZcLKxW7BkzOj2jYJx1v4TKG5YBcSC0="; + hash = "sha256-eD9E/NbM3t1kWhPwY2SmjuCk+XVwklm4rwzISlQHtq0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bencode-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bencode-py/default.nix index e4d5041e8b..4a2dfc5c32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bencode-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bencode-py/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "bencode.py"; - sha256 = "sha256-KiTM2hclpRplCJPQtjJgE4NZ6qKZu256CZYTUKKm4Fw="; + hash = "sha256-KiTM2hclpRplCJPQtjJgE4NZ6qKZu256CZYTUKKm4Fw="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/betterproto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/betterproto/default.nix index 7b3d3bc098..0ef6aac875 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/betterproto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/betterproto/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "danielgtaylor"; repo = "python-betterproto"; rev = "v${version}"; - sha256 = "sha256-XyXdpo3Yo4aO1favMWC7i9utz4fNDbKbsnYXJW0b7Gc="; + hash = "sha256-XyXdpo3Yo4aO1favMWC7i9utz4fNDbKbsnYXJW0b7Gc="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bidict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bidict/default.nix index 45ba90794d..2ecbd11246 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bidict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bidict/default.nix @@ -1,9 +1,11 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, setuptools , sphinx , hypothesis , py +, pytest-xdist , pytestCheckHook , pytest-benchmark , sortedcollections @@ -13,15 +15,22 @@ buildPythonPackage rec { pname = "bidict"; - version = "0.22.0"; + version = "0.22.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-XIJrPhXpfMbmFd4pV1aEfCgqebecVDDTv8kJsayfW9g="; + src = fetchFromGitHub { + owner = "jab"; + repo = "bidict"; + rev = "refs/tags/v${version}"; + hash = "sha256-mPBruasjQwErl5M91OBf71hArztdRVONOCnqos180DY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ sphinx ]; @@ -29,6 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis py + pytest-xdist pytestCheckHook pytest-benchmark sortedcollections @@ -39,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/jab/bidict"; + changelog = "https://github.com/jab/bidict/blob/v${version}/CHANGELOG.rst"; description = "Efficient, Pythonic bidirectional map data structures and related functionality"; license = licenses.mpl20; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix index 84bd82d94a..7789b9b584 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-WJb9EENkYFVgKuByHFJhed/Slt6ayG31LeQk1+14/Ys="; + hash = "sha256-WJb9EENkYFVgKuByHFJhed/Slt6ayG31LeQk1+14/Ys="; }; # needs packages which are not available in nixpkgs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/billiard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/billiard/default.nix index ddf1db4a6b..6c641a16f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/billiard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/billiard/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-GtLuro4oBT1ym6M3PTTZ1uIQ9uTYvwqcZPkr0FPx7fU="; + hash = "sha256-GtLuro4oBT1ym6M3PTTZ1uIQ9uTYvwqcZPkr0FPx7fU="; }; nativeCheckInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python multiprocessing fork with improvements and bugfixes"; homepage = "https://github.com/celery/billiard"; + changelog = "https://github.com/celery/billiard/blob/v${version}/CHANGES.txt"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix index d756865be2..1dfb731f9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.12.1"; + version = "0.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-wLQ2UkedLSwfbUqmb85QgsDYh0zcbgQOMnhbRHW5Bnw="; + hash = "sha256-o6rCxSJtWqcHqcrhKaVSxEfFLDBikUU9jAszRjihM2o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bincopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bincopy/default.nix index 6ecb4d1d18..ee6dcb44d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bincopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bincopy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bincopy"; - version = "17.14.0"; + version = "17.14.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sx+0sBbY2P6vQt38e2M72GLU8tRwKOMpVWNNNtEXx0k="; + hash = "sha256-X03nw3o9t63PPtxIM6Ij8zVtm/CL5y7G5DHJ8KzSnxg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix index 4cadf33f1a..9fb243a576 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "ReFirmLabs"; repo = "binwalk"; rev = "v${version}"; - sha256 = "sha256-hlPbzqGRSXcIqlI+SNKq37CnnHd1IoMBNSjhyeAM1TE="; + hash = "sha256-hlPbzqGRSXcIqlI+SNKq37CnnHd1IoMBNSjhyeAM1TE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/biopython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/biopython/default.nix index 96385466ad..91b4f529f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/biopython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/biopython/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-LPOBErbYQVrTnWphGYjNEftfM+sJNGZmqHJjvrqWFOA="; + hash = "sha256-LPOBErbYQVrTnWphGYjNEftfM+sJNGZmqHJjvrqWFOA="; }; disabled = !isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix index d11db2c845..91872700b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-mVA0CdbGGJn44R6xHnophmsnVMsCwDrPNM3vmXVa7dg="; + hash = "sha256-mVA0CdbGGJn44R6xHnophmsnVMsCwDrPNM3vmXVa7dg="; }; propagatedBuildInputs = [ base58 ecdsa hidapi noiseprotocol protobuf semver typing-extensions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitcoinlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitcoinlib/default.nix index e1cd7bd66a..037ea8b5eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitcoinlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitcoinlib/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "petertodd"; repo = "python-bitcoinlib"; rev = "refs/tags/python-bitcoinlib-v${version}"; - sha256 = "sha256-jguybrH86z6NWLaucQEYjvH2Gkoh3Aqh/PLZ6l8Qel4="; + hash = "sha256-jguybrH86z6NWLaucQEYjvH2Gkoh3Aqh/PLZ6l8Qel4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix index 33509352b6..7ae36bc2c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix @@ -11,10 +11,13 @@ , hatch-fancy-pypi-readme , hatch-vcs , hatchling +, ipython , mypy-extensions +, packaging , pathspec , parameterized , platformdirs +, tokenize-rt , tomli , typed-ast , typing-extensions @@ -23,14 +26,14 @@ buildPythonPackage rec { pname = "black"; - version = "22.12.0"; + version = "23.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IpNR5aGMow9Ee/ck0Af4kPl+E68HC7atTApEHNdZai8="; + hash = "sha256-sL2XvqiQP1orpyGSV6ROPx+dAAc9bMGt1o8L7saWkqw="; }; nativeBuildInputs = [ @@ -39,11 +42,42 @@ buildPythonPackage rec { hatchling ]; + propagatedBuildInputs = [ + click + mypy-extensions + packaging + pathspec + platformdirs + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ] ++ lib.optionals (pythonOlder "3.10") [ + typing-extensions + ]; + + passthru.optional-dependencies = { + colorama = [ + colorama + ]; + d = [ + aiohttp + ]; + uvloop = [ + uvloop + ]; + jupyter = [ + ipython + tokenize-rt + ]; + }; + # Necessary for the tests to pass on Darwin with sandbox enabled. # Black starts a local server and needs to bind a local address. __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ pytestCheckHook parameterized aiohttp ]; + nativeCheckInputs = [ + pytestCheckHook + parameterized + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); preCheck = '' export PATH="$PATH:$out/bin" @@ -69,21 +103,6 @@ buildPythonPackage rec { # multiple tests exceed max open files on hydra builders doCheck = !(stdenv.isLinux && stdenv.isAarch64); - propagatedBuildInputs = [ - click - mypy-extensions - pathspec - platformdirs - tomli - ] ++ lib.optional (pythonOlder "3.8") typed-ast - ++ lib.optional (pythonOlder "3.10") typing-extensions; - - passthru.optional-dependencies = { - d = [ aiohttp aiohttp-cors ]; - colorama = [ colorama ]; - uvloop = [ uvloop ]; - }; - meta = with lib; { description = "The uncompromising Python code formatter"; homepage = "https://github.com/psf/black"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleach-allowlist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleach-allowlist/default.nix index 4c52df127b..81aff57090 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bleach-allowlist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bleach-allowlist/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-VuIghgeaDmoxAK6Z5NuvIOslhUhlmOsOmUAIoRQo2ps="; + hash = "sha256-VuIghgeaDmoxAK6Z5NuvIOslhUhlmOsOmUAIoRQo2ps="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix index 1c6bd8896c..f35d05728e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "bleach"; - version = "5.0.1"; + version = "6.0.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DQMlXEfrm9Lyaqm7fyEHcy5+j+GVyi9kcJ/POwpKCFw="; + hash = "sha256-GhqFwVleB9jbFMXwnwnmQzUCxRxZWXDtwJBVHw25lBQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix index 54f0e009b2..6b9dbe3093 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "2.13.1"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MBAHo4ZpiSsGIh1ra4LugXjdSZP10RB6NG8PnC82DHY="; + hash = "sha256-zBZDfUOmy2stIW3Ldm/VN/2G66vg4Lj6kdJCBwo885Y="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blessed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blessed/default.nix index 984ffbb33f..dd9c831819 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blessed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blessed/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "blessed"; - version = "1.19.1"; + version = "1.20.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mg0JlpW/Yh1GgN1sc/atVH9qNEL72+gMSx2qHtvEkvw="; + hash = "sha256-LN1n+HRuBI8A30eiiA9NasvNs5kDG2BONLqPcdV4doA="; }; nativeCheckInputs = [ pytest mock glibcLocales ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix index 8f53ff5c05..4e6147bbfb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-kj5eL2nBVfLMQtr7vXDhbj/eJNLUqiq3L744YjiJJGI="; + hash = "sha256-kj5eL2nBVfLMQtr7vXDhbj/eJNLUqiq3L744YjiJJGI="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blinkstick/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blinkstick/default.nix index 8e7dd0b11f..d3de7561be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blinkstick/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blinkstick/default.nix @@ -5,7 +5,7 @@ }: buildPythonPackage rec { - pname = "BlinkStick"; + pname = "blinkstick"; version = "1.2.0"; src = fetchPypi { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix index 2a0e2183cb..d5ddebc9c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "blis"; # Do not update to BLIS 0.9.x until the following issue is resolved: # https://github.com/explosion/thinc/issues/771#issuecomment-1255825935 - version = "0.7.9"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Ke9MJQB3hakP/C8Ks9O9O3XNLXhWqaSCt9DayNURoJ0="; + hash = "sha256-fOrEZoAfnZfss04Q3e2MJM9eCSfqfoNNocydLtP8Nm8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/block-io/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/block-io/default.nix index 5ac33d77cf..6540ebe02e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/block-io/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/block-io/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-M7czfpagXqoWWSu4enB3Z2hc2GtAaskI6cnJzJdpC8I="; + hash = "sha256-M7czfpagXqoWWSu4enB3Z2hc2GtAaskI6cnJzJdpC8I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix index 206a3f81a9..95c83b9932 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "blockdiag"; repo = "blockdiag"; rev = version; - sha256 = "sha256-j8FoNUIJJOaahaol1MRPyY2jcPCEIlaAD4bmM2QKFFI="; + hash = "sha256-j8FoNUIJJOaahaol1MRPyY2jcPCEIlaAD4bmM2QKFFI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blocksat-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blocksat-cli/default.nix index a5df0642d3..9edd9ac0d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blocksat-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blocksat-cli/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-btwL8l5UdE9FwWXfuf1OHa8EwXDoFrh8tvOwr1yhyRg="; + hash = "sha256-btwL8l5UdE9FwWXfuf1OHa8EwXDoFrh8tvOwr1yhyRg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blosc2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blosc2/default.nix new file mode 100644 index 0000000000..027dd0ca8e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/blosc2/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools +, scikit-build +, cython +, cmake +, ninja + +# propagates +, msgpack +, ndindex +, numpy +, py-cpuinfo +, rich + +# tests +, psutil +, pytestCheckHook +, torch +}: + +buildPythonPackage rec { + pname = "blosc2"; + version = "2.1.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Blosc"; + repo = "python-blosc2"; + rev = "refs/tags/v${version}"; + fetchSubmodules = true; + hash = "sha256-nbPMLkTye0/Q05ubE35LssN677sUIQErPTxjAtSuGgI="; + }; + + nativeBuildInputs = [ + cmake + cython + ninja + numpy + scikit-build + setuptools + ]; + + dontUseCmakeConfigure = true; + + propagatedBuildInputs = [ + msgpack + ndindex + numpy + py-cpuinfo + rich + ]; + + nativeCheckInputs = [ + psutil + pytestCheckHook + torch + ]; + + meta = with lib; { + description = "Python wrapper for the extremely fast Blosc2 compression library"; + homepage = "https://github.com/Blosc/python-blosc2"; + changelog = "https://github.com/Blosc/python-blosc2/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blspy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blspy/default.nix index 01200a2fae..41d8c13dc5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blspy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blspy/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { owner = "AmineKhaldi"; repo = "libsodium-cmake"; rev = "f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65"; # pinned by blspy - sha256 = "sha256-lGz7o6DQVAuEc7yTp8bYS2kwjzHwGaNjugDi1ruRJOA="; + hash = "sha256-lGz7o6DQVAuEc7yTp8bYS2kwjzHwGaNjugDi1ruRJOA="; fetchSubmodules = true; }; catch2_src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v3.0.0-preview5"; # pinned by blspy - sha256 = "sha256-IQ1yGZo3nKHTqScUoq3i3Njxqvk7uW8hQ3GT0/SxGaw="; + hash = "sha256-IQ1yGZo3nKHTqScUoq3i3Njxqvk7uW8hQ3GT0/SxGaw="; }; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bme680/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bme680/default.nix index 05431afa41..5c6f0f5baf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bme680/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bme680/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "pimoroni"; repo = "bme680-python"; rev = "v${version}"; - sha256 = "sha256-gmdRxMJ0DoCyNcb/bYp746PBi4HktHAAYOcSQJ0Uheg="; + hash = "sha256-gmdRxMJ0DoCyNcb/bYp746PBi4HktHAAYOcSQJ0Uheg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix index 5d57084486..3b7234cdc9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-7zOAEWGvN5Zlq3o0aE8iCYYeOu/VyAOiH7u5nZSHSwM="; + hash = "sha256-7zOAEWGvN5Zlq3o0aE8iCYYeOu/VyAOiH7u5nZSHSwM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix index d2cefade9c..a83cfc0284 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { echo "Building pip wheel..." pushd pip + rm pyproject.toml ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . popd ''; 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 360144a369..33ad5ccf29 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - sha256 = "sha256-OcXAlMc1/HdGJGjB0miTh7k9rH7cC0CZtwKSqePgPUY="; + hash = "sha256-OcXAlMc1/HdGJGjB0miTh7k9rH7cC0CZtwKSqePgPUY="; }; 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 094ce40ce0..09f0938782 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.26.38"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.26.79"; # N.B: if you change this, change botocore and awscli to a matching version format = "pyproject"; src = fetchFromGitHub { owner = "boto"; repo = pname; rev = version; - hash = "sha256-/QkR6gL0XkXofnFDcKa7J0ZbZbgT0IKnqtq2wcilbEs="; + hash = "sha256-9Xsng4xZ+IGNZ3ViYVrOyKZdRH6QPSjZALj9Q3HECBU="; }; propagatedBuildInputs = [ 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 0c93fbf1b5..f6d62659cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.29.40"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.29.79"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - hash = "sha256-5YKsBykBjaQVsLXeFOox/9CtBIOp/bgUeQJSbQY0f7c="; + hash = "sha256-x97UQGK+07kolEz7CeFXjtP+0OTJjeTyM/PCBWqNSR4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bottle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bottle/default.nix index ac2f96455e..3d12ba7e3a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bottle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bottle/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "bottle"; - version = "0.12.23"; + version = "0.12.24"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aD3jqjmfsm6HsnTbz3CxplE4XUWRMXFjh6vcN5LgQWc="; + hash = "sha256-JIASGnPoc4CYm3fjK9IJLRkOfqfXHm8bj3r36rnVTqM="; }; nativeCheckInputs = [ @@ -29,6 +29,8 @@ buildPythonPackage rec { "test_error_in_generator_callback" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { homepage = "https://bottlepy.org/"; description = "A fast and simple micro-framework for small web-applications"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bottleneck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bottleneck/default.nix index b3431b834a..e327e135c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bottleneck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bottleneck/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "bottleneck"; - version = "1.3.6"; + version = "1.3.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Bottleneck"; inherit version; - hash = "sha256-vBXiVF1CgtbyUpWX3xvW5MXwxEKWs/hCW8g1MFvZQ8k="; + hash = "sha256-4UZ+NzrUado0DtD/KDIU1lMcwIv9yiCDNho6pkcGgfg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bpycv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bpycv/default.nix index 90931af254..03aef9fd6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bpycv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bpycv/default.nix @@ -16,10 +16,11 @@ buildPythonPackage rec { pname = "bpycv"; version = "0.3.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4N4rCVhbfJx7H7jS88QR3EcRupISIhnLuZ+cgfwIzg4="; + hash = "sha256-4N4rCVhbfJx7H7jS88QR3EcRupISIhnLuZ+cgfwIzg4="; }; propagatedBuildInputs = [ @@ -41,7 +42,7 @@ buildPythonPackage rec { bpycv_example_data = fetchFromGitHub { owner = "DIYer22"; repo = "bpycv_example_data"; - sha256 = "sha256-dGb6KvbXTGTu5f4AqhA+i4AwTqBoR5SdXk0vsMEcD3Q="; + hash = "sha256-dGb6KvbXTGTu5f4AqhA+i4AwTqBoR5SdXk0vsMEcD3Q="; rev = "6ce0e65c107d572011394da16ffdf851e988dbb4"; }; in '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bracex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bracex/default.nix index 3971c49639..94866e064b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bracex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bracex/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-57I/yLLNBtPewGkrqr7LJJ3alOBqYXkB/wOmxW/XFpM="; + hash = "sha256-57I/yLLNBtPewGkrqr7LJJ3alOBqYXkB/wOmxW/XFpM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bravia-tv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bravia-tv/default.nix index 849f7e0b0a..ce299e4612 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bravia-tv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bravia-tv/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "dcnielsen90"; repo = "python-bravia-tv"; rev = "v${version}"; - sha256 = "sha256-g47bDd5bZl0jad3o6T1jJLcnZj8nx944kz3Vxv8gD2U="; + hash = "sha256-g47bDd5bZl0jad3o6T1jJLcnZj8nx944kz3Vxv8gD2U="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix index 6d27908dd8..12f892b7e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-TqaUn8uwdrl4VFsJn6xoq6011voYmd7vT2uCo9uiV8E="; + hash = "sha256-TqaUn8uwdrl4VFsJn6xoq6011voYmd7vT2uCo9uiV8E="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/brelpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brelpy/default.nix index 66d611f5e9..83d5946c54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/brelpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/brelpy/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pycryptodome -, PyGithub +, pygithub , pythonOlder }: @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-MYWSKYd7emHZfY+W/UweQtTg62GSUMybpecL9BR8dhg="; + hash = "sha256-MYWSKYd7emHZfY+W/UweQtTg62GSUMybpecL9BR8dhg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/brian2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brian2/default.nix index 52149b8830..40276980b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/brian2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/brian2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Brian2"; inherit version; - sha256 = "sha256-x1EcS7PFCsjPYsq3Lt87SJRW4J5DE/OfdFs3NuyHiLw="; + hash = "sha256-x1EcS7PFCsjPYsq3Lt87SJRW4J5DE/OfdFs3NuyHiLw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/brother-ql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brother-ql/default.nix index 891791dfec..c7b727c73a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/brother-ql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/brother-ql/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "brother_ql"; inherit version; - sha256 = "sha256-H1xXoDnwEsnCBDl/RwAB9267dINCHr3phdDLPGFOhmA="; + hash = "sha256-H1xXoDnwEsnCBDl/RwAB9267dINCHr3phdDLPGFOhmA="; }; propagatedBuildInputs = [ future packbits pillow pyusb click attrs ]; 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 23727f2137..ad78355066 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/brotli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/brotli/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tFnXSXv8t3l3HX6GwWLhEtgpqz0c7Yom5U3k47pWM7o="; + hash = "sha256-tFnXSXv8t3l3HX6GwWLhEtgpqz0c7Yom5U3k47pWM7o="; # .gitattributes is not correct or GitHub does not parse it correct and the archive is missing the test data forceFetchGit = true; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bsuite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bsuite/default.nix index 9ed9fce3ea..0a5f225111 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bsuite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bsuite/default.nix @@ -31,7 +31,7 @@ let bsuite = buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ak9McvXl7Nz5toUaPaRaJek9lurxiQiIW209GnZEjX0="; + hash = "sha256-ak9McvXl7Nz5toUaPaRaJek9lurxiQiIW209GnZEjX0="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/btchip-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/btchip-python/default.nix new file mode 100644 index 0000000000..901a3b2cc9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/btchip-python/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, hidapi +, pyscard +, ecdsa + }: + +buildPythonPackage rec { + pname = "btchip-python"; + version = "0.1.32"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-NPXgwWHAj2XcDQcLov9MMV7SHEt+D6oypGhi0Nwbj1U="; + }; + + postPatch = '' + # fix extra_requires validation + substituteInPlace setup.py \ + --replace "python-pyscard>=1.6.12-4build1" "python-pyscard>=1.6.12" + ''; + + propagatedBuildInputs = [ + hidapi + ecdsa + ]; + + passthru.optional-dependencies.smartcard = [ + pyscard + ]; + + # tests requires hardware + doCheck = false; + + pythonImportsCheck = [ + "btchip.btchip" + ]; + + meta = with lib; { + description = "Python communication library for Ledger Hardware Wallet products"; + homepage = "https://github.com/LedgerHQ/btchip-python"; + license = licenses.asl20; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/btchip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/btchip/default.nix deleted file mode 100644 index e34b58907e..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/btchip/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, hidapi, pyscard, ecdsa }: - -buildPythonPackage rec { - pname = "btchip-python"; - version = "0.1.32"; - - src = fetchPypi { - inherit pname version; - sha256 = "34f5e0c161c08f65dc0d070ba2ff4c315ed21c4b7e0faa32a46862d0dc1b8f55"; - }; - - propagatedBuildInputs = [ hidapi pyscard ecdsa ]; - - # tests requires hardware - doCheck = false; - - pythonImportsCheck = [ "btchip.btchip" ]; - - meta = with lib; { - description = "Python communication library for Ledger Hardware Wallet products"; - homepage = "https://github.com/LedgerHQ/btchip-python"; - license = licenses.asl20; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix index fd4ea9a6fd..1f21e852d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "2.8.0"; + version = "2.9.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SdYS/S3wBmIl/f+0H67PcMRX7GiJqAkysvlENshB1yY="; + hash = "sha256-qVPlrj6EVTPJ/HiwynIg6iuJzUGb6Lan/QKC29C2YNk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/btrfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/btrfs/default.nix index 9bcb8f3733..ee20445068 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/btrfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/btrfs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-NSyzhpHYDkunuU104XnbVCcVRNDoVBz4KuJRrE7WMO0="; + hash = "sha256-NSyzhpHYDkunuU104XnbVCcVRNDoVBz4KuJRrE7WMO0="; }; # no tests (in v12) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bucketstore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bucketstore/default.nix index d580b20248..2142140cb8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bucketstore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bucketstore/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "jpetrucciani"; repo = "bucketstore"; rev = version; - sha256 = "sha256-BtoyGqFbeBhGQeXnmeSfiuJLZtXFrK26WO0SDlAtKG4="; + hash = "sha256-BtoyGqFbeBhGQeXnmeSfiuJLZtXFrK26WO0SDlAtKG4="; }; propagatedBuildInputs = [ boto3 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix index bcdd7614ec..7764889888 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix @@ -2,10 +2,10 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, flit-core , filelock -, importlib-metadata , packaging -, pep517 +, pyproject-hooks , pytest-mock , pytest-rerunfailures , pytest-xdist @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "build"; - version = "0.9.0"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -27,28 +27,28 @@ buildPythonPackage rec { owner = "pypa"; repo = pname; rev = version; - hash = "sha256-iQvfZC/h9SbagExoG8dJ2A8G8gVRdMaRvEy9QcQIN5I="; + hash = "sha256-kXFrfTb7+68EV+gSENL81IFSR+ue7Fl6R2gsuFFBJhI="; }; nativeBuildInputs = [ - setuptools + flit-core ]; propagatedBuildInputs = [ packaging - pep517 + pyproject-hooks + ] ++ lib.optionals (pythonOlder "3.11") [ tomli - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata ]; nativeCheckInputs = [ filelock - toml pytest-mock pytest-rerunfailures pytest-xdist pytestCheckHook + setuptools + toml ]; pytestFlagsArray = [ @@ -83,6 +83,7 @@ buildPythonPackage rec { is a simple build tool and does not perform any dependency management. ''; homepage = "https://github.com/pypa/build"; + changelog = "https://github.com/pypa/build/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix index 3b16184ae7..13c0ec8694 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-4BXCOLW5e7RuZEzyD+oRmS2I4oT2W3oTcH4ZPxwKKvU="; + hash = "sha256-4BXCOLW5e7RuZEzyD+oRmS2I4oT2W3oTcH4ZPxwKKvU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix index e6f78dfc0b..df9efd66ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-t4xHfox6h5PY4+phdCQbClHd77+WfpUWErMZCEcMxu0="; + hash = "sha256-t4xHfox6h5PY4+phdCQbClHd77+WfpUWErMZCEcMxu0="; }; # Remove unnecessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-JySn7QO+SgoXjVeV4wYwc9twr0Q2c/wsEspqeq038+k="; + hash = "sha256-JySn7QO+SgoXjVeV4wYwc9twr0Q2c/wsEspqeq038+k="; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-935eeF2kpT68lK/UMg8MZQOYEj7D8FaT9iSs/lNahYA="; + hash = "sha256-935eeF2kpT68lK/UMg8MZQOYEj7D8FaT9iSs/lNahYA="; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-3pHSiVoOZj2iCGfiz+tMWWMPHSBH5Ggp6e3+a8topsg="; + hash = "sha256-3pHSiVoOZj2iCGfiz+tMWWMPHSBH5Ggp6e3+a8topsg="; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-5Qr1FeYIJG/qaFaTB7ScFN9uca+joHKE6FlfKwhubfo="; + hash = "sha256-5Qr1FeYIJG/qaFaTB7ScFN9uca+joHKE6FlfKwhubfo="; }; buildInputs = [ buildbot-pkg ]; @@ -122,7 +122,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-H0Dn+uTtFyZgyqbk3QQEc5t7CJovyzU+XuCoTe4Ajug="; + hash = "sha256-H0Dn+uTtFyZgyqbk3QQEc5t7CJovyzU+XuCoTe4Ajug="; }; buildInputs = [ buildbot-pkg ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix index f8ab7941dc..3ea0feb293 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix @@ -28,7 +28,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Lc+FNrfXLfeEnDqNBs9R96jtoFEOCG2vLRWGKip/+VM="; + hash = "sha256-Lc+FNrfXLfeEnDqNBs9R96jtoFEOCG2vLRWGKip/+VM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap/default.nix index 4adfde8030..8710f3bb04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap/default.nix @@ -4,7 +4,7 @@ , pythonOlder , cryptography , jinja2 -, Mako +, mako , passlib , pytest , pyyaml @@ -19,19 +19,20 @@ buildPythonPackage rec { pname = "bundlewrap"; version = "4.17.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bundlewrap"; repo = "bundlewrap"; - rev = version; - sha256 = "sha256-hdTJcuhVMbLqtPclgj4u6XwH0A5DvnGpnkhIG6Gm8+4="; + rev = "refs/tags/${version}"; + hash = "sha256-hdTJcuhVMbLqtPclgj4u6XwH0A5DvnGpnkhIG6Gm8+4="; }; nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ - setuptools cryptography jinja2 Mako passlib pyyaml requests tomlkit librouteros + setuptools cryptography jinja2 mako passlib pyyaml requests tomlkit librouteros ] ++ lib.optionals (pythonOlder "3.11") [ rtoml ]; pythonImportsCheck = [ "bundlewrap" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bx-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bx-python/default.nix index 0606ccb859..085fc210f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bx-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bx-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "bxlab"; repo = "bx-python"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Pi4hV3FatCXoXY3nNgqm5UfWYIrpP/v5PzzCi3gmIbE="; + hash = "sha256-Pi4hV3FatCXoXY3nNgqm5UfWYIrpP/v5PzzCi3gmIbE="; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bytecode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bytecode/default.nix index ac50b980ab..9821585faa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bytecode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bytecode/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "vstinner"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-nGZ4qcms27lYr1dYvVe4ebd/jc5qIb1EDhSpSZmKKIo="; + hash = "sha256-nGZ4qcms27lYr1dYvVe4ebd/jc5qIb1EDhSpSZmKKIo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; 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 f23a0ada1d..6a4f874a96 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.9.0"; + version = "0.10.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pallets"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-LO1VdirKWXIAy3U8oRtnFI58qO+yn6Vm5bZdCjdgKwo="; + hash = "sha256-2V2FvZC8jM84fZEdK9ShzFrjO8goOQsN6cnJTHDDL9E="; }; nativeCheckInputs = [ @@ -23,6 +23,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # requires set up local server + "tests/test_dynamodb_cache.py" + ]; + pythonImportsCheck = [ "cachelib" ]; meta = with lib; { 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 08e0b559b0..14682f2300 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cachetools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cachetools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "cachetools"; - version = "5.2.1"; + version = "5.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "tkem"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1B/vAfGroGABijMWuiKmIkMyjNSp2B3VkH7s1NMlbw0="; + hash = "sha256-7MbP3jz17lGwjAeWo8QmS5v1vGqIQmYLbKVcK/q89Z4="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cachey/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cachey/default.nix index c5e21598e5..ac175fa079 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cachey/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cachey/default.nix @@ -14,7 +14,7 @@ owner = "dask"; repo = pname; rev = version; - sha256 = "sha256-5USmuufrrWtmgibpfkjo9NtgN30hdl8plJfythmxM4s="; + hash = "sha256-5USmuufrrWtmgibpfkjo9NtgN30hdl8plJfythmxM4s="; }; propagatedBuildInputs = [ typing-extensions heapdict ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cairo-lang/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cairo-lang/default.nix index f1da79151f..2e7ef74202 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cairo-lang/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cairo-lang/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { src = fetchzip { url = "https://github.com/starkware-libs/cairo-lang/releases/download/v${version}/cairo-lang-${version}.zip"; - sha256 = "sha256-+PE7RSKEGADbue63FoT6UBOwURJs7lBNkL7aNlpSxP8="; + hash = "sha256-+PE7RSKEGADbue63FoT6UBOwURJs7lBNkL7aNlpSxP8="; }; # TODO: remove a substantial part when https://github.com/starkware-libs/cairo-lang/pull/88/files is merged. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix index 13a9363d41..6a60128bac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-UJM5syzNjXsAwiBMMnNs3njbU6MuahYtMSR40lYmzZo="; + hash = "sha256-UJM5syzNjXsAwiBMMnNs3njbU6MuahYtMSR40lYmzZo="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix index 98e0235a9b..a81aac5a36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1eyT6QEBs7boKqJF0FRu6bAWz9oLY0RnUVmDDYU9XQQ="; + hash = "sha256-1eyT6QEBs7boKqJF0FRu6bAWz9oLY0RnUVmDDYU9XQQ="; }; propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/caldav/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/caldav/default.nix index b451f4da0c..e67344270a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/caldav/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/caldav/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "caldav"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "python-caldav"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ibizwN4pxqzmVozVjrAPNSrmM1+8+/Qu6UnfRerrwUk="; + hash = "sha256-nA7if28M4rDZwlF+ga/1FqD838zeu0OblrPUer3w3qM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/can/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/can/default.nix index d96f588a0a..d8937082cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/can/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/can/default.nix @@ -10,6 +10,8 @@ , pytest-timeout , pytestCheckHook , pythonOlder +, setuptools +, stdenv , typing-extensions , wrapt , uptime @@ -37,6 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ msgpack packaging + setuptools typing-extensions wrapt ]; @@ -73,10 +76,16 @@ buildPythonPackage rec { # pytest.approx is not supported in a boolean context (since pytest7) "test_pack_unpack" "test_receive" + ] ++ lib.optionals stdenv.isDarwin [ + # timing sensitive + "test_general" + "test_gap" ]; preCheck = '' export PATH="$PATH:$out/bin"; + # skips timing senstive tests + export CI=1 ''; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/canmatrix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/canmatrix/default.nix index 79dbbf9d44..dbc7bd764b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/canmatrix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/canmatrix/default.nix @@ -11,7 +11,7 @@ , lxml , xlwt , xlrd -, XlsxWriter +, xlsxwriter , pyyaml , pytestCheckHook }: @@ -39,7 +39,7 @@ buildPythonPackage rec { lxml xlwt xlrd - XlsxWriter + xlsxwriter pyyaml ] ++ lib.optional (pythonOlder "3.5") typing; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/carbon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/carbon/default.nix index a15d2a5f11..4383998377 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/carbon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/carbon/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-wTtbqRHMWBcM2iFN95yzwCf/BQ+EK0vp5MXT4mKX3lw="; + hash = "sha256-wTtbqRHMWBcM2iFN95yzwCf/BQ+EK0vp5MXT4mKX3lw="; }; # Carbon-s default installation is /opt/graphite. This env variable ensures 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 799796a605..a8ed0ac494 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 @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-8iZ+wcSfh5ACTb3/iQAf2qQpwZ6wExWwcdJoLmCEjB0="; + hash = "sha256-8iZ+wcSfh5ACTb3/iQAf2qQpwZ6wExWwcdJoLmCEjB0="; }; nativeBuildInputs = [ setuptools-scm ]; 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 29feab25ab..5bfde7f67b 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.17.6"; + version = "1.18.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-917JTjNKvO/Gp9qvvd0Dd5Zjl+AQzUw8PfbH2MQ14Dg="; + hash = "sha256-NB8WJJ/cZF4fbgWtU7wM0IplJ98K195Q0WcQ632Ha6U="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix index 553907bf7d..e1c1fed3bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-syXHdlkgi/tq8bDZOxoapBEuG7KaTFztgWdYpyLw44g="; + hash = "sha256-syXHdlkgi/tq8bDZOxoapBEuG7KaTFztgWdYpyLw44g="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/catboost/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/catboost/default.nix index 2c4d3bb235..9c4b4d8049 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/catboost/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/catboost/default.nix @@ -5,15 +5,15 @@ buildPythonPackage rec { pname = "catboost"; - version = "1.0.5"; + version = "1.1.1"; disabled = pythonOlder "3.4"; src = fetchFromGitHub { owner = "catboost"; repo = "catboost"; - rev = "v${version}"; - sha256 = "ILemeZUBI9jPb9G6F7QX/T1HaVhQ+g6y7YmsT6DFCJk="; + rev = "refs/tags/v${version}"; + hash = "sha256-bqnUHTTRan/spA5y4LRt/sIUYpP3pxzdN/4wHjzgZVY="; }; nativeBuildInputs = [ clang_12 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cchardet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cchardet/default.nix deleted file mode 100644 index dbb8394634..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/cchardet/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchPypi -, cython -, nose -}: - -buildPythonPackage rec { - pname = "cchardet"; - version = "2.1.7"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "c428b6336545053c2589f6caf24ea32276c6664cb86db817e03a94c60afa0eaf"; - }; - - nativeBuildInputs = [ - cython # pending https://github.com/PyYoshi/cChardet/pull/78 being released to PyPI - ]; - - pythonImportsCheck = [ - "cchardet" - ]; - - nativeCheckInputs = [ nose ]; - - # on non x86-64 some charsets are identified as their superset, so we skip these tests (last checked with version 2.1.7) - preCheck = '' - cp -R src/tests $TMPDIR - pushd $TMPDIR - '' + lib.optionalString (stdenv.hostPlatform.system != "x86_64-linux") '' - rm $TMPDIR/tests/testdata/th/tis-620.txt # identified as iso-8859-11, which is fine for all practical purposes - rm $TMPDIR/tests/testdata/ga/iso-8859-1.txt # identified as windows-1252, which is fine for all practical purposes - rm $TMPDIR/tests/testdata/fi/iso-8859-1.txt # identified as windows-1252, which is fine for all practical purposes - ''; - - checkPhase = '' - runHook preCheck - - nosetests - - runHook postCheck - ''; - - postCheck = '' - popd - ''; - - meta = { - description = "High-speed universal character encoding detector"; - homepage = "https://github.com/PyYoshi/cChardet"; - license = lib.licenses.mpl11; - maintainers = with lib.maintainers; [ ivan ]; - }; -} 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 45b4807a5e..5096828e39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cdcs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cdcs/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { repo = "pycdcs"; # https://github.com/usnistgov/pycdcs/issues/1 rev = "0a770b752301c27e227ca40a4752f305b55dee20"; - sha256 = "sha256-AUrVEFea4VtBJXWWgECqdBFCqKuHWAlh07Dljp+HBa0="; + hash = "sha256-AUrVEFea4VtBJXWWgECqdBFCqKuHWAlh07Dljp+HBa0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cement/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cement/default.nix index c8d917048b..f8dc2c6a3a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cement/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cement/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-rRGmlGZeKtKEV8VgSU9PjDaiX8WOUA1gip2R4E4dMJM="; + hash = "sha256-rRGmlGZeKtKEV8VgSU9PjDaiX8WOUA1gip2R4E4dMJM="; }; # Disable test tests since they depend on a memcached server running on diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cepa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cepa/default.nix index 95f59ab613..708decb296 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cepa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cepa/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-P7xwGsP8ic1/abxYptDXNbAU+kC2Hiwu/Tge0g21ipY="; + hash = "sha256-P7xwGsP8ic1/abxYptDXNbAU+kC2Hiwu/Tge0g21ipY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certauth/default.nix index 71bd644846..b789fe5d16 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certauth/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ikreymer"; repo = "certauth"; rev = "ad2bae5d40a9e45519fc1f2cd7678174bbc55b3d"; # Repo has no git tags - sha256 = "sha256-Rso5N0jb9k7bdorjPIUMNiZZPnzwbkxFNiTpsJ9pco0="; + hash = "sha256-Rso5N0jb9k7bdorjPIUMNiZZPnzwbkxFNiTpsJ9pco0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-inwx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-inwx/default.nix index 06a6b3ae3d..2874e9419e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-inwx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-inwx/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-v03QBHsxhl6R8YcwWIKD+pf4APy9S2vFcQe3ZEc6AjI="; + hash = "sha256-v03QBHsxhl6R8YcwWIKD+pf4APy9S2vFcQe3ZEc6AjI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix index 10c21a5cad..96f2334935 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix @@ -26,13 +26,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "2.1.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-fCKTDAJiulwL2SOw4bV3vu0VEsvXGF+1ry8esYori8o="; + hash = "sha256-LhipH6kw/fKBy+nHrC5F7HtCdDbUWSjL85LiEC1bGT8="; }; sourceRoot = "source/${pname}"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certomancer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certomancer/default.nix index 767071a75e..324bb21f4d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certomancer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certomancer/default.nix @@ -58,6 +58,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # pyhanko_certvalidator.errors.DisallowedAlgorithmError + "test_validate" + ]; + pythonImportsCheck = [ "certomancer" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certvalidator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certvalidator/default.nix index ee24de068f..ce30bea9f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certvalidator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certvalidator/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "wbond"; repo = pname; rev = version; - sha256 = "sha256-yVF7t4FuU3C9fDg67JeM7LWZZh/mv5F4EKmjlO4AuBY="; + hash = "sha256-yVF7t4FuU3C9fDg67JeM7LWZZh/mv5F4EKmjlO4AuBY="; }; propagatedBuildInputs = [ asn1crypto oscrypto ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cexprtk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cexprtk/default.nix index e8a8a5a360..98c3b84160 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cexprtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cexprtk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-c7QXB+oXzkRveiPpNrW/HY8pMtpZx/RtDpJMVE7fY/A="; + hash = "sha256-c7QXB+oXzkRveiPpNrW/HY8pMtpZx/RtDpJMVE7fY/A="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix index 5f12deb014..5d3e220e98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix @@ -17,7 +17,7 @@ if isPyPy then null else buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1AC/uaN7E1ElPLQCZxzqfom97MKU6AFqcH9tHYrJNPk="; + hash = "sha256-1AC/uaN7E1ElPLQCZxzqfom97MKU6AFqcH9tHYrJNPk="; }; patches = [ @@ -56,7 +56,7 @@ if isPyPy then null else buildPythonPackage rec { # it is released. (fetchpatch { url = "https://foss.heptapod.net/pypy/cffi/-/commit/8a3c2c816d789639b49d3ae867213393ed7abdff.diff"; - sha256 = "sha256-3wpZeBqN4D8IP+47QDGK7qh/9Z0Ag4lAe+H0R5xCb1E="; + hash = "sha256-3wpZeBqN4D8IP+47QDGK7qh/9Z0Ag4lAe+H0R5xCb1E="; }) ]; 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 c6c24b51b7..9c44a4f4b6 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 @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.72.5"; + version = "0.73.2"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "refs/tags/v${version}"; - sha256 = "sha256-UDjCTl4AAOrwiXbKYIFsZCaSDjIFXYwNnp8/hIfXbM0="; + hash = "sha256-CNB5LrXllGxy99NjCrbjkUXUpJ72U3pUnWqrqkOiCG8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cfscrape/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cfscrape/default.nix index 3fd98b7e1e..222adbc489 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cfscrape/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cfscrape/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "Anorov"; repo = "cloudflare-scrape"; rev = "9692fe7ff3c17b76ddf0f4d50d3dba7d1791c9c6"; - sha256 = "sha256-uO8lBZonjk+mlFYoNSaz+GIN/W9yf8VL9OQ7MKfsMgI="; + hash = "sha256-uO8lBZonjk+mlFYoNSaz+GIN/W9yf8VL9OQ7MKfsMgI="; }); propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix index c988ab49a7..0735ac55a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.13.0"; + version = "5.13.1"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "refs/tags/v${version}"; - sha256 = "sha256-j4n5goW2Iu5Z1+Gta1Ar34WXaF8ryUKs5P+6Onhmyh0="; + hash = "sha256-LcCptMtRxXQPbghMIunrPcSLAXQ/r3xVktueMUQ0+gE="; }; sourceRoot = "source/packages/python/chart-studio"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix index 578fdaff2b..631b4e8204 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix @@ -8,6 +8,7 @@ , objgraph , path , portend +, pyopenssl , pytest-forked , pytest-services , pytestCheckHook @@ -99,6 +100,7 @@ buildPythonPackage rec { json = [ simplejson ]; memcached_session = [ python-memcached ]; routes_dispatcher = [ routes ]; + ssl = [ pyopenssl ]; # not packaged yet xcgi = [ /* flup */ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chex/default.nix index 9fa7a378b5..588ca836ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "chex"; - version = "0.1.5"; + version = "0.1.6"; format = "setuptools"; src = fetchFromGitHub { owner = "deepmind"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FYB0IhokM74HBY2wOJYE6xJrHxHHWhDSAZpWFs6HFu0="; + hash = "sha256-VolRlLLgKga9S17ByVrYya9VPtu9yiOnvt/WmlE1DOc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/default.nix index b8ce9ce755..98a0250b3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "chia-rs"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "chia-network"; repo = "chia_rs"; - rev = version; - hash = "sha256-kjURkzynrrb5iD5s77Q3nETt71SCGGazm/2lt9HS5JU="; + rev = "refs/tags/${version}"; + hash = "sha256-mr5v68NP9+M4FlP/3Gv3GvZOWaCNjZDARKGANgDTs4E="; }; patches = [ 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 120be8e920..ea7aa3b0ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chiapos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chiapos/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-TMRf9549z3IQzGt5c53Rk1Vq3tdrpZ3Pqc8jhj4AKzo="; + hash = "sha256-TMRf9549z3IQzGt5c53Rk1Vq3tdrpZ3Pqc8jhj4AKzo="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chromaprint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chromaprint/default.nix index 2a07a4eb6d..e4161064ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chromaprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chromaprint/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-d4M+ieNQpIXcnEH1WyIWnTYZe3P+Y58W0uz1uYPwLQE="; + hash = "sha256-d4M+ieNQpIXcnEH1WyIWnTYZe3P+Y58W0uz1uYPwLQE="; }; buildInputs = [ m2r ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ci-info/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ci-info/default.nix index 24fd2a613f..5034347fa1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ci-info/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ci-info/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-H9UMvUAfKa3/7rGLBIniMtFqwadFisa8MW3qtq5TX7A="; + hash = "sha256-H9UMvUAfKa3/7rGLBIniMtFqwadFisa8MW3qtq5TX7A="; }; nativeCheckInputs = [ pytest pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cinemagoer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cinemagoer/default.nix index b33725d545..ab9507a2e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cinemagoer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cinemagoer/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-uUq/6Uijv6krBNCa5ftBWG/uYLs/5pLyDONLvBoxjYo="; + hash = "sha256-uUq/6Uijv6krBNCa5ftBWG/uYLs/5pLyDONLvBoxjYo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/circuitbreaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/circuitbreaker/default.nix index 35f844d56e..05fce26d6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/circuitbreaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/circuitbreaker/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fabfuel"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-l0ASt9CQmgJmWpRrghElbff/gaNOmxNh+Wj0C0p4jE0="; + hash = "sha256-l0ASt9CQmgJmWpRrghElbff/gaNOmxNh+Wj0C0p4jE0="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ciso8601/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ciso8601/default.nix index 52b87941b5..5a5a8f3246 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ciso8601/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ciso8601/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "closeio"; repo = "ciso8601"; rev = "refs/tags/v${version}"; - sha256 = "sha256-qTpt91Wf3L6Jl7FU8sn9PvGMRd/cjhQ1mQvUaQeLFQU="; + hash = "sha256-qTpt91Wf3L6Jl7FU8sn9PvGMRd/cjhQ1mQvUaQeLFQU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix index 65cd8d1469..a298a166f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-4y5pe0CFD3C1+N0kP/2j9Wser2zkn8Uf4203ci45Rq0="; + hash = "sha256-4y5pe0CFD3C1+N0kP/2j9Wser2zkn8Uf4203ci45Rq0="; }; propagatedBuildInputs = [ click ecdsa hidapi pyaes ]; 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 6f90b5b51e..b955773143 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.41"; + version = "9.2.42"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FX73LF8T6FaQNqN7EB1SCRAGZsChkEduNL2i8ATQuOE="; + hash = "sha256-94FEyPL9zjHBFC8L/Aij8OcS5GiBBEY1Tnm4N7zNW0g="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix index b9712c2a82..fc185cf3cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.41"; + version = "9.2.42"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-v87ma0svBpVfx2SVLw8dx7HdOLQpNzjRwVj9yQs0bR8="; + hash = "sha256-NZPXpL4bnPXJHIPf+Jwt6vE7G43JAjhZhW2xeNSw3R8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clevercsv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clevercsv/default.nix index d657e55b71..22416afa6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clevercsv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clevercsv/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub -, cchardet , chardet +, faust-cchardet , pandas , regex , tabview @@ -22,14 +22,9 @@ buildPythonPackage rec { hash = "sha256-zpnUw0ThYbbYS7CYgsi0ZL1qxbY4B1cy2NhrUU9uzig="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "packaging>=23.0" "packaging" - ''; - propagatedBuildInputs = [ - cchardet chardet + faust-cchardet pandas regex tabview diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-log/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-log/default.nix index c0b8c89ea6..7f091396df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-log/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-log/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-OXD4VwrFRJEje82z2KtePu9sBX3yn4w9EVGlGpwjuXU="; + hash = "sha256-OXD4VwrFRJEje82z2KtePu9sBX3yn4w9EVGlGpwjuXU="; }; propagatedBuildInputs = [ click ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-option-group/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-option-group/default.nix index 47b476c6eb..2f8600a373 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-option-group/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-option-group/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "click-contrib"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ur7ycioZmgWMp4N+MURj1ggYMzs2eauteg1B5eLkSvc="; + hash = "sha256-ur7ycioZmgWMp4N+MURj1ggYMzs2eauteg1B5eLkSvc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-threading/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-threading/default.nix index 77ea7712d7..7fd47fcc82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-threading/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-threading/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-rc/mI8AqWVwQfDFAcvZ6Inj+TrQLcsDRoskDzHivNDk="; + hash = "sha256-rc/mI8AqWVwQfDFAcvZ6Inj+TrQLcsDRoskDzHivNDk="; }; nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click/default.nix index 988027f953..bb86932a70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-doLcivswKXABZ0V16gDRgU2AjWo2r0Fagr1IHTe6e44="; + hash = "sha256-doLcivswKXABZ0V16gDRgU2AjWo2r0Fagr1IHTe6e44="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clickgen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clickgen/default.nix index 759d52bcd3..c4598f86d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clickgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clickgen/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ful1e5"; repo = "clickgen"; rev = "refs/tags/v${version}"; - sha256 = "sha256-qDaSfIeKCbyl3C2iKz9DYQc1oNwTe5xDlGg/yYhakSw="; + hash = "sha256-qDaSfIeKCbyl3C2iKz9DYQc1oNwTe5xDlGg/yYhakSw="; }; propagatedBuildInputs = [ pillow toml numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-cityhash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-cityhash/default.nix index 73be71e67e..770d4e76fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-cityhash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-cityhash/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ezEl19CqE8LMTnWDqWWmv7CqlqEhMUdbRCVSustV9Pg="; + hash = "sha256-ezEl19CqE8LMTnWDqWWmv7CqlqEhMUdbRCVSustV9Pg="; }; propagatedBuildInputs = [ 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 4806f965f0..9e986383dc 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 @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-pa3vkIyNblS1LOwBReTqg8JAR2Ii32a2QIHWjau0uZE="; + hash = "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 34c02b3da3..f6feaaf395 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "4.1.0"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-u+6CEnMIRyoxI+0QtSiWFsssQ1B0ZW3QcuVTYwU9CRw="; + hash = "sha256-l/wx6TVS477GZL6dVa1/kNwqtCqtjfKaW5hbZEybjPI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix index 85a6330e0b..e277ef409d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-eVE8FrD0YHoRreY9CrNb8v4v4KrG83ZU0oFz+V+p+Q0="; + hash = "sha256-eVE8FrD0YHoRreY9CrNb8v4v4KrG83ZU0oFz+V+p+Q0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cligj/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cligj/default.nix index 411e6d622d..b71f1945e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cligj/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cligj/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "mapbox"; repo = "cligj"; rev = version; - sha256 = "sha256-0f9+I6ozX93Vn0l7+WR0mpddDZymJQ3+Krovt6co22Y="; + hash = "sha256-0f9+I6ozX93Vn0l7+WR0mpddDZymJQ3+Krovt6co22Y="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix index 1de1b81d89..83c0f5c5d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "clld"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dva0lbbTxvETDPkACxpI3PPzWh5gz87Fv6W3lTjNv3Q="; + hash = "sha256-dva0lbbTxvETDPkACxpI3PPzWh5gz87Fv6W3lTjNv3Q="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloudscraper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudscraper/default.nix index 6b65a90529..86c12ec6ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cloudscraper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cloudscraper/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cloudscraper"; - version = "1.2.68"; + version = "1.2.69"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TQKs7/qQq9TavHW3m6+jFjYwm6p8Dy7mZeLTRarbiGM="; + hash = "sha256-H/S+/urmOmcHbAJkUVFik1mB3V1RVS8FLcJmv2SZc0U="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloup/default.nix index 77a1835f3e..2f5fd8b49f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cloup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cloup/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-FDDJB1Bi4Jy2TNhKt6/l1azSit9WHWqzEJ6xl1u9e2s="; + hash = "sha256-FDDJB1Bi4Jy2TNhKt6/l1azSit9WHWqzEJ6xl1u9e2s="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clustershell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clustershell/default.nix index e1bd8e4f8b..da99e44660 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clustershell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clustershell/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-bwqzyhQbUI2gPOGb1S8eXo0pdz/DBi1782RQqCIH7Bs="; + hash = "sha256-bwqzyhQbUI2gPOGb1S8eXo0pdz/DBi1782RQqCIH7Bs="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix index 7ea85e4147..d47e15b4c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { owner = "Chia-Network"; repo = "clvm_rs"; rev = version; - sha256 = "sha256-mCKY/PqNOUTaRsFDxQBvbTD6wC4qzP0uv5FldYkwl6c="; + hash = "sha256-mCKY/PqNOUTaRsFDxQBvbTD6wC4qzP0uv5FldYkwl6c="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-TmrR8EeySsGWXohMdo3dCX4oT3l9uLVv5TUeRxCBQeE="; + hash = "sha256-TmrR8EeySsGWXohMdo3dCX4oT3l9uLVv5TUeRxCBQeE="; }; format = "pyproject"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools-rs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools-rs/default.nix index 1e3a554861..a69362c660 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools-rs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools-rs/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { owner = "Chia-Network"; repo = "clvm_tools_rs"; rev = version; - sha256 = "sha256-7eGOJgcZcSGmvLJc5BVfWarcu9kQb/uEcnG70JWXDSw="; + hash = "sha256-7eGOJgcZcSGmvLJc5BVfWarcu9kQb/uEcnG70JWXDSw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-46WEmp1FT6biM9A2M7z5onb45XhWjePKb6NSwLjuemc="; + hash = "sha256-46WEmp1FT6biM9A2M7z5onb45XhWjePKb6NSwLjuemc="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools/default.nix index 394c105d19..9312c18ade 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Chia-Network"; repo = "clvm_tools"; rev = version; - sha256 = "sha256-MAtVTSv1RR2/7QEKCOEQ+QH5vK4aE0Us2TXyRRAMl8U="; + hash = "sha256-MAtVTSv1RR2/7QEKCOEQ+QH5vK4aE0Us2TXyRRAMl8U="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clvm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clvm/default.nix index f3a7cae8ce..a633f85b0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clvm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Chia-Network"; repo = "clvm"; rev = version; - sha256 = "sha256-kTmuiy0IbTGjDokZjxp3p8lr/0uVxG/0pRN2hETLBtA="; + hash = "sha256-kTmuiy0IbTGjDokZjxp3p8lr/0uVxG/0pRN2hETLBtA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix index 3b1be81391..aaa29b577e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-k9msdxbqkBygv9GK47aPH2v1HeCDDD8jPvc0/NUqB5k="; + hash = "sha256-k9msdxbqkBygv9GK47aPH2v1HeCDDD8jPvc0/NUqB5k="; }; propagatedNativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix index ac560205be..996c11955b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix @@ -17,13 +17,14 @@ buildPythonPackage rec { pname = "cmd2"; - version = "2.4.2"; + version = "2.4.3"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Bz5VXAWFOw9pZfPQMym6vfnjil8s6gKOYaZM1+63StU="; + hash = "sha256-cYc8Efcr0Z4rHbV4IUcW8NT3yPolAJPGASZamnF97lI="; }; LC_ALL = "en_US.UTF-8"; @@ -49,7 +50,7 @@ buildPythonPackage rec { ]; disabledTests = [ - # don't require vim for tests, it causes lots of rebuilds + # Don't require vim for tests, it causes lots of rebuilds "test_find_editor_not_specified" "test_transcript" ]; @@ -67,11 +68,14 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; - pythonImportsCheck = [ "cmd2" ]; + pythonImportsCheck = [ + "cmd2" + ]; meta = with lib; { description = "Enhancements for standard library's cmd module"; homepage = "https://github.com/python-cmd2/cmd2"; + changelog = "https://github.com/python-cmd2/cmd2/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ teto ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coapthon3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coapthon3/default.nix index 643072269a..aa2781a7fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coapthon3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coapthon3/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "Tanganelli"; repo = pname; rev = version; - sha256 = "sha256-9QApoPUu3XFZY/lgjAsf5r2StFiRtUd1UXWDrzYUh6w="; + hash = "sha256-9QApoPUu3XFZY/lgjAsf5r2StFiRtUd1UXWDrzYUh6w="; }; propagatedBuildInputs = [ cachetools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cock/default.nix index a7c2355472..47e3364ea0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cock/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Hi8aFxATsYcEO6qNzZnF73V8WLTQjb6Dw2xF4VgT2o4="; + hash = "sha256-Hi8aFxATsYcEO6qNzZnF73V8WLTQjb6Dw2xF4VgT2o4="; }; propagatedBuildInputs = [ click sortedcontainers pyyaml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coconut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coconut/default.nix index 0dc799d7ea..06fe438063 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coconut/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coconut/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "evhub"; repo = "coconut"; rev = "refs/tags/v${version}"; - sha256 = "sha256-+OrVNtre7kAfU5L7/6DadZxFNWVt5raF6HLGXHHpOvE="; + hash = "sha256-+OrVNtre7kAfU5L7/6DadZxFNWVt5raF6HLGXHHpOvE="; }; propagatedBuildInputs = [ cpyparsing ipykernel mypy pygments prompt-toolkit watchdog ]; 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 d9eedb626c..137f4146a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cocotb"; repo = "cocotb"; rev = "refs/tags/v${version}"; - sha256 = "sha256-gLOYwljqnYkGsdbny7+f93QgroLBaLLnDBRpoCe8uEg="; + hash = "sha256-gLOYwljqnYkGsdbny7+f93QgroLBaLLnDBRpoCe8uEg="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/codepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/codepy/default.nix index 34e8722498..ccf1eeaad9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/codepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/codepy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "inducer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-viMfB/nDrvDA/IGRZEX+yXylxbbmqbh/fgdYXBzK0zM="; + hash = "sha256-viMfB/nDrvDA/IGRZEX+yXylxbbmqbh/fgdYXBzK0zM="; }; buildInputs = [ pytools six cgen ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coincurve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coincurve/default.nix index f30cda165a..e7a07a8572 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coincurve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coincurve/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ofek"; repo = "coincurve"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Z5g6ten8wNICoFu7+aZc6r8ET+RDmFeb93ONjsTzcbw="; + hash = "sha256-Z5g6ten8wNICoFu7+aZc6r8ET+RDmFeb93ONjsTzcbw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix index 0826ad13b8..f8f91489d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2022.11.14.16"; + version = "2023.2.23.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2x8S9Jj/1bBnhXS/x0lQ8YUQkCvfpgGcDSQU2dGbAn0="; + hash = "sha256-XZNGasNYmN4ulfG18M4n8qTO06kSyLoZQj64LzXdl34="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colander/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colander/default.nix index 8a4933d195..27111e1b26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colander/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colander/default.nix @@ -1,20 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi -, translationstring, iso8601, enum34 }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, babel +, translationstring +, iso8601 +, pytestCheckHook +}: buildPythonPackage rec { pname = "colander"; - version = "1.8.3"; + version = "2.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "259592a0d6a89cbe63c0c5771f9c0c2522387415af8d715f599583eac659f7d4"; + hash = "sha256-QZzWgXjS7m7kyuXVyxgwclY0sKKECRcVbonrJZIjfvM="; }; - propagatedBuildInputs = [ translationstring iso8601 enum34 ]; + nativeBuildInputs = [ + babel + setuptools + ]; + + propagatedBuildInputs = [ + translationstring + iso8601 + ]; + + pythonImportsCheck = [ + "colander" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "A simple schema-based serialization and deserialization library"; - homepage = "https://docs.pylonsproject.org/projects/colander/en/latest/"; + homepage = "https://github.com/Pylons/colander"; license = licenses.free; # http://repoze.org/LICENSE.txt maintainers = with maintainers; [ domenkozar ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix index 20f45f1fa7..1c45b6b619 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix @@ -6,7 +6,7 @@ }: buildPythonPackage rec { - pname = "ColanderAlchemy"; + pname = "colanderclchemy"; version = "0.3.4"; src = fetchPypi { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colorcet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colorcet/default.nix index 8e77075f79..ea3b729032 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colorcet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colorcet/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-UUVaIDU9EvrJH5U3cthAnyR05qDbGvP6T3AF9AWiSAs="; + hash = "sha256-UUVaIDU9EvrJH5U3cthAnyR05qDbGvP6T3AF9AWiSAs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colored-traceback/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colored-traceback/default.nix index 35d1d5a896..137b4d0157 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colored-traceback/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colored-traceback/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-bafOKx2oafa7VMkntBW5VyfEu22ahMRhXqd9mHKRGwU="; + hash = "sha256-bafOKx2oafa7VMkntBW5VyfEu22ahMRhXqd9mHKRGwU="; }; buildInputs = [ pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colored/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colored/default.nix index dacb30a8e2..1a8c55dfde 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colored/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colored/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-BP9NTdUUJ0/juZohu1L7lvJojAHpP7p77zciHny1bOA="; + hash = "sha256-BP9NTdUUJ0/juZohu1L7lvJojAHpP7p77zciHny1bOA="; }; nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colorlog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colorlog/default.nix index 3a2e4ffa64..833217bdb8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colorlog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colorlog/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-vZS9IcHhP6x70xU/S8On3A6wl0uLwv3xqYnkdPblguU="; + hash = "sha256-vZS9IcHhP6x70xU/S8On3A6wl0uLwv3xqYnkdPblguU="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colormath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colormath/default.nix index fb4ddfd9a6..33f233443d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colormath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colormath/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "gtaylor"; repo = "python-colormath"; rev = "4a076831fd5136f685aa7143db81eba27b2cd19a"; - sha256 = "sha256-eACVPIQFgiGiVmQ/PjUxP/UH/hBOsCywz5PlgpA4dk4="; + hash = "sha256-eACVPIQFgiGiVmQ/PjUxP/UH/hBOsCywz5PlgpA4dk4="; }; propagatedBuildInputs = [ networkx numpy ]; 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 9f4dbe1b28..78001464bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/commentjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/commentjson/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "vaidik"; repo = "commentjson"; rev = "v${version}"; - sha256 = "sha256-dPnIcv7TIeyG7rU938w7FrDklmaGuPpXz34uw/JjOgY="; + hash = "sha256-dPnIcv7TIeyG7rU938w7FrDklmaGuPpXz34uw/JjOgY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix index 064dfc770a..acc8093b74 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "commoncode"; - version = "31.0.0"; + version = "31.0.2"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iX7HjsbW9rUgG35XalqfXh2+89vEiwish90FGOpkzRo="; + hash = "sha256-UWd8fTHVEC5ywETfMIWjfXm4xiNaMrVpwkQ/woeXc0k="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix index cad402dc89..caf7a6fe22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-fUEpbU+wqh72lt/ZJdKvMifUAwYivpmzx9QQfcb4cTo="; + hash = "sha256-fUEpbU+wqh72lt/ZJdKvMifUAwYivpmzx9QQfcb4cTo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/configclass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/configclass/default.nix index 8acf5aaad5..c5138fb1fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/configclass/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/configclass/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-aoDKBuDxJCeXbVwCXhse6FCbDDM30/Xa8p9qRvDkWBk="; + hash = "sha256-aoDKBuDxJCeXbVwCXhse6FCbDDM30/Xa8p9qRvDkWBk="; }; propagatedBuildInputs = [ mergedict ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/confight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/confight/default.nix index ff07a0f8b6..1c4b11d46d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/confight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/confight/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-fJr7f9Y/zEpCedWYd04AMuhkOFqZLJOw4sDiz8SDQ/Y="; + hash = "sha256-fJr7f9Y/zEpCedWYd04AMuhkOFqZLJOw4sDiz8SDQ/Y="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix index 908680c9e4..b703e5de59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-i+JngktUHAmwjbEkkX9Iq1JabD6DcBHzEweBoiTFcJA="; + hash = "sha256-i+JngktUHAmwjbEkkX9Iq1JabD6DcBHzEweBoiTFcJA="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/configupdater/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/configupdater/default.nix index b8fa44ca08..2a502963c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/configupdater/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/configupdater/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "ConfigUpdater"; - sha256 = "sha256-RvDHTXPvpyN3Z2S0PJc59oBSSV3T1zQxnB0OtYUR8Vs="; + hash = "sha256-RvDHTXPvpyN3Z2S0PJc59oBSSV3T1zQxnB0OtYUR8Vs="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix index f3a24d70fb..17f33d8b7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro ? null, futures ? null, enum34 ? null }: buildPythonPackage rec { - version = "1.9.2"; + version = "2.0.2"; pname = "confluent-kafka"; src = fetchPypi { inherit pname version; - sha256 = "sha256-L7l70l1Da9Wf4HmIWqd6Oi8jz6zpxjWdRwAFNmWEkmI="; + hash = "sha256-OzQupCJu0QXKi8A1sId+TcLxFf/adOOjUPNjaDNWUVs="; }; buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ; 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 25f9f3ef56..1d2f56a85f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/confuse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/confuse/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "beetbox"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zdH5DNXnuAfYTuaG9EIKiXL2EbLSfzYjPSkC3G06bU8="; + hash = "sha256-zdH5DNXnuAfYTuaG9EIKiXL2EbLSfzYjPSkC3G06bU8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/connect_box/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/connect_box/default.nix index cfcb1d9468..01d7c2b2fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/connect_box/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/connect_box/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "connect_box"; inherit version; - sha256 = "sha256-d1KqVKaHlZDm2o1GJ7r8KoONwfd1lxXexJxavCvjfW8="; + hash = "sha256-d1KqVKaHlZDm2o1GJ7r8KoONwfd1lxXexJxavCvjfW8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cons/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cons/default.nix index 3712a0c46d..2f352aebd1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cons/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cons/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "pythological"; repo = "python-cons"; rev = "fbeedfc8a3d1bff4ba179d492155cdd55538365e"; - sha256 = "sha256-ivHFep9iYPvyiBIZKMAzqrLGnQkeuxd0meYMZwZFFH0="; + hash = "sha256-ivHFep9iYPvyiBIZKMAzqrLGnQkeuxd0meYMZwZFFH0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/construct-classes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/construct-classes/default.nix index 43c6f87391..386c386ef4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/construct-classes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/construct-classes/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "matejcik"; repo = "construct-classes"; rev = "v${version}"; - sha256 = "sha256-l4sVacKTuQbhXCw2lVHCl1OzpCiKmEAm9nSQ8pxFuTo="; + hash = "sha256-l4sVacKTuQbhXCw2lVHCl1OzpCiKmEAm9nSQ8pxFuTo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/construct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/construct/default.nix index 676f39df6a..f7e5616d4c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/construct/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/construct/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-bp/YyRFP0rrBHPyhiqnn6o1iC5l61oedShZ2phGeqaw="; + hash = "sha256-bp/YyRFP0rrBHPyhiqnn6o1iC5l61oedShZ2phGeqaw="; }; # not an explicit dependency, but it's imported by an entrypoint diff --git a/third_party/nixpkgs/pkgs/development/python-modules/container-inspector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/container-inspector/default.nix index 8afbdc229b..12375681c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/container-inspector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/container-inspector/default.nix @@ -28,6 +28,12 @@ buildPythonPackage rec { dontConfigure = true; + postPatch = '' + # PEP440 support was removed in newer setuptools, https://github.com/nexB/container-inspector/pull/51 + substituteInPlace setup.cfg \ + --replace ">=3.7.*" ">=3.7" + ''; + nativeBuildInputs = [ setuptools-scm ]; @@ -50,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Suite of analysis utilities and command line tools for container images"; homepage = "https://github.com/nexB/container-inspector"; + changelog = "https://github.com/nexB/container-inspector/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/contexttimer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/contexttimer/default.nix index e7526ff7ea..e61178daaa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/contexttimer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/contexttimer/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "brouberol"; repo = "contexttimer"; rev = "a866f420ed4c10f29abf252c58b11f9db6706100"; - sha256 = "sha256-Fc1vK1KSZWgBPtBf5dVydF6dLHEGAOslWMV0FLRdj8w="; + hash = "sha256-Fc1vK1KSZWgBPtBf5dVydF6dLHEGAOslWMV0FLRdj8w="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/contourpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/contourpy/default.nix index 96405864d5..dfefc1b448 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/contourpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/contourpy/default.nix @@ -23,7 +23,7 @@ let countourpy = buildPythonPackage rec { pname = "contourpy"; - version = "1.0.6"; + version = "1.0.7"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ let countourpy = buildPythonPackage rec { owner = "contourpy"; repo = "contourpy"; rev = "refs/tags/v${version}"; - hash = "sha256-JbLaQ2NomJlgDmEATa7OmZ749Bezt3tvnt1nOA1aOVw="; + hash = "sha256-n04b9yUoUMH2H7t8um/8h5XaL3hzY/uNMYmOKTVKEPA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix index e4cf1138f1..8f764f4d5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-85gr6NnFPawSYYZAE/3sf4Ov0uQu3m9t0GnF4UnFQNU="; + hash = "sha256-85gr6NnFPawSYYZAE/3sf4Ov0uQu3m9t0GnF4UnFQNU="; }; nativeCheckInputs = [ pytest pytest-cov pytest-mock freezegun ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coqpit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coqpit/default.nix index ad1fdb35ef..f06b542970 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coqpit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coqpit/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "coqui-ai"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-FY3PYd8dY5HFKkhD6kBzPt0k1eFugdqsO3yIN4oDk3E="; + hash = "sha256-FY3PYd8dY5HFKkhD6kBzPt0k1eFugdqsO3yIN4oDk3E="; }; nativeCheckInputs = [ 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 2a30bed993..4e1f780e36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "coverage"; - version = "7.0.1"; + version = "7.2.1"; # uses f strings disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pKV0oZ7rZ1daUyildgu7tzf6poVhZYap+dpCgflAEJw="; + hash = "sha256-x38qkJPM8yndUjqbKzyFTCDSo9lott7zuCAnLKZzIkI="; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cppheaderparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cppheaderparser/default.nix index 7602132c24..bf2c696f28 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cppheaderparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cppheaderparser/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-OCswQW2VsKXoUCshSBDcrCpWQykX4mUUR9Or4lPjzEI="; + hash = "sha256-OCswQW2VsKXoUCshSBDcrCpWQykX4mUUR9Or4lPjzEI="; }; propagatedBuildInputs = [ ply ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cppy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cppy/default.nix index 5b982d6128..025da89686 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cppy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cppy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-g7Q78XsQhawVxd69tCFU8Ti5KCNLIURzWJgfadDW/hs="; + hash = "sha256-g7Q78XsQhawVxd69tCFU8Ti5KCNLIURzWJgfadDW/hs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crashtest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crashtest/default.nix index d8bd8c95b8..4b03e38b74 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crashtest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crashtest/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-gNex8xbr+9Qp9kgHbWJ1yHe6MLpIl53kGRcUp1Jm8M4="; + hash = "sha256-gNex8xbr+9Qp9kgHbWJ1yHe6MLpIl53kGRcUp1Jm8M4="; }; # has tests, but only on GitHub, however the pyproject build fails for me diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crc32c/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crc32c/default.nix index f4a85fba59..d8f4e2662e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crc32c/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crc32c/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "ICRAR"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0FgNOVpgJTxRALuufZ7Dt1TwuX+zqw35yCq8kmq4RTc="; + hash = "sha256-0FgNOVpgJTxRALuufZ7Dt1TwuX+zqw35yCq8kmq4RTc="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/criticality-score/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/criticality-score/default.nix index d7e4ac4619..e1ff875493 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/criticality-score/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/criticality-score/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, PyGithub, python-gitlab }: +{ lib, buildPythonPackage, fetchPypi, pygithub, python-gitlab }: buildPythonPackage rec { pname = "criticality_score"; @@ -6,10 +6,10 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-5XkVT0blnLG158a01jDfQl1Rx9U1LMsqaMjTdN7Q4QQ="; + hash = "sha256-5XkVT0blnLG158a01jDfQl1Rx9U1LMsqaMjTdN7Q4QQ="; }; - propagatedBuildInputs = [ PyGithub python-gitlab ]; + propagatedBuildInputs = [ pygithub python-gitlab ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cron-descriptor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cron-descriptor/default.nix index 5c2b0e8ba8..dd8755a9e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cron-descriptor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cron-descriptor/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "Salamek"; repo = "cron-descriptor"; rev = "refs/tags/${version}"; - sha256 = "sha256-Qei9f0HlIu5sautMEASvxdUqZyXKvHDWJgd3oST1gJo="; + hash = "sha256-Qei9f0HlIu5sautMEASvxdUqZyXKvHDWJgd3oST1gJo="; }; # remove tests_require, as we don't do linting anyways diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crownstone-cloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crownstone-cloud/default.nix index 632f0812f0..86b77b994e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crownstone-cloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crownstone-cloud/default.nix @@ -3,6 +3,7 @@ , asynctest , buildPythonPackage , fetchFromGitHub +, fetchpatch , certifi , pythonOlder , pytestCheckHook @@ -18,10 +19,19 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "crownstone"; repo = "crownstone-lib-python-cloud"; - rev = version; - sha256 = "sha256-CS1zeQiWPnsGCWixCsN9sz08mPORW5sVqIpSFPh0Qt0="; + rev = "refs/tags/${version}"; + hash = "sha256-CS1zeQiWPnsGCWixCsN9sz08mPORW5sVqIpSFPh0Qt0="; }; + patches = [ + # Remove asynctest, https://github.com/crownstone/crownstone-lib-python-cloud/pull/4 + (fetchpatch { + name = "remove-asynctest.patch"; + url = "https://github.com/crownstone/crownstone-lib-python-cloud/commit/7f22c9b284bf8d7f6f43e205816787dd3bb37e78.patch"; + hash = "sha256-LS1O9LVB14WyBXfuHf/bs1juJ59zWhJ8pL4aGtVrTG8="; + }) + ]; + propagatedBuildInputs = [ aiohttp asynctest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crownstone-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crownstone-core/default.nix index 544eb25ada..b03f76f8f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crownstone-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crownstone-core/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "crownstone"; repo = "crownstone-lib-python-core"; rev = version; - sha256 = "sha256-zrlCzx7N3aUcTUNa64jSzDdWgQneX+Hc5n8TTTcZ4ck="; + hash = "sha256-zrlCzx7N3aUcTUNa64jSzDdWgQneX+Hc5n8TTTcZ4ck="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crownstone-sse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crownstone-sse/default.nix index 7bde66a8a3..ca2cd4e0d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crownstone-sse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crownstone-sse/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "crownstone"; repo = "crownstone-lib-python-sse"; rev = version; - sha256 = "sha256-z/z8MmydHkHubwuX02gGbOcOEZ+FHX4i82vAK5gAl+c="; + hash = "sha256-z/z8MmydHkHubwuX02gGbOcOEZ+FHX4i82vAK5gAl+c="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crownstone-uart/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crownstone-uart/default.nix index c0e82acc17..edfd9dff59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crownstone-uart/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crownstone-uart/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "crownstone"; repo = "crownstone-lib-python-uart"; rev = version; - sha256 = "sha256-Sc6BCIRbf1+GraTScmV4EAgwtSE/JXNe0f2XhKyACIY="; + hash = "sha256-Sc6BCIRbf1+GraTScmV4EAgwtSE/JXNe0f2XhKyACIY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptolyzer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptolyzer/default.nix index 5928a9b90e..f25c46907b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cryptolyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptolyzer/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "cryptolyzer"; - version = "0.8.2"; + version = "0.8.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "CryptoLyzer"; inherit version; - hash = "sha256-Bo8w9ijJu9IWdgr8OQws2iErzmuxUhs9YE6NAydPYgM="; + hash = "sha256-7qMNz8F0B3bph/nHkS1VrkcF1bETWAklXFOlMWu3K9s="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptoparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptoparser/default.nix index c4771b3949..afbbe513b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cryptoparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptoparser/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cryptoparser"; - version = "0.8.2"; + version = "0.8.4"; src = fetchPypi { inherit pname version; - hash = "sha256-eLQNqeCUnjcxWbazhWHtqJJgvPUMH42fboU5y2ZMy44="; + hash = "sha256-Sn4sfzu1Y1gC+4K9WdiZW92cYuVbUsBXcNbNQOv0BRw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/css-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/css-parser/default.nix index 81c9aafa3c..0b5b2e7ee8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/css-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/css-parser/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-mU1qARWo9OK2ZI4rEnMwNtBfoWQniqI0YwyfA+UsjIA="; + hash = "sha256-mU1qARWo9OK2ZI4rEnMwNtBfoWQniqI0YwyfA+UsjIA="; }; # Test suite not included in tarball yet diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix index 16a1a16095..9b58da4fdb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-HM2YTauJ/GiVUEOspOGwPgzynK2YgPbijjunp0sUqlo="; + hash = "sha256-HM2YTauJ/GiVUEOspOGwPgzynK2YgPbijjunp0sUqlo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix index 19a09d100e..e067e134d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-VipYbbICFrp9K+gmPeuesHnlYEj5uJBtEdX0WqgcUkc="; + hash = "sha256-VipYbbICFrp9K+gmPeuesHnlYEj5uJBtEdX0WqgcUkc="; }; nativeCheckInputs = [ @@ -30,7 +30,6 @@ buildPythonPackage rec { "test_write_timeout" # flaky, does not always time out "test_aside_cancel" # fails because modifies PYTHONPATH and cant find pytest "test_ssl_outgoing" # touches network - ] ++ lib.optionals stdenv.isDarwin [ "test_unix_echo" # socket bind error on hydra when built with other packages "test_unix_ssl_server" # socket bind error on hydra when built with other packages ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cvss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cvss/default.nix index 9f4979c532..140852cb98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cvss/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cvss/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "RedHatProductSecurity"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-gD9MreJQPaxziy02Wt3BGFiIoQ/+pW3KqiNfNlTijJY="; + hash = "sha256-gD9MreJQPaxziy02Wt3BGFiIoQ/+pW3KqiNfNlTijJY="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix index d47debe407..8c1da0f7f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ALGyMvnR+QLVeKnXWBS2f6AgdY1a5CLijKjO9iafpcY="; + hash = "sha256-ALGyMvnR+QLVeKnXWBS2f6AgdY1a5CLijKjO9iafpcY="; }; buildInputs = (if stdenv.isDarwin then [ openblas ] else [ blas lapack ]); 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 03b7d84224..1959794fcc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cwcwidth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cwcwidth/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-WtwDS3yQ5qhYa9BGvL9gBONeFrDX4x3jlVE6UNcpu/Y="; + hash = "sha256-WtwDS3yQ5qhYa9BGvL9gBONeFrDX4x3jlVE6UNcpu/Y="; }; nativeBuildInputs = [ cython setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix index c039222925..bee15a5e38 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cx-freeze"; - version = "6.13.1"; + version = "6.14.4"; src = fetchPypi { pname = "cx_Freeze"; inherit version; - sha256 = "sha256-9pT1Ta8pLpc9krFN8KLp3b10IGyvMjiaU3Cn4eVAiaQ="; + hash = "sha256-ydox+o4B0t/dYD+nDiY5CmWupt1iMzyU2fA4tCqgVcg="; }; disabled = pythonOlder "3.5"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cymem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cymem/default.nix index bb78eb5eb2..0332ffd1f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cymem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cymem/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "explosion"; repo = "cymem"; rev = "refs/tags/v${version}"; - sha256 = "sha256-lYMRFFMS+ETjWd4xi12ezC8CVLbLJfynmOU1DpYQcck="; + hash = "sha256-lYMRFFMS+ETjWd4xi12ezC8CVLbLJfynmOU1DpYQcck="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cypari2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cypari2/default.nix index 6b9b1a14be..bc8a5df2ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cypari2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cypari2/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { (fetchpatch { name = "use-trashcan-for-gen.patch"; url = "https://git.sagemath.org/sage.git/plain/build/pkgs/cypari/patches/trashcan.patch?id=b6ea17ef8e4d652de0a85047bac8d41e90b25555"; - sha256 = "sha256-w4kktWb9/aR9z4CjrUvAMOxEwRN2WkubaKzQttN8rU8="; + hash = "sha256-w4kktWb9/aR9z4CjrUvAMOxEwRN2WkubaKzQttN8rU8="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cypherpunkpay/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cypherpunkpay/default.nix index 77b7031db3..0ee8de9328 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cypherpunkpay/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cypherpunkpay/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub , poetry-core -, APScheduler +, apscheduler , bitstring , cffi , ecdsa @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "CypherpunkPay"; repo = "CypherpunkPay"; rev = "refs/tags/v${version}"; - sha256 = "sha256-X0DB0PVwR0gRnt3jixFzglWAOPKBMvqTOG6pK6OJ03w="; + hash = "sha256-X0DB0PVwR0gRnt3jixFzglWAOPKBMvqTOG6pK6OJ03w="; }; postPatch = '' @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - APScheduler + apscheduler bitstring cffi ecdsa diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix index 314f27f17d..768950237a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-/DOQk5dIHJDePOyDG/uI2X4iDckZOdmWkgIC8YS0ZI4="; + hash = "sha256-/DOQk5dIHJDePOyDG/uI2X4iDckZOdmWkgIC8YS0ZI4="; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/daiquiri/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/daiquiri/default.nix new file mode 100644 index 0000000000..9c5a0abdbd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/daiquiri/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, python-json-logger +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "daiquiri"; + version = "3.2.1"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-QIxNKOyPDqI+llN0R5gpvSI2TQwI15HL63u6JFlj4P0="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + python-json-logger + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "daiquiri" ]; + + meta = with lib; { + description = "Library to configure Python logging easily"; + homepage = "https://github.com/Mergifyio/daiquiri"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dalle-mini/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dalle-mini/default.nix index 1cafda7087..0f5a0f07e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dalle-mini/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dalle-mini/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "dalle-mini"; - version = "0.1.1"; + version = "0.1.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/wGIuYSWEUgJmeRN5K9/xuoCs+hpFX4/Tu1un1C4ljk="; + hash = "sha256-UwCcoKbGxZT5XB+Mtv8kAHFdj0iLw8U1Ayo60y3Tm7U="; }; format = "setuptools"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix index 259e760fee..c6103d5e5e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "dash_core_components"; inherit version; - sha256 = "sha256-xnM4dK+XXlUvlaE5ihbC7n3xTOQ/pguzcYo8bgtj/+4="; + hash = "sha256-xnM4dK+XXlUvlaE5ihbC7n3xTOQ/pguzcYo8bgtj/+4="; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash-table/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash-table/default.nix index e327f4e761..2463e50fb3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash-table/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash-table/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "dash_table"; inherit version; - sha256 = "sha256-GGJNaT1MjvLd7Jmm8WdZNDen6gvxU6og8xjBcMW8cwg="; + hash = "sha256-GGJNaT1MjvLd7Jmm8WdZNDen6gvxU6og8xjBcMW8cwg="; }; # No tests in archive 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 5140a0a6cb..4968c5b28f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "dash"; - version = "2.7.0"; + version = "2.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,16 +30,16 @@ buildPythonPackage rec { owner = "plotly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kxat6CjX4xPEtlhRiYJF5wN2Luds7DduZyiUA9/kKWY="; + hash = "sha256-6FsLvLsqnkSt/i27q/JJGfNh2zxKeA0t6VYNPCzhR0w="; }; propagatedBuildInputs = [ - plotly - flask - flask-compress dash-core-components dash-html-components dash-table + flask + flask-compress + plotly ]; passthru.optional-dependencies = { @@ -55,9 +55,9 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - pytestCheckHook - pytest-mock mock + pytest-mock + pytestCheckHook pyyaml ]; @@ -67,6 +67,11 @@ buildPythonPackage rec { "tests/integration" ]; + disabledTests = [ + # Failed: DID NOT RAISE + "test_missing_flask_compress_raises" + ]; + pythonImportsCheck = [ "dash" ]; @@ -74,6 +79,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python framework for building analytical web applications"; homepage = "https://dash.plot.ly/"; + changelog = "https://github.com/plotly/dash/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ antoinerg ]; }; 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 a43f1a5afb..c6e9a1b9ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2023.1.0"; + version = "2023.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - hash = "sha256-avyrKBAPyYZBNgItnkNCferqb6+4yeGpBAZhSkL/fFA="; + hash = "sha256-7cuTxJ5SxOEf0v+SvSiaz7x8YYTx/qIS+KktbtubiDU="; }; propagatedBuildInputs = [ @@ -101,8 +101,6 @@ buildPythonPackage rec { "--reruns 3" # Don't run tests that require network access "-m 'not network'" - # DeprecationWarning: The 'sym_pos' keyword is deprecated and should be replaced by using 'assume_a = "pos"'. 'sym_pos' will be removed in SciPy 1.11.0. - "-W" "ignore::DeprecationWarning" ]; disabledTests = lib.optionals stdenv.isDarwin [ @@ -115,6 +113,9 @@ buildPythonPackage rec { "test_chunksize_files" # TypeError: 'ArrowStringArray' with dtype string does not support reduction 'min' "test_set_index_string" + # numpy 1.24 + # RuntimeWarning: invalid value encountered in cast + "test_setitem_extended_API_2d_mask" ]; __darwinAllowLocalNetworking = true; 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 b01564c7ee..f3bbe6ace9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix @@ -78,5 +78,7 @@ buildPythonPackage rec { changelog = "https://github.com/encode/databases/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; + # https://github.com/encode/databases/issues/530 + broken = lib.versionAtLeast sqlalchemy.version "2.0.0"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix index fa90f3d72f..7deca5f471 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 = "10.4.18"; + version = "11.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7lP9pn05EaGLZpaAp+oeed4yLhIjo6/wQg+lDpt1Hwg="; + hash = "sha256-kAUBA9V1st5UxXihrXQjyk+1ahsum/VEcNfDK1he/Pc="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix index 5c01cb734d..278d7c15fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -1,21 +1,24 @@ { lib , buildPythonPackage , fetchFromGitHub +, alembic , lz4 , numpy , oauthlib +, openpyxl , pandas , poetry-core , pyarrow , pytestCheckHook , pythonOlder , pythonRelaxDepsHook +, sqlalchemy , thrift }: buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "2.3.0"; + version = "2.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +27,7 @@ buildPythonPackage rec { owner = "databricks"; repo = "databricks-sql-python"; rev = "refs/tags/v${version}"; - hash = "sha256-XyDkL/bGnivx7MRG86vGS69mKdrWw7kKiuvQfBYFKVQ="; + hash = "sha256-V8Nl6xr96Xnd1gkw9R0aqXkitLESsAyW7ufTYn6ttLg="; }; pythonRelaxDeps = [ @@ -38,11 +41,14 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + alembic lz4 numpy oauthlib + openpyxl pandas pyarrow + sqlalchemy thrift ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datafusion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datafusion/default.nix index 84afbfc3a1..00c72615d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datafusion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datafusion/default.nix @@ -35,12 +35,12 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XYXZMorPs2Ue7E38DASd4rmxvX0wlx8A6sCpAbYUh4I="; + hash = "sha256-XYXZMorPs2Ue7E38DASd4rmxvX0wlx8A6sCpAbYUh4I="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src pname version; - sha256 = "sha256-6mPdKwsEN09Gf4eNsd/v3EBHVezHmff/KYB2lsXgzcA="; + hash = "sha256-6mPdKwsEN09Gf4eNsd/v3EBHVezHmff/KYB2lsXgzcA="; }; nativeBuildInputs = with rustPlatform; [ 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 6781f82135..f552e33216 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.64.1"; + version = "0.64.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-EXYAiXqEfQVDTwc4MFTroLPEaTZ3QYTlUsuNQ72oHpA="; + hash = "sha256-AxIJUJzFEAvAV59hYDB3pb5/1rS9d7T0ltl6lVWTCrE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datauri/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datauri/default.nix index ec2643eaa5..4c89eb9ba2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datauri/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datauri/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "fcurella"; repo = "python-datauri"; rev = "v${version}"; - sha256 = "sha256-Eevd/xxKgxvvsAfI/L/KShH+PfxffBGyVwKewLgyEu0="; + hash = "sha256-Eevd/xxKgxvvsAfI/L/KShH+PfxffBGyVwKewLgyEu0="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dateutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dateutil/default.nix index d263414b4a..d1dcac893a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dateutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dateutil/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ASPKzBYnrhnd88J6XeW9Z+5FhvvdZEDZdI+Ku0g9PoY="; + hash = "sha256-ASPKzBYnrhnd88J6XeW9Z+5FhvvdZEDZdI+Ku0g9PoY="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dateutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dateutils/default.nix index faa3b11554..9a53d92fe7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dateutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dateutils/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-A92QvLIVQb1OtLATY35PG1+USIHEbMbktnpgWeNw4/E="; + hash = "sha256-A92QvLIVQb1OtLATY35PG1+USIHEbMbktnpgWeNw4/E="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datrie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datrie/default.nix index a74e53a939..920e31c7f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datrie/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datrie/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-UlsI9jjVz2EV32zNgY5aASmM0jCy2skcj/LmSZ0Ydl0="; + hash = "sha256-UlsI9jjVz2EV32zNgY5aASmM0jCy2skcj/LmSZ0Ydl0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix index 09eff1461d..7a81d88ebe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.84.1"; + version = "1.84.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-L2+8mS7mTRWDQwXcYfJW3078N69AFY2vs4a4vi62XYE="; + hash = "sha256-jrEyRP9Rf6oIrj6fXfTQtRGfLcBq/sy4KGGiUBU39oc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix index c8f8714e56..f1b32b6a3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "altdesktop"; repo = "python-dbus-next"; rev = "v${version}"; - sha256 = "sha256-EKEQZFRUe+E65Z6DNCJFL5uCI5kbXrN7Tzd4O0X5Cqo="; + hash = "sha256-EKEQZFRUe+E65Z6DNCJFL5uCI5kbXrN7Tzd4O0X5Cqo="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus-python-client-gen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus-python-client-gen/default.nix index ee4a467b57..3c7d91ebed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbus-python-client-gen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbus-python-client-gen/default.nix @@ -4,17 +4,21 @@ , into-dbus-python , dbus-python , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "dbus-python-client-gen"; - version = "0.8"; + version = "0.8.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; - rev = "v${version}"; - hash = "sha256-nSzxT65WHBVct5pGHmIAHJXftd0tKZeK/argN+V9xcs="; + rev = "refs/tags/v${version}"; + hash = "sha256-RYgS4RNLLCtp+5gS/LlzdH7rlub48TSSSKhykkkBcuo="; }; propagatedBuildInputs = [ @@ -31,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library for generating dbus-python client code"; homepage = "https://github.com/stratis-storage/dbus-python-client-gen"; + changelog = "https://github.com/stratis-storage/dbus-python-client-gen/blob/v${version}/CHANGES.txt"; license = licenses.mpl20; maintainers = with maintainers; [ nickcao ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ddt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ddt/default.nix index f92e0c331b..4c0d90575c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ddt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ddt/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-9xs0hzG4x4wxAL/72VGnafvUOQiNH9uzhB7uAZr4Cs0="; + hash = "sha256-9xs0hzG4x4wxAL/72VGnafvUOQiNH9uzhB7uAZr4Cs0="; }; propagatedBuildInputs = lib.optionals (!isPy3k) [ 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 defe0b6907..a6e9011992 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deap/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-h3LxsP/wQtXlFrCuusLHBiQwRap9DejguGWPOAGBzzE="; + hash = "sha256-h3LxsP/wQtXlFrCuusLHBiQwRap9DejguGWPOAGBzzE="; }; propagatedBuildInputs = [ numpy matplotlib ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debtcollector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debtcollector/default.nix index ced1929bcd..b7617af15f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/debtcollector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/debtcollector/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-3J0a0/dFxD9LvtvKMPn/6JBajAKMmSbmEHeEfV6iV6s="; + hash = "sha256-3J0a0/dFxD9LvtvKMPn/6JBajAKMmSbmEHeEfV6iV6s="; }; nativeBuildInputs = [ pbr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix index 4035cc5232..d6dfff0ad7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "debugpy"; rev = "refs/tags/v${version}"; - sha256 = "sha256-GanRWzGyg0Efa+kuU7Q0IOmO0ohXZIjuz8RZYERTpzo="; + hash = "sha256-GanRWzGyg0Efa+kuU7Q0IOmO0ohXZIjuz8RZYERTpzo="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/decli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/decli/default.nix index 1e0fd21320..2926d2d102 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/decli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/decli/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-8s3lUDSnXIGcYwx2VahExhLyWYxCwhKZFgRl32rUY60="; + hash = "sha256-8s3lUDSnXIGcYwx2VahExhLyWYxCwhKZFgRl32rUY60="; }; pythonImportsCheck = [ "decli" ]; 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 e26c1a1081..a918f7e941 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/decorator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/decorator/default.nix @@ -1,21 +1,35 @@ { lib , buildPythonPackage , fetchPypi +, pytestCheckHook }: buildPythonPackage rec { pname = "decorator"; version = "5.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330"; + hash = "sha256-Y3mWIRA2tjhe+RQ15PriKYlHL51XH6uoknuoJTrLwzA="; }; + pythonImportsCheck = [ + "decorator" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "src/tests/test.py" + ]; + meta = with lib; { - homepage = "https://pypi.python.org/pypi/decorator"; + homepage = "https://github.com/micheles/decorator"; description = "Better living through Python with decorators"; - license = lib.licenses.mit; - maintainers = [ maintainers.costrouc ]; + license = licenses.bsd2; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deemix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deemix/default.nix index c12bdac5fd..ac0e0a9d46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deemix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deemix/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-xEahzA1PIrGPfnnOcuXQLVQpSVOUFk6/0v9ViLgWCwk="; + hash = "sha256-xEahzA1PIrGPfnnOcuXQLVQpSVOUFk6/0v9ViLgWCwk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deep-chainmap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deep-chainmap/default.nix index f553bcf6d4..9a9bada8c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deep-chainmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deep-chainmap/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "deep_chainmap"; inherit version; - sha256 = "sha256-6K7dyB5iQzzw3lXLcU10SVsiHZ+SAXhz9DSCkYnPQAA="; + hash = "sha256-6K7dyB5iQzzw3lXLcU10SVsiHZ+SAXhz9DSCkYnPQAA="; }; # Tests are not published to pypi 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 eec2c9fd89..7f1604a301 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 @@ -9,14 +9,15 @@ buildPythonPackage rec { pname = "deep-translator"; - version = "1.9.3"; + version = "1.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-7VsEN6t9c0FMw0zHWnxnIyilQmQ127rXEfLrAYatKEc="; + pname = "deep_translator"; + inherit version; + hash = "sha256-6ZQ42rcOO+vNqTLj9ehv09MrQ/h9Zu2fi2gW2xRvHZ8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deepmerge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deepmerge/default.nix index d35395881c..2ef1e6aa51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deepmerge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deepmerge/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-TCeg213iheGnzqx9vBUx3qpVa2J96kkAyCRFgezf6i0="; + hash = "sha256-TCeg213iheGnzqx9vBUx3qpVa2J96kkAyCRFgezf6i0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deepwave/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deepwave/default.nix index 986a0ca8d7..3e91e1394c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deepwave/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deepwave/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ar4"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4B3V87/voYs61pXhqmydLe48JsnRGuJlUYOOdmJlroA="; + hash = "sha256-4B3V87/voYs61pXhqmydLe48JsnRGuJlUYOOdmJlroA="; }; # unable to find ninja although it is available, most likely because it looks for its pip version diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix index f36a73fc27..f06c9b0d29 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-saMy+IeAy6H9SgS8XHnZ9klFerGyr+vQqhuCtimgbEo="; + hash = "sha256-saMy+IeAy6H9SgS8XHnZ9klFerGyr+vQqhuCtimgbEo="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/delorean/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/delorean/default.nix index 847a5c6e5a..8573dc7095 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/delorean/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/delorean/default.nix @@ -4,21 +4,31 @@ , babel , humanize , python-dateutil +, pytz , tzlocal }: buildPythonPackage rec { pname = "Delorean"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "0d31ay7yq2w7xz7m3ssk5phjbm64b2k8hmgcif22719k29p7hrzy"; + hash = "sha256-/md4bhIzhSOEi+xViKZYxNQl4S1T61HP74cL7I9XYTQ="; }; - propagatedBuildInputs = [ babel humanize python-dateutil tzlocal ]; + propagatedBuildInputs = [ + babel + humanize + python-dateutil + pytz + tzlocal + ]; - pythonImportsCheck = [ "delorean" ]; + pythonImportsCheck = [ + "delorean" + ]; # test data not included doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/demetriek/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/demetriek/default.nix index 8330ec6ec7..b553a1b083 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/demetriek/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/demetriek/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-demetriek"; rev = "refs/tags/v${version}"; - sha256 = "sha256-LCHHBcZgO9gw5jyaJiiS4lKyb0ut+PJvKTylIvIKHhc="; + hash = "sha256-LCHHBcZgO9gw5jyaJiiS4lKyb0ut+PJvKTylIvIKHhc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deprecated/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deprecated/default.nix index 933e55e184..d172849d6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deprecated/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deprecated/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Deprecated"; inherit version; - sha256 = "sha256-Q6xTNdqQwxwkugKK9TapHUHVP55pAd2wIbzFcs5E440="; + hash = "sha256-Q6xTNdqQwxwkugKK9TapHUHVP55pAd2wIbzFcs5E440="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deprecation/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deprecation/default.nix index 5e3ddf7b07..9ea6e5c2c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deprecation/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deprecation/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # fixes for python 3.10 test suite (fetchpatch { url = "https://github.com/briancurtin/deprecation/pull/57/commits/e13e23068cb8d653a02a434a159e8b0b7226ffd6.patch"; - sha256 = "sha256-/5zr2V1s5ULUZnbLXsgyHxZH4m7/a27QYuqQt2Savc8="; + hash = "sha256-/5zr2V1s5ULUZnbLXsgyHxZH4m7/a27QYuqQt2Savc8="; includes = [ "tests/test_deprecation.py" ]; }) ]; 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 737ec13ad6..2782789e95 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 @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "devolo-home-control-api"; - version = "0.18.2"; + version = "0.18.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "2Fake"; repo = "devolo_home_control_api"; rev = "v${version}"; - sha256 = "sha256-H4kLomHM0qq6LqsRMEp34oKy/4Me7AQi6dij2vraBS8="; + hash = "sha256-4AyC1DDYtKl8SwJf75BbzoOAhbZXmBZ05ma9YmLzksM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix index 6d41bc86ba..4295506989 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-kHiYknmteenBgce63EpzhGBEUYcQHrDLreZ1k01eRkQ="; + hash = "sha256-kHiYknmteenBgce63EpzhGBEUYcQHrDLreZ1k01eRkQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/devtools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/devtools/default.nix index 6f3f9b7479..79f8d3d5cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/devtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/devtools/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "samuelcolvin"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "sha256-x9dL/FE94OixMAmjnmfzZUcYJBqE5P2AAIFsNJF0Fxo="; + hash = "sha256-x9dL/FE94OixMAmjnmfzZUcYJBqE5P2AAIFsNJF0Fxo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diceware/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diceware/default.nix index cadc22fcbb..d719dd738c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diceware/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/diceware/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-srTMm1n1aNLvUb/fn34a+UHSX7j1wl8XAZHburzpZWk="; + hash = "sha256-srTMm1n1aNLvUb/fn34a+UHSX7j1wl8XAZHburzpZWk="; }; nativeBuildInputs = [ pytest-runner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dict2xml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dict2xml/default.nix index 7b18007dc1..c032eef5f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dict2xml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dict2xml/default.nix @@ -2,12 +2,12 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, setuptools +, hatchling }: buildPythonPackage rec { pname = "dict2xml"; - version = "1.7.2"; + version = "1.7.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,11 +16,11 @@ buildPythonPackage rec { owner = "delfick"; repo = "python-dict2xml"; rev = "refs/tags/release-${version}"; - hash = "sha256-Ara+eWaUQv4VuzuVrpb5mjMXHHCxydS22glLsYz+UE0="; + hash = "sha256-0Ahc+8pb1gHvcpnYhKAJYLIaQ5Wbp7Q8clzMVcnVdYs="; }; nativeBuildInputs = [ - setuptools + hatchling ]; # Tests are inplemented in a custom DSL (RSpec) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dicttoxml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dicttoxml/default.nix index c4fd588052..c96f37c177 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dicttoxml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dicttoxml/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-bzbOZEiB21zYlAvum3yz8/a3sye6imfYPT4sqgU4v50="; + hash = "sha256-bzbOZEiB21zYlAvum3yz8/a3sye6imfYPT4sqgU4v50="; }; # No tests in archive 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 3f650e6075..dae663f2bb 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 @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "7.3.0"; + version = "7.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "diff_cover"; inherit version; - hash = "sha256-qbHyu9FJYs1Sedc1ijuo1ya5pswD2/QJ+JzCB2pCQjQ="; + hash = "sha256-pLMCSoMeTzjCLoCZRfCdCmp7pmLcjjDSjxprIaPt6/w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dingz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dingz/default.nix index c02746695e..6ad22e7f4c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dingz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dingz/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-dingz"; rev = version; - sha256 = "sha256-bCytQwLWw8D1UkKb/3LQ301eDCkVR4alD6NHjTs6I+4="; + hash = "sha256-bCytQwLWw8D1UkKb/3LQ301eDCkVR4alD6NHjTs6I+4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/distrax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/distrax/default.nix index cd9ab15d1e..69679a8bbf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/distrax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/distrax/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "distrax"; - version = "0.1.2"; + version = "0.1.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-b/+rxjdowNMuhUBhRCuN45z/iUbj1hN1qCSQqqAtZIw="; + hash = "sha256-x9ORfhGX5catEZMfR+iXkZSRa/wIb0B3CrCWOWf35Ks="; }; buildInputs = [ 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 9fa568bc1d..17aec987d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "distributed"; - version = "2023.1.0"; + version = "2023.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xV3HQmmDtSIn+DM3Rcoyp3dqY9qSjB+8Con6+o6a/y0="; + hash = "sha256-E0eks6HlJzZy/XqHRxQJ4brEcLS9tniMkYMT1FoikRs="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix index 2ed3df7798..3f480b1d71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -1,22 +1,24 @@ { lib , buildPythonPackage , fetchFromGitHub +, django , django-allauth , djangorestframework , djangorestframework-simplejwt , responses , unittest-xml-reporting +, python }: buildPythonPackage rec { pname = "dj-rest-auth"; - version = "2.2.5"; + version = "3.0.0"; src = fetchFromGitHub { owner = "iMerica"; repo = "dj-rest-auth"; - rev = version; - sha256 = "sha256-1oxkl7MJ2wIhcHlgxnCtj9Cp8o1puzNWs+vlMyi+3RM="; + rev = "refs/tags/${version}"; + hash = "sha256-wkbFUrvKhdp2Hd4QkXAvhMiaqSXFD/fgIw03nLPaO5I="; }; postPatch = '' @@ -25,16 +27,35 @@ buildPythonPackage rec { --replace "==" ">=" ''; + buildInputs = [ + django + ]; + propagatedBuildInputs = [ djangorestframework ]; - nativeCheckInputs = [ + passthru.optional-dependencies.with_social = [ django-allauth + ]; + + nativeCheckInputs = [ djangorestframework-simplejwt responses unittest-xml-reporting - ]; + ] ++ passthru.optional-dependencies.with_social; + + preCheck = '' + # connects to graph.facebook.com + substituteInPlace dj_rest_auth/tests/test_serializers.py \ + --replace "def test_http_error" "def dont_test_http_error" + ''; + + checkPhase = '' + runHook preCheck + ${python.interpreter} runtests.py + runHook postCheck + ''; pythonImportsCheck = [ "dj_rest_auth" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-admin-sortable2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-admin-sortable2/default.nix index 6301348e60..ff37726d93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-admin-sortable2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-admin-sortable2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version pname; - sha256 = "sha256-fcCP8PvOWFlQL4CdEIwElfOw2UYJJp6u27EjfgMISss="; + hash = "sha256-fcCP8PvOWFlQL4CdEIwElfOw2UYJJp6u27EjfgMISss="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-annoying/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-annoying/default.nix index 5d4afc37b3..9772df000b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-annoying/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-annoying/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { owner = "skorokithakis"; repo = "django-annoying"; rev = "v${version}"; - sha256 = "sha256-M1zOLr1Vjf2U0xlW66Mpno+S+b4IKLklN+kYxRaj6cA="; + hash = "sha256-M1zOLr1Vjf2U0xlW66Mpno+S+b4IKLklN+kYxRaj6cA="; }; patches = [ (fetchpatch { name = "django-4-compatibility.patch"; url = "https://github.com/skorokithakis/django-annoying/pull/101/commits/51b5bd7bc8bb7a410400667e00d0813603df32bd.patch"; - sha256 = "sha256-gLRlAtIHHJ85I88af3C3y+ZT+nXrj2KrV7QgOuEqspk="; + hash = "sha256-gLRlAtIHHJ85I88af3C3y+ZT+nXrj2KrV7QgOuEqspk="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix index ed44bc75f8..fb8ca50269 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "anymail"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-qEYBHsaHo1gmrsa6q7DQiUJurC7cXhv5e/SQ7R3Tkzc="; + hash = "sha256-qEYBHsaHo1gmrsa6q7DQiUJurC7cXhv5e/SQ7R3Tkzc="; }; propagatedBuildInputs = [ 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 e1ca5f418a..4631c13b6b 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 @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-d/dJ07F4B86OtWqcnI5XRv8xZWf4HVumE0ldnHSVqUk="; + hash = "sha256-d/dJ07F4B86OtWqcnI5XRv8xZWf4HVumE0ldnHSVqUk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-autocomplete-light/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-autocomplete-light/default.nix index faa37e0cfa..379b636423 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-autocomplete-light/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-autocomplete-light/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "yourlabs"; repo = "django-autocomplete-light"; rev = version; - sha256 = "sha256-YUiGN6q7ARM/rg7d+ykeDEYZDYjB+DHxMCmdme6QccU="; + hash = "sha256-YUiGN6q7ARM/rg7d+ykeDEYZDYjB+DHxMCmdme6QccU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-celery-email/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-celery-email/default.nix index 73f81e88be..d94760baf6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-celery-email/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-celery-email/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "pmclanahan"; repo = pname; rev = version; - sha256 = "sha256-LBavz5Nh2ObmIwLCem8nHvsuKgPwkzbS/OzFPmSje/M="; + hash = "sha256-LBavz5Nh2ObmIwLCem8nHvsuKgPwkzbS/OzFPmSje/M="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-celery-results/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-celery-results/default.nix index 1cb4b0f3b8..2b2fe06de6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-celery-results/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-celery-results/default.nix @@ -18,6 +18,11 @@ buildPythonPackage rec { hash = "sha256-dapRlw21aRy/JCxqD/UMjN9BniZc0Om3cjNdBkNsS5k="; }; + postPatch = '' + # Drop malformatted tests_require specification + sed -i '/tests_require=/d' setup.py + ''; + propagatedBuildInputs = [ celery django diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-compressor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-compressor/default.nix index 6cea823956..0df2ebc962 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-compressor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-compressor/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "django-compressor"; - version = "4.1"; + version = "4.3.1"; format = "setuptools"; src = fetchPypi { pname = "django_compressor"; inherit version; - hash = "sha256-js5iHSqY9sZjVIDLizcB24kKmfeT+VyiDLAKvBlNMx0="; + hash = "sha256-aIWMDabMCZzCmgIthsO6iu0RTanXCe7OsNe4GBtfiUI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix index 237e4548d7..11ff7b2b3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-IrmWTmtlfa/Ho1QQoRXSDxRRFJqCc3rcbDMew2WIgZY="; + hash = "sha256-IrmWTmtlfa/Ho1QQoRXSDxRRFJqCc3rcbDMew2WIgZY="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix index 5174f44cca..0c13c0b021 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "adamchainz"; repo = "django-cors-headers"; rev = version; - sha256 = "sha256-pIyf4poW8/slxj4PVvmXpuYp//v5w00yU0Vz6Jiy2yM="; + hash = "sha256-pIyf4poW8/slxj4PVvmXpuYp//v5w00yU0Vz6Jiy2yM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-crispy-forms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-crispy-forms/default.nix index 535eddb3b8..53357b9d7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-crispy-forms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-crispy-forms/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "django-crispy-forms"; - version = "1.14.0"; + version = "2.0"; src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "django-crispy-forms"; - rev = version; - sha256 = "sha256-NZ2lWxsQHc7Qc4HDoWgjJTZ/bJHmjpBf3q1LVLtzA+8="; + rev = "refs/tags/${version}"; + hash = "sha256-oxOW7gFpjUehWGeqZZjhPwptX0Gpgj5lP0lw0zkYGuE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix index 2b3b41135b..fb897ef1dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-wAq8uNUkBnOQpmUYz80yaDuHrTzGINWRNkn8dwe4CDM="; + hash = "sha256-wAq8uNUkBnOQpmUYz80yaDuHrTzGINWRNkn8dwe4CDM="; }; propagatedBuildInputs = [ six django persisting-theory ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix index 462c4674c9..4392427b86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , django , factory_boy , mock @@ -20,9 +21,17 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-i8A/FMba1Lc3IEBzefP3Uu23iGcDGYqo5bNv+u6hKQI="; + hash = "sha256-i8A/FMba1Lc3IEBzefP3Uu23iGcDGYqo5bNv+u6hKQI="; }; + patches = [ + (fetchpatch { + # pygments 2.14 compat for tests + url = "https://github.com/django-extensions/django-extensions/commit/61ebfe38f8fca9225b41bec5418e006e6a8815e1.patch"; + hash = "sha256-+sxaQMmKi/S4IlfHqARPGhaqc+F1CXUHVFyeU/ArW2U="; + }) + ]; + postPatch = '' substituteInPlace setup.cfg \ --replace "--cov=django_extensions --cov-report html --cov-report term" "" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-filter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-filter/default.nix index 24c2c6d15b..1225a3301a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-filter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-filter/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-7Uc7duhPfoOyURuyBQw++zbRNSB9ASjf465LNuNZS6U="; + hash = "sha256-7Uc7duhPfoOyURuyBQw++zbRNSB9ASjf465LNuNZS6U="; }; propagatedBuildInputs = [ django ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-formtools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-formtools/default.nix index 11a1fb0716..af6381feef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-formtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-formtools/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-3rkyvlWx2UGeN9xNZd+/640we3HIwR/VLxWaul/A3u0="; + hash = "sha256-3rkyvlWx2UGeN9xNZd+/640we3HIwR/VLxWaul/A3u0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix index f953de0770..e85d27f907 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-l+MZeu/CJf5AW28XYAolNL+CfLTWdDEwwgvBoG9yk6Q="; + hash = "sha256-l+MZeu/CJf5AW28XYAolNL+CfLTWdDEwwgvBoG9yk6Q="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-hcaptcha/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-hcaptcha/default.nix index d200444ab5..52cf7ffb7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-hcaptcha/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-hcaptcha/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "django-hCaptcha"; - sha256 = "sha256-slGerwzJeGWscvglMBEixc9h4eSFLWiVmUFgIirLbBo="; + hash = "sha256-slGerwzJeGWscvglMBEixc9h4eSFLWiVmUFgIirLbBo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix index 49f68462d0..0858c8b320 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "2.8.0"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "django-import-export"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-km6TQq4OZZtx9/lgBzS3tEifAYjkkUX//9FRATDLX/0="; + hash = "sha256-GvauDAkQd8dVCgon8nC7FPW4yLM7kS72g8bOBwt9RuY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix index ba8f1d79db..9513a75767 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix @@ -1,12 +1,20 @@ -{ lib, buildPythonPackage, fetchPypi, django }: +{ lib +, buildPythonPackage +, fetchPypi +, django +, pythonOlder +}: buildPythonPackage rec { pname = "django-ipware"; - version = "4.0.2"; + version = "5.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "602a58325a4808bd19197fef2676a0b2da2df40d0ecf21be414b2ff48c72ad05"; + hash = "sha256-T6VgfuheEu5eFYvHVp/x4TT7FXloGqH/Pw7QS+Ib4VM="; }; propagatedBuildInputs = [ django ]; @@ -20,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Django application to retrieve user's IP address"; homepage = "https://github.com/un33k/django-ipware"; + changelog = "https://github.com/un33k/django-ipware/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-js-reverse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-js-reverse/default.nix index a63ef50a80..b06f8c89e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-js-reverse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-js-reverse/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "ierror"; repo = "django-js-reverse"; rev = "7cab78c4531780ab4b32033d5104ccd5be1a246a"; - sha256 = "sha256-oA4R5MciDMcSsb+GAgWB5jhj+nl7E8t69u0qlx2G93E="; + hash = "sha256-oA4R5MciDMcSsb+GAgWB5jhj+nl7E8t69u0qlx2G93E="; }; patches = [ (fetchpatch { name = "fix-requires_system_checks-list-or-tuple"; url = "https://github.com/ierror/django-js-reverse/commit/1477ba44b62c419d12ebec86e56973f1ae56f712.patch"; - sha256 = "sha256-xUtCziewVhnCOaNWddJBH4/Vvhwjjq/wcQDvh2YzWMQ="; + hash = "sha256-xUtCziewVhnCOaNWddJBH4/Vvhwjjq/wcQDvh2YzWMQ="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix index ea1be64768..32bfe947c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-mailman3"; - version = "1.3.8"; + version = "1.3.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-C3ZyiQZ50JFg2e+HS0oIJFK+dV8TcDYehVh875zBRFU="; + hash = "sha256-GpI1W0O9aJpLF/mcS23ktJDZsP69S2zQy7drOiWBnTM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix index 2a1778708a..ef41805b6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = "django-model-utils"; rev = version; - sha256 = "sha256-TLqvpP/ZaGGFdqnN+UHbhXv1K1YVYTYBkCiWCjYrFh8="; + hash = "sha256-TLqvpP/ZaGGFdqnN+UHbhXv1K1YVYTYBkCiWCjYrFh8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix index d3628d66e3..fc68d0c489 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-mynchdvrfBGKMeFFb2oDaANhtSCxq85Nibx7GfSY2nQ="; + hash = "sha256-mynchdvrfBGKMeFFb2oDaANhtSCxq85Nibx7GfSY2nQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-otp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-otp/default.nix index d3fd24281a..5b2a41faf7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-otp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-otp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "django-otp"; repo = "django-otp"; rev = "v${version}"; - sha256 = "sha256-Ac9p7q9yaUr3WTTGxCY16Yo/Z8i1RtnD2g0Aj2pqSXY="; + hash = "sha256-Ac9p7q9yaUr3WTTGxCY16Yo/Z8i1RtnD2g0Aj2pqSXY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-phonenumber-field/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-phonenumber-field/default.nix index 084bf31736..e056b32426 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-phonenumber-field/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-phonenumber-field/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "django-phonenumber-field"; - version = "6.4.0"; + version = "7.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "stefanfoulis"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rrJTCWn1mFV4QQu8wyLDxheHkZQ/FIE7mRC/9nXNSaM="; + hash = "sha256-y5eVyF6gBgkH+uQ2424kCe+XRB/ttbnJPkg6ToRxAmI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix index 0d4e950287..f9756a8d59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "django-polymorphic"; repo = "django-polymorphic"; rev = "v${version}"; - sha256 = "sha256-JJY+FoMPSnWuSsNIas2JedGJpdm6RfPE3E1VIjGuXIc="; + hash = "sha256-JJY+FoMPSnWuSsNIas2JedGJpdm6RfPE3E1VIjGuXIc="; }; propagatedBuildInputs = [ django ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix index bcbb09fa43..7cb06453a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Koed00"; repo = "django-q"; - sha256 = "sha256-gFSrAl3QGoJEJfvTTvLQgViPPjeJ6BfvgEwgLLo+uAA="; + hash = "sha256-gFSrAl3QGoJEJfvTTvLQgViPPjeJ6BfvgEwgLLo+uAA="; rev = "v${version}"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-redis/default.nix index 11033b3e0f..27f7d8d950 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-redis/default.nix @@ -30,7 +30,7 @@ buildPythonPackage { owner = "jazzband"; repo = "django-redis"; rev = version; - sha256 = "sha256-e8wCgfxBT+WKFY4H83CTMirTpQym3QAoeWnXbRCDO90="; + hash = "sha256-e8wCgfxBT+WKFY4H83CTMirTpQym3QAoeWnXbRCDO90="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix index 77e532ed7f..654118feda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Tivix"; repo = "django-rest-auth"; rev = version; - sha256 = "sha256-rCChUHv8sTEFErDCZnPN5b5XVtMJ7JNVZwBYF3d99mY="; + hash = "sha256-rCChUHv8sTEFErDCZnPN5b5XVtMJ7JNVZwBYF3d99mY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-rest-polymorphic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-rest-polymorphic/default.nix index 7715900c60..5f108f37b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-rest-polymorphic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-rest-polymorphic/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { repo = "django-rest-polymorphic"; # https://github.com/denisorehovsky/django-rest-polymorphic/issues/42 rev = "9d920eb91ef13144094426f9ebc0ca80247c0fe3"; - sha256 = "sha256-k7Cl2QYkaGOZaTo8v5Wg9Wqh8x0WC5i9Sggqj8eeECY="; + hash = "sha256-k7Cl2QYkaGOZaTo8v5Wg9Wqh8x0WC5i9Sggqj8eeECY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-scopes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-scopes/default.nix index 9b11393d3d..0f8c449e59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-scopes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-scopes/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { repo = "django-scopes"; # No 1.2.0.post1 tag, see https://github.com/raphaelm/django-scopes/issues/27 rev = "0b93cdb6a8335cb02a8ea7296511358ba841d137"; - sha256 = "sha256-djptJRkW1pfVbxhhs58fJA4d8dKZuvYRy01Aa3Btr+k="; + hash = "sha256-djptJRkW1pfVbxhhs58fJA4d8dKZuvYRy01Aa3Btr+k="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-sites/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-sites/default.nix index 9e6bdc2fdb..5587014c57 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-sites/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-sites/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "niwinz"; repo = "django-sites"; rev = version; - sha256 = "sha256-MQtQC+9DyS1ICXXovbqPpkKIQ5wpuJDgq3Lcd/1kORU="; + hash = "sha256-MQtQC+9DyS1ICXXovbqPpkKIQ5wpuJDgq3Lcd/1kORU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-stubs-ext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-stubs-ext/default.nix index 0fb43a1dca..ccc43bfc2d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-stubs-ext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-stubs-ext/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-T9jNvGjRpCHyG7fg2edtUPaktQTTULp4ZAXa9TbpDCE="; + hash = "sha256-T9jNvGjRpCHyG7fg2edtUPaktQTTULp4ZAXa9TbpDCE="; }; # setup.cfg tries to pull in nonexistent LICENSE.txt file diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-stubs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-stubs/default.nix index 0ecb78f475..662a4db74b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-stubs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-stubs/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "django-stubs"; - version = "1.13.1"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vMYYujU9q8VA2YK52sHVoZIWUvj8KhNlPVRaV9XjzA8="; + hash = "sha256-C7+esXLFsG7M/y1wTHw5BuSixhRt+MMu6fOlHikmVYE="; }; propagatedBuildInputs = [ 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 123d44a78a..7870e79140 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 @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mfogel"; repo = pname; rev = version; - sha256 = "sha256-GXkvF/kAOU1JK0GDpUT1irCQlkxIWieYRqPd0fr2HXw="; + hash = "sha256-GXkvF/kAOU1JK0GDpUT1irCQlkxIWieYRqPd0fr2HXw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix index 9ff9a5bec5..a03a8a282d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "django-versatileimagefield"; - version = "2.2"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "6569d5c3e13c69ab8912ba5100084aa5abcdcffb8d1f5abc085b226e7bbd65b3"; + hash = "sha256-FlHbLtNthDz7F4jyYBRyopPZuoZyk2m29uVZERI1esc="; }; propagatedBuildInputs = [ pillow python-magic ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix index 88bbdfdedd..66189a88d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SN4A8VZ34BaiFq7/IF1uAOQ5HJpXAhNsZBGcRytzVto="; + hash = "sha256-SN4A8VZ34BaiFq7/IF1uAOQ5HJpXAhNsZBGcRytzVto="; }; propagatedBuildInputs = [ django ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_environ/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_environ/default.nix index 4fa1b0e8ce..bb3cd1acf7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django_environ/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django_environ/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-v/U4FTMFYyjJrAL3F5C9W/HOqBsb7rZI8ouByeg+CiE="; + hash = "sha256-v/U4FTMFYyjJrAL3F5C9W/HOqBsb7rZI8ouByeg+CiE="; }; # The testsuite fails to modify the base environment 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 cc0c4f5b4c..55da45f463 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-TwU9ASjij0EpJuLakCc19L3Lq1wI1Dvk3+/XR/yi6W4="; + hash = "sha256-TwU9ASjij0EpJuLakCc19L3Lq1wI1Dvk3+/XR/yi6W4="; }; propagatedBuildInputs = [ ply ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix index 3fd274a2c9..d45b600c80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-za51hGZIq7ZYXHRwY5odL7Bk3EX46LYqqlC+fxp6YfQ="; + hash = "sha256-za51hGZIq7ZYXHRwY5odL7Bk3EX46LYqqlC+fxp6YfQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix index 4242c24c90..dc97ddb295 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "oxan"; repo = "djangorestframework-dataclasses"; rev = "refs/tags/v${version}"; - sha256 = "sha256-PTX5huYdusPV6xCBW+8sFwusuPtZBH1vVApvcQU7Dlc="; + hash = "sha256-PTX5huYdusPV6xCBW+8sFwusuPtZBH1vVApvcQU7Dlc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-guardian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-guardian/default.nix index e822a26d0f..9aec9ff0c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-guardian/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-guardian/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "rpkilby"; repo = "django-rest-framework-guardian"; rev = version; - sha256 = "sha256-jl/VEl1pUHU8J1d5ZQSGJweNJayIGw1iVAmwID85fqw="; + hash = "sha256-jl/VEl1pUHU8J1d5ZQSGJweNJayIGw1iVAmwID85fqw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-recursive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-recursive/default.nix index e8dfe0c115..b6029ad993 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-recursive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-recursive/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "heywbj"; repo = "django-rest-framework-recursive"; rev = version; - sha256 = "sha256-Q/6yxpz3c402sMZudAeFIht9+5GmTRlzM51AMAx5muY="; + hash = "sha256-Q/6yxpz3c402sMZudAeFIht9+5GmTRlzM51AMAx5muY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix index 067502961f..912c484b0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "encode"; repo = "django-rest-framework"; rev = version; - sha256 = "sha256-Fnj0n3NS3SetOlwSmGkLE979vNJnYE6i6xwVBslpNz4="; + hash = "sha256-Fnj0n3NS3SetOlwSmGkLE979vNJnYE6i6xwVBslpNz4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix index 9d294977ca..b05cfb9a08 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dkimpy"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NQDukEVLfCz3ElgeA5jrRwONJ+aRSDKd9jTs2Y3YYhw="; + hash = "sha256-dVl0S1qQGWkZCPCgxlPiBrbL9jbIxtZuGggnz8jsf5E="; }; nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dlms-cosem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dlms-cosem/default.nix index d9356e1492..d106d12955 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dlms-cosem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dlms-cosem/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pwitab"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-BrLanP+SIRRof15yzqwcDOxw92phbW7m9CfORz0xo7I="; + hash = "sha256-BrLanP+SIRRof15yzqwcDOxw92phbW7m9CfORz0xo7I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dnachisel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dnachisel/default.nix index 7ef6a44ba9..52ca9eff66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dnachisel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dnachisel/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Edinburgh-Genome-Foundry"; repo = "DnaChisel"; rev = "refs/tags/v${version}"; - sha256 = "sha256-YlNOvK7ZXUHYdRX1NFEdZ646NGLtGXU1YgAjN6RY2QE="; + hash = "sha256-YlNOvK7ZXUHYdRX1NFEdZ646NGLtGXU1YgAjN6RY2QE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docopt-ng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docopt-ng/default.nix index 60d14fa8e9..a6297780a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docopt-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docopt-ng/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-6mphooj8hk7uayLW/iiqIC1Z/Ib60F8W/145zE6n9uM="; + hash = "sha256-6mphooj8hk7uayLW/iiqIC1Z/Ib60F8W/145zE6n9uM="; }; pythonImportsCheck = [ "docopt" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix index 1d3c53c95d..46018acec3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { # No source available from official repo src = fetchPypi { inherit pname version; - sha256 = "sha256-JWkUtMAROk4cePMuogx9dtyO/ihv6JAnDnXPrVD+UQ8="; + hash = "sha256-JWkUtMAROk4cePMuogx9dtyO/ihv6JAnDnXPrVD+UQ8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix index a47dc6246a..7fe0466a25 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix @@ -4,7 +4,7 @@ , pythonOlder , pytestCheckHook , mock -, Mako +, mako , decorator , stevedore }: @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "dogpile.cache"; inherit version; - sha256 = "sha256-2ETou2OMxPVEpMiag039Nv6TVAC3GhbL10Tr37cg/U4="; + hash = "sha256-2ETou2OMxPVEpMiag039Nv6TVAC3GhbL10Tr37cg/U4="; }; preCheck = '' @@ -30,7 +30,7 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; - nativeCheckInputs = [ pytestCheckHook mock Mako ]; + nativeCheckInputs = [ pytestCheckHook mock mako ]; propagatedBuildInputs = [ decorator stevedore ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dogtail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dogtail/default.nix index cc4430ddb3..2f8a02dc3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dogtail/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dogtail/default.nix @@ -37,7 +37,6 @@ buildPythonPackage { nativeBuildInputs = [ gobject-introspection dbus xvfb-run wrapGAppsHook ]; # for setup hooks propagatedBuildInputs = [ at-spi2-core gtk3 pygobject3 pyatspi pycairo ]; - strictDeps = false; # issue 56943 checkPhase = '' runHook preCheck @@ -50,6 +49,12 @@ buildPythonPackage { runHook postCheck ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + # TODO: Tests require accessibility doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/doit-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/doit-py/default.nix index 2ad323f167..ed8666a034 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/doit-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/doit-py/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pydoit"; repo = pname; rev = version; - sha256 = "sha256-DBl6/no04ZGRHHmN9gkEtBmAMgmyZWcfPCcFz0uxAv4="; + hash = "sha256-DBl6/no04ZGRHHmN9gkEtBmAMgmyZWcfPCcFz0uxAv4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/doit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/doit/default.nix index 40a94c6aeb..d3cc29c775 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/doit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/doit/default.nix @@ -24,7 +24,7 @@ let doit = buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-cdB8zJUUyyL+WdmJmVd2ZeqrV+FvZE0EM2rgtLriNLw="; + hash = "sha256-cdB8zJUUyyL+WdmJmVd2ZeqrV+FvZE0EM2rgtLriNLw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dotty-dict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dotty-dict/default.nix index 9a665ec0b5..69da618a5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dotty-dict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dotty-dict/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SwFuA7iuJlU5dXpT66JLm/2lBvuU+84L7oQ8bwVUGhU="; + hash = "sha256-SwFuA7iuJlU5dXpT66JLm/2lBvuU+84L7oQ8bwVUGhU="; }; nativeBuildInputs = [ setuptools-scm ]; 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 97d7396078..6c1d142fcc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dpath/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-M4CnfQ20q/EEElhg/260vQfJfGW4Gq1CpglxcImhvtA="; + hash = "sha256-M4CnfQ20q/EEElhg/260vQfJfGW4Gq1CpglxcImhvtA="; }; # use pytest as nosetests hangs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dpkt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dpkt/default.nix index f59b7ba736..f2046d106b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dpkt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dpkt/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Q/hobkVdpQUoNf0e2iaJ1R3jZwqsl5mxsAz9IDkn7kU="; + hash = "sha256-Q/hobkVdpQUoNf0e2iaJ1R3jZwqsl5mxsAz9IDkn7kU="; }; # Project has no tests 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 74740aeffb..d4c96ba3b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dragonfly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dragonfly/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "dictation-toolbox"; repo = pname; rev = version; - sha256 = "sha256-sqEEEr5/KG3cn4rmOGJt9zMNAjeLO6h3NJgg0EyewrM="; + hash = "sha256-sqEEEr5/KG3cn4rmOGJt9zMNAjeLO6h3NJgg0EyewrM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix index 8cfdcdce74..0789e76dab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix @@ -7,12 +7,13 @@ buildPythonPackage rec { pname = "drf-spectacular-sidecar"; version = "2023.3.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "tfranzel"; repo = "drf-spectacular-sidecar"; rev = version; - sha256 = "sha256-UTH6t/znN4nYnqDhtFFxXoBXX8Zo19pJE9iDsvw7bGE="; + hash = "sha256-UTH6t/znN4nYnqDhtFFxXoBXX8Zo19pJE9iDsvw7bGE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix index 0b0a256c1d..e7866a54ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix @@ -28,13 +28,13 @@ buildPythonPackage rec { pname = "drf-spectacular"; - version = "0.24.2"; + version = "0.26.0"; src = fetchFromGitHub { owner = "tfranzel"; repo = "drf-spectacular"; rev = version; - sha256 = "sha256-WE+iOD3OjDByisHI9GgvjUUSpvOz+IYi/3Y8AmR7Eps="; + hash = "sha256-yq+aTkoHI3zSsrYjokbn5UoPm/43LCnyTqdFtkrU92M="; }; propagatedBuildInputs = [ @@ -76,6 +76,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sane and flexible OpenAPI 3 schema generation for Django REST framework"; homepage = "https://github.com/tfranzel/drf-spectacular"; + changelog = "https://github.com/tfranzel/drf-spectacular/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drf-writable-nested/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-writable-nested/default.nix index 339677d387..603f94426b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drf-writable-nested/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/drf-writable-nested/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "beda-software"; repo = "drf-writable-nested"; rev = "refs/tags/v${version}"; - sha256 = "sha256-/7MZAw0clzzlBdYchUVKldWT7WqtwdSe+016QAP0hqk="; + hash = "sha256-/7MZAw0clzzlBdYchUVKldWT7WqtwdSe+016QAP0hqk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix index 4853e7eb08..2a12ca816f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-zu8MO13EOJeBr9eG5tw2l68qL+DYck7h9jfCPXW7xbI="; + hash = "sha256-zu8MO13EOJeBr9eG5tw2l68qL+DYck7h9jfCPXW7xbI="; }; postPatch = '' 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 6e5b4dc2b6..bc2d2763e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/drms/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-crPVo7ALErZWvNcsaJ/BuBa0VkfCsZ+C929x4kEZHKw="; + hash = "sha256-crPVo7ALErZWvNcsaJ/BuBa0VkfCsZ+C929x4kEZHKw="; }; nativeBuildInputs = [ 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 68eeb2aeb5..5c8f4287e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix @@ -42,7 +42,10 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ + --replace ">= 2.*" ">= 2.0" \ --replace "'pytest-runner == 5.2.0'," "" + substituteInPlace test/requirements.txt \ + --replace ">=2.*" ">=2.0" ''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ducc0/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ducc0/default.nix index 0ad328bfd8..3f8ce880e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ducc0/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ducc0/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "mtr"; repo = "ducc"; rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-yh7L87s3STL2usGBXgIhCS7GKQuau/PV6US3T06bb0M="; + hash = "sha256-yh7L87s3STL2usGBXgIhCS7GKQuau/PV6US3T06bb0M="; }; buildInputs = [ pybind11 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duecredit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duecredit/default.nix index 301d99aabe..28b21cabc1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duecredit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duecredit/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Dg/Yfp5GzmyUMI6feAwgP+g22JYoQE+L9a+Wp0V77Rw="; + hash = "sha256-Dg/Yfp5GzmyUMI6feAwgP+g22JYoQE+L9a+Wp0V77Rw="; }; propagatedBuildInputs = [ citeproc-py requests six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duet/default.nix index f2ca9f5410..4741414ca5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duet/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "google"; repo = "duet"; rev = "v${version}"; - sha256 = "sha256-9CTAupAxZI1twoLpgr7VfECw70QunE6pk+SskiT3JDw="; + hash = "sha256-9CTAupAxZI1twoLpgr7VfECw70QunE6pk+SskiT3JDw="; }; propagatedBuildInputs = [ typing-extensions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dungeon-eos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dungeon-eos/default.nix index f87bbf82b7..c8525c3fcb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dungeon-eos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dungeon-eos/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "sha256-Z1fGtslXP8zcZmVeWjRrbcM2ZJsfbrWjpLWZ49uSCRY="; + hash = "sha256-Z1fGtslXP8zcZmVeWjRrbcM2ZJsfbrWjpLWZ49uSCRY="; }; doCheck = false; # there are no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix index 3c03a9e0fd..151154f19e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "0.40.3"; + version = "0.41.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kJABNVUFoaN8Q7IVJKW/LF2kJwB4HcsvMEDmE6eTAxg="; + hash = "sha256-+rK5OGbIBP7g69swhsgnaJovllxp7XdO8iT3hfYwhV4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-http/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-http/default.nix new file mode 100644 index 0000000000..cb812d850c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-http/default.nix @@ -0,0 +1,53 @@ +{ lib +, aiohttp-retry +, buildPythonPackage +, fetchFromGitHub +, dvc-objects +, fsspec +, pythonOlder +, pythonRelaxDepsHook +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "dvc-http"; + version = "2.30.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "iterative"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-IlgJEnS+rHSg5cw7SCc3vVtG1mJA5voGViya7nkpL2M="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + dvc-objects + fsspec + aiohttp-retry + ]; + + # Currently it's not possible to run the tests + # ModuleNotFoundError: No module named 'dvc.testing' + doCheck = false; + + pythonImportsCheck = [ + "dvc_http" + ]; + + meta = with lib; { + description = "HTTP plugin for dvc"; + homepage = "https://github.com/iterative/dvc-http"; + changelog = "https://github.com/iterative/dvc-http/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix index a0ab592eaa..343e5705f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.19.3"; + version = "0.20.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-oKK+BhOgdRPZZAACgxgmr9rlzEH9yWmvbmx09d42u/Y="; + hash = "sha256-T7vcnxxN0YUHoDVc98f0QwiMqT88lx8NejTsDfBY5SY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvclive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvclive/default.nix index a62c459ef3..954d2e4902 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvclive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvclive/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "1.3.0"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FAupTvaOLPp5EQ0vvE8tQCa8WnKW/qrQTc7i+6F7F1A="; + hash = "sha256-n3JjZrh2ImpjW1MUTwag716qaVjSChrYqNJuNp6K1s8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/easydict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/easydict/default.nix index fd1ebf8d9f..889116b791 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/easydict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/easydict/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Edyywgqqu/7kwYi0vBQ+9r4ESzTb8M5aWTJCwmlaCA8="; + hash = "sha256-Edyywgqqu/7kwYi0vBQ+9r4ESzTb8M5aWTJCwmlaCA8="; }; doCheck = false; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/easyenergy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/easyenergy/default.nix index bb2191d706..99a6a72d49 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/easyenergy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/easyenergy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "easyenergy"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-easyenergy"; rev = "refs/tags/v${version}"; - hash = "sha256-EhpZKwoayT53lhyuM/DlyLQ/1OSGuiAaiBdjM0UTZ8E="; + hash = "sha256-FjqkePMD55LWLwL6ZWzKwCI0tcYACPdRuci5fy6n02s="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/easygui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/easygui/default.nix index 7749c246e1..6b3c04c726 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/easygui/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/easygui/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1lP/ee4fQvY7WgkPL5jOAjNdhq2JY7POJmGAXK/pmgQ="; + hash = "sha256-1lP/ee4fQvY7WgkPL5jOAjNdhq2JY7POJmGAXK/pmgQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/easyocr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/easyocr/default.nix index 9c55897188..2a5e82cc8e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/easyocr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/easyocr/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "JaidedAI"; repo = "EasyOCR"; rev = "v${version}"; - sha256 = "sha256-f+JBSnFMRvVlhRRiL1rJb7a0CNjZPuh6r8r3K1meQCk="; + hash = "sha256-f+JBSnFMRvVlhRRiL1rJb7a0CNjZPuh6r8r3K1meQCk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix index 97707e0e9f..b1818665f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix @@ -1,12 +1,13 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - pname = "EasyProcess"; + pname = "easyprocess"; version = "1.1"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-iFiYMCpXqrlIlz6LXTKkIpOSufstmGqx1P/VkOW6kOw="; + pname = "EasyProcess"; + inherit version; + hash = "sha256-iFiYMCpXqrlIlz6LXTKkIpOSufstmGqx1P/VkOW6kOw="; }; # No tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ebaysdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ebaysdk/default.nix index 8c80ccd4c3..bd4b736b72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ebaysdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ebaysdk/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Lrh11wa0gfWcqN0wdFON9+UZaBT5zhLQ74RpA0Opx/M="; + hash = "sha256-Lrh11wa0gfWcqN0wdFON9+UZaBT5zhLQ74RpA0Opx/M="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix index 66831b0513..ba5fa836c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-GQNIBBVZ4hsiodZc7khSgsoRpvgdUD/duE1QF+ntHkk="; + hash = "sha256-GQNIBBVZ4hsiodZc7khSgsoRpvgdUD/duE1QF+ntHkk="; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ecos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ecos/default.nix index d5ef0867c3..24df1f56b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ecos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ecos/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "embotech"; repo = "ecos-python"; rev = "v${version}"; - sha256 = "sha256-TPxrTyVZ1KXgPoDbZZqXT5+NEIEndg9qepujqFQwK+Q="; + hash = "sha256-TPxrTyVZ1KXgPoDbZZqXT5+NEIEndg9qepujqFQwK+Q="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ecs-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ecs-logging/default.nix index 01298469f8..85c574eb3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ecs-logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ecs-logging/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "ecs-logging-python"; rev = "refs/tags/${version}"; - sha256 = "sha256-2BfZ96D24sfjFD6l+gjp6xXbSJ0kjQD/FhHLI3bpVGM="; + hash = "sha256-2BfZ96D24sfjFD6l+gjp6xXbSJ0kjQD/FhHLI3bpVGM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ed25519-blake2b/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ed25519-blake2b/default.nix index f7decd1037..64061551e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ed25519-blake2b/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ed25519-blake2b/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-0aHLkDLsMHzpW0HGGUQP1NP87MGPIkA1zH1tx6fY70A="; + hash = "sha256-0aHLkDLsMHzpW0HGGUQP1NP87MGPIkA1zH1tx6fY70A="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/edalize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/edalize/default.nix index 8f103df269..9621fe42ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/edalize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/edalize/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "olofk"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-h6b0mdAUR4NsN2SpnLu5OgS9Fy9ZRitG+5Sbon1jlUM="; + hash = "sha256-h6b0mdAUR4NsN2SpnLu5OgS9Fy9ZRitG+5Sbon1jlUM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/editables/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/editables/default.nix index 9090e98f40..0211a855b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/editables/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/editables/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-FnUk43c1jtHxN05hwmjw16S/fb0EbGVve0EM3hYWGxo="; + hash = "sha256-FnUk43c1jtHxN05hwmjw16S/fb0EbGVve0EM3hYWGxo="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix index 2918733e96..ebd6a66210 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix @@ -9,7 +9,7 @@ let owner = "editorconfig"; repo = "editorconfig-core-test"; rev = "e407c1592df0f8e91664835324dea85146f20189"; - sha256 = "sha256-9WSEkMJOewPqJjB6f7J6Ir0L+U712hkaN+GszjnGw7c="; + hash = "sha256-9WSEkMJOewPqJjB6f7J6Ir0L+U712hkaN+GszjnGw7c="; }; in buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "editorconfig"; repo = "editorconfig-core-py"; rev = "v${version}"; - sha256 = "sha256-ZwoTMgk18+BpPNtXKQUMXGcl2Lp+1RQVyPHgk6gHWh8="; + hash = "sha256-ZwoTMgk18+BpPNtXKQUMXGcl2Lp+1RQVyPHgk6gHWh8="; # workaround until https://github.com/editorconfig/editorconfig-core-py/pull/40 is merged # fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix index b7286ad39c..5e7f76cee0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix @@ -8,7 +8,7 @@ , httpx , jinja2 , jsonschema -, Logbook +, logbook , mock , pytest-asyncio , pytest-bdd @@ -57,7 +57,7 @@ buildPythonPackage rec { httpx jinja2 jsonschema - Logbook + logbook mock pytest-asyncio pytest-bdd diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elgato/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elgato/default.nix index 16b468ab62..92b4cad66b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elgato/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elgato/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-elgato"; rev = "refs/tags/v${version}"; - sha256 = "sha256-kyFnc/lMxgYy8s/gAP5vpEPV8a+dphOummr6G7deGQ4="; + hash = "sha256-kyFnc/lMxgYy8s/gAP5vpEPV8a+dphOummr6G7deGQ4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elmax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elmax/default.nix index 7202f0efbd..6391e86a56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elmax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elmax/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-elmax"; rev = version; - sha256 = "sha256-EcYEpYv+EwwEfW8Sy7aQjFAPpmsA6qVbmlwrPdxdnEw="; + hash = "sha256-EcYEpYv+EwwEfW8Sy7aQjFAPpmsA6qVbmlwrPdxdnEw="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/email-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/email-validator/default.nix index bf106a26da..76b5b6fbe3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/email-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/email-validator/default.nix @@ -1,20 +1,24 @@ { lib , buildPythonPackage -, fetchFromGitHub , dnspython +, fetchFromGitHub , idna , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "email-validator"; - version = "1.3.0"; + version = "1.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "JoshData"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-mflUF2ZKYhCiQEoG+fKI+K266dukuSzG9cyg6gwBcTo="; + hash = "sha256-JW6Yrotm3HjUOUtNFxRorkrJKjzuwIXwjpUuMWEyLV0="; }; propagatedBuildInputs = [ @@ -45,10 +49,10 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A robust email syntax and deliverability validation library"; - homepage = "https://github.com/JoshData/python-email-validator"; - changelog = "https://github.com/JoshData/python-email-validator/releases/tag/v${version}"; - license = licenses.cc0; + description = "Email syntax and deliverability validation library"; + homepage = "https://github.com/JoshData/python-email-validator"; + changelog = "https://github.com/JoshData/python-email-validator/releases/tag/v${version}"; + license = licenses.cc0; maintainers = with maintainers; [ siddharthist ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/emailthreads/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/emailthreads/default.nix index 8af7fc18e3..0f13e877e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/emailthreads/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/emailthreads/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "emersion"; repo = "python-emailthreads"; rev = "v${version}"; - sha256 = "sha256-7BhYS1DQCW9QpG31asPCq5qPyJy+WW2onZpvEHhwQCs="; + hash = "sha256-7BhYS1DQCW9QpG31asPCq5qPyJy+WW2onZpvEHhwQCs="; }; nativeCheckInputs = [ unittestCheckHook ]; 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 index b6c31519ef..e539d0fea8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/empty-files/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/empty-files/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "EmptyFiles.Python"; rev = "v${version}"; - sha256 = "sha256-K4rlVO1X1AWxYI3EqLsyQ5/Ist/jlwFrmOM4aMojtKU="; + hash = "sha256-K4rlVO1X1AWxYI3EqLsyQ5/Ist/jlwFrmOM4aMojtKU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enaml/default.nix index 669b518738..e53b38d04e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/enaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/enaml/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "enaml"; - version = "0.15.2"; + version = "0.16.0"; src = fetchFromGitHub { owner = "nucleic"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-FNp/8Fs+06m4kiczkN5lx5Qly0ALLtSmxD4LkkJiqho="; + hash = "sha256-0W5FWGS4vu5+O6/C4El60QDsRNj+P4xGQ62NdkfJd5I="; }; # qt bindings cannot be found during tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enamlx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enamlx/default.nix index 641956f10b..795ebb4975 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/enamlx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/enamlx/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "frmdstryr"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-LHqOZ1uLWFbUeQAGKoMH9GljhRq1K4RTVWzgV/pt3g8="; + hash = "sha256-LHqOZ1uLWFbUeQAGKoMH9GljhRq1K4RTVWzgV/pt3g8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/energyflip-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/energyflip-client/default.nix index b0f13eafc1..50cb9e1884 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/energyflip-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/energyflip-client/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dennisschroer"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-neuZ6pZWW/Rgexu/iCEymjnxi5l/IuLKPFn6S9U4DgU="; + hash = "sha256-neuZ6pZWW/Rgexu/iCEymjnxi5l/IuLKPFn6S9U4DgU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/entrance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/entrance/default.nix index 4bce72125e..97ac60fa50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/entrance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/entrance/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-PvsP6HXCllW102h3o7abz9uC2AZTwvg5qIqP+rdkk6Y="; + hash = "sha256-PvsP6HXCllW102h3o7abz9uC2AZTwvg5qIqP+rdkk6Y="; }; # The versions of `sanic` and `websockets` in nixpkgs only support 3.6 or later diff --git a/third_party/nixpkgs/pkgs/development/python-modules/entrypoint2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/entrypoint2/default.nix index 812749b3be..6e81b70f59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/entrypoint2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/entrypoint2/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, EasyProcess +, easyprocess , path , pytestCheckHook , pythonOlder @@ -20,7 +20,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - EasyProcess + easyprocess path pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/entrypoints/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/entrypoints/default.nix index 916b499a98..fe83e797d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/entrypoints/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/entrypoints/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-twbt2qkhihnrzWe1aBjwW7J1ibHKno15e3Sv+tTMrNQ="; + hash = "sha256-twbt2qkhihnrzWe1aBjwW7J1ibHKno15e3Sv+tTMrNQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enturclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enturclient/default.nix index a177a68766..7140ded8bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/enturclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/enturclient/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "hfurubotten"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y2sBPikCAxumylP1LUy8XgjBRCWaNryn5XHSrRjJIIo="; + hash = "sha256-Y2sBPikCAxumylP1LUy8XgjBRCWaNryn5XHSrRjJIIo="; }; nativeBuildInputs = [ 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 464b0685be..5591d74d38 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/environs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/environs/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sloria"; repo = pname; rev = version; - sha256 = "sha256-hucApIn7ul7+MC2W811VTxZNO8Pqb6HDXz9VRcEdmIc="; + hash = "sha256-hucApIn7ul7+MC2W811VTxZNO8Pqb6HDXz9VRcEdmIc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix index 6a7dde6f4e..c49579a03f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-AATsUNcYLB4vtyvuooAMDZx8p5fayijb6yJoUKTCW40="; + hash = "sha256-AATsUNcYLB4vtyvuooAMDZx8p5fayijb6yJoUKTCW40="; }; patches = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { (fetchpatch { name = "fix-mistake-in-menu-group-specification.patch"; url = "https://github.com/enthought/envisage/commit/f23ea3864a5f6ffca665d47dec755992e062029b.patch"; - sha256 = "sha256-l4CWB4jRkSmoTDoV8CtP2w87Io2cLINKfOSaSPy7cXE="; + hash = "sha256-l4CWB4jRkSmoTDoV8CtP2w87Io2cLINKfOSaSPy7cXE="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/envoy-reader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/envoy-reader/default.nix index 1a60d40c70..15603b59d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/envoy-reader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/envoy-reader/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jesserizzo"; repo = "envoy_reader"; rev = version; - sha256 = "sha256-aIpZ4ln4L57HwK8H0FqsyNnXosnAp3ingrJI6/MPS90="; + hash = "sha256-aIpZ4ln4L57HwK8H0FqsyNnXosnAp3ingrJI6/MPS90="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix index 6ed71e7e43..0accb3ccf6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-c6WfDSFi0WJFNcPDt1+VZVa9uyBV6vVUp77xR9P5x2A="; + hash = "sha256-c6WfDSFi0WJFNcPDt1+VZVa9uyBV6vVUp77xR9P5x2A="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix index 0bb5eb5adc..8054757dd0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "epson_projector"; inherit version; - sha256 = "sha256-a9pRncC22DCKX+7ObC8PORpR+RGbOBor2lbwzfrU8tk="; + hash = "sha256-a9pRncC22DCKX+7ObC8PORpR+RGbOBor2lbwzfrU8tk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eradicate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eradicate/default.nix index 8df654c0a2..cddeddfef8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eradicate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eradicate/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "wemake-services"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-pVjvzW3UVeLMLLYcU0SIE19GEHFmouoA/JKSweTZSGo="; + hash = "sha256-pVjvzW3UVeLMLLYcU0SIE19GEHFmouoA/JKSweTZSGo="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/etcd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/etcd/default.nix index a2c4dc971c..b98e9a63dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/etcd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/etcd/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "dsoprea"; repo = "PythonEtcdClient"; rev = version; - sha256 = "sha256-h+jYIRSNdrGkW3tBV1ifIDEXU46EQGyeJoz/Mxym4pI="; + hash = "sha256-h+jYIRSNdrGkW3tBV1ifIDEXU46EQGyeJoz/Mxym4pI="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/etcd3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/etcd3/default.nix new file mode 100644 index 0000000000..494f70ddf4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/etcd3/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, etcd +, fetchFromGitHub +, grpcio +, hypothesis +, mock +, pifpaf +, protobuf +, pytestCheckHook +, six +, tenacity +}: + +buildPythonPackage rec { + pname = "etcd3"; + version = "0.12.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "kragniz"; + repo = "python-etcd3"; + rev = "refs/tags/v${version}"; + hash = "sha256-YM72+fkCDYXl6DORJa/O0sqXqHDWQcFLv2ifQ9kEHBo="; + }; + + propagatedBuildInputs = [ + grpcio + protobuf + six + tenacity + ]; + + # various failures and incompatible with newer hypothesis versions + doCheck = false; + + nativeCheckInputs = [ + etcd + hypothesis + mock + pifpaf + pytestCheckHook + ]; + + preCheck = '' + pifpaf -e PYTHON run etcd --cluster + ''; + + pythonImportsCheck = [ + "etcd3" + ]; + + meta = with lib; { + description = "Python client for the etcd API v3"; + homepage = "https://github.com/kragniz/python-etcd3"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix index 01177a703f..43d5401ce5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = "eth-abi"; rev = "v${version}"; - sha256 = "sha256-xrZpT/9zwDtjSwSPDDse+Aq8plPm26OR/cIrliZUpLY="; + hash = "sha256-xrZpT/9zwDtjSwSPDDse+Aq8plPm26OR/cIrliZUpLY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-account/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-account/default.nix index 1a929ca909..38389fc31f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-account/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-account/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = "eth-account"; rev = "v${version}"; - sha256 = "sha256-cjQvTKC4lDbKnAvbmnTGHQiJZsZFhXc/+UH5rUdlGxs="; + hash = "sha256-cjQvTKC4lDbKnAvbmnTGHQiJZsZFhXc/+UH5rUdlGxs="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix index 7f5b436a14..070fe454bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = "eth-hash"; rev = "v${version}"; - sha256 = "sha256-LMDtFUrsPYgj/Fl9aBW1todlj1D3LlFxAkzNFAzCGLQ="; + hash = "sha256-LMDtFUrsPYgj/Fl9aBW1todlj1D3LlFxAkzNFAzCGLQ="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-keyfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-keyfile/default.nix index 54b76e2360..f50da1d17d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-keyfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-keyfile/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { repo = "eth-keyfile"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-JD4bRoD9L0JXcd+bTZrq/BkWw5QGzOi1RvoyLJC77kk="; + hash = "sha256-JD4bRoD9L0JXcd+bTZrq/BkWw5QGzOi1RvoyLJC77kk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix index 2b5a64527e..601013b20f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = "eth-keys"; rev = "v${version}"; - sha256 = "sha256-jG/jJPM4t3z6UQIdc8L6y0DxZiGx5pVuGL8XwbIt60o="; + hash = "sha256-jG/jJPM4t3z6UQIdc8L6y0DxZiGx5pVuGL8XwbIt60o="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-rlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-rlp/default.nix index e97926b3d7..8747d15f55 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-rlp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-rlp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = "eth-rlp"; rev = "v${version}"; - sha256 = "sha256-wfmRjHFu6H3J6hNin8ZA2454xXrLgcUdeR8iGXFomRE="; + hash = "sha256-wfmRjHFu6H3J6hNin8ZA2454xXrLgcUdeR8iGXFomRE="; }; propagatedBuildInputs = [ 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 7297471ff7..42aa421acc 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 @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E2vUROc2FcAv00k50YpdxaaYIRDk1yGSPB8cHHw+7Yw="; + hash = "sha256-E2vUROc2FcAv00k50YpdxaaYIRDk1yGSPB8cHHw+7Yw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/etils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/etils/default.nix index b3ff9c680f..bcb47a4fac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/etils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/etils/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "etils"; - version = "0.9.0"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SJED6eSZpWZ2XGBFjuFdGFzwBl8gYKTRamj49Gli7Q0="; + hash = "sha256-0QmC93AkIr6oY11ShLi+1in1GRn8EirB4eSr9F7I94U="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/etuples/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/etuples/default.nix index 7ea15ebb8d..2ad6c2a4ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/etuples/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/etuples/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "pythological"; repo = "etuples"; rev = "refs/tags/v${version}"; - sha256 = "sha256-wEgam2IoI3z75bN45/R9o+0JmL3g0YmtsuJ4TnZjhi8="; + hash = "sha256-wEgam2IoI3z75bN45/R9o+0JmL3g0YmtsuJ4TnZjhi8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/evaluate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/evaluate/default.nix index 1ada1243bf..6412e7834a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/evaluate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/evaluate/default.nix @@ -4,6 +4,7 @@ , pythonOlder , pythonRelaxDepsHook , pytestCheckHook +, cookiecutter , datasets , dill , fsspec @@ -13,6 +14,7 @@ , numpy , packaging , pandas +, pyarrow , requests , responses , tqdm @@ -37,6 +39,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "responses" ]; propagatedBuildInputs = [ + cookiecutter datasets numpy dill @@ -48,6 +51,7 @@ buildPythonPackage rec { fsspec huggingface-hub packaging + pyarrow responses ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata @@ -66,5 +70,6 @@ buildPythonPackage rec { changelog = "https://github.com/huggingface/evaluate/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ bcdarwin ]; + mainProgram = "evaluate-cli"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eve/default.nix index f897819887..9a9dc6897b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eve/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "eve"; - version = "2.0.4"; + version = "2.1.0"; format = "setuptools"; src = fetchPypi { inherit version; pname = "Eve"; - sha256 = "sha256-RZ6dwekCKA+PomBp2Ht7/0elOLLUs/sO0KgdxxTOjtc="; + hash = "sha256-NobIzu+7+NI7M4NRQKjrhye3v6YGMeGnbDRB39b3Dy8="; }; disabled = pythonOlder "3.7"; @@ -34,11 +34,12 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "flask<2.2" "flask" \ --replace "events>=0.3,<0.4" "events>=0.3" ''; - pythonImportsCheck = [ "eve" ]; + pythonImportsCheck = [ + "eve" + ]; # tests call a running mongodb instance doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/evohome-async/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/evohome-async/default.nix index 908d68dd27..c9ad0cc36d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/evohome-async/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/evohome-async/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "zxdavb"; repo = pname; rev = version; - sha256 = "sha256-/dZRlcTcea26FEpw/XDItKh4ncr/eEFQcdfIE2KIMo8="; + hash = "sha256-/dZRlcTcea26FEpw/XDItKh4ncr/eEFQcdfIE2KIMo8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix index ba581cdef3..15979b0f22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-r0SCigkUpOiba4MDf80+dLjOjjruVNILh/raWfvjXA0="; + hash = "sha256-r0SCigkUpOiba4MDf80+dLjOjjruVNILh/raWfvjXA0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exif/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exif/default.nix index 6ecad38e2a..14fbab2206 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/exif/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/exif/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "TNThieding"; repo = "exif"; rev = "v${version}"; - sha256 = "sha256-XSORawioXo8oPVZ3Jnxqa6GFIxnQZMT0vJitdmpBj0E="; + hash = "sha256-XSORawioXo8oPVZ3Jnxqa6GFIxnQZMT0vJitdmpBj0E="; }; propagatedBuildInputs = [ plum-py ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exifread/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exifread/default.nix index 1e4ba3c176..ab8fde6f8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/exifread/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/exifread/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-CsWjZBadvfK9YvlPXAc5cKtmlKMWYXf15EixDJQ+LKQ="; + hash = "sha256-CsWjZBadvfK9YvlPXAc5cKtmlKMWYXf15EixDJQ+LKQ="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/expiringdict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/expiringdict/default.nix index e97f823377..e4e6dd8b78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/expiringdict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/expiringdict/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "mailgun"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-vRhJSHIqc51I+s/wndtfANM44CKW3QS1iajqyoSBf0I="; + hash = "sha256-vRhJSHIqc51I+s/wndtfANM44CKW3QS1iajqyoSBf0I="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exrex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exrex/default.nix index 0d51a9862e..2ef58acc90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/exrex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/exrex/default.nix @@ -1,31 +1,35 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch +, pythonOlder }: buildPythonPackage rec { pname = "exrex"; - version = "unstable-2021-04-22"; + version = "0.11.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "asciimoo"; repo = "exrex"; - rev = "9a66706e7582a9cf31c4121629c9035e329bbe21"; - sha256 = "sha256-g31tHY+LzGxwBmUpSa0DV7ruLfYwmuDg+XyBxMZRa9U="; + # https://github.com/asciimoo/exrex/issues/68 + rev = "239e4da37ff3a66d8b4b398d189299ae295594c3"; + hash = "sha256-Tn/XIIy2wnob+1FmP9bdD9+gHLQZDofF2c1FqOijKWA="; }; - patches = [ - (fetchpatch { - # https://github.com/asciimoo/exrex/pull/65 - url = "https://github.com/asciimoo/exrex/commit/44712bfb1350a509581a5834d9fa8aebcd9434db.patch"; - hash = "sha256-thKotSvdVdVjXaG/AhsXmW51FHLOYUeYTYw8SA/k2t4="; - }) - ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "version=about['__version__']," "version='${version}'," + ''; # Projec thas no released tests doCheck = false; - pythonImportsCheck = [ "exrex" ]; + + pythonImportsCheck = [ + "exrex" + ]; meta = with lib; { description = "Irregular methods on regular expressions"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/extractcode/7z.nix b/third_party/nixpkgs/pkgs/development/python-modules/extractcode/7z.nix index be6fcde55c..6e2db205e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/extractcode/7z.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/extractcode/7z.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { rm 7z 7z.so ln -s ${p7zip}/bin/7z 7z - ln -s ${p7zip}/lib/p7zip/7z.so 7z.so + ln -s ${lib.getLib p7zip}/lib/p7zip/7z.so 7z.so popd ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/extractcode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/extractcode/default.nix index 2c592e081d..7b42f579ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/extractcode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/extractcode/default.nix @@ -23,6 +23,12 @@ buildPythonPackage rec { hash = "sha256-gIGTkum8+BKfdNiQT+ipjA3+0ngjVoQnNygsAoMRPYg="; }; + postPatch = '' + # PEP440 support was removed in newer setuptools, https://github.com/nexB/extractcode/pull/46 + substituteInPlace setup.cfg \ + --replace ">=3.6.*" ">=3.6" + ''; + dontConfigure = true; nativeBuildInputs = [ @@ -69,6 +75,7 @@ buildPythonPackage rec { meta = with lib; { description = "Universal archive extractor using z7zip, libarchve, other libraries and the Python standard library"; homepage = "https://github.com/nexB/extractcode"; + changelog = "https://github.com/nexB/extractcode/releases/tag/v${version}"; license = licenses.asl20; maintainers = teams.determinatesystems.members; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/extruct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/extruct/default.nix index 5dd294c547..7752421236 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/extruct/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/extruct/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "scrapinghub"; repo = "extruct"; rev = "v${version}"; - sha256 = "sha256-hf6b/tZLggHzgFmZ6aldZIBd17Ni7vCTIIzhNlyjvxw="; + hash = "sha256-hf6b/tZLggHzgFmZ6aldZIBd17Ni7vCTIIzhNlyjvxw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eyed3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eyed3/default.nix index 2b5cc5afba..9c29db7fa8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eyed3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eyed3/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-k7GOk5M3akURT5QJ18yhGftvT5o31LaXtQCvSLTFzw8="; + hash = "sha256-k7GOk5M3akURT5QJ18yhGftvT5o31LaXtQCvSLTFzw8="; }; # requires special test data: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix index 94e9c37c02..e0c7b76d1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mozman"; repo = "ezdxf"; rev = "refs/tags/v${version}"; - sha256 = "sha256-x1p9dWrbDtDreXdBuzOA4Za+ZC40y4xdEU7MGb9uUec="; + hash = "sha256-x1p9dWrbDtDreXdBuzOA4Za+ZC40y4xdEU7MGb9uUec="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ezyrb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ezyrb/default.nix index 0297ede47b..5a1bb19734 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ezyrb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ezyrb/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ezyrb"; - version = "1.3.0.post2212"; + version = "1.3.0.post2302"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mathLab"; repo = "EZyRB"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Em7t84fCTYCJfsjLGKhno75PheALhSbLH7z1mfgQ+v4="; + hash = "sha256-ZVmQnxqLHKr275Xx0lOID3BZZFTmn/PMHpYhBFSxT7I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/f90nml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/f90nml/default.nix index 39aa55542d..de9d56e75e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/f90nml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/f90nml/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "marshallward"; repo = pname; rev = "v" + version; - sha256 = "sha256-nSpVBAS2VvXIQwYK/qVVzEc13bicAQ+ScXpO4Rn2O+8="; + hash = "sha256-nSpVBAS2VvXIQwYK/qVVzEc13bicAQ+ScXpO4Rn2O+8="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faadelays/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faadelays/default.nix index 7cd0e29199..22f764ad4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faadelays/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faadelays/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-osZqfSYlKPYZMelBR6YB331iRB4DTjCUlmX7pcrIiGk="; + hash = "sha256-osZqfSYlKPYZMelBR6YB331iRB4DTjCUlmX7pcrIiGk="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Fabric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fabric/default.nix similarity index 92% rename from third_party/nixpkgs/pkgs/development/python-modules/Fabric/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/fabric/default.nix index 9b44b55264..8dfd102539 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Fabric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fabric/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "fabric"; - version = "2.7.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dvj+9ZzyBh29hJu85P5JvdggiEOFAEsMpZE2rD2xKeQ="; + hash = "sha256-v+lgwa6QTnYkr51ArVubmVge2cT9CTScDQK3SG4dD4k="; }; # only relevant to python < 3.4 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fabulous/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fabulous/default.nix index b357eb0c01..26329cc73b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fabulous/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fabulous/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "jart"; repo = pname; rev = version; - sha256 = "sha256-hchlxuB5QP+VxCx+QZ2739/mR5SQmYyE+9kXLKJ2ij4="; + hash = "sha256-hchlxuB5QP+VxCx+QZ2739/mR5SQmYyE+9kXLKJ2ij4="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix index a5b0130911..0e4d38c290 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "factory_boy"; inherit version; - sha256 = "sha256-qY0newwEfHXrbkq4UIp/gfsD0sshmG9ieRNUbveipV4="; + hash = "sha256-qY0newwEfHXrbkq4UIp/gfsD0sshmG9ieRNUbveipV4="; }; 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 75263084f9..7e26264bc3 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 = "15.3.4"; + version = "17.3.0"; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-LVRDck9kDOB2WMqMqLvUDSa1iRTmPuxlSXJ4aapn4sw="; + hash = "sha256-JrKGSlMyCU8sfzlo3uurzmm+Oe1dtNvyK0+guj0aza4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index 7753384417..8c53292583 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "faraday_agent_parameters_types"; inherit version; - sha256 = "sha256-jQgE/eR8Gd9nMGijH9unhHCrLUn7DbWFkTauoz3O/sM="; + hash = "sha256-jQgE/eR8Gd9nMGijH9unhHCrLUn7DbWFkTauoz3O/sM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastapi-mail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastapi-mail/default.nix index e9c03b10ae..dc1d232bf0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastapi-mail/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastapi-mail/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "fastapi-mail"; - version = "1.2.5"; + version = "1.2.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "sabuhish"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-SogtdLTiTCJ8qUYsnwhPgBLFbj66EJC7L4wS64Nmuoo="; + hash = "sha256-PL/0swFiAG8HlvxnsEqwEEec1CIsA3qFer3LKyS2y/Y="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix index 37671597fc..fec7d7b6a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.88.0"; + version = "0.92.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2rjKmQcehqkL5OnmtLRTvsyUSpK2aUgyE9VLvz+oWNw="; + hash = "sha256-4USWfYvPxR+LzPELRTDg0Jl4K5yBnumYKfXT84FWctg="; }; nativeBuildInputs = [ @@ -39,6 +39,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ + --replace '"databases[sqlite] >=0.3.2,<0.7.0",' "" \ --replace "starlette==" "starlette>=" ''; @@ -49,7 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aiosqlite - databases + # databases FIXME incompatible with SQLAlchemy 2.0 flask httpx orjson @@ -73,6 +74,9 @@ buildPythonPackage rec { "tests/test_default_response_class.py" # Don't test docs and examples "docs_src" + # databases is incompatible with SQLAlchemy 2.0 + "tests/test_tutorial/test_async_sql_databases" + "tests/test_tutorial/test_sql_databases" ]; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix index 928593c380..baeb5e4f9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-IKs3uYGxiSy++tjF2XhWFrIfOo+SSl2JATUHBhCE3ZQ="; + hash = "sha256-IKs3uYGxiSy++tjF2XhWFrIfOo+SSl2JATUHBhCE3ZQ="; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix index d0ed5bb149..14418d716c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-PSqwpDTzEaBXH77c64yv1s2TvQyIiz6It9cgjnCmrhY="; + hash = "sha256-PSqwpDTzEaBXH77c64yv1s2TvQyIiz6It9cgjnCmrhY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastjsonschema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastjsonschema/default.nix index 449e0a3fdd..8c1be492ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastjsonschema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastjsonschema/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { repo = "python-fastjsonschema"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-Gojayel/xQ5gRI0nbwsroeSMdRndjb+8EniX1Qs4nbg="; + hash = "sha256-Gojayel/xQ5gRI0nbwsroeSMdRndjb+8EniX1Qs4nbg="; }; nativeCheckInputs = [ 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 f0fe2e7b91..e3a91b366d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastnumbers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastnumbers/default.nix @@ -4,25 +4,31 @@ , fastnumbers , fetchFromGitHub , hypothesis +, numpy , pytestCheckHook , pythonOlder +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "fastnumbers"; - version = "3.2.1"; - format = "setuptools"; + version = "5.0.1"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "SethMMorton"; repo = pname; - rev = version; - sha256 = "1v9l5p90y6ygrs0qmgdzxfv2vp1mpfp65snkl9jp6kcy44g3alhp"; + rev = "refs/tags/${version}"; + hash = "sha256-y9QnFh44zHC+CSlYtKPmkhLSFBUquYZv4qP/pQxu9e0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ typing-extensions ]; @@ -33,6 +39,7 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis + numpy pytestCheckHook ]; @@ -43,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for number conversion"; homepage = "https://github.com/SethMMorton/fastnumbers"; + changelog = "https://github.com/SethMMorton/fastnumbers/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix index 2ef751ad1b..6ea456bac5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ehfStDiJD4OMBI7vzjLE3tRxl+zI6gQs7MM9PeuAIvU="; + hash = "sha256-ehfStDiJD4OMBI7vzjLE3tRxl+zI6gQs7MM9PeuAIvU="; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fasttext-predict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fasttext-predict/default.nix index 9e46a4b8ce..313f57e385 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fasttext-predict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fasttext-predict/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-iSCt54tqBmNfrcntDFRXb550607Zr1mMCO2PC1ZbVQw="; + hash = "sha256-iSCt54tqBmNfrcntDFRXb550607Zr1mMCO2PC1ZbVQw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faust-cchardet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faust-cchardet/default.nix index ca2cdc0216..ad979dbaf6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faust-cchardet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faust-cchardet/default.nix @@ -7,6 +7,7 @@ , setuptools , wheel , pytestCheckHook +, python }: buildPythonPackage rec { @@ -29,6 +30,12 @@ buildPythonPackage rec { wheel ]; + postFixup = '' + # fake cchardet distinfo, so packages that depend on cchardet + # accept it as a drop-in replacement + ln -s $out/${python.sitePackages}/{faust_,}cchardet-${version}.dist-info + ''; + pythonImportsCheck = [ "cchardet" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/feedparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/feedparser/default.nix index 6fb99a9183..02396ec834 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/feedparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/feedparser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-J9pIX0Y3znFjzeqxOoAxK5O30MG3db70pHYpoxELylE="; + hash = "sha256-J9pIX0Y3znFjzeqxOoAxK5O30MG3db70pHYpoxELylE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fido2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fido2/default.nix index 5f079f7086..c457d6e1ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fido2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fido2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-K0tOYgwhAEQsIGeODpUa1tHvs7pcqOu3IMTI1UMpNnQ="; + hash = "sha256-K0tOYgwhAEQsIGeODpUa1tHvs7pcqOu3IMTI1UMpNnQ="; }; propagatedBuildInputs = [ six cryptography ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fields/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fields/default.nix index 35bf686b43..25b567c9c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fields/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fields/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-MdSqA9jUTjXfE8Qx3jUTaZfwR6kkpZfYT3vCCeG+Vyc="; + hash = "sha256-MdSqA9jUTjXfE8Qx3jUTaZfwR6kkpZfYT3vCCeG+Vyc="; }; pythonImportsCheck = [ "fields" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/filecheck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/filecheck/default.nix index d0945961ce..b7b9c2948a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/filecheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/filecheck/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "filecheck"; - version = "0.0.22"; + version = "0.0.23"; format = "pyproject"; src = fetchFromGitHub { owner = "mull-project"; repo = "FileCheck.py"; - rev = "v${version}"; - sha256 = "sha256-I2SypKkgcVuLyLiwNw5oWDb9qT56TbC6vbui8PEcziI="; + rev = "refs/tags/v${version}"; + hash = "sha256-R+e4Z1EX6Nk7INLar3gtkUpk+30xIJO7yiZbUvrhN74="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix index eda0bfe215..30437950b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix @@ -8,11 +8,11 @@ }: buildPythonPackage rec { pname = "fingerprints"; - version = "1.0.3"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "cafd5f92b5b91e4ce34af2b954da9c05b448a4778947785abb19a14f363352d0"; + hash = "sha256-GZmurg3rpD081QZW/LUKWblhsQQSS6lg9O7y/kGy4To="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/finitude/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/finitude/default.nix index aa6687a308..d7f1af7875 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/finitude/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/finitude/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "dulitz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yCI5UCRDhw+dJoTKyjmHbAGBm3by2AyxHKlqCywnLcs="; + hash = "sha256-yCI5UCRDhw+dJoTKyjmHbAGBm3by2AyxHKlqCywnLcs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fipy/default.nix index 07d11670ef..db11999a64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fipy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "usnistgov"; repo = "fipy"; rev = version; - sha256 = "sha256-oTg/5fGXqknWBh1ShdAOdOwX7lVDieIoM5aALcOWFqY="; + hash = "sha256-oTg/5fGXqknWBh1ShdAOdOwX7lVDieIoM5aALcOWFqY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flake8-future-import/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flake8-future-import/default.nix index 1c99267153..7a3f4dbd80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flake8-future-import/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "xZise"; repo = "flake8-future-import"; rev = "refs/tags/${version}"; - sha256 = "sha256-2EcCOx3+PCk9LYpQjHCFNpQVI2Pdi+lWL8R6bNadFe0="; + hash = "sha256-2EcCOx3+PCk9LYpQjHCFNpQVI2Pdi+lWL8R6bNadFe0="; }; patches = lib.optionals (pythonAtLeast "3.10") [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flake8-length/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flake8-length/default.nix index 348246a939..9214a92ce5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flake8-length/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flake8-length/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Dr1hTCU2G1STczXJsUPMGFYs1NpIAk1I95vxXsRTtRA="; + hash = "sha256-Dr1hTCU2G1STczXJsUPMGFYs1NpIAk1I95vxXsRTtRA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flametree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flametree/default.nix index 46157dac93..a6d3ebbd0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flametree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flametree/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Edinburgh-Genome-Foundry"; repo = "Flametree"; rev = "refs/tags/v${version}"; - sha256 = "sha256-oyiuhsYouGDKRssKc0aYIoG32H7GS6Bn4RtI7/9N158="; + hash = "sha256-oyiuhsYouGDKRssKc0aYIoG32H7GS6Bn4RtI7/9N158="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix index 08bfbaed96..2db849435b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-KtMGQftoYVNNMtfYeYiaQyMLAySpf9YXLMxj+e/CV5I="; + hash = "sha256-KtMGQftoYVNNMtfYeYiaQyMLAySpf9YXLMxj+e/CV5I="; }; nativeCheckInputs = [ 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 d4b2f4d71d..b524a941f4 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 @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "flask-admin"; - version = "1.6.0"; + version = "1.6.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-Admin"; inherit version; - hash = "sha256-Qk/8ebew3/8FFVVobqEuhuSN/6ysFL6qMZ+0UCrECYg="; + hash = "sha256-JMrir4MramEaAdfcNfQtJmwdbHWkJrhp2MskG3gjM2k="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix index 0222ea21c9..c573521bc9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch # build-system , poetry-core @@ -32,6 +33,14 @@ buildPythonPackage rec { hash = "sha256-bHsB1f7dbZW4k8JteyZOwVCgWRDZMu21XdMcjM5NYjk="; }; + patches = [ + (fetchpatch { + # https://github.com/python-babel/flask-babel/pull/222 + url = "https://github.com/python-babel/flask-babel/commit/756cace7d96e9eacef66813c8df653d2bb349da0.patch"; + hash = "sha256-hp/QPS/ZyRMUnyqU+fvMJKPISBECc9kqdCu8U6Hnd5g="; + }) + ]; + outputs = [ "out" "doc" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-babelex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-babelex/default.nix index 7f48b68b0c..5a6aca4978 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-babelex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-babelex/default.nix @@ -5,12 +5,14 @@ , babel , speaklater , jinja2 -, pytest +, pytestCheckHook +, pytz }: buildPythonPackage rec { pname = "flask-babelex"; version = "0.9.4"; + format = "setuptools"; src = fetchPypi { inherit version; @@ -26,17 +28,23 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest + pytestCheckHook + pytz ]; - checkPhase = '' + pytestFlagsArray = [ + "tests/tests.py" + ]; + + disabledTests = [ # Disabled 3 tests failing due to string representations of dates: # Like "12. April 2010 um 15:46:00 MESZ" != 12. "April 2010 15:46:00 MESZ" - - pytest tests/tests.py -k "not test_init_app \ - and not test_custom_locale_selector \ - and not test_basics" - ''; + "test_init_app" + "test_custom_locale_selector" + "test_basics" + "test_non_initialized" + "test_refreshing" + ]; meta = with lib; { description = "Adds i18n/l10n support to Flask applications"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-basicauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-basicauth/default.nix index 7554c4cdca..51fe449bc9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-basicauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-basicauth/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "jpvanhal"; repo = pname; rev = "v${version}"; - sha256 = "sha256-han0OjMI1XmuWKHGVpk+xZB+/+cpV1I+659zOG3hcPY="; + hash = "sha256-han0OjMI1XmuWKHGVpk+xZB+/+cpV1I+659zOG3hcPY="; }; patches = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { # https://github.com/jpvanhal/flask-basicauth/pull/29 name = "fix-test-flask-ext-imports.patch"; url = "https://github.com/jpvanhal/flask-basicauth/commit/23f57dc1c3d85ea6fc7f468e8d8c6f19348a0a81.patch"; - sha256 = "sha256-njUYjO0TRe3vr5D0XjIfCNcsFlShbGxtFV/DJerAKDE="; + hash = "sha256-njUYjO0TRe3vr5D0XjIfCNcsFlShbGxtFV/DJerAKDE="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-bcrypt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-bcrypt/default.nix index 3a95dcd2aa..a4bd3af49a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-bcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-bcrypt/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "maxcountryman"; repo = pname; rev = version; - sha256 = "sha256-WlIholi/nzq6Ikc0LS6FhG0Q5Kz0kvvAlA2YJ7EksZ4="; + hash = "sha256-WlIholi/nzq6Ikc0LS6FhG0Q5Kz0kvvAlA2YJ7EksZ4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix index 0f4b8a1433..08ff5d808f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix @@ -5,6 +5,7 @@ , fetchPypi , cachelib , flask +, asgiref , pytest-asyncio , pytest-xprocess , pytestCheckHook @@ -18,15 +19,21 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-JLYMVS1ZqWBcwbakLFbNs5qCoo2rRTK77bkiKuVOy04="; + hash = "sha256-JLYMVS1ZqWBcwbakLFbNs5qCoo2rRTK77bkiKuVOy04="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "cachelib >= 0.9.0, < 0.10.0" "cachelib" + ''; + propagatedBuildInputs = [ cachelib flask ]; nativeCheckInputs = [ + asgiref pytest-asyncio pytest-xprocess pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix index 654919256d..2868ac81c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-7pbxi/mwDy3rTjQGykoFCTqoDi7wV4Ulo7TTLs3/Ep0="; + hash = "sha256-7pbxi/mwDy3rTjQGykoFCTqoDi7wV4Ulo7TTLs3/Ep0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-expects-json/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-expects-json/default.nix new file mode 100644 index 0000000000..fd608b5044 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-expects-json/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flask +, jsonschema +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "flask-expects-json"; + version = "1.7.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Fischerfredl"; + repo = pname; + rev = version; + hash = "sha256-CUxuwqjjAb9Fy6xWtX1WtSANYaYr5//vY8k89KghYoQ="; + }; + + propagatedBuildInputs = [ + flask + jsonschema + ] ++ flask.optional-dependencies.async; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "flask_expects_json" + ]; + + disabledTests = [ + # https://github.com/Fischerfredl/flask-expects-json/issues/26 + "test_check_mimetype" + "test_default_behaviour" + "test_default_gets_validated" + "test_format_validation_rejection" + "test_ignore_multiple" + "test_ignore_one" + "test_valid_decorator_no_schema_async" + "test_valid_decorator" + "test_validation_invalid" + ]; + + meta = with lib; { + homepage = "https://github.com/fischerfredl/flask-expects-json"; + description = "Decorator for REST endpoints in flask. Validate JSON request data."; + license = licenses.mit; + maintainers = []; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-httpauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-httpauth/default.nix index d3057e13ec..c96555c756 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-httpauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-httpauth/default.nix @@ -1,22 +1,40 @@ -{ lib, python, buildPythonPackage, fetchPypi, pytestCheckHook, flask }: +{ lib +, python +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, setuptools +, flask + }: buildPythonPackage rec { pname = "flask-httpauth"; version = "4.7.0"; + format = "pyproject"; disabled = python.pythonOlder "3"; src = fetchPypi { pname = "Flask-HTTPAuth"; version = version; - sha256 = "sha256-9xmee60g1baLPwtivd/KdjfFUIfp0C9gWuJuDeR5/ZQ="; + hash = "sha256-9xmee60g1baLPwtivd/KdjfFUIfp0C9gWuJuDeR5/ZQ="; }; - nativeCheckInputs = [ pytestCheckHook ]; + nativeBuildInputs = [ + setuptools + ]; - propagatedBuildInputs = [ flask ]; + propagatedBuildInputs = [ + flask + ]; - pythonImportsCheck = [ "flask_httpauth" ]; + pythonImportsCheck = [ + "flask_httpauth" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ flask.optional-dependencies.async; meta = with lib; { description = "Extension that provides HTTP authentication for Flask routes"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix index d0971ee26d..f30598797a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix @@ -18,7 +18,7 @@ }: buildPythonPackage rec { - pname = "Flask-Limiter"; + pname = "flask-limiter"; version = "3.1.0"; format = "setuptools"; @@ -88,5 +88,6 @@ buildPythonPackage rec { description = "Rate limiting for flask applications"; homepage = "https://flask-limiter.readthedocs.org/"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-login/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-login/default.nix index 0d59651fa1..c1b8c15bea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-login/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-login/default.nix @@ -1,4 +1,5 @@ { lib +, asgiref , blinker , buildPythonPackage , fetchPypi @@ -20,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-Login"; inherit version; - sha256 = "sha256-wKe6qf3ESM3T3W8JOd9y7sUXey96vmy4L8k00pyqycM="; + hash = "sha256-wKe6qf3ESM3T3W8JOd9y7sUXey96vmy4L8k00pyqycM="; }; propagatedBuildInputs = [ @@ -29,6 +30,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + asgiref blinker pytestCheckHook semantic-version diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-mailman/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-mailman/default.nix index 8dee11fe7d..f0cd2e5e14 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-mailman/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-mailman/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "waynerv"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cfLtif+48M6fqOkBbi4PJRFpf9FRXCPesktFQky34eU="; + hash = "sha256-cfLtif+48M6fqOkBbi4PJRFpf9FRXCPesktFQky34eU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix index 470639835a..b6bdd4e8f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix @@ -7,21 +7,27 @@ , flask_script , flask-sqlalchemy , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "Flask-Migrate"; - version = "4.0.2"; - format = "setuptools"; + version = "4.0.4"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = pname; rev = "v${version}"; - hash = "sha256-6P5oIH/mVuMy4J71VIRD1p+qbvPUlq3COpytEgKz1qo="; + hash = "sha256-x52LGYvXuTUCP9dR3FP7a/xNRWyCAV1sReDAYJbYDvE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ alembic flask diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-paranoid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-paranoid/default.nix index d20f5c4663..77949730c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-paranoid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-paranoid/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tikD8efc3Q3xIQnaC3SSBaCRQxMI1HzXxeupvYeNnE4="; + hash = "sha256-tikD8efc3Q3xIQnaC3SSBaCRQxMI1HzXxeupvYeNnE4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix index 20dd72b662..d2b30ba052 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "python-restx"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Rp+TQjAZqgIS6jmj0PAqshD+5a3JPOr2Qw5l4INxK/Y="; + hash = "sha256-Rp+TQjAZqgIS6jmj0PAqshD+5a3JPOr2Qw5l4INxK/Y="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-seasurf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-seasurf/default.nix index 55c96f4ea6..79d024f5b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-seasurf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-seasurf/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "maxcountryman"; repo = "flask-seasurf"; rev = version; - sha256 = "sha256-L/ZUEqqHmsyXG5eShcITII36ttwQlZN5GBngo+GcCdw="; + hash = "sha256-L/ZUEqqHmsyXG5eShcITII36ttwQlZN5GBngo+GcCdw="; }; propagatedBuildInputs = [ flask ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix index 638199020a..c63b99161a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pname = "flask-security-too"; - version = "5.1.1"; + version = "5.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -54,7 +54,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-Security-Too"; inherit version; - hash = "sha256-CgtlPP0cXSUplL2HsfESQxzsLVys7fpJs24XQNohw30="; + hash = "sha256-lZzm43m30y+2qjxNddFEeg9HDlQP9afq5VtuR25zaLc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-session/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-session/default.nix index b6b65228d9..e34e302e6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-session/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-session/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ye1UMh+oxMoBMv/TNpWCdZ7aclL7SzvuSA5pDRukH0Y="; + hash = "sha256-ye1UMh+oxMoBMv/TNpWCdZ7aclL7SzvuSA5pDRukH0Y="; }; propagatedBuildInputs = [ flask cachelib ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix index 3c02d57108..ad9e76e17b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "Flask-SocketIO"; rev = "v${version}"; - sha256 = "sha256-PnNJEtcWaisOlt6OmYUl97TlZb9cK2ORvtEcmGPxSB0="; + hash = "sha256-PnNJEtcWaisOlt6OmYUl97TlZb9cK2ORvtEcmGPxSB0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix index e68f69e248..f7c045432a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-o3AZmngNZ4sy448b4Q1Nge+g7mPp/i+3Zv8aS2w32sg="; + hash = "sha256-o3AZmngNZ4sy448b4Q1Nge+g7mPp/i+3Zv8aS2w32sg="; }; doCheck = false; # there are no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-talisman/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-talisman/default.nix index 82f3e09b47..11488956bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-talisman/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-talisman/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-IF0958Xs+tZnyEEj9fvlgLH2jNmhsFjXNTzANI4Vsb8="; + hash = "sha256-IF0958Xs+tZnyEEj9fvlgLH2jNmhsFjXNTzANI4Vsb8="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix index 8b68eb9d55..4954f19f91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix @@ -11,28 +11,14 @@ buildPythonPackage rec { pname = "flask-wtf"; - version = "1.0.1"; + version = "1.1.1"; src = fetchPypi { pname = "Flask-WTF"; inherit version; - sha256 = "34fe5c6fee0f69b50e30f81a3b7ea16aa1492a771fe9ad0974d164610c09a6c9"; + hash = "sha256-QcQkTprmJtY77UKuR4W5Bme4hbFTXVpAleH2MGDRKqk="; }; - patches = [ - # Fix failing `test_set_default_message_language` test - # - # Caused by Flask 2.2 that throws an error when setup methods are - # mistakenly called before the first request. - # - # Will be fixed upstream with: https://github.com/wtforms/flask-wtf/pull/533 - # - (fetchpatch { - url = "https://github.com/wtforms/flask-wtf/commit/36a53fadf7bc42c79a1428657531961ec30ca003.patch"; - hash = "sha256-bgLwDG9Wpufm6fd/6PS83Jvvuk1Ha6XdyaWngluPs30="; - }) - ]; - propagatedBuildInputs = [ flask itsdangerous 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 3f0415d86d..03b1873edc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix @@ -19,17 +19,15 @@ buildPythonPackage rec { pname = "flask"; - version = "2.2.2"; + version = "2.2.3"; src = fetchPypi { pname = "Flask"; inherit version; - sha256 = "sha256-ZCxFDRnErUgvlnKb0qj20yVUqh4jH09rTn5SZLFsyis="; + hash = "sha256-frNzmEvxx3ACP86dsWTtDDNTzQtT8TD0aT2gynVqLm0="; }; propagatedBuildInputs = [ - asgiref - python-dotenv click itsdangerous jinja2 @@ -43,6 +41,10 @@ buildPythonPackage rec { passthru.tests = { inherit flask-limiter flask-restful flask-restx moto; }; + passthru.optional-dependencies = { + dotenv = [ python-dotenv ]; + async = [ asgiref ]; + }; meta = with lib; { homepage = "https://flask.palletsprojects.com/"; 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 12b340639f..85660368f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "flax"; - version = "0.6.1"; + version = "0.6.5"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-fZiODo+izOwGjCCTvi11GvUG/VQL1DV9bNXKjvIIw4A="; + hash = "sha256-Vv68BK83gTIKj0r9x+twdhqmRYziD0vxQCdHkYSeTak="; }; buildInputs = [ jaxlib ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fleep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fleep/default.nix index 04b6073251..ae8522955c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fleep/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fleep/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "floyernick"; repo = "fleep-py"; rev = "994bc2c274482d80ab13d89d8f7343eb316d3e44"; - sha256 = "sha256-TaU7njx98nxkhZawGMFqWj4g+yCtIX9aPWQHoamzfMY="; + hash = "sha256-TaU7njx98nxkhZawGMFqWj4g+yCtIX9aPWQHoamzfMY="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flipr-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flipr-api/default.nix index 3e1f5be4d8..1f23aaa248 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flipr-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flipr-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "flipr-api"; - version = "1.4.4"; + version = "1.5.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cnico"; repo = pname; - rev = version; - sha256 = "sha256-LcxLJQ2MAif4yC+/SvO7IEa1lNOV67FgJU1UWT4ope4="; + rev = "refs/tags/${version}"; + hash = "sha256-IAxB3i/HkwO5sjDh2aBCtijOcG0VIbatQjTWIh0inoM="; }; nativeBuildInputs = [ @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for Flipr API"; homepage = "https://github.com/cnico/flipr-api"; + changelog = "https://github.com/cnico/flipr-api/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flufl/bounce.nix b/third_party/nixpkgs/pkgs/development/python-modules/flufl/bounce.nix index 7687c0980c..c4b98c6490 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flufl/bounce.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flufl/bounce.nix @@ -9,6 +9,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-JVBK65duwP5aGc1sQTo0EMtRT9zb3Kn5tdjTQ6hgODE="; + hash = "sha256-JVBK65duwP5aGc1sQTo0EMtRT9zb3Kn5tdjTQ6hgODE="; }; } 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 541abe453a..57a33e233c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flufl/i18n.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flufl/i18n.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-wKz6aggkJ9YBJ+o75XjC4Ddnn+Zi9hlYDnliwTc7DNs="; + hash = "sha256-wKz6aggkJ9YBJ+o75XjC4Ddnn+Zi9hlYDnliwTc7DNs="; }; meta = with lib; { 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 bd9fddf340..1b4a575e76 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-rxQXKzW7xYaHvQa3DRaT/Y1Iy/D/3n5RphjBSK4kBC0="; + hash = "sha256-rxQXKzW7xYaHvQa3DRaT/Y1Iy/D/3n5RphjBSK4kBC0="; }; nativeBuildInputs = [ pdm-pep517 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fontmake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fontmake/default.nix index 1d9c08a81c..1f684becb9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fontmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fontmake/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-njJArNq7nhdoq0Si3+RUDE+VJSwuUvk+e7WeuNaluK0="; + hash = "sha256-njJArNq7nhdoq0Si3+RUDE+VJSwuUvk+e7WeuNaluK0="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fontmath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fontmath/default.nix index 63659bd083..bb5799cff1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fontmath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fontmath/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-alOHy3/rEFlY2y9c7tyHhRPMNb83FeJiCQ8FV74MGxw="; + hash = "sha256-alOHy3/rEFlY2y9c7tyHhRPMNb83FeJiCQ8FV74MGxw="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix index 2bf5db3483..e3113b8d1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-He3BAIWxwDIM80ixmYjyAHlwDK9bBe/qS8P4+TVEkEg="; + hash = "sha256-He3BAIWxwDIM80ixmYjyAHlwDK9bBe/qS8P4+TVEkEg="; extension = "zip"; }; 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 11db4867eb..845ca18e4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-cdZI2kwR3zzS6eiiXGpeHIp+kgPCPEsTOSTV60pODTM="; + hash = "sha256-cdZI2kwR3zzS6eiiXGpeHIp+kgPCPEsTOSTV60pODTM="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/foolscap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/foolscap/default.nix index 771feb3215..2da8276219 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/foolscap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/foolscap/default.nix @@ -1,46 +1,45 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , mock , pyopenssl , pytestCheckHook +, pythonOlder , service-identity +, six , twisted +, txi2p-tahoe +, txtorcon }: buildPythonPackage rec { pname = "foolscap"; - version = "21.7.0"; + version = "23.3.0"; + + disabled = pythonOlder "3.7"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6dGFU4YNk1joXXZi2c2L84JtUbTs1ICgXfv0/EU2P4Q="; + hash = "sha256-Vu7oXC1brsgBwr2q59TAgx8j1AFRbi5mjRNIWZTbkUU="; }; - patches = [ - (fetchpatch { - name = "fix-tests-with-twisted-22.10.0.patch"; - url = "https://github.com/warner/foolscap/commit/c04202eb5d4cf052e650ec2985ea6037605fd79e.patch"; - hash = "sha256-RldDc18n3WYHdYg0ZmM8PBffIuiGa1NIfdoHs3mEEfc="; - }) - ]; - propagatedBuildInputs = [ - mock + six twisted pyopenssl - service-identity - ]; + ] ++ twisted.optional-dependencies.tls; + + passthru.optional-dependencies = { + i2p = [ txi2p-tahoe ]; + tor = [ txtorcon ]; + }; nativeCheckInputs = [ + mock pytestCheckHook - ]; - - disabledTestPaths = [ - # Not all dependencies are present - "src/foolscap/test/test_connection.py" - ]; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "foolscap" ]; 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 3485ab85c6..a56eab06bb 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 @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "forecast_solar"; rev = "refs/tags/${version}"; - sha256 = "sha256-1xRbTOeBHzLmf0FJwsrg/4+Z2Fs7uwbQwS2Tm41mNRk="; + hash = "sha256-1xRbTOeBHzLmf0FJwsrg/4+Z2Fs7uwbQwS2Tm41mNRk="; }; PACKAGE_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/formbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/formbox/default.nix index d5b85d4e5b..387ee2bea4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/formbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/formbox/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "~cnx"; repo = pname; rev = version; - sha256 = "sha256-zOvXmSeBiwc0Z5mRMwMsHLU3A/iP7rpjXm0T0I2gUTk="; + hash = "sha256-zOvXmSeBiwc0Z5mRMwMsHLU3A/iP7rpjXm0T0I2gUTk="; }; propagatedBuildInputs = [ bleach markdown ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/formencode/default.nix similarity index 92% rename from third_party/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/formencode/default.nix index 307ad10b30..1323f2902c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/formencode/default.nix @@ -10,13 +10,14 @@ }: buildPythonPackage rec { - pname = "FormEncode"; + pname = "formencode"; version = "2.0.1"; disabled = isPy27; src = fetchPypi { - inherit pname version; + pname = "FormEncode"; + inherit version; sha256 = "8f2974112c2557839d5bae8b76490104c03830785d923abbdef148bf3f710035"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/formulaic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/formulaic/default.nix index 1f7d875b91..457d2eab2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/formulaic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/formulaic/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "matthewwardrop"; repo = "formulaic"; rev = "v${version}"; - sha256 = "sha256-sIvHTuUS/nkcDjRgZCoEOY2negIOsarzH0PeXJsavWc="; + hash = "sha256-sIvHTuUS/nkcDjRgZCoEOY2negIOsarzH0PeXJsavWc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; 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 e1c22cd578..230f83a8e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fpylll/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fpylll/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "fplll"; repo = "fpylll"; rev = version; - sha256 = "sha256-T6l6hKzRDevlLyLu5H+bnEdl0OhsPer1coCDiftbPAk="; + hash = "sha256-T6l6hKzRDevlLyLu5H+bnEdl0OhsPer1coCDiftbPAk="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fqdn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fqdn/default.nix index def6532348..2b7182569b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fqdn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fqdn/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ypcrts"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T0CdWWr8p3JVhp3nol5hyxsrD3951JE2EDpFt+m+3bE="; + hash = "sha256-T0CdWWr8p3JVhp3nol5hyxsrD3951JE2EDpFt+m+3bE="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/frigidaire/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/frigidaire/default.nix index 61082cb409..92ce118638 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/frigidaire/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/frigidaire/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bm1549"; repo = pname; rev = version; - sha256 = "sha256-U2ixBtigY15RzMNIeUK71uNOndUepK2kE/CTFwl855w="; + hash = "sha256-U2ixBtigY15RzMNIeUK71uNOndUepK2kE/CTFwl855w="; }; propagatedBuildInputs = [ 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 79301cf600..bdc0826ac8 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.11.0"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "kbr"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-BHlOX5STnKaIOM5tiBZ9JHNQIYVZfIPDMuSw6DAJliA="; + hash = "sha256-1giXmmyuy+qrY6xV3yZn4kcDd6w6l8uCL4ozcZE4N00="; }; propagatedBuildInputs = [ @@ -28,6 +28,10 @@ buildPythonPackage rec { pytestCheckHook ]; + preCheck = '' + export HOME=$TEMP + ''; + pythonImportsCheck = [ "fritzconnection" ]; @@ -35,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to communicate with the AVM Fritz!Box"; homepage = "https://github.com/kbr/fritzconnection"; - changelog = "https://fritzconnection.readthedocs.io/en/${version}/sources/changes.html"; + changelog = "https://fritzconnection.readthedocs.io/en/${version}/sources/version_history.html"; license = licenses.mit; maintainers = with maintainers; [ dotlambda valodim ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fritzprofiles/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fritzprofiles/default.nix index b998f99498..fe0cfb6727 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fritzprofiles/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fritzprofiles/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-VoKgLJWF9x8dW8A6CNwLtK+AmehtgZP41nUGQO819es="; + hash = "sha256-VoKgLJWF9x8dW8A6CNwLtK+AmehtgZP41nUGQO819es="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fs/default.nix index e27216d551..d8232eb2bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fs/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-rpfH1RIT9LcLapWCklMCiQkN46fhWEHhCPvhRPBp0xM="; + hash = "sha256-rpfH1RIT9LcLapWCklMCiQkN46fhWEHhCPvhRPBp0xM="; }; buildInputs = [ glibcLocales ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ftfy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ftfy/default.nix index d7e6c75656..058eca5600 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ftfy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ftfy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-v8IBn4T82FFBkVIyCmN1YEoPFFnCgbWxmbLNDS5yf48="; + hash = "sha256-v8IBn4T82FFBkVIyCmN1YEoPFFnCgbWxmbLNDS5yf48="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix index ae2ad068e4..fd2345fea0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "vlasovskikh"; repo = pname; rev = version; - sha256 = "sha256-moWaOzyF/yhDQCLEp7bc0j8wNv7FM7cvvpCwon3j+gI="; + hash = "sha256-moWaOzyF/yhDQCLEp7bc0j8wNv7FM7cvvpCwon3j+gI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/funcy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/funcy/default.nix index 5abacb6a79..74c8b8ff4d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/funcy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/funcy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-FUSNGajrzHpYWv56OEoZGG0L1ny/VvtCzR/Q92MT+bI="; + hash = "sha256-FUSNGajrzHpYWv56OEoZGG0L1ny/VvtCzR/Q92MT+bI="; }; # No tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix index 22fbcce40e..4003b54af6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-dOX/szaCu6mlrypaBI9Ht+e0ZOv4QpG/WiWL+60Do6o="; + hash = "sha256-dOX/szaCu6mlrypaBI9Ht+e0ZOv4QpG/WiWL+60Do6o="; }; buildInputs = [ fuse ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fvs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fvs/default.nix index c60f3a1255..6183c18b50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fvs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fvs/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { inherit version; pname = "FVS"; extension = "tar.gz"; - sha256 = "sha256-yYd0HzdwbqB9kexJjBRRYmdsoWtZtcjCNRz0ZJVM5CI="; + hash = "sha256-yYd0HzdwbqB9kexJjBRRYmdsoWtZtcjCNRz0ZJVM5CI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fx2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fx2/default.nix index e826794435..30849134cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fx2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fx2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "whitequark"; repo = "libfx2"; rev = "v${version}"; - sha256 = "sha256-Uk+K7ym92JX4fC3PyTNxd0UvBzoNZmtbscBYjSWChuk="; + hash = "sha256-Uk+K7ym92JX4fC3PyTNxd0UvBzoNZmtbscBYjSWChuk="; }; nativeBuildInputs = [ sdcc ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix index 1ed186126d..1e3b5e0fd9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.3.2"; + version = "0.3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; rev = "refs/tags/v${version}"; - sha256 = "sha256-8YxC0QYZqgUIKlYLXnm5+tfojQOmOX63dD7cxBO+0Gg="; + hash = "sha256-nlNy4+GwStyuCD8f47w07NhNmepxBRtu6PXiL31vzwA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix index adadfc030b..1d5cd94588 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.1.53"; + version = "0.1.54"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-bUOdurCuAxpVag+mv3brxYIyNu9KhoDauL+lcrcob/k="; + hash = "sha256-lxifhL70Yn3BIjeRPnWqOs97Oy65RD0Rrgw4bJno2kI="; }; propagatedBuildInputs = [ 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 69e757df9d..32e4df0ae1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gast/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "serge-sans-paille"; repo = pname; rev = version; - sha256 = "sha256-0y2bHT7YEfTvDxTm6yLl3GmnPUYEieoGEnwkzfA6mOg="; + hash = "sha256-0y2bHT7YEfTvDxTm6yLl3GmnPUYEieoGEnwkzfA6mOg="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gb-io/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gb-io/default.nix index e1fa9a5734..bd5dd2cab1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gb-io/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gb-io/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { owner = "althonos"; repo = "gb-io.py"; rev = "v${version}"; - sha256 = "sha256-1B7BUJ8H+pTtmDtazfPfYtlXzL/x4rAHtRIFAAsSoWs="; + hash = "sha256-1B7BUJ8H+pTtmDtazfPfYtlXzL/x4rAHtRIFAAsSoWs="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src sourceRoot; name = "${pname}-${version}"; - sha256 = "sha256-lPnOFbEJgcaPPl9bTngugubhW//AUFp9RAjyiFHxC70="; + hash = "sha256-lPnOFbEJgcaPPl9bTngugubhW//AUFp9RAjyiFHxC70="; }; sourceRoot = "source"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gbinder-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gbinder-python/default.nix index e575c51e31..9d9b906e24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gbinder-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gbinder-python/default.nix @@ -26,6 +26,11 @@ buildPythonPackage rec { pkg-config ]; + postPatch = '' + # Fix pkg-config name for cross-compilation + substituteInPlace setup.py --replace "pkg-config" "$PKG_CONFIG" + ''; + setupPyGlobalFlags = [ "--cython" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gbulb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gbulb/default.nix index f2a772d1ad..2aa73d10db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gbulb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gbulb/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "beeware"; repo = "gbulb"; rev = "refs/tags/v${version}"; - sha256 = "sha256-AdZSvxix0cpoFQSrslGl+hB/s6Nh0EsWMQmXZAJVJOg="; + hash = "sha256-AdZSvxix0cpoFQSrslGl+hB/s6Nh0EsWMQmXZAJVJOg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gcovr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gcovr/default.nix index 2661ae1503..81fe8ae042 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gcovr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gcovr/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "gcovr"; - version = "5.2"; + version = "6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IXGVCF7JQ0YpGoe3sebZz97u5WKz4PmjKyXJUws7zo8="; + hash = "sha256-hjjV9E3vEOOOMWbIozvvZkPsIEaH4Kx9NFzkGpjFdQs="; }; propagatedBuildInputs = [ @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python script for summarizing gcov data"; homepage = "https://www.gcovr.com/"; + changelog = "https://github.com/gcovr/gcovr/blob/${version}/CHANGELOG.rst"; license = licenses.bsd0; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix index b3a38afafd..cb298fa2ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "GoogleCloudPlatform"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-slTxh2j9VhLiSyiTmJIFFakzpzH/+mgilDRxx0VqqKQ="; + hash = "sha256-slTxh2j9VhLiSyiTmJIFFakzpzH/+mgilDRxx0VqqKQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gekitchen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gekitchen/default.nix index 4c9e1d7b96..a06dada36d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gekitchen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gekitchen/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "ajmarks"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eKGundh7j9LqFd71bx86rNBVu2iAcgLN25JfFa39+VA="; + hash = "sha256-eKGundh7j9LqFd71bx86rNBVu2iAcgLN25JfFa39+VA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/generic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/generic/default.nix index 26ced17565..5c4e01a749 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/generic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/generic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-UHz2v6K5lNYb7cxBViTfPkpu2M8LItApGoSg3Bb2bqI="; + hash = "sha256-UHz2v6K5lNYb7cxBViTfPkpu2M8LItApGoSg3Bb2bqI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/genpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/genpy/default.nix index 5b7600efe8..3de2bad0f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/genpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/genpy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-FGZbQlUgbJjnuiDaKS/vVlraMVmFF1cAQk7S3aPWXx4="; + hash = "sha256-FGZbQlUgbJjnuiDaKS/vVlraMVmFF1cAQk7S3aPWXx4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/genshi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/genshi/default.nix index 6dd458fefb..090807f249 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/genshi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/genshi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-wQBSCGLNaQhdEO4ah+kSief1n2s9m9Yiv1iygE5rmqs="; + hash = "sha256-wQBSCGLNaQhdEO4ah+kSief1n2s9m9Yiv1iygE5rmqs="; }; # FAIL: test_sanitize_remove_script_elem (genshi.filters.tests.html.HTMLSanitizerTestCase) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geocachingapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geocachingapi/default.nix index df537283ef..61e2a1f7a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geocachingapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geocachingapi/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Sholofly"; repo = "geocachingapi-python"; rev = "refs/tags/${version}"; - sha256 = "sha256-C4nj4KFEwsY5V5f0Q1x+9sD8Ihz5m7b3jg2pOyB/pDg="; + hash = "sha256-C4nj4KFEwsY5V5f0Q1x+9sD8Ihz5m7b3jg2pOyB/pDg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix index 281e1bb620..fcdf7a015e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-9/Qchdw+HC09k17IZmDcOyyEjIPhf5qeUbqdUUahWFk="; + hash = "sha256-9/Qchdw+HC09k17IZmDcOyyEjIPhf5qeUbqdUUahWFk="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/GeoIP/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geoip/default.nix similarity index 86% rename from third_party/nixpkgs/pkgs/development/python-modules/GeoIP/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/geoip/default.nix index 95423a858d..0db8cb1e4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/GeoIP/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geoip/default.nix @@ -1,17 +1,18 @@ {lib, buildPythonPackage, fetchPypi -, geoip, nose}: +, libgeoip, nose}: buildPythonPackage rec { - pname = "GeoIP"; + pname = "geoip"; version = "1.3.2"; nativeCheckInputs = [ nose ]; propagatedBuildInputs = [ - geoip + libgeoip ]; src = fetchPypi { - inherit pname version; + pname = "GeoIP"; + inherit version; sha256 = "1rphxf3vrn8wywjgr397f49s0s22m83lpwcq45lm0h2p45mdm458"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geojson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geojson/default.nix index 4a733fe350..69cd2ed306 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geojson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geojson/default.nix @@ -1,21 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi, glibcLocales }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, glibcLocales +, unittestCheckHook + }: buildPythonPackage rec { pname = "geojson"; - version = "2.5.0"; + version = "3.0.1"; + format = "setuptools"; - format = "wheel"; - - src = fetchPypi { - inherit pname version format; - sha256 = "1filqm050ixy53kdv81bd4n80vjvfapnmzizy7jg8a6pilv17gfc"; + src = fetchFromGitHub { + owner = "jazzband"; + repo = "geojson"; + rev = "refs/tags/${version}"; + hash = "sha256-VlP/odzRH6Eg0BMZPBQkbHL/O2cIwWTKJcL5SfZoUWQ="; }; - LC_ALL = "en_US.UTF-8"; - nativeCheckInputs = [ glibcLocales ]; + pythonImportsCheck = [ + "geojson" + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; meta = { - homepage = "https://github.com/frewsxcv/python-geojson"; + homepage = "https://github.com/jazzband/geojson"; + changelog = "https://github.com/jazzband/geojson/blob/${version}/CHANGELOG.rst"; description = "Python bindings and utilities for GeoJSON"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ oxzi ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix index 47d2376b41..d899978527 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix @@ -8,7 +8,7 @@ , pyproj , pytestCheckHook , pythonOlder -, Rtree +, rtree , shapely }: @@ -36,7 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - Rtree + rtree ]; doCheck = !stdenv.isDarwin; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geopy/default.nix index 4094bacb82..ca50920b18 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geopy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-bHfjUfuiEH3AxRDTLmbm67bKOw6fBuMQDUQA2NLg800="; + hash = "sha256-bHfjUfuiEH3AxRDTLmbm67bKOw6fBuMQDUQA2NLg800="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/georss-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/georss-client/default.nix index 97acd538d0..d6529cbf9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/georss-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/georss-client/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-georss-client"; rev = "v${version}"; - sha256 = "sha256-D1ggfEDU+vlFmi1USwdHj1due0PrCQCpKF4zaarHCFs="; + hash = "sha256-D1ggfEDU+vlFmi1USwdHj1due0PrCQCpKF4zaarHCFs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/georss-generic-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/georss-generic-client/default.nix index d346a2afdc..7e3cb77588 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/georss-generic-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/georss-generic-client/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-georss-generic-client"; rev = "v${version}"; - sha256 = "sha256-58NpACrJK29NUnx3RrsLFPPo+6A/JlIlkrv8N9juMu0="; + hash = "sha256-58NpACrJK29NUnx3RrsLFPPo+6A/JlIlkrv8N9juMu0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix index db9d23c690..273b67acfb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-georss-ingv-centro-nazionale-terremoti-client"; rev = "v${version}"; - sha256 = "sha256-zqjo70NzpUt5zNEar0P1sl/gMb+ZcS+7GX7QGuFjMYY="; + hash = "sha256-zqjo70NzpUt5zNEar0P1sl/gMb+ZcS+7GX7QGuFjMYY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ghapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ghapi/default.nix index bed070512e..c613809b34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ghapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ghapi/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "ghapi"; rev = "refs/tags/${version}"; - sha256 = "sha256-nH3OciLhet4620WAEmm8mUAmlnpniyIsF2oIzqbZ7FI="; + hash = "sha256-nH3OciLhet4620WAEmm8mUAmlnpniyIsF2oIzqbZ7FI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ghrepo-stats/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ghrepo-stats/default.nix index 00f49fbdae..274765e304 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ghrepo-stats/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ghrepo-stats/default.nix @@ -3,13 +3,13 @@ , buildPythonPackage , fetchFromGitHub , matplotlib -, PyGithub +, pygithub , pythonOlder }: buildPythonPackage rec { pname = "ghrepo-stats"; - version = "0.5.2"; + version = "0.5.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mrbean-bremen"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YKGVDE1cM3Lcr9lHE2iserleob0BE3DxchdSX65CJBE="; + hash = "sha256-65+Ah1DCEkIym2ehlZkubLIE+yJynlYNwE4g1IZ+AzM="; }; postPatch = '' @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ beautifulsoup4 matplotlib - PyGithub + pygithub ]; # Module has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix index 50b8a0e709..f0d7e35179 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-pTP4WleVUmFDPCUHAUdjBMw3QDfAq2aw5TcrSEZ0nVw="; + hash = "sha256-pTP4WleVUmFDPCUHAUdjBMw3QDfAq2aw5TcrSEZ0nVw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix index 5953e206b2..675ea286c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gios"; - version = "2.3.0"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bieniu"; repo = pname; - rev = version; - hash = "sha256-/lAENP9wKZ+h2Iq2e9S7s7Naa0CTl/I2cwCxBEAwsrA="; + rev = "refs/tags/${version}"; + hash = "sha256-7lOY8J42mRmIA18tQrmY3gNEQf6YqzbeULecrGhNwFc="; }; propagatedBuildInputs = [ @@ -36,13 +36,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov --cov-report term-missing " "" - substituteInPlace setup.py \ - --replace "pytest-runner" "" - ''; - disabledTests = [ # Test requires network access "test_invalid_station_id" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/git-filter-repo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/git-filter-repo/default.nix index ba666c5abe..b8f8097d39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/git-filter-repo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/git-filter-repo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-/hdT4Y8L1tPJtXhoyAEa59BWpuurcGcGOWoV71MScl4="; + hash = "sha256-/hdT4Y8L1tPJtXhoyAEa59BWpuurcGcGOWoV71MScl4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/git-revise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/git-revise/default.nix index 4f5efc2719..726805edba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/git-revise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/git-revise/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mystor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xV1Z9O5FO4Q/XEpNwnX31tbv8CrXY+wF1Ltpfq+ITRg="; + hash = "sha256-xV1Z9O5FO4Q/XEpNwnX31tbv8CrXY+wF1Ltpfq+ITRg="; }; disabled = pythonOlder "3.8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gitdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gitdb/default.nix index 3528bb2bca..d2d79697d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gitdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gitdb/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-brmQtp304VutiZ6oaNxGVyw/dTOXNWY7gd55sG8X65o="; + hash = "sha256-brmQtp304VutiZ6oaNxGVyw/dTOXNWY7gd55sG8X65o="; }; propagatedBuildInputs = [ smmap ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/github-to-sqlite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/github-to-sqlite/default.nix index 2d02a2a732..ed26284177 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/github-to-sqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/github-to-sqlite/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dogsheep"; repo = pname; rev = version; - sha256 = "sha256-4wkwtcChcR7XH421wa3dGdIPhwgeaTFk247zIRX98xo="; + hash = "sha256-4wkwtcChcR7XH421wa3dGdIPhwgeaTFk247zIRX98xo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/github3_py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/github3_py/default.nix index ba83ca1847..e92af93808 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/github3_py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/github3_py/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Cbcr4Ul9NGsJaM3oNgoNavedwgbQFJpjzT7IbGXDd8w="; + hash = "sha256-Cbcr4Ul9NGsJaM3oNgoNavedwgbQFJpjzT7IbGXDd8w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gitpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gitpython/default.nix index e5a98bb27d..0915170bc7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gitpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gitpython/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "gitpython"; - version = "3.1.30"; + version = "3.1.31"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gitpython-developers"; repo = "GitPython"; - rev = version; - hash = "sha256-odtYBQLscncdC+NbDC9D84QQveDoimkQ6RzUQLJgizI="; + rev = "refs/tags/${version}"; + hash = "sha256-lpx/vptFhz4WOkybJpqq1teMGgX6RQo/f2OTNEm5XJU="; }; propagatedBuildInputs = [ @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Git Library"; homepage = "https://github.com/gitpython-developers/GitPython"; + changelog = "https://github.com/gitpython-developers/GitPython/blob/${version}/doc/source/changes.rst"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glad/default.nix index 5307a2e461..ba738b3572 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glad/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glad/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-P7ANv+x65t2+ugTiFUf2fzzPx5X8NFYkUM8/K7Gf28c="; + hash = "sha256-P7ANv+x65t2+ugTiFUf2fzzPx5X8NFYkUM8/K7Gf28c="; }; meta = with lib; { 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 9aab37ade7..bc9b3895c1 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 @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-glances-api"; rev = version; - sha256 = "sha256-IBEy19iouYAHIZwc/bnMgmHLrbfZjLni0Ne4o0I6FNg="; + hash = "sha256-IBEy19iouYAHIZwc/bnMgmHLrbfZjLni0Ne4o0I6FNg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glcontext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glcontext/default.nix index a654759347..62f9fb1451 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glcontext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glcontext/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "moderngl"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-TGkVDZbxxvOOal+rLHeCNUoyOzvg9wQsAMan8LDn938="; + hash = "sha256-TGkVDZbxxvOOal+rLHeCNUoyOzvg9wQsAMan8LDn938="; }; disabled = !isPy3k; 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 7506c5295b..3543003195 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 @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "glean-parser"; - version = "7.0.0"; + version = "7.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-xIlg3W/A3FBvVOEin/ku0QdmzGXlmOm5yLeYvoGkzNU="; + hash = "sha256-IgBaLVTVF4pGkC5EKZvLaa7U6Lwy2r/xit3E26kWEas="; }; postPatch = '' @@ -68,6 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tools for parsing the metadata for Mozilla's glean telemetry SDK"; homepage = "https://github.com/mozilla/glean_parser"; + changelog = "https://github.com/mozilla/glean_parser/blob/v${version}/CHANGELOG.md"; license = licenses.mpl20; maintainers = with maintainers; []; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glfw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glfw/default.nix index f90a24f090..c695169deb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glfw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glfw/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "FlorianRhiem"; repo = "pyGLFW"; rev = "refs/tags/v${version}"; - sha256 = "sha256-zusVOhZfJyUpftvrUSLZJl7mG5AEGMLGXMOojFnEsH0="; + hash = "sha256-zusVOhZfJyUpftvrUSLZJl7mG5AEGMLGXMOojFnEsH0="; }; # Patch path to GLFW shared object diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glom/default.nix index 876feaf6c2..97101ce578 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glom/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glom/default.nix @@ -12,16 +12,21 @@ buildPythonPackage rec { pname = "glom"; - version = "22.1.0"; + version = "23.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FRDGWHqPnGSiRmQbcAM8vF696Z8CrSRWk2eAOOghrrU="; + hash = "sha256-t0QjCeAT/rb+qyBhl6v4rsMoNexwnYqSqFFDIvZMDv8="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "face==20.1.1" "face" + ''; + propagatedBuildInputs = [ boltons attrs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix index 8b6e68de4b..445b18dc61 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "glyphsLib"; rev = "refs/tags/v${version}"; - sha256 = "sha256-TulMOubqY1hI1No0yW4d9Wo5xjqBm0qXqmo17+Fvq0w="; + hash = "sha256-TulMOubqY1hI1No0yW4d9Wo5xjqBm0qXqmo17+Fvq0w="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix index 27f6d8538d..6f5d7be002 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix @@ -21,7 +21,7 @@ buildPythonPackage { owner = "aleaxit"; repo = "gmpy"; rev = "gmpy2-${version}"; - sha256 = "sha256-ARCttNzRA+Ji2j2NYaSCDXgvoEg01T9BnYadyqON2o0="; + hash = "sha256-ARCttNzRA+Ji2j2NYaSCDXgvoEg01T9BnYadyqON2o0="; }; buildInputs = [ gmp mpfr libmpc ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gnureadline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gnureadline/default.nix index 6a3b4cb464..e2d853c32b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gnureadline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gnureadline/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-QmKmqjVqsi72QvQ6f5TrQqctbwxTLttOjGuTP1cwVtI="; + hash = "sha256-QmKmqjVqsi72QvQ6f5TrQqctbwxTLttOjGuTP1cwVtI="; }; buildInputs = [ pkgs.ncurses ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/goalzero/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/goalzero/default.nix index d21b6335a7..1f007c032e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/goalzero/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/goalzero/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-PveHE317p5fGSxgx7LQkpRYF55HwdzpZFY8/F8s3CBQ="; + hash = "sha256-PveHE317p5fGSxgx7LQkpRYF55HwdzpZFY8/F8s3CBQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/goobook/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/goobook/default.nix index 4b24bc41d8..16125400c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/goobook/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/goobook/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "goobook"; repo = "goobook"; rev = version; - sha256 = "sha256-gWmeRlte+lP7VP9gbPuMHwhVkx91wQ0GpQFQRLJ29h8="; + hash = "sha256-gWmeRlte+lP7VP9gbPuMHwhVkx91wQ0GpQFQRLJ29h8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix index b459d44bb5..77698e3ace 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.27"; + version = "0.2.28"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-J7hmtFEvJ2ivVi5UsahcpWen/gw65bf3rhBEpiOKsWk="; + hash = "sha256-HkOlvZaCQOt+jbmzal17W5eU7SEq+kzTgbFd3fiTY/A="; }; postPatch = '' 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 5e83c98599..87cf03b79b 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.75.0"; + version = "2.79.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DxCaK3HxTJp7SCMf7PzdOrlYYeqav1TwYKxFwgT63D0="; + hash = "sha256-V3wK6uHrPHVOrLkSLTadZ2Cf73WbxqT6Fsr+q08wAZs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix index a197a12441..134fb80d41 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.8.0"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gQVqMQ+xxKPlp+GkQ+Hrllk8a7xVsmwCYeTTKV0+ZZM="; + hash = "sha256-43UGSWSCC0ciGn4bfuH9dwUbYyPD+ePhl4X3irZ+z8U="; }; 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 0f6600d159..eb96d31189 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 @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "google-auth"; - version = "2.15.0"; + version = "2.16.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cvEqbPyWjXVNe9qzacXFwWAyEG5S0yxt/YSE5MAabR8="; + hash = "sha256-X9FwmGvOa/17tchFxLg2LtseDLqQHgYhlug/i7XV0yw="; }; propagatedBuildInputs = [ @@ -96,6 +96,8 @@ buildPythonPackage rec { "tests/transport/test__custom_tls_signer.py" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Google Auth Python Library"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index b105e9cfe1..d96874aeeb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.1.15"; + version = "0.1.16"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-W6Nb+H2CaULQ7Hp1hYxtnF9ITYa++Usc7XVoPkQPnVk="; + hash = "sha256-+L5Rre6LHpSlc+yzdQpMLSvURLHd412apDes5zwzdgc="; }; propagatedBuildInputs = [ 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 f92580db80..660dd96cfe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.15.0"; + version = "2.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-idnWz7o7RuOAZbY+H5STVAVa1rexThDY3Zb5eaI10Ao="; + hash = "sha256-wysLs0seCRDadYj9aRowebq6+kMi7RZp/DITC4lqsVY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-compute/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-compute/default.nix index 19910f1167..b0314d615a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.8.0"; + version = "1.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pnhXkYSXph7aIZJoI3tXTNIUkH44S22QDIGXUl9ceFU="; + hash = "sha256-/iUUTtBxBmiDIczIRuwbr/SLTs2hYKXSAbufmjFtMDU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 289fef97b1..70f339e703 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.3.0"; + version = "5.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iuhXfFp6cfDNDtk3JS+U8YbQAOII0khY2bmvP75QAP4="; + hash = "sha256-oMX+XMglmgu2sfREVxSq/E9foEf49UzHEzkUupeFb14="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix index ad4931e560..a6441e16b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.14.0"; + version = "2.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-00SlS6iL65Z2N6tgNEaIcQ09WB8Jy8emOwlaZoKjNgA="; + hash = "sha256-HbIUo7JpYajnaESs7sZPuEpqyGiaYeB8ooYXgH/kqoE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix index 86888e3fb6..94941e4eef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.11.1"; + version = "3.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TwVY6/4TSY8cPj3y/A7+cxpyVJ9+lPg+vAKNhfBNfqI="; + hash = "sha256-v874eaWthn7DD9Sxg+hrXr/93k7u591h0GL68wwmeP4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix index b06a5d3499..aff4744fb0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.10.0"; + version = "2.11.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-8q/Am7x5LFN9Uaw37QdUdwL19J1FgxRKjRL0Vrc+1TI="; + hash = "sha256-viN/BiIYmE83B1JMh5THgj2/HLGOeIotDVLdTODZBAg="; }; 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 27a2e9e067..250305eea2 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 @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.13.0"; + version = "2.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0nOQnibi1T0JW9NQaKSrNCnfB5EgsnNYMVCEiUsPRdU="; + hash = "sha256-/tm08lOWjQMjV1IVov8cX0EJsKjwxMQD2NIcJnoHdVc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix index 248fcb7140..147407a428 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.11.1"; + version = "2.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dRavwtaU+dpRZkO49Q0Btmh2Mi/zUWbvZbImrfUkrAM="; + hash = "sha256-0uhWndF50vKVUk71DwoInQORAiR5vQyNMMA+T2p69W4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index b2aa7804b6..af5bc6855b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.8.1"; + version = "1.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-npTv+f533JK/J2ceJ6Na7mS90HfKaHORmGnFz1LBzLQ="; + hash = "sha256-LRSAJoqdqMbNlQhoH7YQ9cZ3g7Iq4pkItaxTQTGZw1E="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix index 8751b58372..3ab5abb61d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.12.1"; + version = "2.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2kRj5zlAPVO2U3EzN+opz5OBtwEru5RqGOXGqLUPaUA="; + hash = "sha256-7V57grRH2ysU765TDmqq7DOna9o8Nu9v4HjDAIf/ETA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix index 10a2826c5d..390abd0a58 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-bRjvNNmvsBy0sR4C0DoC/n7A9ez6AfXUJrXZiHKkz0g="; + hash = "sha256-bRjvNNmvsBy0sR4C0DoC/n7A9ez6AfXUJrXZiHKkz0g="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix index a753acdcc1..f21dd08b0f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.10.0"; + version = "1.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aU6XD+uj/X9Gs8z2vP0rhTlaqkg7u4H9CV/CJl2b7ak="; + hash = "sha256-i3jUbzivzXG9bIM06ZKG9olZubBOuCWz5kk5yPZRv4k="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix index 6ae9ff0ea9..e6744bd66f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.10.1"; + version = "3.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-++1k8lhJfJ7e/oK//IyYx9W/RacQa/1RwdrhyvCYWEM="; + hash = "sha256-phwMOu6YEndLOOvXDnoYvShXGMMR+O/CfUyp5+gMdKM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index b8019c03cc..e8707e9d9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.10.1"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HlmuzMOaCl7z9NBVI5HoCH1vltQCeel30B5roX/+2HE="; + hash = "sha256-rkqKaHNzbcIjYyCe+AN1WCLvjZ1HjWHH4xeCs8/TkZI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix index d02dd0dda4..da7f93da90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "googleapis"; repo = "python-crc32c"; rev = "v${version}"; - sha256 = "sha256-Tx7UBIwKzSBbpuqdqGiXTbmBE+1MDRknVe3Zee0UHKQ="; + hash = "sha256-Tx7UBIwKzSBbpuqdqGiXTbmBE+1MDRknVe3Zee0UHKQ="; }; buildInputs = [ crc32c ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix index 600703130e..5d26ba2de3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "mirumee"; repo = "google-i18n-address"; rev = "refs/tags/${version}"; - sha256 = "sha256-7t5sNpEVajdwcW8+xTNZQKZVgxhUzfbVbEVgn7JJ2MY="; + hash = "sha256-7t5sNpEVajdwcW8+xTNZQKZVgxhUzfbVbEVgn7JJ2MY="; }; propagatedBuildInputs = [ requests ]; 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 d8fe3ca62f..4fbddfb226 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 @@ -1,6 +1,5 @@ { lib , aiohttp -, asynctest , buildPythonPackage , coreutils , fetchFromGitHub @@ -37,7 +36,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - asynctest coreutils pytest-aiohttp pytest-asyncio 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 3dda409f15..b39e550860 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 @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "2.4.0"; + version = "2.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jVUYUC+SuezISsRneb1PCWlOyzujij58pzeobRXLyh8="; + hash = "sha256-Fbii5130LcZQLRMG2wvOJke6YBP5zQO24XNowIhu6Qo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix index 7ac264a649..3b08b4619c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.57.0"; + version = "1.58.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-J6hJ1iBYOPtsw8HCHLmABwemYbshxs5/sT6Z6x+KDEY="; + hash = "sha256-xyclHsAllH1UUYS6F+NXiED8OiSgUWoCBHntq2YEV98="; }; propagatedBuildInputs = [ grpc protobuf ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/goveelights/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/goveelights/default.nix index 484321cd7c..254ae57d32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/goveelights/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/goveelights/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-A7tfY+aFzhfruCZ43usj1/CsTejbPMzHM8SYrY/TU1s="; + hash = "sha256-A7tfY+aFzhfruCZ43usj1/CsTejbPMzHM8SYrY/TU1s="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix index fa161a4b50..bea5b01ab1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-mEbF/fOtw0cU/bx7DgQcmmJ/yqal8Hs/1KaLGC3e4/c="; + hash = "sha256-mEbF/fOtw0cU/bx7DgQcmmJ/yqal8Hs/1KaLGC3e4/c="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix index fd8236fe07..3a1707a467 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-68rnLrMlp/BsvqlbnV5kvsJTcDEtsV6OLkbE1U5ynno="; + hash = "sha256-68rnLrMlp/BsvqlbnV5kvsJTcDEtsV6OLkbE1U5ynno="; }; propagatedBuildInputs = [ pycryptodomex requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gpt-2-simple/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gpt-2-simple/default.nix index 68f8cba8dc..f627ead49d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gpt-2-simple/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gpt-2-simple/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "minimaxir"; repo = "gpt-2-simple"; rev = "v${version}"; - sha256 = "sha256-WwD4sDcc28zXEOISJsq8e+rgaNrrgIy79Wa4J3E7Ovc="; + hash = "sha256-WwD4sDcc28zXEOISJsq8e+rgaNrrgIy79Wa4J3E7Ovc="; }; propagatedBuildInputs = [ regex requests tqdm numpy toposort tensorflow ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gpustat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gpustat/default.nix index f7df51d616..1acb6cf006 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gpustat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gpustat/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-WB6P+FjDLJWjIruPA/HZ3D0Xe07LM93L7Sw3PGf04/E="; + hash = "sha256-WB6P+FjDLJWjIruPA/HZ3D0Xe07LM93L7Sw3PGf04/E="; }; nativeBuildInputs = [ pythonRelaxDepsHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gpxpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gpxpy/default.nix index 86e4a87a86..96c969c520 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gpxpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gpxpy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "tkrajina"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Fkl2dte1WkPi2hBOdT23BMfNflR0j4GeNH86d46WNQk="; + hash = "sha256-Fkl2dte1WkPi2hBOdT23BMfNflR0j4GeNH86d46WNQk="; }; propagatedBuildInputs = [ lxml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix index 221b1cfbfa..f20e251fad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix @@ -37,12 +37,12 @@ buildPythonPackage rec { (fetchpatch { name = "CVE-2022-4730.CVE-2022-4729.CVE-2022-4728.part-1.patch"; url = "https://github.com/graphite-project/graphite-web/commit/9c626006eea36a9fd785e8f811359aebc9774970.patch"; - sha256 = "sha256-JMmdhLqsaRhUG2FsH+yPNl+cR7O2YLfKFliL2GU0aAk="; + hash = "sha256-JMmdhLqsaRhUG2FsH+yPNl+cR7O2YLfKFliL2GU0aAk="; }) (fetchpatch { name = "CVE-2022-4730.CVE-2022-4729.CVE-2022-4728.part-2.patch"; url = "https://github.com/graphite-project/graphite-web/commit/2f178f490e10efc03cd1d27c72f64ecab224eb23.patch"; - sha256 = "sha256-NL7K5uekf3NlLa58aFFRPJT9ktjqBeNlWC4Htd0fRQ0="; + hash = "sha256-NL7K5uekf3NlLa58aFFRPJT9ktjqBeNlWC4Htd0fRQ0="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix index 7c9eb5ae4b..5ea1e5c55e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "graspologic"; rev = "refs/tags/v${version}"; - sha256 = "sha256-EmbCA4JpY2OIwXrRWjBxA4iNm0ddQODjoGmHIYgvAWs="; + hash = "sha256-EmbCA4JpY2OIwXrRWjBxA4iNm0ddQODjoGmHIYgvAWs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix index b1bc8a007b..56f6bfae2a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-iGXQt3tcsThR3WAaWK0sgry1LafKEG8FOMV4fxJzaKY="; + hash = "sha256-iGXQt3tcsThR3WAaWK0sgry1LafKEG8FOMV4fxJzaKY="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/greenlet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/greenlet/default.nix index bd33f3c096..e8a4e862b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/greenlet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/greenlet/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "greenlet"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; disabled = isPyPy; # builtin for pypy src = fetchPypi { inherit pname version; - hash = "sha256-QuYCVkRg2g6O5ny21yNjY+5eExqhWUO2Zw5E5cLtD2c="; + hash = "sha256-58jcE699sJe+1koFHS3Unp8K9JXCaZXACp7oQmkNNMA="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix index efa1021323..65da72dee7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "apache"; repo = "tinkerpop"; rev = version; - sha256 = "sha256-FMA9hJdq7gYkDtQO04Bwpjq2Q7nXGuN9wrBD4b9GgwY="; + hash = "sha256-FMA9hJdq7gYkDtQO04Bwpjq2Q7nXGuN9wrBD4b9GgwY="; }; sourceRoot = "source/gremlin-python/src/main/python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grip/default.nix index fd22e420fd..ef1ad0512c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grip/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "joeyespo"; repo = "grip"; rev = "v${version}"; - sha256 = "sha256-CHL2dy0H/i0pLo653F7aUHFvZHTeZA6jC/rwn1KrEW4="; + hash = "sha256-CHL2dy0H/i0pLo653F7aUHFvZHTeZA6jC/rwn1KrEW4="; }; nativeCheckInputs = [ pytest responses ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix index eb47b502d8..303d67c58e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "grpc-google-iam-v1"; - version = "0.12.4"; + version = "0.12.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PwrCyUC5qFXXzn4x/eKL3bDZrDYtMtB8ZxSDBpMaDjA="; + hash = "sha256-K8S4/fIhFaZddRyTFzKTImAsObfIaiicm3LSKNlg718="; }; propagatedBuildInputs = [ grpcio googleapis-common-protos ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix index 022d677cf5..4eb45eca6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.51.1"; + version = "1.52.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "ac2617a3095935ebd785e2228958f24b10a0d527a0c9eb5a0863c784f648a816"; + hash = "sha256-YCo4CNSFobaeEdFQoHXj6Sf2R/Oos4fuPD8BYzRFsvw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix index 82e9315aec..28af8e6af2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.51.1"; + version = "1.52.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "8e62d23d3fed9d4f81738f98dd193dbd2e21aed4a8f0dd715e75b5439e649727"; + hash = "sha256-wD6X5M1kMnavIQDL3Mn2sTBLHbeeWflXWMMCOj7kvVQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpclib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpclib/default.nix index d6c1a6f50a..c6c0114953 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpclib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpclib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage { owner = "vmagamedov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zjctvsuX5yJl1EXIAaiukWGYJbdgU7OZllgOYAmp1b4="; + hash = "sha256-zjctvsuX5yJl1EXIAaiukWGYJbdgU7OZllgOYAmp1b4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gruut-ipa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gruut-ipa/default.nix index 18a1a2c952..26a7223b97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gruut-ipa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gruut-ipa/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "rhasspy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Q2UKELoG8OaAPxIrZNCpXgeWZ2fCzb3g3SOVzCm/gg0="; + hash = "sha256-Q2UKELoG8OaAPxIrZNCpXgeWZ2fCzb3g3SOVzCm/gg0="; }; postPatch = '' 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 0038a85a3c..bd6e95909d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gruut/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gruut/default.nix @@ -41,14 +41,14 @@ buildPythonPackage rec { owner = "rhasspy"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-DD7gnvH9T2R6E19+exWE7Si+XEpfh0Iy5FYbycjgzgM="; + hash = "sha256-DD7gnvH9T2R6E19+exWE7Si+XEpfh0Iy5FYbycjgzgM="; }; postPatch = '' substituteInPlace requirements.txt \ - --replace "dateparser~=1.0.0" "dateparser" \ --replace "gruut_lang_en~=2.0.0" "gruut_lang_en" \ - --replace "jsonlines~=1.2.0" "jsonlines" + --replace "jsonlines~=1.2.0" "jsonlines" \ + --replace "networkx>=2.5.0,<3.0.0" "networkx" ''; 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 8bc82046f8..9b41e272b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pythongssapi"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - sha256 = "sha256-qz4EWAO++yq72/AGwyNOtH/fTRSFbiCo/K98htROUxI="; + hash = "sha256-qz4EWAO++yq72/AGwyNOtH/fTRSFbiCo/K98htROUxI="; }; # It's used to locate headers diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gtts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gtts/default.nix index 09c317d6a8..be70ec9df0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gtts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gtts/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pndurette"; repo = "gTTS"; rev = "refs/tags/v${version}"; - sha256 = "sha256-dbIcx6U5TIy3CteUGrZqcWqOJoZD2HILaJmKDY+j/II="; + hash = "sha256-dbIcx6U5TIy3CteUGrZqcWqOJoZD2HILaJmKDY+j/II="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix index d41b45a479..7bd347d750 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "benoitc"; repo = "gunicorn"; rev = version; - sha256 = "sha256-xdNHm8NQWlAlflxof4cz37EoM74xbWrNaf6jlwwzHv4="; + hash = "sha256-xdNHm8NQWlAlflxof4cz37EoM74xbWrNaf6jlwwzHv4="; }; patches = [ (fetchpatch { # fix eventlet 0.30.3+ compability url = "https://github.com/benoitc/gunicorn/commit/6a8ebb4844b2f28596ffe7421eb9f7d08c8dc4d8.patch"; - sha256 = "sha256-+iApgohzPZ/cHTGBNb7XkqLaHOVVPF26BnPUsvISoZw="; + hash = "sha256-+iApgohzPZ/cHTGBNb7XkqLaHOVVPF26BnPUsvISoZw="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/guppy3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/guppy3/default.nix index df409599cd..0da4387fc0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/guppy3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/guppy3/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "zhuyifei1999"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f7YpaZ85PU/CSsDwSm2IJ/x2ZxzHoMOVbdbzT1i8y/w="; + hash = "sha256-f7YpaZ85PU/CSsDwSm2IJ/x2ZxzHoMOVbdbzT1i8y/w="; }; propagatedBuildInputs = [ tkinter ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix index c170bc3da3..378d9f7203 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-TwGeLEfP69ZK/fkhS0sB6aPh8aDjg6Tri2mUUzk4jbk="; + hash = "sha256-TwGeLEfP69ZK/fkhS0sB6aPh8aDjg6Tri2mUUzk4jbk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gym-notices/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gym-notices/default.nix index 1cd974976e..6c6d97a459 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gym-notices/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gym-notices/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-rSXiAEh8r6NpcoYl/gZOiK2hNGYYUmECZZtGQPK0uRE="; + hash = "sha256-rSXiAEh8r6NpcoYl/gZOiK2hNGYYUmECZZtGQPK0uRE="; }; pythonImportsCheck = [ "gym_notices" ]; 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 ad19991140..56bbe2b9e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "openai"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-uJgm8l1SxIRC5PV6BIH/ht/1ucGT5UaUhkFMdusejgA="; + hash = "sha256-uJgm8l1SxIRC5PV6BIH/ht/1ucGT5UaUhkFMdusejgA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h11/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h11/default.nix index e82ca2baaf..50682ec31a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/h11/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/h11/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-jxn7vpnnJCD/NcALJ6NMuZN+kCqLgQ4siDAMbwo7aZ0="; + hash = "sha256-jxn7vpnnJCD/NcALJ6NMuZN+kCqLgQ4siDAMbwo7aZ0="; }; nativeCheckInputs = [ pytestCheckHook ]; 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 c69fec2564..8c6dde1803 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/h2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/h2/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qDrKCPvnqst5/seIycC6yTY0NWDtnsGLgqE6EsKNKrs="; + hash = "sha256-qDrKCPvnqst5/seIycC6yTY0NWDtnsGLgqE6EsKNKrs="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h3/default.nix index 0296046a52..eb9af29bbb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/h3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/h3/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "uber"; repo = "h3-py"; rev = "refs/tags/v${version}"; - sha256 = "sha256-QNiuiHJ4IMxpi39iobPSSlYUUj5oxpxO4B2+HXVQ/Zk="; + hash = "sha256-QNiuiHJ4IMxpi39iobPSSlYUUj5oxpxO4B2+HXVQ/Zk="; }; dontConfigure = true; 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 8bdfe84d9b..8450386c26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/habanero/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/habanero/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools-scm , requests , tqdm , nose @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "habanero"; - version = "1.2.2"; + version = "1.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,9 +21,13 @@ buildPythonPackage rec { owner = "sckott"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-i6tgMEiaDcaBR8XfGvEMXQfTaDp1RJRosj/EfF1dQU4="; + hash = "sha256-IQp85Cigs0in3X07a9d45nMC3X2tAkPzl5hFVhfr00o="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ requests tqdm diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hacking/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hacking/default.nix index 5f516175ea..3ea0b24f06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hacking/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hacking/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qzWyCK8/FHpvlZUnMxw4gK5BrCHMzra/1oqE9OtW4CY="; + hash = "sha256-qzWyCK8/FHpvlZUnMxw4gK5BrCHMzra/1oqE9OtW4CY="; }; postPatch = '' 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 5a0ce432b6..afcd8841d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, orjson , pydevccu , pytest-aiohttp , pytestCheckHook @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.2.10"; + version = "2023.2.11"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-LyX/wHd4FnI9RrmwV6IDhz8gWJlBwG3Up64JYaIVdmM="; + hash = "sha256-Nrq7Bc9Lzdle8/rINp/GPy+DWANgMe7WCLP48gHohIo="; }; nativeBuildInputs = [ @@ -33,6 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + orjson python-slugify voluptuous ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/halohome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/halohome/default.nix index 7d8dbe2efb..2ef4acd077 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/halohome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/halohome/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "nayaverdier"; repo = pname; rev = version; - sha256 = "sha256-xnUOObqVg1E7mTDKHZMoC95KI9ZIn0YpkQjoASa5Dds="; + hash = "sha256-xnUOObqVg1E7mTDKHZMoC95KI9ZIn0YpkQjoASa5Dds="; }; 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 687a04b884..0122599c66 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 @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "sha256-KG2eCwGZWVtepJQdsSwFziWsT1AbV6rYWRIO/I/CR8g="; + hash = "sha256-KG2eCwGZWVtepJQdsSwFziWsT1AbV6rYWRIO/I/CR8g="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatch-nodejs-version/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatch-nodejs-version/default.nix index da991314ca..ed849eaa52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hatch-nodejs-version/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hatch-nodejs-version/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "agoose77"; repo = "hatch-nodejs-version"; rev = "refs/tags/v${version}"; - sha256 = "sha256-txF392XiRqHndTEYw6QVk12Oqw9E6cOwF81hUyp2oh4="; + hash = "sha256-txF392XiRqHndTEYw6QVk12Oqw9E6cOwF81hUyp2oh4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatch-vcs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatch-vcs/default.nix index 6ccdfccfe0..4fa2c56cab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hatch-vcs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hatch-vcs/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "hatch_vcs"; inherit version; - sha256 = "sha256-zsUQfPzkgsZ/i8lvGLvDIMmqDQaBgOFK0xe77loVP+4="; + hash = "sha256-zsUQfPzkgsZ/i8lvGLvDIMmqDQaBgOFK0xe77loVP+4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatchling/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatchling/default.nix index 09b7e4f8b1..35187aff51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hatchling/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hatchling/default.nix @@ -20,7 +20,7 @@ let pname = "hatchling"; - version = "1.11.1"; + version = "1.13.0"; in buildPythonPackage { inherit pname version; @@ -28,7 +28,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-n4Q2H3DPOnq5VDsMPsxkIR7SuopganHrakc8HJsI4dA="; + hash = "sha256-+NJ1osxyBzUoa3wuK8NdoFdh5tNpXC+kFlUDlfEMU8c="; }; # listed in backend/src/hatchling/ouroboros.py @@ -72,7 +72,7 @@ buildPythonPackage { meta = with lib; { description = "Modern, extensible Python build backend"; homepage = "https://hatch.pypa.io/latest/"; - changelog = "https://github.com/pypa/hatch/blob/hatchling-v${version}/docs/history.md#hatchling"; + changelog = "https://github.com/pypa/hatch/releases/tag/hatchling-v${version}"; license = licenses.mit; maintainers = with maintainers; [ hexa ofek ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix index 5de14ba8d2..1971516a00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-7tr3Hy87vt/Ew42hrUiXRUzl69R5LhponJecKFPtwFo="; + hash = "sha256-7tr3Hy87vt/Ew42hrUiXRUzl69R5LhponJecKFPtwFo="; }; patches = [ # should be included in next release @@ -29,7 +29,7 @@ buildPythonPackage rec { "docs/basic_hdbscan.rst" "docs/how_hdbscan_works.rst" ]; - sha256 = "sha256-t0D4OsHEcMwmBZM8Mk1N0uAKi6ra+TOzEks9/efsvWI="; + hash = "sha256-t0D4OsHEcMwmBZM8Mk1N0uAKi6ra+TOzEks9/efsvWI="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hdf5plugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hdf5plugin/default.nix index 0716c65f2f..35d329f4d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hdf5plugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hdf5plugin/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hdf5plugin"; - version = "4.1.0"; + version = "4.1.1"; format = "setuptools"; src = fetchFromGitHub { owner = "silx-kit"; repo = "hdf5plugin"; rev = "refs/tags/v${version}"; - hash = "sha256-fFR5t8jHOQc6eDNDhDcntibaveGAmI+j/dVte1tdcyk="; + hash = "sha256-w3jgIKfJPlu8F2rJXATmbHKyabp3PQLVmCYj3RsYL3c="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/heatshrink2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/heatshrink2/default.nix index dccb27327c..4edc94167c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/heatshrink2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/heatshrink2/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { repo = "pyheatshrink"; rev = version; fetchSubmodules = true; - sha256 = "sha256-P3IofGbW4x+erGCyxIPvD9aNHIJ/GjjWgno4n95SQoQ="; + hash = "sha256-P3IofGbW4x+erGCyxIPvD9aNHIJ/GjjWgno4n95SQoQ="; }; pythonImportsCheck = [ "heatshrink2" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/here-routing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/here-routing/default.nix index 26ed821d85..c1ca069b51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/here-routing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/here-routing/default.nix @@ -13,9 +13,9 @@ buildPythonPackage rec { pname = "here-routing"; - version = "0.2.0"; + version = "1.0.0"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; format = "pyproject"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "eifinger"; repo = "here_routing"; rev = "v${version}"; - hash = "sha256-IXiYLDrPXc6YT8u0QT6f2GAjBNYhWwzkFxGhmAyiq5s="; + hash = "sha256-wdjPbM9J+2q3NisdlOHIddSWHHIfwQY/83v6IBAXSq0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hexbytes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hexbytes/default.nix index 913bc34b06..d0b57d1059 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hexbytes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hexbytes/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = "hexbytes"; rev = "v${version}"; - sha256 = "sha256-EDFE5MUc+XMwe8BaXkz/DRchAZbS86X+AcShi5rx83M="; + hash = "sha256-EDFE5MUc+XMwe8BaXkz/DRchAZbS86X+AcShi5rx83M="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hexdump/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hexdump/default.nix index 75da23e985..9b8487ffa8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hexdump/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hexdump/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-14GkOwwWrOP5Nmqt5z6K06e9UTfVjwtFqy0/VIdvINs="; + hash = "sha256-14GkOwwWrOP5Nmqt5z6K06e9UTfVjwtFqy0/VIdvINs="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix index 073637b253..5e1dcaeba2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-7LCsw6LSFB0r2jJt7/3X18jxRhLGsRjWmjllVLxspbU="; + hash = "sha256-7LCsw6LSFB0r2jJt7/3X18jxRhLGsRjWmjllVLxspbU="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hid/default.nix index 32987c877a..eeade4606c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hid/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-HpVOf3q5t8nfx421lQRpLBfbO3EklJK5drFSW5fbsOg="; + hash = "sha256-HpVOf3q5t8nfx421lQRpLBfbO3EklJK5drFSW5fbsOg="; }; propagatedBuildInputs = [ hidapi ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hiredis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hiredis/default.nix index eea5e5bf80..9123a8baa4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hiredis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hiredis/default.nix @@ -1,34 +1,43 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder # tested using -, python +, pytestCheckHook }: buildPythonPackage rec { pname = "hiredis"; - version = "2.0.0"; + version = "2.2.2"; format = "setuptools"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "81d6d8e39695f2c37954d1011c0480ef7cf444d4e3ae24bc5e89ee5de360139a"; + src = fetchFromGitHub { + owner = "redis"; + repo = "hiredis-py"; + rev = "refs/tags/v${version}"; + fetchSubmodules = true; + hash = "sha256-VfiYXkvLcdokT4P5ks1ReDh5sBe6pdNxWyscmSaJ1Lo="; }; - pythonImportsCheck = [ "hiredis" ]; + pythonImportsCheck = [ + "hiredis" + ]; - checkPhase = '' - mv hiredis _hiredis - ${python.interpreter} test.py + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + rm -rf hiredis ''; meta = with lib; { description = "Wraps protocol parsing code in hiredis, speeds up parsing of multi bulk replies"; homepage = "https://github.com/redis/hiredis-py"; + changelog = "https://github.com/redis/hiredis-py/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ mmai ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hiro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hiro/default.nix index 00b5606096..9eefc61dbf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hiro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hiro/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi, six, mock }: buildPythonPackage rec { pname = "hiro"; - version = "0.5.1"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "d10e3b7f27b36673b4fa1283cd38d610326ba1ff1291260d0275152f15ae4bc7"; + hash = "sha256-2jM5rx3JpZTMqdycccclJysuMGYE5F0OBXXNE8X5XWg="; }; propagatedBuildInputs = [ six mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hiyapyco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hiyapyco/default.nix index 0742496f8a..fa55f03d46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hiyapyco/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hiyapyco/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "zerwes"; repo = pname; rev = "refs/tags/release-${version}"; - sha256 = "sha256-MVJoMnEi+319ZkhffYWYVi/wj0Ihm0nfVeEXvx7Ac/4="; + hash = "sha256-MVJoMnEi+319ZkhffYWYVi/wj0Ihm0nfVeEXvx7Ac/4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix index bab50ea617..0110d038e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.20"; + version = "0.21"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dr-prodigy"; repo = "python-holidays"; rev = "refs/tags/v.${version}"; - hash = "sha256-hz0v4g94RMA1dKOLu4BSYnK5EPNl1hIWEShFJWO0F3A="; + hash = "sha256-acV/m4orkOEbON7C4ThGvaQtTMpp4c8FNesC7UepJFc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/homepluscontrol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/homepluscontrol/default.nix index 9d32704815..dfb255661e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/homepluscontrol/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/homepluscontrol/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "chemaaa"; repo = pname; rev = version; - sha256 = "sha256-COOGqfYiR4tueQHXuCvVxShrYS0XNltcW4mclbFWcfA="; + hash = "sha256-COOGqfYiR4tueQHXuCvVxShrYS0XNltcW4mclbFWcfA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hpack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hpack/default.nix index 6dd6863d3a..41b2a5522e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hpack/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "python-hyper"; repo = "hpack"; rev = "v${version}"; - sha256 = "sha256-2CehGy3K5fKbkB1J8+8x1D4XvnBn1Mbapx+p8rdXDYc="; + hash = "sha256-2CehGy3K5fKbkB1J8+8x1D4XvnBn1Mbapx+p8rdXDYc="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hpccm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hpccm/default.nix index 6c2adca0fe..29f3234faa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hpccm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hpccm/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "NVIDIA"; repo = "hpc-container-maker"; rev = "v${version}"; - sha256 = "sha256-dLMbwtvn7HTVVlWHAzXU19ERdJxytf9NlnqMXW6ShKI="; + hash = "sha256-dLMbwtvn7HTVVlWHAzXU19ERdJxytf9NlnqMXW6ShKI="; }; propagatedBuildInputs = [ six archspec ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hsluv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hsluv/default.nix index 385d4718e4..d7e1ef4612 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hsluv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hsluv/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "hsluv"; repo = "hsluv-python"; rev = "v${version}"; - sha256 = "sha256-p3KD+zhHCOs/rLUVf1IkW/isfpUPQstB2VHGmZ/aEPU="; + hash = "sha256-p3KD+zhHCOs/rLUVf1IkW/isfpUPQstB2VHGmZ/aEPU="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/html-text/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/html-text/default.nix index 1368f286cb..c7b4ec2366 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/html-text/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/html-text/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "TeamHG-Memex"; repo = "html-text"; rev = version; - sha256 = "sha256-jw/hpz0QfcgP5OEJcmre0h1OzOfpPtaROxHm+YUqces="; + hash = "sha256-jw/hpz0QfcgP5OEJcmre0h1OzOfpPtaROxHm+YUqces="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/html5lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/html5lib/default.nix index c6ca6dda22..f069aee876 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/html5lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/html5lib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { # Will be included in the next release after 1.1. (fetchpatch { url = "https://github.com/html5lib/html5lib-python/commit/2c19b9899ab3a3e8bd0ca35e5d78544334204169.patch"; - sha256 = "sha256-VGCeB6o2QO/skeCZs8XLPfgEYVOSRL8cCpG7ajbZWEs="; + hash = "sha256-VGCeB6o2QO/skeCZs8XLPfgEYVOSRL8cCpG7ajbZWEs="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/htseq/default.nix similarity index 97% rename from third_party/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/htseq/default.nix index 486f8a4556..5c369d7f06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/htseq/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, cython, numpy, pysam, matplotlib, python, isPy27, isPy3k }: buildPythonPackage rec { version = "0.12.4"; - pname = "HTSeq"; + pname = "htseq"; src = fetchFromGitHub { owner = "htseq"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httmock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httmock/default.nix index 22e9b333cc..f48cdbd1ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httmock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httmock/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "patrys"; repo = "httmock"; rev = version; - sha256 = "sha256-yid4vh1do0zqVzd1VV7gc+Du4VPrkeGFsDHqNbHL28I="; + hash = "sha256-yid4vh1do0zqVzd1VV7gc+Du4VPrkeGFsDHqNbHL28I="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix index 95acab6579..cbc536b1ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-1Pl+l28J7crfO2UY/9/D019IzOHWOwjR+UvVEHICTqU="; + hash = "sha256-1Pl+l28J7crfO2UY/9/D019IzOHWOwjR+UvVEHICTqU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httptools/default.nix index 67c284abc3..1b34c07187 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httptools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httptools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-KVh0hhwXP5EBlgu6MyQpu3ftTc2M31zumSLrAOT2vAk="; + hash = "sha256-KVh0hhwXP5EBlgu6MyQpu3ftTc2M31zumSLrAOT2vAk="; }; # tests are not included in pypi tarball 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 ae55a10212..3ac4635ab7 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 @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-HwLJ2pScgiNmM/l14aKp47MMuGW1qSaIq7ujpCSRtqA="; + hash = "sha256-HwLJ2pScgiNmM/l14aKp47MMuGW1qSaIq7ujpCSRtqA="; }; 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 8384470ef1..90b11bbc59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.23.1"; + version = "0.23.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -37,8 +37,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "encode"; repo = pname; - rev = version; - hash = "sha256-1gRBHbGFUkaFvVgHHoXfpo9j0L074SyevFwMY202+uk="; + rev = "refs/tags/${version}"; + hash = "sha256-ZLRzkyoFbAY2Xs1ORWBqvc2gpKovg9wRs/RtAryOcVg="; }; nativeBuildInputs = [ @@ -98,8 +98,8 @@ buildPythonPackage rec { ''; pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + "-W" "ignore::DeprecationWarning" + "-W" "ignore::trio.TrioDeprecationWarning" ]; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix index 0144040f1c..da287226ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "hupper"; - version = "1.10.3"; + version = "1.11"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zW9Rtyx1h7ybzopl7NAloelfGwMoRRm/6RKE0BAxbNk="; + hash = "sha256-FcEb13XY+YCVt0W05lihfCXIbjtzJ1yuiWrByNUzyxg="; }; # FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent 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 86887c3146..89a2bf03de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hwi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hwi/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bitcoin-core"; repo = "HWI"; rev = "refs/tags/${version}"; - sha256 = "sha256-vQJN2YXWGvYSVV9lemZyu61inc9iBFxf5nIlpIiRe+s="; + hash = "sha256-vQJN2YXWGvYSVV9lemZyu61inc9iBFxf5nIlpIiRe+s="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hydra-check/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hydra-check/default.nix index 8c1fd56b8d..8a6b7c8ac6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hydra-check/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hydra-check/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "nix-community"; repo = pname; rev = "v${version}"; - sha256 = "sha256-voSbpOPJUPjwzdMLVt2TC/FIi6LKk01PLd/GczOAUR8="; + hash = "sha256-voSbpOPJUPjwzdMLVt2TC/FIi6LKk01PLd/GczOAUR8="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hydra-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hydra-core/default.nix index 4cb6f264fb..5bf37b4539 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hydra-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hydra-core/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "hydra-core"; - version = "1.3.1"; + version = "1.3.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "facebookresearch"; repo = "hydra"; rev = "refs/tags/v${version}"; - hash = "sha256-4FOh1Jr+LM8ffh/xcAqMqKudKbXb2DZdxU+czq2xwxs="; + hash = "sha256-kD4BStnstr5hwyAOxdpPzLAJ9MZqU/CPiHkaD2HnUPI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hydrus-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hydrus-api/default.nix index d9afe61a65..bfa7f8c91c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hydrus-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hydrus-api/default.nix @@ -2,21 +2,33 @@ , buildPythonPackage , pythonOlder , fetchPypi +, poetry-core , requests }: buildPythonPackage rec { pname = "hydrus-api"; - version = "4.0.0"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-4by2TlZJIKElGgaof1w555ik2hUNbg16YekSWwICGmg="; - }; + version = "5.0.0"; + format = "pyproject"; disabled = pythonOlder "3.9"; + src = fetchPypi { + pname = "hydrus_api"; + inherit version; + hash = "sha256-s6gS1rVcbg7hcE63hGdPhJCcgS4N4d58MpSrECAfe0U="; + }; + + postPatch = '' + substituteInPlace pyproject.toml --replace \ + "poetry.masonry.api" \ + "poetry.core.masonry.api" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ requests ]; 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 50def57aeb..1e0f08936f 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 @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "dermotduffy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-arcnpCQsRuiWCrAz/t4TCjTe8DRDtRuzYp8k7nnjGDk="; + hash = "sha256-arcnpCQsRuiWCrAz/t4TCjTe8DRDtRuzYp8k7nnjGDk="; }; patches = [ 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 61b4f87a67..b3f93e03f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.61.0"; + version = "6.68.2"; outputs = [ "out" ] ++ lib.optional enableDocumentation "doc"; format = "setuptools"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-gTcdJaOgP8Nc4fN8UH6+sLedivq5ZNxMRULajFOVnSo="; + hash = "sha256-SgX8esTyC3ulFIv9mZJUoBA5hiv7Izr2hyD+NOudkpE="; }; # I tried to package sphinx-selective-exclude, but it throws @@ -85,6 +85,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for property based testing"; homepage = "https://github.com/HypothesisWorks/hypothesis"; + changelog = "https://hypothesis.readthedocs.io/en/latest/changes.html#v${lib.replaceStrings [ "." ] [ "-" ] version}"; license = licenses.mpl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; 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 eac1d6b4d8..a9c3af6c32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-vc6EXsmE5uP+0h5l0ugrjrxt5cpeuTZJ39dgNMWQakY="; + hash = "sha256-vc6EXsmE5uP+0h5l0ugrjrxt5cpeuTZJ39dgNMWQakY="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix index 3c88fa2709..223ef9fe7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "neurodata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DQ5DrQrFBJ3dnGAjD1c/7GCJeR3g+aL2poR4hwOvmPA="; + hash = "sha256-DQ5DrQrFBJ3dnGAjD1c/7GCJeR3g+aL2poR4hwOvmPA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iapws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iapws/default.nix index 5268112b04..33c3b5073f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iapws/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iapws/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-QVxbf9EF9YwAVPewAqhc1WZD6jVr/rFXQUw/jJ7kkDU="; + hash = "sha256-QVxbf9EF9YwAVPewAqhc1WZD6jVr/rFXQUw/jJ7kkDU="; }; propagatedBuildInputs = [ scipy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix index 6f5052910e..d1196d4bc3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix @@ -58,13 +58,13 @@ let owner = "ibis-project"; repo = "testing-data"; rev = "3c39abfdb4b284140ff481e8f9fbb128b35f157a"; - sha256 = "sha256-BZWi4kEumZemQeYoAtlUSw922p+R6opSWp/bmX0DjAo="; + hash = "sha256-BZWi4kEumZemQeYoAtlUSw922p+R6opSWp/bmX0DjAo="; }; in buildPythonPackage rec { pname = "ibis-framework"; - version = "4.0.0"; + version = "4.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -72,8 +72,8 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "ibis"; owner = "ibis-project"; - rev = version; - hash = "sha256-G3kMd6Jyib7ZXHFP6t2CEPlDD5n5zHE2jq/0he3U4Nk="; + rev = "refs/tags/${version}"; + hash = "sha256-ipnMymf+BOpG9iGWO47no47m4nLIBbqLdbzlevuxeBw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ibis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibis/default.nix index a58fb34080..8bb64ba4e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ibis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ibis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "dmulholl"; repo = pname; rev = version; - sha256 = "sha256-EPz9zHnxR75WoRaiHKJNiCRWFwU1TBpC4uHz62jUOqM="; + hash = "sha256-EPz9zHnxR75WoRaiHKJNiCRWFwU1TBpC4uHz62jUOqM="; }; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix index 421167f239..777590a6d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "watson-developer-cloud"; repo = "python-sdk"; rev = "refs/tags/v${version}"; - sha256 = "sha256-jvDkAwuDFgo7QlZ8N7TNVsY7+aXdIDc50uIIoO+5MLs="; + hash = "sha256-jvDkAwuDFgo7QlZ8N7TNVsY7+aXdIDc50uIIoO+5MLs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/icecream/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/icecream/default.nix index 45dc837665..a12b4c4c0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/icecream/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/icecream/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-CqSnwzdOw2FTodCPgeMIDoPYrB7v2X0vT+lUTo+bSd4="; + hash = "sha256-CqSnwzdOw2FTodCPgeMIDoPYrB7v2X0vT+lUTo+bSd4="; }; propagatedBuildInputs = [ asttokens colorama executing pygments ]; 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 aae5785fcc..07449e0cce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ValentinBELYN"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EQyu7lV8F/U8cZklYYIMk9ut1FTcoBvGc8Ggx6JerDk="; + hash = "sha256-EQyu7lV8F/U8cZklYYIMk9ut1FTcoBvGc8Ggx6JerDk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/icnsutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/icnsutil/default.nix index 05c24ec7c3..d01f1591f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/icnsutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/icnsutil/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "relikd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TfQvAbP7iCpRQg2G+ejl245NCYo9DpYwMgiwY2BuJnY="; + hash = "sha256-TfQvAbP7iCpRQg2G+ejl245NCYo9DpYwMgiwY2BuJnY="; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/icoextract/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/icoextract/default.nix index 8aa38c1d96..0f2636997d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/icoextract/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/icoextract/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "tar.gz"; - sha256 = "sha256-x0GEV0PUbkAzoUJgAqup9bHd7iYttGyzIZNdo8KsFyo="; + hash = "sha256-x0GEV0PUbkAzoUJgAqup9bHd7iYttGyzIZNdo8KsFyo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix index c50e2caa97..9f2665b59f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ics-py"; repo = "ics-py"; rev = "refs/tags/v${version}"; - sha256 = "sha256-hdtnET7YfSb85+TGwpwzoxOfxPT7VSj9eKSiV6AXUS8="; + hash = "sha256-hdtnET7YfSb85+TGwpwzoxOfxPT7VSj9eKSiV6AXUS8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/idasen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/idasen/default.nix index 0d653ed1e5..544ecba1c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/idasen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/idasen/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "idasen"; - version = "0.9.4"; + version = "0.9.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "newAM"; repo = "idasen"; - rev = "v${version}"; - hash = "sha256-GYQj7hiwyrCQDK19tZ7gN/pS1mFDSHgRfz7eCsKise4="; + rev = "refs/tags/v${version}"; + hash = "sha256-tjjoKUaX1v06I43TkkvKRHmd1rDuXqjEIHSTatbzyQk="; }; nativeBuildInputs = [ 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 061b20a835..cfc3339212 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.5.18"; + version = "2.5.20"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Pf9/mjbyC859WT8ZreFq5u6YER/tRgsQuqIgt6mdPqE="; + hash = "sha256-QBFA4vq58rlW9XR1jrn2VrrsZuW+hZJHrZzSoRVZUMQ="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/idna/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/idna/default.nix index 99b40c25a7..a21125c237 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/idna/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/idna/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-gU9Sjo3q19MpgzuRxfqofWC/cYJM0Sp1MLVSYGPQLLQ="; + hash = "sha256-gU9Sjo3q19MpgzuRxfqofWC/cYJM0Sp1MLVSYGPQLLQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix index ab7080ed27..abe6836b59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-zAy/yqv3ZdRFlYJfuWqZuxLHlxa3O0QzDqOO4rDErtQ="; + hash = "sha256-zAy/yqv3ZdRFlYJfuWqZuxLHlxa3O0QzDqOO4rDErtQ="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix index da48ed3147..a47a97de6a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pytorch"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-iuaBuKoKlt7F7Z7fbVOZAUAoFnU3AOxYC/ANgqoQksU="; + hash = "sha256-iuaBuKoKlt7F7Z7fbVOZAUAoFnU3AOxYC/ANgqoQksU="; }; nativeCheckInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix index bd7d404fe2..c2aaac6548 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix @@ -23,7 +23,7 @@ , idna , itsdangerous , jinja2 -, Mako +, mako , markupsafe , python-dateutil , pytz @@ -48,7 +48,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-uQgZBbpqqbZYHpR+GwHWX0c7di2rVvEz0jPRY6+BkkQ="; + hash = "sha256-uQgZBbpqqbZYHpR+GwHWX0c7di2rVvEz0jPRY6+BkkQ="; }; propagatedBuildInputs = [ @@ -71,7 +71,7 @@ buildPythonPackage rec { idna itsdangerous jinja2 - Mako + mako markupsafe psycopg2 python-dateutil diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ilua/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ilua/default.nix index 28bc7524fa..143f1ed035 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ilua/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ilua/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-YxV6xC7GS5NXyMPRZN9YIJxamgP2etwrZUAZjk5PjtU="; + hash = "sha256-YxV6xC7GS5NXyMPRZN9YIJxamgP2etwrZUAZjk5PjtU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/image-go-nord/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/image-go-nord/default.nix index 7b97e7763e..519ac772a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/image-go-nord/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/image-go-nord/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "Schrodinger-Hat"; repo = "ImageGoNord-pip"; rev = "v${version}"; - sha256 = "sha256-O34COlGsXExJShRd2zvhdescNfYXWLNuGpkjcH3koPU="; + hash = "sha256-O34COlGsXExJShRd2zvhdescNfYXWLNuGpkjcH3koPU="; }; propagatedBuildInputs = [ pillow ]; 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 2fa5f47d58..141654fd95 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 @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "imageio-ffmpeg"; - version = "0.4.7"; + version = "0.4.8"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-egiDj5fzY+N8pBghuGT9P9yZqx/iQhBAx4619Wqecj4="; + hash = "sha256-/aoFrRD+Bwt/qOX2FcsNKPO5t5HQCvbSoR5pQVjRCqk="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch index d193ec199f..33e2f9695d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch @@ -1,11 +1,11 @@ diff --git a/imageio_ffmpeg/_utils.py b/imageio_ffmpeg/_utils.py -index 1399cfd..c0eb9be 100644 +index 6387834..e5e312d 100644 --- a/imageio_ffmpeg/_utils.py +++ b/imageio_ffmpeg/_utils.py -@@ -23,33 +23,7 @@ def get_ffmpeg_exe(): - if exe: - return exe +@@ -38,29 +38,7 @@ def get_ffmpeg_exe(): + @lru_cache() + def _get_ffmpeg_exe(): - plat = get_platform() - - # 2. Try from here @@ -28,12 +28,8 @@ index 1399cfd..c0eb9be 100644 - if _is_valid_exe(exe): - return exe - -- # Nothing was found -- raise RuntimeError( -- "No ffmpeg exe could be found. Install ffmpeg on your system, " -- "or set the IMAGEIO_FFMPEG_EXE environment variable." -- ) -+ return '@ffmpeg@' +- return None ++ return "@ffmpeg@" def _popen_kwargs(prevent_sigint=False): 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 45eb10658b..dd6cb552a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.25.0"; + version = "2.26.0"; disabled = pythonOlder "3.7"; src = fetchPypi { - sha256 = "sha256-uAeWofjDjGl6lAoq1zl+4okA1cTlEGG5pn0WrKhn8z4="; inherit pname version; + hash = "sha256-Fp8WQs23IxM/6P6QGIf08bObwDZFjEZk8fnSViJs7TU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imagesize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imagesize/default.nix index 0f06d36df4..e1d390a8c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imagesize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imagesize/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-aRUERK/7nLDVzFqSs2dvCy+3zZrjnpR6XhGja0SXzUo="; + hash = "sha256-aRUERK/7nLDVzFqSs2dvCy+3zZrjnpR6XhGja0SXzUo="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix index 9e156f01e0..834dce891c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-vHYJYZ7Dw4xEIpKSgjmtPRC13rCviinIOCK3tXsxn4s="; + hash = "sha256-vHYJYZ7Dw4xEIpKSgjmtPRC13rCviinIOCK3tXsxn4s="; }; propagatedBuildInputs = [ scikit-learn ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/importlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/importlab/default.nix index 9b9c6ffa0c..5b572e50f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/importlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/importlab/default.nix @@ -14,7 +14,7 @@ buildPythonPackage { owner = "google"; repo = "importlab"; rev = "676d17cd41ac68de6ebb48fb71780ad6110c4ae3"; - sha256 = "sha256-O8y1c65NQ+19BnGnUnWrA0jYUqF+726CFAcWzHFOiHE="; + hash = "sha256-O8y1c65NQ+19BnGnUnWrA0jYUqF+726CFAcWzHFOiHE="; }; propagatedBuildInputs = [ networkx ]; 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 d9f03c521a..bb9a899086 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "5.2.0"; + version = "6.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-QE1I1iu6C3p3/51AXv2RUBvvLmf/Ss4L7UCgzyjDx80="; + hash = "sha256-41S+3rYO+mr/3MiuEhtzVEp6p0FW0EcxGUj21xHNN40="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix index ddd3949dd7..b470eb12a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "importlib-resources"; - version = "5.10.2"; + version = "5.12.0"; format = "pyproject"; disabled = isPy27; src = fetchPypi { pname = "importlib_resources"; inherit version; - sha256 = "sha256-5KlsjMAzlkf/ml4FUNnydvxaAf+idgErWOwQjP17hIQ="; + hash = "sha256-S+glib9cHXmZrt8qRRWdEMs8pPGbInH4eSvI5tp7IvY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/in-n-out/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/in-n-out/default.nix index d345869bed..cbec40b634 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/in-n-out/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/in-n-out/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-PuzjidORMFVlmFZbmnu9O92FoiuXrC8NNRyjwdodriY="; + hash = "sha256-PuzjidORMFVlmFZbmnu9O92FoiuXrC8NNRyjwdodriY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/incremental/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/incremental/default.nix index 5f1f0beb25..8fabae484d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/incremental/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/incremental/default.nix @@ -11,7 +11,7 @@ let incremental = buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-kS/uteD34BiOb0IkHS9FAALhG7wJN8ZYZQRYVMJMC9A="; + hash = "sha256-kS/uteD34BiOb0IkHS9FAALhG7wJN8ZYZQRYVMJMC9A="; }; propagatedBuildInputs = [ 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 7a77373264..9f2cb0cb7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-8aa8sBBQRviWGf3hp9BExhLGFMLYXvGCWC2dybhtMJo="; + hash = "sha256-8aa8sBBQRviWGf3hp9BExhLGFMLYXvGCWC2dybhtMJo="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix index 0ada1ee5d8..7e858003d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.36.0"; + version = "1.36.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-RHcUkIYzshJr6r76Kq4FsjDl9YXZJOaCeijBwMTvPfw="; + hash = "sha256-O10q/ResES3mE26LZQLgGPSLjhUCEOwZpm6vZj6H5mQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix index a8a4a611fe..04f06c013d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix @@ -1,18 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm }: +{ lib +, buildPythonPackage +, substituteAll +, fetchPypi +, hatch-vcs +, hatchling +}: buildPythonPackage rec { pname = "iniconfig"; - version = "1.1.1"; + version = "2.0.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"; + hash = "sha256-LZHhNb9y0xpBCxfBbaYQqCy1X2sEd9GpAhNLJKRVuLM="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + hatchling + ]; + + patches = [ + # Cannot use hatch-vcs, due to an inifinite recursion + (substituteAll { + src = ./version.patch; + inherit version; + }) + ]; + + pythonImportsCheck = [ + "iniconfig" + ]; doCheck = false; # avoid circular import with pytest - pythonImportsCheck = [ "iniconfig" ]; meta = with lib; { description = "brain-dead simple parsing of ini files"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/version.patch b/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/version.patch new file mode 100644 index 0000000000..a075464046 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/version.patch @@ -0,0 +1,42 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 6eee6ef..263999f 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,12 +1,12 @@ + [build-system] + build-backend = "hatchling.build" + requires = [ +- "hatch-vcs", + "hatchling", + ] + + [project] + name = "iniconfig" ++version = "@version@" + description = "brain-dead simple config-ini parsing" + readme = "README.rst" + license = "MIT" +@@ -15,9 +15,6 @@ authors = [ + { name = "Holger Krekel", email = "holger.krekel@gmail.com" }, + ] + requires-python = ">=3.7" +-dynamic = [ +- "version", +-] + classifiers = [ + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", +@@ -38,13 +35,6 @@ classifiers = [ + [project.urls] + Homepage = "https://github.com/pytest-dev/iniconfig" + +- +-[tool.hatch.version] +-source = "vcs" +- +-[tool.hatch.build.hooks.vcs] +-version-file = "src/iniconfig/_version.py" +- + [tool.hatch.build.targets.sdist] + include = [ + "/src", diff --git a/third_party/nixpkgs/pkgs/development/python-modules/injector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/injector/default.nix index f616cf3c27..9bbf48b5a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/injector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/injector/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-hmG0mi+DCc5h46aoK3rLXiJcS96OF9FhDIk6Zw3/Ijo="; + hash = "sha256-hmG0mi+DCc5h46aoK3rLXiJcS96OF9FhDIk6Zw3/Ijo="; }; propagatedBuildInputs = [ typing-extensions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/installer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/installer/default.nix index 836cfa0687..b52e6c7283 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/installer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/installer/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "pradyunsg"; repo = pname; rev = version; - sha256 = "sha256-IXznSrc/4LopgZDGFSC6cAOCbts+siKpdl5SvN1FFvA="; + hash = "sha256-IXznSrc/4LopgZDGFSC6cAOCbts+siKpdl5SvN1FFvA="; }; nativeBuildInputs = [ flit-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix index 6303ec76fe..2d71334ead 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "insteon-frontend-home-assistant"; - version = "0.3.2"; + version = "0.3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7jRf6fp+5u6qqR5xP1R+kp6LURsBVqfct6yuCkbxBMw="; + hash = "sha256-aZ10z7xCVWq4V2+jPCybFa5LKGhvtchrwgTVFfxhM+o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intelhex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intelhex/default.nix index fdeeae5007..57b8fe75d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intelhex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/intelhex/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-iStzYacZ9JRSN9qMz3VOlRPbMvViiFJ4WuoQjc0lAJM="; + hash = "sha256-iStzYacZ9JRSN9qMz3VOlRPbMvViiFJ4WuoQjc0lAJM="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix index 339332452e..0abbf3e311 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "intensity_normalization"; inherit version; - sha256 = "sha256-Yjd4hXmbT87xNKSqc6zkKNisOVhQzQAUZI5wBiI/UBk="; + hash = "sha256-Yjd4hXmbT87xNKSqc6zkKNisOVhQzQAUZI5wBiI/UBk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix index e0021cbc39..978906f583 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-PLf+PMIXlaoL974e7coQCQKH6cVBYODPhkDxa2vhTB0="; + hash = "sha256-PLf+PMIXlaoL974e7coQCQKH6cVBYODPhkDxa2vhTB0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/default.nix index ce77b9e311..3c48dcc4d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ShieldMnt"; repo = "invisible-watermark"; rev = version; - sha256 = "sha256-NGDPEETuM7rYbo8kXYoRWLJWpa/lWLKEvaaiDzSWYZ4="; + hash = "sha256-NGDPEETuM7rYbo8kXYoRWLJWpa/lWLKEvaaiDzSWYZ4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/invoke/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/invoke/default.nix index 65f4fe105f..3b15406340 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/invoke/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/invoke/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "invoke"; - version = "1.7.3"; + version = "2.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-QbQoNC1GaoITXVqzcRloWpiXE3Qr5G5Co6OZ1oVXkxQ="; + hash = "sha256-erXdnNdreH1WCnixqYENJSNnq1lZhcUGEnAr4h1nHdc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ionhash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ionhash/default.nix index 901cf602dc..1b9455dbe8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ionhash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ionhash/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { owner = "amzn"; repo = "ion-hash-python"; rev = "v${version}"; - sha256 = "sha256-mXOLKXauWwwIA/LnF4qyZsBiF/QM+rF9MmE2ewmozYo="; + hash = "sha256-mXOLKXauWwwIA/LnF4qyZsBiF/QM+rF9MmE2ewmozYo="; fetchSubmodules = true; }; patches = [ (fetchpatch { url = "https://github.com/amzn/ion-hash-python/commit/5cab56d694ecc176e394bb455c2d726ba1514ce0.patch"; - sha256 = "sha256-P5QByNafgxI//e3m+b0oG00+rVymCsT/J4dOZSk3354="; + hash = "sha256-P5QByNafgxI//e3m+b0oG00+rVymCsT/J4dOZSk3354="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix index 965bb5625d..b3c912551d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "ipfs-shipyard"; repo = "py-ipfs-http-client"; rev = version; - sha256 = "sha256-OmC67pN2BbuGwM43xNDKlsLhwVeUbpvfOazyIDvoMEA="; + hash = "sha256-OmC67pN2BbuGwM43xNDKlsLhwVeUbpvfOazyIDvoMEA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipwhl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipwhl/default.nix index 6ccb1dabeb..8006829314 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipwhl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipwhl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "~cnx"; repo = "ipwhl-utils"; rev = version; - sha256 = "sha256-YaIYcoUnbiv9wUOFIzGj2sWGbh7NsqRQcqOR2X6+QZA="; + hash = "sha256-YaIYcoUnbiv9wUOFIzGj2sWGbh7NsqRQcqOR2X6+QZA="; }; buildInputs = [ kubo ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipwhois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipwhois/default.nix new file mode 100644 index 0000000000..676ec23081 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipwhois/default.nix @@ -0,0 +1,71 @@ +{ lib +, stdenv +, buildPythonPackage +, dnspython +, fetchFromGitHub +, iana-etc +, libredirect +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "ipwhois"; + version = "1.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "secynic"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-2CfRRHlIIaycUtzKeMBKi6pVPeBCb1nW3/1hoxQU1YM="; + }; + + pythonRelaxDeps = [ + "dnspython" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + dnspython + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ipwhois" + ]; + + preCheck = lib.optionalString stdenv.isLinux '' + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \ + LD_PRELOAD=${libredirect}/lib/libredirect.so + ''; + + disabledTestPaths = [ + # Tests require network access + "ipwhois/tests/online/" + ]; + + disabledTests = [ + "test_lookup" + "test_unique_addresses" + "test_get_http_json" + ]; + + meta = with lib; { + description = "Library to retrieve and parse whois data"; + homepage = "https://github.com/secynic/ipwhois"; + changelog = "https://github.com/secynic/ipwhois/blob/v${version}/CHANGES.rst"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix index 88c426870c..09a7ddab47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-T7LOaT+yaM2ukAN0z6GpFkHiLZUU0eweYtp0cFCST3Y="; + hash = "sha256-T7LOaT+yaM2ukAN0z6GpFkHiLZUU0eweYtp0cFCST3Y="; }; nativeBuildInputs = [ 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 b5afa47275..aeb19ec9f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.20.0"; + version = "6.21.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ffr67GRTAHEMQUecCwvcE6nqZjm+5uOtBCdXZ06amik="; + hash = "sha256-bpITSE5M4fsUJn7kNeGPI8w6BjTmNbn7TtRne4Tg/fg="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix index c70fe92b5d..f227d5d7c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version format; - sha256 = "sha256-0RPNVYkbr+myfvmbbdERqHvra7KuVQxAQpInIQO+gBM="; + hash = "sha256-0RPNVYkbr+myfvmbbdERqHvra7KuVQxAQpInIQO+gBM="; }; 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 094b3370c5..d0fd08146b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix @@ -28,26 +28,15 @@ buildPythonPackage rec { pname = "ipython"; - version = "8.4.0"; + version = "8.11.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "f2db3a10254241d9b447232cec8b424847f338d9d36f9a577a6192c332a46abd"; + sha256 = "735cede4099dbc903ee540307b9171fbfef4aa75cfcacc5a273b2cda2f02be04"; }; - patches = [ - (fetchpatch { - # The original URL might not be very stable, so let's prefer a copy. - urls = [ - "https://raw.githubusercontent.com/bmwiedemann/openSUSE/9b35e4405a44aa737dda623a7dabe5384172744c/packages/p/python-ipython/ipython-pr13714-xxlimited.patch" - "https://github.com/ipython/ipython/pull/13714.diff" - ]; - sha256 = "XPOcBo3p8mzMnP0iydns9hX8qCQXTmRgRD0TM+FESCI="; - }) - ]; - nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix index d18c5e9621..26b79b633e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-hBqNvg6dKx6P5Yo17nUA9ztmvQjz+ChNFWnD2OOPp3U="; + hash = "sha256-hBqNvg6dKx6P5Yo17nUA9ztmvQjz+ChNFWnD2OOPp3U="; }; propagatedBuildInputs = [ ipywidgets ]; 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 1fbf03cfa7..44a097fd1b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipyvuetify/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { # GitHub version tries to run npm (Node JS) src = fetchPypi { inherit pname version; - sha256 = "sha256-viBWeFLGuKQKs9wXO3EULTNorrW25P2DFX1t5OmUcW0="; + hash = "sha256-viBWeFLGuKQKs9wXO3EULTNorrW25P2DFX1t5OmUcW0="; }; propagatedBuildInputs = [ ipyvue ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix index 5d8a6f87c3..2ee67e8548 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix @@ -33,6 +33,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ + # https://github.com/jupyter-widgets/ipywidgets/issues/3711 + "test_append_display_data" + ]; + meta = { description = "IPython HTML widgets for Jupyter"; homepage = "https://ipython.org/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix index 88e7efbc23..99525060c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-tvc3ky3UeR87GOMZ3nt9rwLSKFpr6iY9EB9NjlU4B+w="; + hash = "sha256-tvc3ky3UeR87GOMZ3nt9rwLSKFpr6iY9EB9NjlU4B+w="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ircrobots/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ircrobots/default.nix index 8351ff3d86..e698e231c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ircrobots/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ircrobots/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jesopo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+BrS1+ZkgwT/qvqD0PwRZi2LF+31biS738SzKH1dy7w="; + hash = "sha256-+BrS1+ZkgwT/qvqD0PwRZi2LF+31biS738SzKH1dy7w="; }; postPatch = '' 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 e0863e43fd..9f40a88dd3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/irctokens/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/irctokens/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "jesopo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FgcLngS11U9eBNV/8jllwdrm89tCmthA1sUaFDovk6U="; + hash = "sha256-FgcLngS11U9eBNV/8jllwdrm89tCmthA1sUaFDovk6U="; }; nativeCheckInputs = [ pyyaml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ismartgate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ismartgate/default.nix index 7998b03a37..fd1d81014c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ismartgate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ismartgate/default.nix @@ -1,5 +1,4 @@ { lib -, asynctest , buildPythonPackage , click , defusedxml @@ -29,6 +28,11 @@ buildPythonPackage rec { hash = "sha256-o2yzMxrF0WB6MbeL1Tuf0Sq4wS4FDIWZZx1x2rvwLmY="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner>=5.2",' "" + ''; + propagatedBuildInputs = [ click defusedxml @@ -39,18 +43,12 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - asynctest pytest-asyncio pytest-raises pytestCheckHook respx ]; - postPatch = '' - substituteInPlace setup.py \ - --replace '"pytest-runner>=5.2",' "" - ''; - pythonImportsCheck = [ "ismartgate" ]; @@ -58,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to work with the ismartgate and gogogate2 API"; homepage = "https://github.com/bdraco/ismartgate"; + changelog = "https://github.com/bdraco/ismartgate/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iso3166/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iso3166/default.nix index 9291912ecf..27cca09990 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iso3166/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iso3166/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "deactivated"; repo = "python-iso3166"; rev = version; - sha256 = "sha256-/y7c2qSA6+WKUP9YTSaMBjBxtqAuF4nB3MKvL5P6vL0="; + hash = "sha256-/y7c2qSA6+WKUP9YTSaMBjBxtqAuF4nB3MKvL5P6vL0="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/isoduration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/isoduration/default.nix index e0383b9883..e37e44361a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/isoduration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/isoduration/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bolsote"; repo = pname; rev = version; - sha256 = "sha256-6LqsH+3V/K0s2YD1gvmelo+cCH+yCAmmyTYGhUegVdk="; + hash = "sha256-6LqsH+3V/K0s2YD1gvmelo+cCH+yCAmmyTYGhUegVdk="; }; propagatedBuildInputs = [ 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 1b0ec627d3..5abfcc9737 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/isort/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/isort/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "isort"; rev = "refs/tags/${version}"; - sha256 = "sha256-8ija4xWWZuYkElXLdziV7ulN8dubIsChcZQ5dx9hfO0="; + hash = "sha256-8ija4xWWZuYkElXLdziV7ulN8dubIsChcZQ5dx9hfO0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/isounidecode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/isounidecode/default.nix index 388b7be391..417fca817f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/isounidecode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/isounidecode/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-TbCpYsY0GCbJpprKq8L5I6WxJNU6M1voku8pFzvDHFs="; + hash = "sha256-TbCpYsY0GCbJpprKq8L5I6WxJNU6M1voku8pFzvDHFs="; }; pythonImportsCheck = [ "isounidecode" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iteration-utilities/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iteration-utilities/default.nix index fd17b76103..fd055d35bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iteration-utilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iteration-utilities/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "MSeifert04"; repo = "iteration_utilities"; rev = "v${version}"; - sha256 = "sha256-Q/ZuwAf+NPikN8/eltwaUilnLw4DKFm864tUe6GLDak="; + hash = "sha256-Q/ZuwAf+NPikN8/eltwaUilnLw4DKFm864tUe6GLDak="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iterm2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iterm2/default.nix index eff730e0ad..2016e492ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iterm2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iterm2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-9vC+xGwyzsr3vn/YIpbsRpfUvyEB8MSqskzBI5kfojA="; + hash = "sha256-9vC+xGwyzsr3vn/YIpbsRpfUvyEB8MSqskzBI5kfojA="; }; propagatedBuildInputs = [ protobuf websockets ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix index e4a22a268d..4121be315f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XbvGizF+XkLzJ/kCF2NUXcP8O/4i5t65aq8fw4h0FWo="; + hash = "sha256-XbvGizF+XkLzJ/kCF2NUXcP8O/4i5t65aq8fw4h0FWo="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-abode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-abode/default.nix index 8ddb8f4b49..9f6f4aa3ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-abode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-abode/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "jaraco-abode"; - version = "3.3.0"; + version = "4.1.0"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "jaraco"; repo = "jaraco.abode"; rev = "refs/tags/v${version}"; - hash = "sha256-LnbWzIST+GMtdsHDKg67WWt9GmHUcSuGZ5Spei3nEio="; + hash = "sha256-MD8Piwgm+WStEKX+LP0sCezRI4gdHmHis/XMJ8Vuw04="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-net/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-net/default.nix index d4ff9e9294..164b46dd4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-net/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-net/default.nix @@ -24,12 +24,13 @@ , pytestCheckHook , cherrypy , importlib-resources +, pyparsing , requests-mock }: buildPythonPackage rec { pname = "jaraco-net"; - version = "9.3.0"; + version = "9.3.1"; disabled = pythonOlder "3.7"; @@ -39,7 +40,7 @@ buildPythonPackage rec { owner = "jaraco"; repo = "jaraco.net"; rev = "refs/tags/v${version}"; - hash = "sha256-Ks8e3xPjIWgSO0PSpjMYftxAuDt3ilogoDFuJqfN74o="; + hash = "sha256-aq5v4QlapmMTrqwNA0GtRi/xZCcyoR1giZECBsYwymw="; }; nativeBuildInputs = [ @@ -75,6 +76,7 @@ buildPythonPackage rec { pytestCheckHook cherrypy importlib-resources + pyparsing requests-mock ]; 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 e42499b709..e60da37712 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 @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-VjBP1L1OuNWFzgys4KyAQYeRsUCFHjdIElQbCqJ8kdA="; + hash = "sha256-VjBP1L1OuNWFzgys4KyAQYeRsUCFHjdIElQbCqJ8kdA="; }; postPatch = '' 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 afd7e11318..c0a373c8b6 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 @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "jaraco.functools"; - version = "3.5.2"; + version = "3.6.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RbBcFY860ocxB1VW/9R0m9JU7Gf5Hh6zZ9z+v/EVHbQ="; + hash = "sha256-Lho74Rq67O5fWrjdWJY4voMEzEy5E2H+Xmg/S22ft6M="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix index 8950d1aff3..fa652a5355 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-YJjts3xrgCPzeU1CWIoTv3WyygK0D/l5XIRry+DBtGw="; + hash = "sha256-YJjts3xrgCPzeU1CWIoTv3WyygK0D/l5XIRry+DBtGw="; }; pythonNamespaces = [ "jaraco" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix index 1fa4e6dfed..e6cd8e253d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jaraco.logging"; inherit version; - sha256 = "sha256-k6cLizdnd5rWx7Vu6YV5ztd7afFqu8rnSfYsLFnmeTE="; + hash = "sha256-k6cLizdnd5rWx7Vu6YV5ztd7afFqu8rnSfYsLFnmeTE="; }; pythonNamespaces = [ "jaraco" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix index 21f0317cea..38febd83f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "jaraco.text"; - version = "3.11.0"; + version = "3.11.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DdtYlZX+F26oF5yAHKTs4r4Kpx83e5HzymW010GUg1E="; + hash = "sha256-Mzpd8hSPcTlxhgfN81L+HZUWKXGnKZw4Dcwk2rAWiYA="; }; pythonNamespaces = [ 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 816f6fe1c4..26f89695ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix @@ -69,6 +69,12 @@ buildPythonPackage rec { disabledTests = [ # Exceeds tolerance when the machine is busy "test_custom_linear_solve_aux" + # UserWarning: Explicitly requested dtype + # requested in astype is not available, and will be truncated to + # dtype float32. (With numpy 1.24) + "testKde3" + "testKde5" + "testKde6" ] ++ lib.optionals usingMKL [ # See # * https://github.com/google/jax/issues/9705 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/JayDeBeApi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaydebeapi/default.nix similarity index 82% rename from third_party/nixpkgs/pkgs/development/python-modules/JayDeBeApi/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/jaydebeapi/default.nix index 0263b4b752..378da83759 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/JayDeBeApi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaydebeapi/default.nix @@ -1,20 +1,21 @@ { lib , buildPythonPackage , fetchPypi -, JPype1 +, jpype1 }: buildPythonPackage rec { - pname = "JayDeBeApi"; + pname = "jaydebeapi"; version = "1.2.3"; src = fetchPypi { - inherit pname version; + pname = "JayDeBeApi"; + inherit version; sha256 = "f25e9307fbb5960cb035394c26e37731b64cc465b197c4344cee85ec450ab92f"; }; propagatedBuildInputs = [ - JPype1 + jpype1 ]; meta = with lib; { 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 dbf050bcf9..a1373da2de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "kellyjonbrazil"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-0ZKdySzRHHtDWvSrQ0qJTggu48TyCBVrtEZZkM8HqNQ="; + hash = "sha256-0ZKdySzRHHtDWvSrQ0qJTggu48TyCBVrtEZZkM8HqNQ="; }; 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 463d3ce5e0..f8ae9d1827 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SmeoLuV+NbX2+ff75qDtpj9Wzh3Yr0CbTComozQEV9s="; + hash = "sha256-SmeoLuV+NbX2+ff75qDtpj9Wzh3Yr0CbTComozQEV9s="; }; propagatedBuildInputs = [ 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 49b7dd44c6..5e5cf339b7 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 = "4.1.0"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5jCltdomD4u5LZrYJFUHB/sLORXYuWoeJOalAci0+XQ="; + hash = "sha256-pvka8TLMEclzJ2Iw4iLSiR1ioV3frzQStLu21+kSSHI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix index 58fbd305e3..f5a646a16f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "jenkinsapi"; - version = "0.3.11"; + version = "0.3.13"; format = "setuptools"; disabled = pythonAtLeast "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a212a244b0a6022a61657746c8120ac9b6db83432371b345154075eb8faceb61"; + hash = "sha256-JGqYpj5h9UoV0WEFyxVIjFZwc030HobHrw1dnAryQLk="; }; propagatedBuildInputs = [ pytz requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jinja2-ansible-filters/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jinja2-ansible-filters/default.nix index 33975ee204..79af7744a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jinja2-ansible-filters/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jinja2-ansible-filters/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-B8EM9E1wc/TwEQLKEtmi3DG0HUfkxh7ZLvam0mabNWs="; + hash = "sha256-B8EM9E1wc/TwEQLKEtmi3DG0HUfkxh7ZLvam0mabNWs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jinja2-time/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jinja2-time/default.nix index ecd42a1c54..3daf84fa69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jinja2-time/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jinja2-time/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { # fix usage of arrow in tests (fetchpatch { url = "https://github.com/hackebrot/jinja2-time/pull/19/commits/3b2476c266ba53262352153104ca3501722823a4.patch"; - sha256 = "sha256-zh4PpAj2GtpgaEap/Yvu6DNY84AwH/YTJlUPRRHPyTs="; + hash = "sha256-zh4PpAj2GtpgaEap/Yvu6DNY84AwH/YTJlUPRRHPyTs="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix index 048890d18c..cb30b871ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-MTUacCpAip51laj8YVD8P0O7a/fjGXcMvA2535Q36FI="; + hash = "sha256-MTUacCpAip51laj8YVD8P0O7a/fjGXcMvA2535Q36FI="; }; propagatedBuildInputs = [ 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 1002ae15dd..80dda79fc0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "jira"; - version = "3.4.1"; + version = "3.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pycontribs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-EZCvYpcQ1dSsXDhipUalrHEG5SYOochktYrBdIoNDRo="; + hash = "sha256-6Nx12xEEPSWZE6XORU3I5HYM7vIjbAWPu7vNrzR4W24="; }; nativeBuildInputs = [ @@ -62,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to interact with the JIRA REST API"; homepage = "https://github.com/pycontribs/jira"; + changelog = "https://github.com/pycontribs/jira/releases/tag/${version}"; license = licenses.bsd2; maintainers = with maintainers; [ globin ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jmespath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jmespath/default.nix index 92005868a5..db761a9823 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jmespath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jmespath/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-kCYbIG1t79WP3V6F9Hi/YzopAXmJBr4q04kVDFxg7b4="; + hash = "sha256-kCYbIG1t79WP3V6F9Hi/YzopAXmJBr4q04kVDFxg7b4="; }; nativeCheckInputs = [ 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 66eece32c5..d45c684623 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jmp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jmp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "deepmind"; repo = pname; rev = "260e5ba01f46b10c579a61393e6c7e546aeae93e"; - sha256 = "sha256-BTHy/jNf6LeV+x3GTI9MDBWLK6A5z2Z1TQyBkHMTeuE="; + hash = "sha256-BTHy/jNf6LeV+x3GTI9MDBWLK6A5z2Z1TQyBkHMTeuE="; }; # Wheel requires only `numpy`, but the import needs `jax`. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix index 98ec450671..2a2389cf82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-4c7kp55K8iiBFk8hjUMR9gB0GX+3B+CC6AO2H20TcBg="; + hash = "sha256-4c7kp55K8iiBFk8hjUMR9gB0GX+3B+CC6AO2H20TcBg="; }; nativeCheckInputs = [ sphinx numpydoc pytestCheckHook psutil ]; 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 4dfe43e5ca..76004df63b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-iTHa84+KTIUnSg6LfLJa3f2NHyj5+4++0FPdUa7HXck="; + hash = "sha256-iTHa84+KTIUnSg6LfLJa3f2NHyj5+4++0FPdUa7HXck="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jplephem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jplephem/default.nix index 93b1ffb550..a2da6c10b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jplephem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jplephem/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SSkR6KTEeDB5GwO5oP/ff8ZfaF0cuzoXkLHqKIrn+uU="; + hash = "sha256-SSkR6KTEeDB5GwO5oP/ff8ZfaF0cuzoXkLHqKIrn+uU="; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jproperties/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jproperties/default.nix index 35c762988b..c67fea93b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jproperties/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jproperties/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Tblue"; repo = "python-jproperties"; rev = "v${version}"; - sha256 = "sha256-O+ALeGHMNjW1dc9IRyLzO81k8DW2vbGjuZqXxgrhYjo="; + hash = "sha256-O+ALeGHMNjW1dc9IRyLzO81k8DW2vbGjuZqXxgrhYjo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; 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 9e31735242..81f3c11b1b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix @@ -19,7 +19,7 @@ let owner = "openpreserve"; repo = "jpylyzer-test-files"; rev = "146cb0029b5ea9d8ef22dc6683cec8afae1cc63a"; - sha256 = "sha256-uKUau7mYXqGs4dSnXGPnPsH9k81ZCK0aPj5F9HWBMZ8="; + hash = "sha256-uKUau7mYXqGs4dSnXGPnPsH9k81ZCK0aPj5F9HWBMZ8="; }; in buildPythonPackage rec { @@ -30,7 +30,7 @@ in buildPythonPackage rec { owner = "openpreserve"; repo = pname; rev = version; - sha256 = "sha256-LBVOwjWC/HEvGgoi8WxEdl33M4JrfdHEj1Dk7f1NAiA="; + hash = "sha256-LBVOwjWC/HEvGgoi8WxEdl33M4JrfdHEj1Dk7f1NAiA="; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/JPype1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jpype1/default.nix similarity index 84% rename from third_party/nixpkgs/pkgs/development/python-modules/JPype1/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/jpype1/default.nix index f26473f0a9..dc16012391 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/JPype1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jpype1/default.nix @@ -9,13 +9,14 @@ }: buildPythonPackage rec { - pname = "JPype1"; + pname = "jpype1"; version = "1.4.1"; disabled = isPy27; src = fetchPypi { - inherit pname version; - sha256 = "sha256-3I7oVAc0dK15rhaNkML2iThU9Yk2z6GPNYfK2uDTaW0="; + pname = "JPype1"; + inherit version; + hash = "sha256-3I7oVAc0dK15rhaNkML2iThU9Yk2z6GPNYfK2uDTaW0="; }; propagatedBuildInputs = [ 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 e948c9f306..3e7c7f954e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "mwilliamson"; repo = "jq.py"; rev = version; - sha256 = "sha256-1EQm5ShjFHbO1IO5QD42fsGHFGDBrJulLrcl+WeU7wo="; + hash = "sha256-1EQm5ShjFHbO1IO5QD42fsGHFGDBrJulLrcl+WeU7wo="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-home-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json-home-client/default.nix index 3658ec111e..6b63733505 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/json-home-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-home-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "plinss"; repo = "json_home_client"; rev = "v${version}"; - sha256 = "sha256-DhnvvY1nMe1sdRE+OgjBt4TsLmiqnD8If4rl700zW9E="; + hash = "sha256-DhnvvY1nMe1sdRE+OgjBt4TsLmiqnD8If4rl700zW9E="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-rpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json-rpc/default.nix index 58e4b52964..6c36533f8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/json-rpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-rpc/default.nix @@ -8,7 +8,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-/13xx/2G4dvQJZ8GWZdRzpGnx5DykEFHk6Vlq1ht3FI="; + hash = "sha256-/13xx/2G4dvQJZ8GWZdRzpGnx5DykEFHk6Vlq1ht3FI="; }; nativeCheckInputs = pythonEnv ++ [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-stream-rs-tokenizer/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/json-stream-rs-tokenizer/Cargo.lock new file mode 100644 index 0000000000..7c6a60e689 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-stream-rs-tokenizer/Cargo.lock @@ -0,0 +1,596 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "arrayvec" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bytecount" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" + +[[package]] +name = "camino" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "error-chain" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" +dependencies = [ + "version_check", +] + +[[package]] +name = "fastrand" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "indoc" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2d6f23ffea9d7e76c53eee25dfb67bcd8fde7f1198b0855350698c9f07c780" + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "itoa" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" + +[[package]] +name = "json-stream-rs-tokenizer" +version = "0.1.0" +dependencies = [ + "num-bigint", + "pyo3", + "pyo3-build-config 0.17.3", + "pyo3-file", + "thiserror", + "utf8-chars", +] + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys", +] + +[[package]] +name = "proc-macro2" +version = "1.0.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pulldown-cmark" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" +dependencies = [ + "bitflags", + "memchr", + "unicase", +] + +[[package]] +name = "pyo3" +version = "0.16.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0220c44442c9b239dd4357aa856ac468a4f5e1f0df19ddb89b2522952eb4c6ca" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "num-bigint", + "parking_lot", + "pyo3-build-config 0.16.6", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.16.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c819d397859445928609d0ec5afc2da5204e0d0f73d6bf9e153b04e83c9cdc2" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-build-config" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.16.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca882703ab55f54702d7bfe1189b41b0af10272389f04cae38fe4cd56c65f75f" +dependencies = [ + "libc", + "pyo3-build-config 0.16.6", +] + +[[package]] +name = "pyo3-file" +version = "0.5.0" +source = "git+https://github.com/smheidrich/pyo3-file.git?branch=divide-buf-length-by-4-to-fix-textio-bug-forjsonstream#c29bf591842e3487e8b00890b91e0d4841103138" +dependencies = [ + "pyo3", + "skeptic", +] + +[[package]] +name = "pyo3-macros" +version = "0.16.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "568749402955ad7be7bad9a09b8593851cd36e549ac90bfd44079cea500f3f21" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.16.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "611f64e82d98f447787e82b8e7b0ebc681e1eb78fc1252668b2c605ffb4e1eb8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] + +[[package]] +name = "ryu" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "semver" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "skeptic" +version = "0.13.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8" +dependencies = [ + "bytecount", + "cargo_metadata", + "error-chain", + "glob", + "pulldown-cmark", + "tempfile", + "walkdir", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "target-lexicon" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d" + +[[package]] +name = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi", +] + +[[package]] +name = "thiserror" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "unindent" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" + +[[package]] +name = "utf8-chars" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "437bc4a6a3acdb2a99491b19ec1c2131a536d9f1d7da112341ec5c9e5f4dfc3a" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix new file mode 100644 index 0000000000..21277a176d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, rustPlatform +, setuptools-rust +, json-stream-rs-tokenizer +, json-stream +}: + +buildPythonPackage rec { + pname = "json-stream-rs-tokenizer"; + version = "0.4.13"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "smheidrich"; + repo = "py-json-stream-rs-tokenizer"; + rev = "refs/tags/v${version}"; + hash = "sha256-9pJi80V7WKvsgtp0ffItWnjoOvFvfE/Sz6y2VlsU+wQ="; + }; + + postPatch = '' + cp ${./Cargo.lock} ./Cargo.lock + ''; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src postPatch; + name = "${pname}-${version}"; + hash = "sha256-TjRdHSXHmF6fzCshX1I4Sq+A/fEmBHDPGZvJUxL13aM="; + }; + + nativeBuildInputs = [ + setuptools-rust + ] + ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + # Tests depend on json-stream, which depends on this package. + # To avoid infinite recursion, we only enable tests when building passthru.tests. + doCheck = false; + + checkInputs = [ + json-stream + ]; + + pythonImportsCheck = [ + "json_stream_rs_tokenizer" + ]; + + passthru.tests = { + runTests = json-stream-rs-tokenizer.overrideAttrs (_: { doCheck = true; }); + }; + + meta = with lib; { + description = "A faster tokenizer for the json-stream Python library"; + homepage = "https://github.com/smheidrich/py-json-stream-rs-tokenizer"; + license = licenses.mit; + maintainers = with maintainers; [ winter ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-stream/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json-stream/default.nix index de3d7b65c5..010edcd27a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/json-stream/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-stream/default.nix @@ -1,30 +1,38 @@ { lib +, stdenv , buildPythonPackage , fetchPypi +, iconv , pytestCheckHook , pythonOlder , requests +, json-stream-rs-tokenizer , setuptools }: buildPythonPackage rec { pname = "json-stream"; - version = "1.5.1"; + version = "2.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-htajifmbXtivUwsORzBzJA68nJCACcL75kiBysVYCxY="; + hash = "sha256-Vg6zF4iR4YqVAsx93Gy5mO2JNldm2f7BhNBtjzVY82w="; }; nativeBuildInputs = [ setuptools ]; + buildInputs = lib.optionals stdenv.isDarwin [ + iconv + ]; + propagatedBuildInputs = [ requests + json-stream-rs-tokenizer ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonconversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonconversion/default.nix index dda1d48a69..a98798f05f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonconversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonconversion/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-4hMY0N/Px+g5zn3YzNfDWPyi8Pglvd/c2N9SeC4JoZ0="; + hash = "sha256-4hMY0N/Px+g5zn3YzNfDWPyi8Pglvd/c2N9SeC4JoZ0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsondiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsondiff/default.nix index b6d6401b45..df2e883825 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsondiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsondiff/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-J5WETvB17IorjThcTVn16kiwjnGA/OPLJ4e+DbALH7Q="; + hash = "sha256-J5WETvB17IorjThcTVn16kiwjnGA/OPLJ4e+DbALH7Q="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix index 69a76db190..6dfa6914f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-otH4ACHFwdcKSeMfhitfBo+dsGYIDYVh6AZU3nSjWE0="; + hash = "sha256-otH4ACHFwdcKSeMfhitfBo+dsGYIDYVh6AZU3nSjWE0="; }; propagatedBuildInputs = [ jsonschema ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonpath-ng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonpath-ng/default.nix index 86d39b5944..3f189a8943 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonpath-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonpath-ng/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { repo = pname; # missing tag https://github.com/h2non/jsonpath-ng/issues/114 rev = "cce4a3d4063ac8af928795acc53beb27a2bfd101"; - sha256 = "sha256-+9iQHQs5TQhZFeIqMlsa3FFPfZEktAWy1lSdJU7kZrc="; + hash = "sha256-+9iQHQs5TQhZFeIqMlsa3FFPfZEktAWy1lSdJU7kZrc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix index 8289bf0e95..d60fd41d70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-AyU4gEeV5zuU6tQQgArDh/223pj4iCrJV/zSR+OoUgA="; + hash = "sha256-AyU4gEeV5zuU6tQQgArDh/223pj4iCrJV/zSR+OoUgA="; }; nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix index 504b7f7035..646824b064 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-l8ulFSbIKSgiGP65nasbHmvfjv0cQ9ydV74JPA1pyZo="; + hash = "sha256-l8ulFSbIKSgiGP65nasbHmvfjv0cQ9ydV74JPA1pyZo="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix index fb70cdf695..6c1569055b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "emlove"; repo = "jsonrpc-websocket"; rev = version; - sha256 = "sha256-xSOITOVtsNMEDrq610l8LNipLdyMWzKOQDedQEGaNOQ="; + hash = "sha256-xSOITOVtsNMEDrq610l8LNipLdyMWzKOQDedQEGaNOQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonrpclib-pelix/default.nix index f049e2a09d..31bb0fe313 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonrpclib-pelix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonrpclib-pelix/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-6eCzPvqPog2BfdeN/Z5M2zlnyKXTy1p4O+HugcSonHw="; + hash = "sha256-6eCzPvqPog2BfdeN/Z5M2zlnyKXTy1p4O+HugcSonHw="; }; doCheck = false; # test_suite="tests" in setup.py but no tests in pypi. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonschema-spec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonschema-spec/default.nix index 28e93508ae..e0220c640d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonschema-spec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonschema-spec/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "jsonschema-spec"; - version = "0.1.2"; + version = "0.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-RfkD2fVH9OUTe0XNpHO6brQ4+8zbMpae6AgdeFpYXa8="; + hash = "sha256-vDuIMzl9w7/e6r3AYleGVV5RRjrXDSvY6IBhtLuAFIs="; }; postPatch = '' 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 71a7bc3632..f60b693a82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-D4ZEN6uLYHa6ZwdFPvj5imoNUSqA6T+KvbZ29zfstg0="; + hash = "sha256-D4ZEN6uLYHa6ZwdFPvj5imoNUSqA6T+KvbZ29zfstg0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jstyleson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jstyleson/default.nix index d5b7b0a76b..757a8ef8bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jstyleson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jstyleson/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { repo = "jstyleson"; # https://github.com/linjackson78/jstyleson/issues/6 rev = "544b9fdb43339cdd15dd03dc69a6d0f36dd73241"; - sha256 = "sha256-s/0DDfy+07TuUNjHPqKRT3xMMQl6spZCacB7Dweof7A="; + hash = "sha256-s/0DDfy+07TuUNjHPqKRT3xMMQl6spZCacB7Dweof7A="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-book/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-book/default.nix index 12c4e08c9a..fc3544ac70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-book/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-book/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "jupyter-book"; - version = "0.14.0"; + version = "0.15.1"; format = "flit"; @@ -34,7 +34,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-BxrVrOsCqFRmx16l6YdkJplwdnU2XhRFMHd5DGy+dqE="; + hash = "sha256-ihY07Bb37t7g0Rbx5ft8SCAyia2S2kLglRnccdlWwBA="; }; nativeBuildInputs = [ @@ -65,7 +65,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "docutils" - "sphinx-book-theme" ]; pythonImportsCheck = [ @@ -75,6 +74,7 @@ buildPythonPackage rec { meta = with lib; { description = "Build a book with Jupyter Notebooks and Sphinx"; homepage = "https://jupyterbook.org/"; + changelog = "https://github.com/executablebooks/jupyter-book/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ marsam ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix index 23a1f35d2d..5aa400a169 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "7.4.8"; + version = "8.0.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EJo8M7YqnPZaqDJYUKCZmnlfrBVdneT3VVrvXzEO41o="; + hash = "sha256-7WVJi+pth2752No+DbPdM8XRKfWyZF9WrgOZN4KWa9A="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-core/default.nix index 4a64530d1c..a25681dda4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-core/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch , hatchling , platformdirs , traitlets @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "jupyter-core"; - version = "5.1.1"; + version = "5.2.0"; disabled = pythonOlder "3.7"; format = "pyproject"; @@ -19,11 +20,16 @@ buildPythonPackage rec { owner = "jupyter"; repo = "jupyter_core"; rev = "refs/tags/v${version}"; - hash = "sha256-54zbo+RXgT9AJabmJYHCznyoinTQqrTORzlM48WpnQQ="; + hash = "sha256-X3P3bTLhpWIa6EHdxZ/KFiQNAnhszha2cfZ8PynZPRs="; }; patches = [ ./tests_respect_pythonpath.patch + (fetchpatch { + # add support for platformdirs>=3 + url = "https://github.com/jupyter/jupyter_core/commit/ff4086cdbdac2ea79c18632e4e35acebc1f7cf57.patch"; + hash = "sha256-UhHO58xZ4hH47NBhOhsfBjgsUtA+1EIHxPBvnKA5w28="; + }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-events/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-events/default.nix index 26b3328538..a60983e404 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-events/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-events/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "jupyter-events"; - version = "0.5.0"; + version = "0.6.3"; format = "pyproject"; src = fetchFromGitHub { owner = "jupyter"; repo = "jupyter_events"; rev = "refs/tags/v${version}"; - hash = "sha256-ak5JNMitxMvXaHPmjMhB58y8Fy8N1oLtqNMNZ9lgpnM="; + hash = "sha256-k+OyCKUN9hC6J1Ff2DDb2ECLvmWkkK1HtNxfKVXyl8g="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-lsp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-lsp/default.nix index 342e0233eb..b0ef523e28 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-lsp/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-dRq9NUE76ZpDMfNZewk0Gtx1VYntMgkawvaG2z1hJn4="; + hash = "sha256-dRq9NUE76ZpDMfNZewk0Gtx1VYntMgkawvaG2z1hJn4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-packaging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-packaging/default.nix index 62dfc6ded9..24ad566b2a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-packaging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-packaging/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyter_packaging"; inherit version; - sha256 = "sha256-nZsrY7l//WeovFORwypCG8QVsmSjLJnk2NjdMdqunPQ="; + hash = "sha256-nZsrY7l//WeovFORwypCG8QVsmSjLJnk2NjdMdqunPQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-fileid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-fileid/default.nix new file mode 100644 index 0000000000..2846b00ddb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-fileid/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, hatchling +, jupyter-events +, jupyter-server +, pytest-jupyter +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jupyter-server-fileid"; + version = "0.8.0"; + + disables = pythonOlder "3.7"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jupyter-server"; + repo = "jupyter_server_fileid"; + rev = "refs/tags/v${version}"; + hash = "sha256-gJ+OM2b4JrdBObPnltqCWGK3e5p3K2XcoUohej3nDIM="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + jupyter-events + jupyter-server + ]; + + pythonImportsCheck = [ "jupyter_server_fileid" ]; + + checkInputs = [ + pytest-jupyter + pytestCheckHook + ]; + + preCheck = '' + export HOME=$TEMPDIR + ''; + + meta = { + changelog = "https://github.com/jupyter-server/jupyter_server_fileid/blob/${src.rev}/CHANGELOG.md"; + description = "An extension that maintains file IDs for documents in a running Jupyter Server"; + homepage = "https://github.com/jupyter-server/jupyter_server_fileid"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix index 21eb1f9eb7..1f6c3b3547 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix @@ -2,23 +2,26 @@ , buildPythonPackage , fetchPypi , jupyter-packaging +, setuptools , jupyter-server -, pytest-tornasync +, pytest-jupyter , pytestCheckHook }: buildPythonPackage rec { pname = "jupyter-server-mathjax"; version = "0.2.6"; + format = "pyproject"; src = fetchPypi { inherit version; pname = "jupyter_server_mathjax"; - sha256 = "sha256-ux5rbcBobB/jhqIrWIYWPbVIiTqZwoEMNjmenEyiOUM="; + hash = "sha256-ux5rbcBobB/jhqIrWIYWPbVIiTqZwoEMNjmenEyiOUM="; }; nativeBuildInputs = [ jupyter-packaging + setuptools ]; propagatedBuildInputs = [ @@ -26,7 +29,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest-tornasync + pytest-jupyter pytestCheckHook ]; @@ -36,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "MathJax resources as a Jupyter Server Extension"; - homepage = "https://jupyter.org"; + homepage = "https://github.com/jupyter-server/jupyter_server_mathjax"; license = licenses.bsd3; maintainers = with maintainers; [ jonringer ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-terminals/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-terminals/default.nix index 507df9b224..584b7fb634 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-terminals/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-terminals/default.nix @@ -16,14 +16,14 @@ let self = buildPythonPackage rec { pname = "jupyter-server-terminals"; - version = "0.4.3"; + version = "0.4.4"; format = "pyproject"; src = fetchFromGitHub { owner = "jupyter-server"; repo = "jupyter_server_terminals"; rev = "refs/tags/v${version}"; - hash = "sha256-swFMuKP/JIHJJ0zr3Dqv71Ne4WaP7GbzeNQ2tzEBpRU="; + hash = "sha256-F1lpg4ASw3ImvhC8XA8Ya4qpcbGY6fg8PYJt8sJj4cs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-ydoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-ydoc/default.nix new file mode 100644 index 0000000000..0a94adc318 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-ydoc/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, hatchling +, jupyter-server-fileid +, jupyter-ydoc +, ypy-websocket +, pytest-jupyter +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jupyter-server-ydoc"; + version = "0.8.0"; + + disabled = pythonOlder "3.7"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jupyterlab"; + repo = "jupyter_collaboration"; + rev = "refs/tags/v${version}"; + hash = "sha256-KLb7kU5jsj6ihGO6HU3Y7uF+0PcwKoQlqQAhtO0oaJw="; + }; + + postPatch = '' + sed -i "/^timeout/d" pyproject.toml + ''; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + jupyter-server-fileid + jupyter-ydoc + ypy-websocket + ]; + + pythonImportsCheck = [ "jupyter_server_ydoc" ]; + + nativeCheckInputs = [ + pytest-jupyter + pytestCheckHook + ]; + + preCheck = '' + export HOME=$TEMP + ''; + + meta = { + changelog = "https://github.com/jupyterlab/jupyter_collaboration/blob/${src.rev}/CHANGELOG.md"; + description = "A Jupyter Server Extension Providing Y Documents"; + homepage = "https://github.com/jupyterlab/jupyter_collaboration"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-sphinx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-sphinx/default.nix index 7355cb9276..13758cb07c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-sphinx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-sphinx/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "jupyter_sphinx"; - sha256 = "sha256-DBGjjxNDE48sUFHA00xMVF9EgBdMG9QcAlb+gm4LqlU="; + hash = "sha256-DBGjjxNDE48sUFHA00xMVF9EgBdMG9QcAlb+gm4LqlU="; }; propagatedBuildInputs = [ nbconvert nbformat sphinx ipywidgets ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-ydoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-ydoc/default.nix new file mode 100644 index 0000000000..d2643155bf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-ydoc/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchPypi +, hatch-nodejs-version +, hatchling +, y-py +, pytestCheckHook +, websockets +, ypy-websocket +}: + +buildPythonPackage rec { + pname = "jupyter-ydoc"; + version = "0.3.4"; + + format = "pyproject"; + + src = fetchPypi { + pname = "jupyter_ydoc"; + inherit version; + hash = "sha256-WiJi5wvwBLgsxs5xZ16TMKoFj+MNsuh82BJa1N0a5OE="; + }; + + nativeBuildInputs = [ + hatch-nodejs-version + hatchling + ]; + + propagatedBuildInputs = [ + y-py + ]; + + pythonImportsCheck = [ "jupyter_ydoc" ]; + + nativeCheckInputs = [ + pytestCheckHook + websockets + ypy-websocket + ]; + + # requires a Node.js environment + doCheck = false; + + meta = { + changelog = "https://github.com/jupyter-server/jupyter_ydoc/blob/v${version}/CHANGELOG.md"; + description = "Document structures for collaborative editing using Ypy"; + homepage = "https://github.com/jupyter-server/jupyter_ydoc"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix index f6065afa2b..91e21f9101 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix @@ -1,45 +1,75 @@ { lib , buildPythonPackage , fetchPypi -, nose -, jupyter-client -, ipython +, pythonOlder +, substituteAll +, hatchling , ipykernel +, ipython +, jupyter-client +, jupyter-core , prompt-toolkit , pygments -, pythonOlder +, pyzmq +, traitlets +, flaky +, pexpect +, pytestCheckHook }: buildPythonPackage rec { pname = "jupyter_console"; - version = "6.5.1"; - disabled = pythonOlder "3.5"; + version = "6.6.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-a5G3tuinFQU7U22yCaL0sCQp17KNsnNzpWomsL69Ygs="; + hash = "sha256-WTEhLVy8H5Vvb9YVdVteFfOJqOqmlyiNu+Q3cBdhXsw="; }; - propagatedBuildInputs = [ - jupyter-client - ipython - ipykernel - prompt-toolkit - pygments + nativeBuildInputs = [ + hatchling ]; - nativeCheckInputs = [ nose ]; postPatch = '' - substituteInPlace setup.py \ - --replace "prompt_toolkit>=2.0.0,<2.1.0" "prompt_toolkit" + # use wrapped executable in tests + substituteInPlace jupyter_console/tests/test_console.py \ + --replace "args = ['-m', 'jupyter_console', '--colors=NoColor']" "args = ['--colors=NoColor']" \ + --replace "cmd = sys.executable" "cmd = '${placeholder "out"}/bin/jupyter-console'" \ + --replace "check_output([sys.executable, '-m', 'jupyter_console'," "check_output(['${placeholder "out"}/bin/jupyter-console'," ''; - # ValueError: underlying buffer has been detached - doCheck = false; + propagatedBuildInputs = [ + ipykernel + ipython + jupyter-client + jupyter-core + prompt-toolkit + pygments + pyzmq + traitlets + ]; + + pythonImportsCheck = [ + "jupyter_console" + ]; + + nativeCheckInputs = [ + flaky + pexpect + pytestCheckHook + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; meta = { description = "Jupyter terminal console"; - homepage = "https://jupyter.org/"; + homepage = "https://github.com/jupyter/jupyter_console"; + changelog = "https://github.com/jupyter/jupyter_console/releases/tag/v${version}"; license = lib.licenses.bsd3; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix index 2137a0f3f0..31f33821b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "jupyterhub"; repo = "systemdspawner"; rev = "v${version}"; - sha256 = "sha256-EUCA+CKCeYr+cLVrqTqe3Q32JkbqeALL6tfOnlVHk8Q="; + hash = "sha256-EUCA+CKCeYr+cLVrqTqe3Q32JkbqeALL6tfOnlVHk8Q="; }; 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 ffa6a33669..8424d5add9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-3GGPZXwjukYoDjYlflCTGAZnS6Dp5kmK+wke/GIm1p0="; + hash = "sha256-3GGPZXwjukYoDjYlflCTGAZnS6Dp5kmK+wke/GIm1p0="; }; # Most of this only applies when building from source (e.g. js/css assets are 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 8d7d78ce70..e894a8c88d 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 @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyterlab_git"; inherit version; - sha256 = "sha256-UXZ9qgAvCKfPCzchFOtwbv8vNPEtcLU0dwBGTmiHSD4="; + hash = "sha256-UXZ9qgAvCKfPCzchFOtwbv8vNPEtcLU0dwBGTmiHSD4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-lsp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-lsp/default.nix index 9140e2290d..3f04f837c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-lsp/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-VZrUaS+X9C3WufCzMKuScD8CuORbuvbpz1mJiolyIqA="; + hash = "sha256-VZrUaS+X9C3WufCzMKuScD8CuORbuvbpz1mJiolyIqA="; }; propagatedBuildInputs = [ 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 1634e986d0..195a649a25 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 @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyterlab_widgets"; inherit version; - sha256 = "sha256-7q7N6vbAOvyWDdriAc7YjVl5tMqcOJG8uPZjGvcF9e8="; + hash = "sha256-7q7N6vbAOvyWDdriAc7YjVl5tMqcOJG8uPZjGvcF9e8="; }; 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 8ac600083f..743e758207 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix @@ -1,33 +1,57 @@ { lib , buildPythonPackage , fetchPypi +, ipython +, packaging +, tornado +, jupyter-core , jupyterlab_server +, jupyter-server +, jupyter-server-ydoc , notebook +, jinja2 +, tomli , pythonOlder , jupyter-packaging +, pythonRelaxDepsHook , nbclassic }: buildPythonPackage rec { pname = "jupyterlab"; - version = "3.5.3"; + version = "3.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UeiJRIrhlO7vjlD2P1xPSH9yj0d77+Q26XSWcvdRHb4="; + hash = "sha256-rumMF0GA6YowRwKX0QuVno5k8iiJcMDeZfCm0rSAcDQ="; }; nativeBuildInputs = [ jupyter-packaging + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "jupyter-ydoc" + "jupyter-server-ydoc" ]; propagatedBuildInputs = [ + ipython + packaging + tornado + jupyter-core jupyterlab_server - notebook + jupyter-server + jupyter-server-ydoc nbclassic + notebook + jinja2 + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; makeWrapperArgs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix index 35abc73f5d..1c1ea206e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "2.17.0"; + version = "2.19.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pbaSPiqeopn5jeW1DN6Qci10748HE6dcvL+/0/Qa0Fg="; + hash = "sha256-muwhohg7vt2fkahmKDVUSVdfGGLYiyitX5BQGdMebCE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/k5test/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/k5test/default.nix index b3f56a8e0d..640a80d700 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/k5test/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/k5test/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-nJ3uvK1joxXoGDPUXp/RK/IBZmQ7iry5/29NaxhMVx8="; + hash = "sha256-nJ3uvK1joxXoGDPUXp/RK/IBZmQ7iry5/29NaxhMVx8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix index c82f2b4c04..f528519304 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix @@ -11,7 +11,7 @@ let owner = "kaitai-io"; repo = "kaitai_compress"; rev = "12f4cffb45d95b17033ee4f6679987656c6719cc"; - sha256 = "sha256-l3rGbblUgxO6Y7grlsMEiT3nRIgUZV1VqTyjIgIDtyA="; + hash = "sha256-l3rGbblUgxO6Y7grlsMEiT3nRIgUZV1VqTyjIgIDtyA="; }; in buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-oETe4pFz1q+6zye8rDna+JtlTdQYz6AJq4LZF4qa5So="; + hash = "sha256-oETe4pFz1q+6zye8rDna+JtlTdQYz6AJq4LZF4qa5So="; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kajiki/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kajiki/default.nix index 759adc82ab..7ebd9d6cdb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kajiki/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kajiki/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "kajiki"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "jackrosenthal"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-bdQBVFHRB408/7X9y+3+fpllhymFRsdv/MEPTVjJh2E="; + rev = "refs/tags/v${version}"; + hash = "sha256-EbXe4Jh2IKAYw9GE0kFgKVv9c9uAOiFFYaMF8CGaOfg="; }; propagatedBuildInputs = [ babel pytz nine ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kazoo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kazoo/default.nix index 3e6457aafe..4799e1503e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kazoo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kazoo/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-gAMYx/PatkjN9hbfslvavu+rKmg3qmlR4Po/+A5laWk="; + hash = "sha256-gAMYx/PatkjN9hbfslvavu+rKmg3qmlR4Po/+A5laWk="; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keep/default.nix index 8b9823b6f0..176924b5fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keep/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keep/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, PyGithub +, pygithub , terminaltables , click , requests @@ -20,7 +20,7 @@ buildPythonPackage rec { click requests terminaltables - PyGithub + pygithub ]; # no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix index 37b7de10f8..a2a90aa851 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit format pname version; - sha256 = "sha256-OMb/8OqaiwaicXc2VlySpzyM2bHCOecSXMsYi3hI9l4="; + hash = "sha256-OMb/8OqaiwaicXc2VlySpzyM2bHCOecSXMsYi3hI9l4="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keyboard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keyboard/default.nix index 8c85da5ef4..c54f8f5fcd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keyboard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keyboard/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "boppreh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U4GWhPp28azBE3Jn9xpLxudOKx0PjnYO77EM2HsJ9lM="; + hash = "sha256-U4GWhPp28azBE3Jn9xpLxudOKx0PjnYO77EM2HsJ9lM="; }; pythonImportsCheck = [ "keyboard" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix index b556718a8c..ab6959389a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-K6PVZEG6Bjf1+cCWBo9nAQrART+dC2Jt4qowGTU7ZDE="; + hash = "sha256-K6PVZEG6Bjf1+cCWBo9nAQrART+dC2Jt4qowGTU7ZDE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/default.nix index 87cda53512..a31a5a3c95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-jW+cKMm+xef8C+fl0CGe+6SEkYBHDjFX2/kLCZ62j6c="; + hash = "sha256-jW+cKMm+xef8C+fl0CGe+6SEkYBHDjFX2/kLCZ62j6c="; }; patches = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { # change of API in keyrings.testing (fetchpatch { url = "https://github.com/frispete/keyrings.cryptfile/commit/6fb9e45f559b8b69f7a0a519c0bece6324471d79.patch"; - sha256 = "sha256-1878pMO9Ed1zs1pl+7gMjwx77HbDHdE1CryN8TPfPdU="; + hash = "sha256-1878pMO9Ed1zs1pl+7gMjwx77HbDHdE1CryN8TPfPdU="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix index c55bbf7a8d..82938b33f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-vrA3+/awws4R2BAxn9wYDKuIZdqioWsQnDr3MYL/5E0="; + hash = "sha256-vrA3+/awws4R2BAxn9wYDKuIZdqioWsQnDr3MYL/5E0="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keyrings-passwordstore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-passwordstore/default.nix index 11f632d7bf..f7f5cf0aef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keyrings-passwordstore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-passwordstore/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-pylZw45FUtLHzUV4cDyl/nT8tCZwNj4Jf41MMlyskoU="; + hash = "sha256-pylZw45FUtLHzUV4cDyl/nT8tCZwNj4Jf41MMlyskoU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix index b13e862cde..71faf0c4cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "keystoneauth1"; - version = "5.1.0"; + version = "5.1.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nve0txmnmkoEOHpqpVintspK3xi4Ex8YasrwZD/5e74="; + hash = "sha256-2fdIStX8mwu7fsw8vzeVoXBpT72EglEzHlS6SLvuzHI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kiss-headers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kiss-headers/default.nix index f89c7983de..5f2906cc8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kiss-headers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kiss-headers/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "Ousret"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-xPjw/uJTmvmQZDrI3i1KTUeAZuDF1mc13hvFBl8Erh0="; + hash = "sha256-xPjw/uJTmvmQZDrI3i1KTUeAZuDF1mc13hvFBl8Erh0="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kivy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kivy/default.nix index 77054ebe40..d3276c622b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kivy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kivy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "kivy"; repo = "kivy"; rev = version; - sha256 = "sha256-k9LIiLtlHY6H1xfVylI/Xbm7R6pCpC5UHe8GWnCwEGA="; + hash = "sha256-k9LIiLtlHY6H1xfVylI/Xbm7R6pCpC5UHe8GWnCwEGA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix index 1481bc8699..0a985bc3de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix @@ -20,9 +20,7 @@ buildPythonPackage rec { hash = "sha256-1BmXUZ/LpKHkbrSi/jG8EvD/lXsrgbrCjbJHRPMz6VU="; }; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ - "-I${lib.getDev libcxx}/include/c++/v1" - ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; nativeBuildInputs = [ setuptools-scm diff --git a/third_party/nixpkgs/pkgs/development/python-modules/klaus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/klaus/default.nix index aaea3c9b6f..cede627f91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/klaus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/klaus/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "jonashaag"; repo = pname; rev = version; - sha256 = "sha256-kQcza2beyekJhRT9RwSdMIkeyapcUDtjgkapK3rocvg="; + hash = "sha256-kQcza2beyekJhRT9RwSdMIkeyapcUDtjgkapK3rocvg="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix index 28fe591d80..28b9a3f840 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix @@ -6,7 +6,7 @@ , case , fetchPypi , importlib-metadata -, Pyro4 +, pyro4 , pytestCheckHook , pythonOlder , pytz @@ -25,6 +25,11 @@ buildPythonPackage rec { hash = "sha256-N87j7nJflOqLsXPqq3wXYCA+pTu+uuImMoYA+dJ5lhA="; }; + postPatch = '' + substituteInPlace requirements/test.txt \ + --replace "pytz>dev" "pytz" + ''; + propagatedBuildInputs = [ amqp vine @@ -36,7 +41,7 @@ buildPythonPackage rec { nativeCheckInputs = [ azure-servicebus case - Pyro4 + pyro4 pytestCheckHook pytz ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/korean-lunar-calendar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/korean-lunar-calendar/default.nix index c4a1672dd5..3a172d73a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/korean-lunar-calendar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/korean-lunar-calendar/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "korean_lunar_calendar"; - sha256 = "sha256-6yxIUSSgYQFpJr3qbYnv35uf2/FttViVts8eW+wXuFc="; + hash = "sha256-6yxIUSSgYQFpJr3qbYnv35uf2/FttViVts8eW+wXuFc="; }; # no real tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix index a74f22ffa7..5b18605852 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "kubernetes-client"; repo = "python"; rev = "refs/tags/v${version}"; - sha256 = "sha256-2QkQGZ4Dho2PykH90ijosWWBzhQoCHoWhRL3ruOiDBg="; + hash = "sha256-2QkQGZ4Dho2PykH90ijosWWBzhQoCHoWhRL3ruOiDBg="; }; propagatedBuildInputs = [ 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 641a4accc8..cac243e72b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.34.0"; + version = "3.38.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "Labelbox"; repo = "labelbox-python"; rev = "refs/tags/v.${version}"; - hash = "sha256-x/XvcGiFS//f/le3JAd2n/tuUy9MBrCsISpkIkCCNis="; + hash = "sha256-AyQPI19As49GML3kVXtHtRNOKthrpkQ7MCmww+F6owc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/labmath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/labmath/default.nix index 602cc06012..8ace5b3327 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/labmath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/labmath/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-dzJ4szPxnck0Cgc5IEp5FBmHvIyAC0rqKRVrkt20ntQ="; + hash = "sha256-dzJ4szPxnck0Cgc5IEp5FBmHvIyAC0rqKRVrkt20ntQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/language-tags/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/language-tags/default.nix index fb40b1fbc9..2d3f68f82c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/language-tags/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/language-tags/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "language-tags"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "OnroerendErfgoed"; repo = "language-tags"; - rev = version; - sha256 = "sha256-4Ira3EMS64AM8I3SLmUm+m6V5vwtDYf8WDmVDvI+ZOw="; + rev = "refs/tags/${version}"; + hash = "sha256-T9K290seKhQLqW36EfA9kn3WveKCmyjN4Mx2j50qIEk="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix index 7707693f2a..b5ba6c7583 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "lark-parser"; repo = "lark"; rev = "refs/tags/${version}"; - sha256 = "sha256-drvF+0PSOdrha2rfpntrM8xIbeb0S7eNtfioxkdjEKw="; + hash = "sha256-drvF+0PSOdrha2rfpntrM8xIbeb0S7eNtfioxkdjEKw="; }; # Optional import, but fixes some re known bugs & allows advanced regex features diff --git a/third_party/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix index 2ac1ca14eb..02acb86b60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-AYmMk3R3sMZKdTOK2wl3Ao1zRqigGesCPPaP7ZmFAUY="; + hash = "sha256-AYmMk3R3sMZKdTOK2wl3Ao1zRqigGesCPPaP7ZmFAUY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix index 9a4cfbaa75..c7a9ef78ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-B1FxfH502xmH6adzNXB9TX2XzwSxrQiYuCLxIzPWiHw="; + hash = "sha256-B1FxfH502xmH6adzNXB9TX2XzwSxrQiYuCLxIzPWiHw="; }; propagatedBuildInputs = [ distro httplib2 oauthlib setuptools six wadllib ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lazy-loader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lazy-loader/default.nix new file mode 100644 index 0000000000..05880d57ae --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/lazy-loader/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "lazy-loader"; + version = "0.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "scientific-python"; + repo = "lazy_loader"; + rev = "refs/tags/v${version}"; + hash = "sha256-zMmDvAyCaTSMOXgCiLQ4Z/9Ro3k0qJxJPLLoNmK/dmE="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Populate library namespace without incurring immediate import costs"; + homepage = "https://github.com/scientific-python/lazy_loader"; + changelog = "https://github.com/scientific-python/lazy_loader/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} 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 475c6e86d5..a3367cc9bd 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.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-whmgAkWvD2+k6VkB7SgERUT1AVKEDFtqPnslaNs00VY="; + hash = "sha256-ZZ+1gJ+kYpuKGsUQb2ac/HvvJvuzid2lOz4BDRrE664="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lc7001/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lc7001/default.nix index 5e78d42471..6e0f565bdc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lc7001/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lc7001/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-I4I3vwW1kJsgLFPMGpe9hkD3iEeC3AqI4pCi6SCWPx4="; + hash = "sha256-I4I3vwW1kJsgLFPMGpe9hkD3iEeC3AqI4pCi6SCWPx4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lcgit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lcgit/default.nix new file mode 100644 index 0000000000..967ef29fe2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/lcgit/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "lcgit"; + version = "0.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "cisagov"; + repo = "lcgit"; + rev = "refs/tags/v${version}"; + hash = "sha256-MYRqlfz2MRayBT7YGZmcyqJdoDRfENmgxk/TmhyoAlQ="; + }; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --cov" "" + ''; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "lcgit" + ]; + + meta = with lib; { + description = "A pythonic Linear Congruential Generator iterator"; + homepage = "https://github.com/cisagov/lcgit"; + changelog = "https://github.com/cisagov/lcgit/releases/tag/v${version}"; + license = licenses.cc0; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lcov_cobertura/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lcov_cobertura/default.nix index ecbeb35b90..a40265c76c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lcov_cobertura/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lcov_cobertura/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-xs40e/PuZ/jV0CDNZiYmo1lM8r5yfMY0qg0R+j9/E3Q="; + hash = "sha256-xs40e/PuZ/jV0CDNZiYmo1lM8r5yfMY0qg0R+j9/E3Q="; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix index caf4f3ef33..edbcc2c110 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-jEnrGTddSqs+W4NYYGFODLF+VrtaIOGHSAj6W+xno1g="; + hash = "sha256-jEnrGTddSqs+W4NYYGFODLF+VrtaIOGHSAj6W+xno1g="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/leb128/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/leb128/default.nix index aada84c736..b206de1362 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/leb128/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/leb128/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "mohanson"; repo = "leb128"; rev = "refs/tags/v${version}"; - sha256 = "sha256-zK14LPziBkvXAMzuPbcg/47caO/5GEYA9txAzCGfpS8="; + hash = "sha256-zK14LPziBkvXAMzuPbcg/47caO/5GEYA9txAzCGfpS8="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ledgerwallet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ledgerwallet/default.nix index cf2be98f92..6d4687d1e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ledgerwallet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ledgerwallet/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { (fetchpatch { # Fix removed function in construct library url = "https://github.com/LedgerHQ/ledgerctl/commit/fd23d0e14721b93789071e80632e6bd9e47c1256.patch"; - sha256 = "sha256-YNlENguPQW5FNFT7mqED+ghF3TJiKao4H+56Eu+j+Eo="; + hash = "sha256-YNlENguPQW5FNFT7mqED+ghF3TJiKao4H+56Eu+j+Eo="; excludes = [ "setup.py" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix index 8a4a5a6a2d..61d58ea468 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "romanz"; repo = "trezor-agent"; rev = "v${version}"; - sha256 = "sha256-RISAy0efdatr9u4CWNRGnlffkC8ksw1NyRpJWKwqz+s="; + hash = "sha256-RISAy0efdatr9u4CWNRGnlffkC8ksw1NyRpJWKwqz+s="; }; # hardcode the path to gpgconf in the libagent library diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libarcus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libarcus/default.nix index 494e786e97..0230e68007 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libarcus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libarcus/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "sha256-X33ptwYj9YkVWqUDPP+Ic+hoIb+rwsLdQXvHLA9z+3w="; + hash = "sha256-X33ptwYj9YkVWqUDPP+Ic+hoIb+rwsLdQXvHLA9z+3w="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix index 817afce5cd..2361768258 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-FIqeUAaWVEMqfTSZeVTpFDTdOOv2iDLrnHXUQrPmL60="; + hash = "sha256-FIqeUAaWVEMqfTSZeVTpFDTdOOv2iDLrnHXUQrPmL60="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libevdev/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libevdev/default.nix index 0f4e1a8e05..5f63653e3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libevdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libevdev/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-6coAak3ySIpgvZp0ABHulI2BkEviNk8BflYBaVCPVg8="; + hash = "sha256-6coAak3ySIpgvZp0ABHulI2BkEviNk8BflYBaVCPVg8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix index 89a83df426..6b141af3c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix @@ -8,7 +8,7 @@ , numpy , six , nose -, Mako +, mako , cudaSupport ? false, cudaPackages , openclSupport ? true, ocl-icd, clblas }: @@ -59,7 +59,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy six - Mako + mako ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/liblarch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/liblarch/default.nix index 6035260a9d..45c020b537 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/liblarch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/liblarch/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "getting-things-gnome"; repo = "liblarch"; rev = "v${version}"; - sha256 = "sha256-A2qChe2z6rAhjRVX5VoHQitebf/nMATdVZQgtlquuYg="; + hash = "sha256-A2qChe2z6rAhjRVX5VoHQitebf/nMATdVZQgtlquuYg="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libnacl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libnacl/default.nix index cefa9b8188..d07c08bc65 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libnacl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libnacl/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "saltstack"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nttR9PQimhqd2pByJ5IJzJ4RmSI4y7lcX7a7jcK+vqc="; + hash = "sha256-nttR9PQimhqd2pByJ5IJzJ4RmSI4y7lcX7a7jcK+vqc="; }; patches = [ @@ -23,7 +23,7 @@ buildPythonPackage rec { (fetchpatch { name = "fix-crypto_kdf_derive_from_key-32bit.patch"; url = "https://github.com/saltstack/libnacl/commit/e8a1f95ee1d4d0806fb6aee793dcf308b05d485d.patch"; - sha256 = "sha256-z6TAVNfPcuWZ/hRgk6Aa8I1IGzne7/NYnUOOQ3TjGVU="; + hash = "sha256-z6TAVNfPcuWZ/hRgk6Aa8I1IGzne7/NYnUOOQ3TjGVU="; }) ]; 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 d12087e59f..b00c895fd7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix @@ -1,39 +1,106 @@ { lib , buildPythonPackage -, fetchPypi -, joblib -, matplotlib -, six -, scikit-learn -, decorator +, fetchFromGitHub + +# build-system +, setuptools + +# runtime , audioread -, resampy -, soundfile +, decorator +, joblib +, lazy-loader +, matplotlib +, msgpack +, numba +, numpy , pooch +, scikit-learn +, scipy +, soundfile +, soxr +, typing-extensions + +# tests +, ffmpeg-headless +, packaging +, pytest-mpl +, pytestCheckHook +, resampy +, samplerate }: buildPythonPackage rec { pname = "librosa"; - version = "0.9.2"; + version = "0.10.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-W1drXv3OQo6QvJiL3VqVPRKnJ+X5MfMNdMU7Y6u+PIk="; + src = fetchFromGitHub { + owner = "librosa"; + repo = "librosa"; + rev = "refs/tags/${version}"; + fetchSubmodules = true; # for test data + hash = "sha256-MXzPIcbG8b1JwhEyAZG4DRObGaHq+ipVHMrZCzaxLdE="; }; - propagatedBuildInputs = [ joblib matplotlib six scikit-learn decorator audioread resampy soundfile pooch ]; + nativeBuildInputs = [ + setuptools + ]; - # No tests - # 1. Internet connection is required - # 2. Got error "module 'librosa' has no attribute 'version'" - doCheck = false; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-report term-missing --cov librosa --cov-report=xml " "" + ''; + + propagatedBuildInputs = [ + audioread + decorator + joblib + lazy-loader + msgpack + numba + numpy + pooch + scipy + scikit-learn + soundfile + soxr + typing-extensions + ]; + + passthru.optional-dependencies.matplotlib = [ + matplotlib + ]; # check that import works, this allows to capture errors like https://github.com/librosa/librosa/issues/1160 - pythonImportsCheck = [ "librosa" ]; + pythonImportsCheck = [ + "librosa" + ]; + + nativeCheckInputs = [ + ffmpeg-headless + packaging + pytest-mpl + pytestCheckHook + resampy + samplerate + ] ++ passthru.optional-dependencies.matplotlib; + + preCheck = '' + export HOME=$TMPDIR + ''; + + disabledTests = [ + # requires network access + "test_example" + "test_example_info" + "test_load_resample" + ]; meta = with lib; { - description = "Python module for audio and music processing"; - homepage = "http://librosa.github.io/"; + description = "Python library for audio and music analysis"; + homepage = "https://github.com/librosa/librosa"; + changelog = "https://github.com/librosa/librosa/releases/tag/${version}"; license = licenses.isc; maintainers = with maintainers; [ GuillaumeDesforges ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/librouteros/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/librouteros/default.nix index 03f5e9b072..c59af697b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/librouteros/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/librouteros/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "luqasz"; repo = pname; rev = version; - sha256 = "sha256-VwpZ1RY6Sul7xvWY7ZoOxZ7KgbRmKRwcVdF9e2b3f6Q="; + hash = "sha256-VwpZ1RY6Sul7xvWY7ZoOxZ7KgbRmKRwcVdF9e2b3f6Q="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libsass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libsass/default.nix index 61c3cb845b..3410664525 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libsass/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libsass/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "sass"; repo = "libsass-python"; rev = "refs/tags/${version}"; - sha256 = "sha256-5O4Er3jNUFy83m/K0HzYR+fHcSDqF/3M+fXaFZY8zEg="; + hash = "sha256-5O4Er3jNUFy83m/K0HzYR+fHcSDqF/3M+fXaFZY8zEg="; }; buildInputs = [ libsass ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix index 588ebfcd1e..83b3e129ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "libSavitar"; rev = version; - sha256 = "sha256-MAA1WtGED6lvU6N4BE6wwY1aYaFrCq/gkmQFz3VWqNA="; + hash = "sha256-MAA1WtGED6lvU6N4BE6wwY1aYaFrCq/gkmQFz3VWqNA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libversion/default.nix index e3b48b4120..dfebeaad53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libversion/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "repology"; repo = "py-libversion"; rev = version; - sha256 = "sha256-p0wtSB+QXAERf+57MMb8cqWoy1bG3XaCpR9GPwYYvJM="; + hash = "sha256-p0wtSB+QXAERf+57MMb8cqWoy1bG3XaCpR9GPwYYvJM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix index 13916a74ea..6328bd5003 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - sha256 = "sha256-kdWmgmkvI7yaqyFytPnHN6OtF+gsRe58q6AlXFycfQ8="; + hash = "sha256-kdWmgmkvI7yaqyFytPnHN6OtF+gsRe58q6AlXFycfQ8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lifelines/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lifelines/default.nix index 437a7881b7..7e2496d230 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lifelines/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lifelines/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "CamDavidsonPilon"; repo = "lifelines"; rev = "v${version}"; - sha256 = "sha256-KDoXplqkTsk85dmcTBhbj2GDcC4ry+2z5C2QHAnBTw4="; + hash = "sha256-KDoXplqkTsk85dmcTBhbj2GDcC4ry+2z5C2QHAnBTw4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix index c080bbac92..cd5fb226e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "lightning-utilities"; - version = "0.5.0"; + version = "0.7.1"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "utilities"; rev = "refs/tags/v${version}"; - hash = "sha256-J73sUmX1a7ww+rt1vwBt9P0Xbeoxag6jR0W63xEySCI="; + hash = "sha256-xjE5FsU1d/YcVHlfjtZE0T2LjGvsIOzbGJFU7PMDqdc="; }; nativeBuildInputs = [ @@ -49,6 +49,10 @@ buildPythonPackage rec { "lightning_utilities.core.imports.RequirementCache" "lightning_utilities.core.imports.compare_version" "lightning_utilities.core.imports.get_dependency_min_version_spec" + # weird doctests fail on imports, but providing the dependency + # fails another test + "lightning_utilities.core.imports.ModuleAvailableCache" + "lightning_utilities.core.imports.requires" ]; disabledTestPaths = [ 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 39c46e2840..aa1b4a697f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/limits/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/limits/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , deprecated , fetchFromGitHub +, etcd3 , hiro , packaging , pymemcache @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "limits"; - version = "2.8.0"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -32,7 +33,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/limits/_version.py" ''; - hash = "sha256-XGYwSe9KWw6PdxDjyqZ5kw5jlBxQR0VYacquwZ2z8rA="; + hash = "sha256-zMU2MU7MFTWSig2j1PaBLPtKM5/7gNkFajKXw3A+fIQ="; }; propagatedBuildInputs = [ @@ -43,6 +44,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + etcd3 hiro pymemcache pymongo diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lineedit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lineedit/default.nix new file mode 100644 index 0000000000..5631054627 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/lineedit/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pygments +, six +, wcwidth +, pytestCheckHook +, pyte +, ptyprocess +, pexpect +}: + +buildPythonPackage rec { + pname = "lineedit"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "randy3k"; + repo = pname; + rev = "v${version}"; + sha256 = "fq2NpjIQkIq1yzXEUxi6cz80kutVqcH6MqJXHtpTFsk="; + }; + + propagatedBuildInputs = [ + pygments + six + wcwidth + ]; + + nativeCheckInputs = [ + pytestCheckHook + pyte + pexpect + ptyprocess + ]; + + pythonImportsCheck = [ "lineedit" ]; + + meta = with lib; { + description = "A readline library based on prompt_toolkit which supports multiple modes"; + homepage = "https://github.com/randy3k/lineedit"; + license = licenses.mit; + maintainers = with maintainers; [ savyajha ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lingua/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lingua/default.nix index f116df7e2f..c218e4a537 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lingua/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lingua/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-DhqUZ0HbKIpANhrQT/OP4EvwgZg0uKu4TEtTX+2bpO8="; + hash = "sha256-DhqUZ0HbKIpANhrQT/OP4EvwgZg0uKu4TEtTX+2bpO8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/livestreamer-curses/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/livestreamer-curses/default.nix index 53cb71a123..213caaf4fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/livestreamer-curses/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/livestreamer-curses/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "gapato"; repo = "livestreamer-curses"; rev = "v${version}"; - sha256 = "sha256-Pi0PIOUhMMAWft9ackB04IgF6DyPrXppNqyVjozIjN4="; + hash = "sha256-Pi0PIOUhMMAWft9ackB04IgF6DyPrXppNqyVjozIjN4="; }; propagatedBuildInputs = [ livestreamer ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix index 4dd4c35cc7..c7c4b06a97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "chrippa"; repo = "livestreamer"; rev = "v${version}"; - sha256 = "sha256-PqqyBh+oMmu7Ynly3fqx/+6mQYX+6SpI0Okj2O+YLz0="; + hash = "sha256-PqqyBh+oMmu7Ynly3fqx/+6mQYX+6SpI0Okj2O+YLz0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lizard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lizard/default.nix index dec52c8021..b54e910cac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lizard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lizard/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "terryyin"; repo = "lizard"; rev = version; - sha256 = "sha256-4jq6gXpI1hFtX7ka2c/qQ+S6vZCThKOGhQwJ2FOYItY="; + hash = "sha256-4jq6gXpI1hFtX7ka2c/qQ+S6vZCThKOGhQwJ2FOYItY="; }; propagatedBuildInputs = [ jinja2 ]; 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 d53d40ca30..dfdbbe755d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-tDq9fILoBSYcQl1QM1vppsT4QmTjTW1uR1IHMAAF1XI="; + hash = "sha256-tDq9fILoBSYcQl1QM1vppsT4QmTjTW1uR1IHMAAF1XI="; }; nativeBuildInputs = [ llvm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/localstack-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/localstack-client/default.nix index a5a5b0576a..65744f35d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/localstack-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/localstack-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { repo = "localstack-python-client"; # Request for proper tags: https://github.com/localstack/localstack-python-client/issues/38 rev = "f1e538ad23700e5b1afe98720404f4801475e470"; - sha256 = "sha256-MBXTiTzCwkduJPPRN7OKaWy2q9J8xCX/GGu09tyac3A="; + hash = "sha256-MBXTiTzCwkduJPPRN7OKaWy2q9J8xCX/GGu09tyac3A="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix index 1947467c0e..ed9b190b80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "localstack-ext"; - version = "1.3.1"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zMGKGTKomduydhOAxfif/Caf1QJiG2mxig4a+789SJc="; + hash = "sha256-/uesHiB/54wEfcWf4e9BW1ZvcVfAgAD7yGAlfYxv+6g="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix index b0da4fba29..2b722c9291 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "localstack"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "localstack"; repo = "localstack"; rev = "refs/tags/v${version}"; - sha256 = "sha256-cxkEP/fsIGTcFLAM8tn/esCMmAvsIYb46X+EzV2VHDc="; + hash = "sha256-mfPlpB1CvYuhnfucDfJjZtNS+1Kz0/l3+3uUXxxGiF4="; }; postPatch = '' 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 a06101d837..bb5e4b7fa9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/locationsharinglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/locationsharinglib/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "locationsharinglib"; - version = "4.1.8"; + version = "4.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-69NzKSWpuU0Riwlj6cFC4h/shc/83e1mpq++zxDqftY="; + hash = "sha256-1Eu+gHhUDYbZPeLblizxKuHMQfy9DhrHTaEcDYnnuP8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Logbook/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/logbook/default.nix similarity index 90% rename from third_party/nixpkgs/pkgs/development/python-modules/Logbook/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/logbook/default.nix index da1f178729..e6d155760d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Logbook/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/logbook/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, pytest, mock, brotli }: buildPythonPackage rec { - pname = "Logbook"; + pname = "logbook"; version = "1.5.3"; src = fetchPypi { - inherit pname version; + pname = "Logbook"; + inherit version; sha256 = "1s1gyfw621vid7qqvhddq6c3z2895ci4lq3g0r1swvpml2nm9x36"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/logical-unification/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/logical-unification/default.nix index c6abe32723..9b802df672 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/logical-unification/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/logical-unification/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pythological"; repo = "unification"; rev = "707cf4a39e27a4a8bf06b7e7dce7223085574e65"; - sha256 = "sha256-3wqO0pWWFRQeoGNvbSDdLNYFyjNnv+O++F7+vTBUJoI="; + hash = "sha256-3wqO0pWWFRQeoGNvbSDdLNYFyjNnv+O++F7+vTBUJoI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix b/third_party/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix index 9168d2ef8b..e609558d4c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Jk6wvvcDEeHfy7dUcjbnzFIeGBYm5tXzCI26yy+t2qs="; + hash = "sha256-Jk6wvvcDEeHfy7dUcjbnzFIeGBYm5tXzCI26yy+t2qs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ludios_wpull/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ludios_wpull/default.nix index 0045f4b3e0..eae9f78b26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ludios_wpull/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ludios_wpull/default.nix @@ -8,7 +8,7 @@ , namedlist , sqlalchemy , tornado -, Yapsy +, yapsy , pythonAtLeast }: @@ -26,7 +26,7 @@ buildPythonPackage rec { sha256 = "0j4dir0dgg8pkf4d1znicz6wyyi1wzij50r21z838cycsdr54j4c"; }; - propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado Yapsy ]; + propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado yapsy ]; # Test suite has tests that fail on all platforms doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/luftdaten/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/luftdaten/default.nix index 343460325c..b87771380a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/luftdaten/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/luftdaten/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-luftdaten"; rev = version; - sha256 = "sha256-nOhJKlUJ678DJ/ilyRHaiQ2fGfoCl+x6l9lsczVLAGw="; + hash = "sha256-nOhJKlUJ678DJ/ilyRHaiQ2fGfoCl+x6l9lsczVLAGw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/luhn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/luhn/default.nix index b5622a23d6..95d1cad3b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/luhn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/luhn/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "mmcloughlin"; repo = pname; rev = version; - sha256 = "sha256-ZifaCjOVhWdXuzi5n6V+6eVN5vrEHKgUdpSOXoMyR18="; + hash = "sha256-ZifaCjOVhWdXuzi5n6V+6eVN5vrEHKgUdpSOXoMyR18="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lupa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lupa/default.nix index 70fed80b28..b5f40446bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lupa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lupa/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-0P1OYK0Un+JckFMOKg4DKkKm8EVfKcoO24Fw1ux1HG4="; + hash = "sha256-0P1OYK0Un+JckFMOKg4DKkKm8EVfKcoO24Fw1ux1HG4="; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/luxtronik/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/luxtronik/default.nix index b1e74c9ba6..14e0cece25 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/luxtronik/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/luxtronik/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Bouni"; repo = "python-luxtronik"; rev = version; - sha256 = "sha256-7TuvqOAb/MUumOF6BKTRLOJuvteqZPmFUXXsuwEpmOM="; + hash = "sha256-7TuvqOAb/MUumOF6BKTRLOJuvteqZPmFUXXsuwEpmOM="; }; # Project has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix index 65cb5afab1..cf43f6861c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/lxml-${version}"; - sha256 = "sha256-IHuTlcDbrZHvS6Gtx48IkznVU+9WxZT9XHUZf8M1WOE="; + hash = "sha256-IHuTlcDbrZHvS6Gtx48IkznVU+9WxZT9XHUZf8M1WOE="; }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix index 73b03cf83c..e172cf2f97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-aVnXCrTh+0Ip+FgYWN7hLw8N3iQCmXSywhReD5RTUfI="; + hash = "sha256-aVnXCrTh+0Ip+FgYWN7hLw8N3iQCmXSywhReD5RTUfI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix index 8f75d74f95..3d8475530b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-mfImCjCQHJSajcbV+CzVMS/7iryS52YzuvIxu7yy3ss="; + hash = "sha256-mfImCjCQHJSajcbV+CzVMS/7iryS52YzuvIxu7yy3ss="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/m2r/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/m2r/default.nix index 0019a1c5a6..5ef3111d86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/m2r/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/m2r/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { # fix tests in python 3.10 (fetchpatch { url = "https://github.com/miyakogi/m2r/commit/58ee9cabdadf5e3deb13037f3052238f0f2bffcd.patch"; - sha256 = "sha256-CN3PWmnk7xsn1wngRHuEWmDTP3HtVNxkFv0xzD2Zjlo="; + hash = "sha256-CN3PWmnk7xsn1wngRHuEWmDTP3HtVNxkFv0xzD2Zjlo="; }) ./docutils-0.19-compat.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/m3u8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/m3u8/default.nix index cc5dfc7ba2..6bb735e6de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/m3u8/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/m3u8/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { owner = "globocom"; repo = pname; rev = version; - sha256 = "sha256-EfHhmV2otEgEy2OVohS+DF7dk97GFdWZ4cFCERZBmlA="; + hash = "sha256-EfHhmV2otEgEy2OVohS+DF7dk97GFdWZ4cFCERZBmlA="; }; patches = [ # Fix hardcoded /tmp dir (fix build on Hydra) (fetchpatch { url = "https://github.com/globocom/m3u8/commit/cf7ae5fda4681efcea796cd7c51c02f152c36009.patch"; - sha256 = "sha256-SEETpIJQddid8D//6DVrSGs/BqDeMOzufE0bBrm+/xY="; + hash = "sha256-SEETpIJQddid8D//6DVrSGs/BqDeMOzufE0bBrm+/xY="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix index 076e6a50b9..21ab5d70c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix @@ -14,7 +14,7 @@ , keyrings-alt , packaging , pathspec -, Pyro5 +, pyro5 , requests , rich , setuptools @@ -50,7 +50,7 @@ buildPythonPackage rec { keyrings-alt packaging pathspec - Pyro5 + pyro5 requests rich setuptools diff --git a/third_party/nixpkgs/pkgs/development/python-modules/magicgui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/magicgui/default.nix index 6cf78d1298..2cd9fd90fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/magicgui/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/magicgui/default.nix @@ -20,7 +20,7 @@ owner = "napari"; repo = "magicgui"; rev = "refs/tags/v${version}"; - sha256 = "sha256-fVfBQaaT8/lUGqZRXjOPgvkC01Izb8Sxqn7RCqnW9bo="; + hash = "sha256-fVfBQaaT8/lUGqZRXjOPgvkC01Izb8Sxqn7RCqnW9bo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix index e644f1c29e..fa711c1b4c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "luispedro"; repo = "mahotas"; rev = "v${version}"; - sha256 = "sha256-AmctF/9hLgHw6FUm0s61eCdcc12lBa1t0OkXclis//w="; + hash = "sha256-AmctF/9hLgHw6FUm0s61eCdcc12lBa1t0OkXclis//w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/makefun/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/makefun/default.nix index f10f42c567..9eb72a8910 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/makefun/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/makefun/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-QLDxGLbe0NjXjHjx62ebi2skYuPBs+BfsbLajNRrSKU="; + hash = "sha256-QLDxGLbe0NjXjHjx62ebi2skYuPBs+BfsbLajNRrSKU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Mako/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mako/default.nix similarity index 90% rename from third_party/nixpkgs/pkgs/development/python-modules/Mako/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/mako/default.nix index 7b8f9b7a8b..cdfb682b5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Mako/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mako/default.nix @@ -18,14 +18,15 @@ }: buildPythonPackage rec { - pname = "Mako"; + pname = "mako"; version = "1.2.4"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-1go5A9w7sBoYrWqJzb4uTq3GnAvI7x43c7pT1Ew/ejQ="; + pname = "Mako"; + inherit version; + hash = "sha256-1go5A9w7sBoYrWqJzb4uTq3GnAvI7x43c7pT1Ew/ejQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/manuel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/manuel/default.nix index 6f1829c7ec..c004094748 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/manuel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/manuel/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch +, python , isPy27 , six , zope_testing @@ -13,9 +15,19 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-A5Wq32mR+SSseVz61Z2l3AYYcyqMxYrQ9HSWWrco9/Q="; + hash = "sha256-A5Wq32mR+SSseVz61Z2l3AYYcyqMxYrQ9HSWWrco9/Q="; }; + patches = lib.optionals (lib.versionAtLeast python.version "3.11") [ + # https://github.com/benji-york/manuel/pull/32 + # Applying conditionally until upstream arrives at some general solution. + (fetchpatch { + name = "TextTestResult-python311.patch"; + url = "https://github.com/benji-york/manuel/commit/d9f12d03e39bb76e4bb3ba43ad51af6d3e9d45c0.diff"; + hash = "sha256-k0vBtxEixoI1INiKtc7Js3Ai00iGAcCvCFI1ZIBRPvQ="; + }) + ]; + propagatedBuildInputs = [ six ]; nativeCheckInputs = [ zope_testing ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix index 1a791cd0fb..c5cf720844 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ruPeXyg2B0z9gD8crxb2g5DyYu8JzX3H0Oiu6baHhkM="; + hash = "sha256-ruPeXyg2B0z9gD8crxb2g5DyYu8JzX3H0Oiu6baHhkM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdown-include/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdown-include/default.nix index 3d32b50757..f56a8b40e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markdown-include/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markdown-include/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "markdown-include"; - version = "0.8.0"; + version = "0.8.1"; format = "setuptools"; # only wheel on pypi @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "cmacmackin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wTGgxvM3/h+6plUcheeMSkpk1we7pwuWHurkDkmbnPY="; + hash = "sha256-1MEk0U00a5cpVhqnDZkwBIk4NYgsRXTVsI/ANNQ/OH0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix index c1c5da228f..e0c9946a3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix @@ -1,25 +1,29 @@ { lib , attrs , buildPythonPackage +, commonmark , fetchFromGitHub , flit-core , linkify-it-py +, markdown , mdurl -, psutil -, py -, pytest-benchmark +, mistletoe +, mistune +, myst-parser +, panflute +, pyyaml +, sphinx +, sphinx-book-theme +, sphinx-copybutton +, sphinx-design , pytest-regressions , pytestCheckHook , pythonOlder -, typing-extensions -# allow disabling tests for the nixos manual build. -# the test suite closure is just too large. -, disableTests ? false }: buildPythonPackage rec { pname = "markdown-it-py"; - version = "2.1.0"; + version = "2.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -28,7 +32,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-6UATJho3SuIbLktZtFcDrCTWIAh52E+n5adcgl49un0="; + hash = "sha256-qdRU1BxczFDGoIEtl0ZMkKNn4p5tec8YuPt5ZwX5fYM="; }; nativeBuildInputs = [ @@ -36,30 +40,29 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - attrs - linkify-it-py mdurl - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions ]; nativeCheckInputs = [ - psutil - py - ] ++ lib.optionals (! disableTests) [ - pytest-benchmark pytest-regressions pytestCheckHook - ]; + ] ++ passthru.optional-dependencies.linkify; - pytestFlagsArray = [ - "--benchmark-skip" - ]; + # disable and remove benchmark tests + preCheck = '' + rm -r benchmarking + ''; pythonImportsCheck = [ "markdown_it" ]; + passthru.optional-dependencies = { + compare = [ commonmark markdown mistletoe mistune panflute ]; + linkify = [ linkify-it-py ]; + rtd = [ attrs myst-parser pyyaml sphinx sphinx-copybutton sphinx-design sphinx-book-theme ]; + }; + meta = with lib; { description = "Markdown parser in Python"; homepage = "https://markdown-it-py.readthedocs.io/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdown2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdown2/default.nix index 45fc711b1c..8e4cd387e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markdown2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markdown2/default.nix @@ -1,31 +1,22 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , python , pygments }: buildPythonPackage rec { pname = "markdown2"; - version = "2.4.3"; + version = "2.4.8"; # PyPI does not contain tests, so using GitHub instead. src = fetchFromGitHub { owner = "trentm"; repo = "python-markdown2"; rev = version; - sha256 = "sha256-zNZ7/dDZbPIwcxSLvf8u5oaAgHLrZ6kk4vXNPUuZs/4="; + hash = "sha256-0T3HcfjEApEEWtNZGZcta85dY9d/0mSyRBlrqBQEQwk="; }; - patches = [ - (fetchpatch { - name = "SNYK-PYTHON-MARKDOWN2-2606985-xss.patch"; # no CVE (yet?) - url = "https://github.com/trentm/python-markdown2/commit/5898fcc1090ef7cd7783fa1422cc0e53cbca9d1b.patch"; - sha256 = "sha256-M6kKxjHVC3O0BvDeEF4swzfpFsDO/LU9IHvfjK4hznA="; - }) - ]; - nativeCheckInputs = [ pygments ]; checkPhase = '' @@ -39,6 +30,7 @@ buildPythonPackage rec { ''; meta = with lib; { + changelog = "https://github.com/trentm/python-markdown2/blob/${src.rev}/CHANGES.md"; description = "A fast and complete Python implementation of Markdown"; homepage = "https://github.com/trentm/python-markdown2"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdownify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdownify/default.nix index fab9f11eae..8b5942d61f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markdownify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markdownify/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-AJskDgyfTI6vHQhWJdzUAR4S8PjOxV3t+epvdlXkm/4="; + hash = "sha256-AJskDgyfTI6vHQhWJdzUAR4S8PjOxV3t+epvdlXkm/4="; }; propagatedBuildInputs = [ beautifulsoup4 six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markuppy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markuppy/default.nix index e10b7b4bb1..14661a84b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markuppy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markuppy/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "MarkupPy"; inherit version; - sha256 = "sha256-Gt7iwKVCrzeP6EVI/29rAWjzy39Ca0aWEDiivPqtDV8="; + hash = "sha256-Gt7iwKVCrzeP6EVI/29rAWjzy39Ca0aWEDiivPqtDV8="; }; # has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markups/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markups/default.nix index 024097634a..163fc2539d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markups/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markups/default.nix @@ -9,22 +9,27 @@ , python-markdown-math , pythonOlder , pyyaml +, setuptools , textile }: buildPythonPackage rec { pname = "markups"; - version = "3.1.3"; - format = "setuptools"; + version = "4.0.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Markups"; inherit version; - hash = "sha256-q5dHpywcZFdBjrQnbHmHGXfBOmVGGOTxLiofCZD78vw="; + hash = "sha256-Pdua+xxV0M/4EuM5LKM/RoSYwHB6T6iy4F0LoNMsAZ4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ docutils markdown diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix index d164813f8b..7f2ae8af89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "markupsafe"; - version = "2.1.1"; + version = "2.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "MarkupSafe"; inherit version; - sha256 = "sha256-f5EZfMnkj5idEuTm+8RklcRGY238gbnM9Quw7HS5HUs="; + hash = "sha256-q8q8jCsmA21i1MdGOBpvfPYKr8xlMZitZ4MGmGsJRQ0="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix index 57da08b09c..d54b070fbf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Bachmann1234"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oF5LBuDK4kqsAcKwidju+wFjigjy4CNbJ6bfWpGO1yQ="; + hash = "sha256-oF5LBuDK4kqsAcKwidju+wFjigjy4CNbJ6bfWpGO1yQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mask-rcnn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mask-rcnn/default.nix index 2ef6ff5c56..337e7d2753 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mask-rcnn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mask-rcnn/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { (fetchpatch { url = "https://github.com/BupyeongHealer/Mask_RCNN_tf_2.x/commit/7957839fe2b248f2f22c7e991ead12068ddc6cfc.diff"; excludes = [ "mrcnn/model.py" ]; - sha256 = "sha256-70BGrx6X1uJDA2025f0YTlreT2uB3n35yIzuhf+ypVc="; + hash = "sha256-70BGrx6X1uJDA2025f0YTlreT2uB3n35yIzuhf+ypVc="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/masky/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/masky/default.nix index 3a1ea574e6..4d03c4d57d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/masky/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/masky/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "masky"; - version = "0.1.2"; + version = "0.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Z4kSec"; repo = "Masky"; rev = "refs/tags/v${version}"; - hash = "sha256-awPPpdw6/zlVa7/DY1iafrbqIHJERN5+cfX1bTnCjl0="; + hash = "sha256-npRuszHkxwjJ+B+q8eQywXPd0OX0zS+AfCro4TM83Uc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mathlibtools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mathlibtools/default.nix index bf50e7fdd6..4f90bb7f36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mathlibtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mathlibtools/default.nix @@ -6,7 +6,7 @@ , gitpython , networkx , pydot -, PyGithub +, pygithub , pythonOlder , pyyaml , toml @@ -31,7 +31,7 @@ buildPythonPackage rec { gitpython networkx pydot - PyGithub + pygithub pyyaml toml tqdm diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib-inline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib-inline/default.nix index deb2a68f25..f960882b16 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib-inline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib-inline/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-+Ifl8Qupjo0rFQ3c9HAsHl+LOiAAXrD3S/29Ng7m8wQ="; + hash = "sha256-+Ifl8Qupjo0rFQ3c9HAsHl+LOiAAXrD3S/29Ng7m8wQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix index a033e8a11b..b029b4cd26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix @@ -1,15 +1,74 @@ -{ lib, stdenv, fetchPypi, writeText, buildPythonPackage, isPy3k, pycairo -, which, cycler, python-dateutil, numpy, pyparsing, sphinx, tornado, kiwisolver -, freetype, qhull, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection -, certifi, contourpy, pillow, fonttools, setuptools-scm, setuptools-scm-git-archive, packaging -, enableGhostscript ? true, ghostscript, gtk3 -, enableGtk3 ? false, cairo -# darwin has its own "MacOSX" backend -, enableTk ? !stdenv.isDarwin, tcl, tk, tkinter -, enableQt ? false, pyqt5 -# required for headless detection -, libX11, wayland +{ lib +, stdenv +, fetchPypi +, writeText +, buildPythonPackage +, pythonOlder + +# https://github.com/matplotlib/matplotlib/blob/main/doc/devel/dependencies.rst +# build-system +, pkg-config +, pybind11 +, setuptools +, setuptools-scm + +# native libraries +, ffmpeg-headless +, fontconfig +, freetype +, imagemagick +, qhull + +# propagates +, contourpy +, cycler +, fonttools +, kiwisolver +, numpy +, packaging +, pillow +, pyparsing +, python-dateutil + +# optional +, importlib-resources + +# GTK3 +, enableGtk3 ? false +, cairo +, gobject-introspection +, gtk3 +, pycairo +, pygobject3 + +# Tk +, enableTk ? !stdenv.isDarwin # darwin has its own "MacOSX" backend +, tcl +, tk +, tkinter + +# Ghostscript +, enableGhostscript ? true +, ghostscript + +# Qt +, enableQt ? false +, pyqt5 + +# Webagg +, enableWebagg ? false +, tornado + +# nbagg +, enableNbagg ? false +, ipykernel + +# darwin , Cocoa + +# required for headless detection +, libX11 +, wayland }: let @@ -17,83 +76,18 @@ let in buildPythonPackage rec { - version = "3.6.2"; + version = "3.7.0"; pname = "matplotlib"; - format = "setuptools"; + format = "pyproject"; - disabled = !isPy3k; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sD/RChcJ0BAcBUiDtVD3xMXpdPdR4mgDGHWa8AWWSZA="; + hash = "sha256-j279MTQw1+9wo4oydigcsuhkazois7IesifaIOFeaBM="; }; - XDG_RUNTIME_DIR = "/tmp"; - - nativeBuildInputs = [ - pkg-config - setuptools-scm - setuptools-scm-git-archive - ]; - - buildInputs = [ - which - sphinx - ] ++ lib.optionals enableGhostscript [ - ghostscript - ] ++ lib.optionals stdenv.isDarwin [ - Cocoa - ]; - - # clang-11: error: argument unused during compilation: '-fno-strict-overflow' [-Werror,-Wunused-command-line-argument] - hardeningDisable = lib.optionals stdenv.isDarwin [ - "strictoverflow" - ]; - - propagatedBuildInputs = [ - certifi - contourpy - cycler - fonttools - freetype - kiwisolver - libpng - mock - numpy - packaging - pillow - pyparsing - python-dateutil - pytz - qhull - tornado - ] ++ lib.optionals enableGtk3 [ - cairo - gobject-introspection - gtk3 - pycairo - pygobject3 - ] ++ lib.optionals enableTk [ - libX11 - tcl - tk - tkinter - ] ++ lib.optionals enableQt [ - pyqt5 - ]; - - passthru.config = { - directories = { basedirlist = "."; }; - libs = { - system_freetype = true; - system_qhull = true; - } // lib.optionalAttrs stdenv.isDarwin { - # LTO not working in darwin stdenv, see #19312 - enable_lto = false; - }; - }; - - MPLSETUPCFG = writeText "mplsetup.cfg" (lib.generators.toINI {} passthru.config); + env.XDG_RUNTIME_DIR = "/tmp"; # Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the # corresponding interpreter object for its library paths. This fails if @@ -113,24 +107,90 @@ buildPythonPackage rec { --replace libX11.so.6 ${libX11}/lib/libX11.so.6 \ --replace libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0 '' + - # avoid matplotlib trying to download dependencies + # bring our own system libraries + # https://github.com/matplotlib/matplotlib/blob/main/doc/devel/dependencies.rst#c-libraries '' echo "[libs] system_freetype=true system_qhull=true" > mplsetup.cfg - - substituteInPlace setup.py \ - --replace "setuptools_scm>=4,<7" "setuptools_scm>=4" ''; + nativeBuildInputs = [ + pkg-config + pybind11 + setuptools-scm + ]; + + buildInputs = [ + ffmpeg-headless + freetype + qhull + ] ++ lib.optionals enableGhostscript [ + ghostscript + ] ++ lib.optionals enableGtk3 [ + cairo + gobject-introspection + gtk3 + ] ++ lib.optionals enableTk [ + libX11 + tcl + tk + tkinter + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + ]; + + # clang-11: error: argument unused during compilation: '-fno-strict-overflow' [-Werror,-Wunused-command-line-argument] + hardeningDisable = lib.optionals stdenv.isDarwin [ + "strictoverflow" + ]; + + propagatedBuildInputs = [ + # explicit + contourpy + cycler + fonttools + kiwisolver + numpy + packaging + pillow + pyparsing + python-dateutil + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-resources + ] ++ lib.optionals enableGtk3 [ + pycairo + pygobject3 + ] ++ lib.optionals enableQt [ + pyqt5 + ] ++ lib.optionals enableWebagg [ + tornado + ] ++ lib.optionals enableNbagg [ + ipykernel + ]; + + passthru.config = { + directories = { basedirlist = "."; }; + libs = { + system_freetype = true; + system_qhull = true; + } // lib.optionalAttrs stdenv.isDarwin { + # LTO not working in darwin stdenv, see #19312 + enable_lto = false; + }; + }; + + env.MPLSETUPCFG = writeText "mplsetup.cfg" (lib.generators.toINI {} passthru.config); + # Matplotlib needs to be built against a specific version of freetype in # order for all of the tests to pass. doCheck = false; meta = with lib; { description = "Python plotting library, making publication quality plots"; - homepage = "https://matplotlib.org/"; - license = with licenses; [ psfl bsd0 ]; + homepage = "https://matplotlib.org/"; + changelog = "https://github.com/matplotlib/matplotlib/releases/tag/v${version}"; + license = with licenses; [ psfl bsd0 ]; maintainers = with maintainers; [ lovek323 veprbl ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matrix-common/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matrix-common/default.nix index 90289f79cb..8252bc267a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matrix-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matrix-common/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "matrix_common"; inherit version; - sha256 = "sha256-YuEhzM2fJDQXtX7DenbcRK6xmKelxnr9a4J1mS/yq9E="; + hash = "sha256-YuEhzM2fJDQXtX7DenbcRK6xmKelxnr9a4J1mS/yq9E="; }; nativeBuildInputs = [ 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 73171dbdbf..03bc601584 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 @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, Logbook +, logbook , aiofiles , aiohttp , aiohttp-socks @@ -43,8 +43,8 @@ buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace 'aiofiles = "^0.6.0"' 'aiofiles = "*"' \ --replace 'h11 = "^0.12.0"' 'h11 = "*"' \ - --replace 'jsonschema = "^3.2.0"' 'jsonschema = "*"' \ - --replace 'cachetools = { version = "^4.2.1", optional = true }' 'cachetools = { version = "*", optional = true }' + --replace 'cachetools = { version = "^4.2.1", optional = true }' 'cachetools = { version = "*", optional = true }' \ + --replace 'aiohttp-socks = "^0.7.0"' 'aiohttp-socks = "*"' ''; nativeBuildInputs = [ @@ -53,23 +53,28 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - Logbook aiofiles aiohttp aiohttp-socks - atomicwrites attrs - cachetools future h11 h2 jsonschema - peewee + logbook pycryptodome - python-olm unpaddedbase64 ]; + passthru.optional-dependencies = { + e2e = [ + atomicwrites + cachetools + python-olm + peewee + ]; + }; + nativeCheckInputs = [ aioresponses faker @@ -78,7 +83,7 @@ buildPythonPackage rec { pytest-aiohttp pytest-benchmark pytestCheckHook - ]; + ] ++ passthru.optional-dependencies.e2e; pytestFlagsArray = [ "--benchmark-disable" @@ -93,6 +98,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/poljar/matrix-nio"; + changelog = "https://github.com/poljar/matrix-nio/blob/${version}/CHANGELOG.md"; description = "A Python Matrix client library, designed according to sans I/O principles"; license = licenses.isc; maintainers = with maintainers; [ tilpner emily symphorien ]; 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 a764c3b4ed..528dc2da3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix @@ -63,6 +63,11 @@ buildPythonPackage rec { SQLALCHEMY_SILENCE_UBER_WARNING = 1; + disabledTestPaths = [ + # sqlalchemy 2 unsupported + "mautrix/client/state_store/tests/store_test.py" + ]; + pythonImportsCheck = [ "mautrix" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mayavi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mayavi/default.nix index 405dccff2d..bdc0a74007 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mayavi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mayavi/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-n0J+8spska542S02ibpr7KJMhGDicG2KHJuEKJrT/Z4="; + hash = "sha256-n0J+8spska542S02ibpr7KJMhGDicG2KHJuEKJrT/Z4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mbstrdecoder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mbstrdecoder/default.nix index 59914caf80..e43c4dbfce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mbstrdecoder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mbstrdecoder/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mbstrdecoder"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "thombashi"; repo = pname; - rev = "v${version}"; - hash = "sha256-U8F+mWKDulIRvvhswmdGnxKjM2qONQybViQ5TLZbLDY="; + rev = "refs/tags/v${version}"; + hash = "sha256-vLlCS5gnc7NgDN4cEZSxxInzbEq4HXAXmvlVfwn3cSM="; }; propagatedBuildInputs = [ chardet ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mccabe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mccabe/default.nix index f47e4e4d4b..2a7d2d396f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mccabe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mccabe/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-NI4CQMM7YLvfTlIxku+RnyjLLD19XHeU90AJKQ8jYyU="; + hash = "sha256-NI4CQMM7YLvfTlIxku+RnyjLLD19XHeU90AJKQ8jYyU="; }; buildInputs = [ 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 c48dc0d26b..9c4215940a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/md2gemini/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/md2gemini/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-d1zuK+NqoPS36ihh8qx9gOET94tApY+SGStsc/bITnU="; + hash = "sha256-d1zuK+NqoPS36ihh8qx9gOET94tApY+SGStsc/bITnU="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix index 0f06e44f90..ed6fdfa95f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = version; - sha256 = "sha256-6MWUkvZp5CYUWsbMGXM2gudjn5075j5FIuaNnCrgRNs="; + hash = "sha256-6MWUkvZp5CYUWsbMGXM2gudjn5075j5FIuaNnCrgRNs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdit-py-plugins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdit-py-plugins/default.nix index f93751ca71..0128b5eec2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mdit-py-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -6,14 +6,11 @@ , markdown-it-py , pytest-regressions , pytestCheckHook -# allow disabling tests for the nixos manual build. -# the test suite closure is just too large. -, disableTests ? false }: buildPythonPackage rec { pname = "mdit-py-plugins"; - version = "0.3.3"; + version = "0.3.4"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +19,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9eaVM5KxrMY5q0c2KWmctCHyPGmEGGNa9B3LoRL/mcI="; + hash = "sha256-BvxqMSl8YXD84O6qjDI0VZgZpqL0UL0vYDMKxCc9qtI="; }; nativeBuildInputs = [ @@ -33,7 +30,7 @@ buildPythonPackage rec { markdown-it-py ]; - nativeCheckInputs = lib.optionals (!disableTests) [ + nativeCheckInputs = [ pytestCheckHook pytest-regressions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdurl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdurl/default.nix index f245deeb70..4c3bde1d2d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mdurl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mdurl/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "hukkin"; repo = pname; rev = version; - sha256 = "sha256-wxV8DKeTwKpFTUBuGTQXaVHc0eW1//Y+2V8Kgs85TDM="; + hash = "sha256-wxV8DKeTwKpFTUBuGTQXaVHc0eW1//Y+2V8Kgs85TDM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdutils/default.nix index b24f24ab91..8e57316f7c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mdutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mdutils/default.nix @@ -6,17 +6,19 @@ buildPythonPackage rec { pname = "mdutils"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "didix21"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-regIrMWbGmW574dfojxZFJoivpaqOpN1I6YsqLEp8BM="; + rev = "refs/tags/v${version}"; + hash = "sha256-/J5c0ndpm+Zy8QV6MqlMGkoh6fX5gBgfc0NvYowsdEo="; }; nativeCheckInputs = [ unittestCheckHook ]; + pythonImportsCheck = [ "mdutils" ]; + meta = with lib; { description = "Set of basic tools that can help to create Markdown files"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/measurement/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/measurement/default.nix index 250fabe4fd..3323e8c198 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/measurement/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/measurement/default.nix @@ -1,30 +1,53 @@ -{ lib, fetchFromGitHub, buildPythonPackage, isPy3k -, sympy, pytest, pytest-runner, sphinx, setuptools-scm }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, isPy3k +, flit-core +, flit-scm +, sympy +, pytestCheckHook +, sphinx +}: buildPythonPackage rec { pname = "measurement"; - version = "3.2.0"; + version = "3.2.2"; + format = "pyproject"; disabled = !isPy3k; src = fetchFromGitHub { owner = "coddingtonbear"; repo = "python-measurement"; - rev = version; - sha256 = "1mk9qg1q4cnnipr6xa72i17qvwwhz2hd8p4vlsa9gdzrcv4vr8h9"; + rev = "refs/tags/${version}"; + hash = "sha256-ULId0W10FaAtSgVY5ctQL3FPETVr+oq6TKWd/W53viM="; }; + nativeBuildInputs = [ + flit-core + flit-scm + sphinx + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + postPatch = '' - sed -i 's|use_scm_version=True|version="${version}"|' setup.py + substituteInPlace pyproject.toml \ + --replace "--cov=measurement" "" ''; - nativeCheckInputs = [ pytest pytest-runner ]; - nativeBuildInputs = [ sphinx setuptools-scm ]; - propagatedBuildInputs = [ sympy ]; + propagatedBuildInputs = [ + sympy + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Use and manipulate unit-aware measurement objects in Python"; homepage = "https://github.com/coddingtonbear/python-measurement"; + changelog = "https://github.com/coddingtonbear/python-measurement/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ bhipple ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mechanize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mechanize/default.nix index 5b0ca1735c..3060c2f460 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mechanize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mechanize/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XoasB3c1fgBusEzSj37Z+BHUjf+mA9OJGsbSuSKA3JE="; + hash = "sha256-XoasB3c1fgBusEzSj37Z+BHUjf+mA9OJGsbSuSKA3JE="; }; propagatedBuildInputs = [ html5lib ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mediapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mediapy/default.nix index 333f55ce42..563c37a042 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mediapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mediapy/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "mediapy"; - version = "1.1.2"; + version = "1.1.6"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-uz+Pv3DvmhDajIqNpCj+2HsRT7Dh7Ks5yryhiEa8KOI="; + hash = "sha256-n0S3YEAJZNi+pRIaIT+U3JoiXQJtaoGZASg6aV5YVjQ="; }; propagatedBuildInputs = [ ipython matplotlib numpy pillow ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/memory-allocator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/memory-allocator/default.nix index 921f2962f2..b42544963a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/memory-allocator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/memory-allocator/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "memory_allocator"; - sha256 = "sha256-E4BcKuHAG3SJ+rXo6sk2FmK08sAkEuNlLuzkj/aVMWI="; + hash = "sha256-E4BcKuHAG3SJ+rXo6sk2FmK08sAkEuNlLuzkj/aVMWI="; }; propagatedBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mercantile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mercantile/default.nix index cc38298241..b79bac0633 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mercantile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mercantile/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "mapbox"; repo = pname; rev = version; - sha256 = "sha256-DiDXO2XnD3We6NhP81z7aIHzHrHDi/nkqy98OT9986w="; + hash = "sha256-DiDXO2XnD3We6NhP81z7aIHzHrHDi/nkqy98OT9986w="; }; propagatedBuildInputs = [ click ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mergedict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mergedict/default.nix index 6023a6ca23..32b91aea2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mergedict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mergedict/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-4ZkrNqVCKQFPvLx6nIwo0fSuEx6h2NNFyTlz+fDcb9w="; + hash = "sha256-4ZkrNqVCKQFPvLx6nIwo0fSuEx6h2NNFyTlz+fDcb9w="; }; nativeCheckInputs = [ pytestCheckHook ]; 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 3dae72e39b..2d86a55bd2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meshio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meshio/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-4kBpLX/yecErE8bl17QDYpqGrStE6SMJWLPwDB7DafA="; + hash = "sha256-4kBpLX/yecErE8bl17QDYpqGrStE6SMJWLPwDB7DafA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meson-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meson-python/default.nix index b839c61368..20008b2b53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meson-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meson-python/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "meson-python"; - version = "0.12.0"; + version = "0.12.1"; format = "pyproject"; src = fetchPypi { inherit version; pname = "meson_python"; - hash = "sha256-jLFZqAk6LnPPqJf4CS7JO3TjhC+U3/f944HG/g4LBk0="; + hash = "sha256-PVs+WB1wpYqXucEWp16Xp2zEtMfnX6Blj8g5I3Hi8sI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mesonpep517/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mesonpep517/default.nix index b896076e2d..2c0ba17567 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mesonpep517/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mesonpep517/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Fyo7JfLqHJqbahEjVDt/0xJxOfVLqLn3xNJ4lSB7KIw="; + hash = "sha256-Fyo7JfLqHJqbahEjVDt/0xJxOfVLqLn3xNJ4lSB7KIw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/metar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/metar/default.nix index 9e630c1fe9..0ef0ff990c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/metar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/metar/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "python-metar"; repo = "python-metar"; rev = "v${version}"; - sha256 = "sha256-pl2NWRfFCYyM2qvBt4Ic3wgbGkYZvAO6pX2Set8zYW8="; + hash = "sha256-pl2NWRfFCYyM2qvBt4Ic3wgbGkYZvAO6pX2Set8zYW8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meteoalertapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meteoalertapi/default.nix index c6f39a4fb2..87a3b2b8fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meteoalertapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meteoalertapi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "rolfberkenbosch"; repo = "meteoalert-api"; rev = "v${version}"; - sha256 = "sha256-uB2nza9fj7vOWixL4WEQX1N3i2Y80zQPM3x1+gRtg+w="; + hash = "sha256-uB2nza9fj7vOWixL4WEQX1N3i2Y80zQPM3x1+gRtg+w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mf2py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mf2py/default.nix index 0b8ae34043..7990ee7308 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mf2py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mf2py/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "microformats"; repo = "mf2py"; rev = version; - sha256 = "sha256-9pAD/eCmc/l7LGmKixDhZy3hhj1jCmcyo9wbqgtz/wI="; + hash = "sha256-9pAD/eCmc/l7LGmKixDhZy3hhj1jCmcyo9wbqgtz/wI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/microdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/microdata/default.nix index 8502d85d84..d271637d2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/microdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/microdata/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "edsu"; repo = "microdata"; rev = "v${version}"; - sha256 = "sha256-BAygCLBLxZ033ZWRFSR52dSM2nPY8jXplDXQ8WW3KPo="; + hash = "sha256-BAygCLBLxZ033ZWRFSR52dSM2nPY8jXplDXQ8WW3KPo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/milc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/milc/default.nix index 0931bfbad3..6db6d7492b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/milc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/milc/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "clueboard"; repo = "milc"; rev = version; - sha256 = "sha256-aX6cTpIN9+9xuEGYHVlM5SjTPLcudJFEuOI4CiN3byE="; + hash = "sha256-aX6cTpIN9+9xuEGYHVlM5SjTPLcudJFEuOI4CiN3byE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/millheater/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/millheater/default.nix index 1be28fc98a..369947d7dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/millheater/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/millheater/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pymill"; rev = version; - sha256 = "sha256-ImEg+VEiASQPnMeZzbYMMb+ZgcsxagQcN9IDFGO05Vw="; + hash = "sha256-ImEg+VEiASQPnMeZzbYMMb+ZgcsxagQcN9IDFGO05Vw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minexr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minexr/default.nix index 7cb8632ea5..dc5ae86b4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/minexr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/minexr/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "cheind"; repo = "py-minexr"; rev = "v${version}"; - sha256 = "sha256-Om67ttAHxu7C3IwPB+JHYi78E9qBi1E6layMVg4+S3M="; + hash = "sha256-Om67ttAHxu7C3IwPB+JHYi78E9qBi1E6layMVg4+S3M="; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minidump/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minidump/default.nix index 76ac4abf8c..26ac7f8afc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/minidump/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/minidump/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-g9YSr7bFdyfr84rKQztVD4P5+MfDtlYq0quXBx/YXzo="; + hash = "sha256-g9YSr7bFdyfr84rKQztVD4P5+MfDtlYq0quXBx/YXzo="; }; # Upstream doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minikanren/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minikanren/default.nix index 1b25a84377..7a54b1eb97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/minikanren/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/minikanren/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pythological"; repo = "kanren"; rev = "5aa9b1734cbb3fe072a7c72b46e1b72a174d28ac"; - sha256 = "sha256-daAtREgm91634Q0mc0/WZivDiyZHC7TIRoGRo8hMnGE="; + hash = "sha256-daAtREgm91634Q0mc0/WZivDiyZHC7TIRoGRo8hMnGE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mip/default.nix index 1011677338..42353bdab7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mip/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "mip"; - version = "1.14.2"; + version = "1.15.0"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wr4gXSh456heG5nsaEi2yo7LMre2Nd6QbTm0dcDCX1k="; + hash = "sha256-f28Dgc/ixSwbhkAgPaLLVpdLJuI5UN37GnazfZFvGX4="; }; nativeCheckInputs = [ matplotlib networkx numpy pytestCheckHook ]; 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 bd352fd414..98844b1e8e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mistletoe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mistletoe/default.nix @@ -2,24 +2,29 @@ , fetchPypi , buildPythonPackage , pythonOlder +, pytestCheckHook }: buildPythonPackage rec { pname = "mistletoe"; - version = "1.0.0"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+g6cV+IFDP1orjBOT5xeHmk1dMxf2DI9szRSlJ1oJmE="; + hash = "sha256-sfia+weaGxpULp7ywI3UUKB6K9k1wDyrIsMorXyk2Og="; }; pythonImportsCheck = [ "mistletoe" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Fast and extensible Markdown parser"; homepage = "https://github.com/miyuchina/mistletoe"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix index 0d38d3259d..a99e31d0c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "mitmproxy"; rev = "refs/tags/${version}"; - sha256 = "sha256-CINKvRnBspciS+wefJB8gzBE13L8CjbYCkmLmTTeYlA="; + hash = "sha256-CINKvRnBspciS+wefJB8gzBE13L8CjbYCkmLmTTeYlA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mitogen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mitogen/default.nix index 6b6f29e1d5..073ad71cfe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mitogen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mitogen/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "mitogen-hq"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cx0q2Y9A6UzpdD1kuGBtXIs9oBGFpkIyvPfN2hj+A1g="; + hash = "sha256-cx0q2Y9A6UzpdD1kuGBtXIs9oBGFpkIyvPfN2hj+A1g="; }; # Tests require network access and Docker support diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mixins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mixins/default.nix new file mode 100644 index 0000000000..9c9bfbc3a4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mixins/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "mixins"; + version = "0.1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-SmYYRzo6wClQBMc2oRgO0CQEHOxWe8GFL24TPa6A4NQ="; + }; + + pythonImportsCheck = [ + "mixins" + ]; + + meta = with lib; { + homepage = "https://github.com/nickderobertis/py-mixins"; + description = "Mixin classes which may be added to your own classes to add certain functionality to them"; + maintainers = with maintainers; [ aanderse ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-autorefs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-autorefs/default.nix index 39f1a00043..3b98ff015c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-autorefs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-autorefs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "autorefs"; rev = version; - sha256 = "sha256-kiHb/XSFw6yaUbLJHBvHaQAOVUM6UfyFeomgniDZqgU="; + hash = "sha256-kiHb/XSFw6yaUbLJHBvHaQAOVUM6UfyFeomgniDZqgU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix index 9d95d72fee..8482393738 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-9cvA186FS6bHmpOrv4OfPZ5kRfgfafBfaWxgWJIlwwA="; + hash = "sha256-9cvA186FS6bHmpOrv4OfPZ5kRfgfafBfaWxgWJIlwwA="; }; propagatedBuildInputs = [ mkdocs drawio-headless ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-gitlab-plugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-gitlab-plugin/default.nix index 5e8f12337e..69242caa89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-gitlab-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-gitlab-plugin/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchzip { url = "https://gitlab.inria.fr/vidjil/mkdocs-gitlab-plugin/-/archive/fb87fbfd404839e661a799c540664b1103096a5f/mkdocs-gitlab-plugin-fb87fbfd404839e661a799c540664b1103096a5f.tar.gz"; - sha256 = "sha256-z+U0PRwymDDXVNM7a2Yl4pNNVBxpx/BhJnlx6kgyvww="; + hash = "sha256-z+U0PRwymDDXVNM7a2Yl4pNNVBxpx/BhJnlx6kgyvww="; }; patches = [ ./mkdocs-gitlab-plugin.diff ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix index fe1eca4000..a17f10e863 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix @@ -2,6 +2,7 @@ , callPackage , buildPythonPackage , fetchFromGitHub +, colorama , hatch-requirements-txt , hatch-nodejs-version , hatchling @@ -12,12 +13,13 @@ , pygments , pymdown-extensions , pythonOlder +, regex , requests }: buildPythonPackage rec { pname = "mkdocs-material"; - version = "8.5.11"; + version = "9.0.15"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +28,7 @@ buildPythonPackage rec { owner = "squidfunk"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jF5lpRv2itkhkqH7RzUXEH5e0Bia3SnTApfoy61RfJA="; + hash = "sha256-GIzHgCU4BzHuQMBleGn9DcJBm+pQ7/JP67e8eIcyhpc="; }; nativeBuildInputs = [ @@ -36,12 +38,14 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + colorama jinja2 markdown mkdocs mkdocs-material-extensions pygments pymdown-extensions + regex requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix index 57f900c6ab..8202b76941 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "fralau"; repo = "mkdocs-mermaid2-plugin"; rev = "v${version}"; - sha256 = "sha256-Oe6wkVrsB0NWF+HHeifrEogjxdGPINRDJGkh9p+GoHs="; + hash = "sha256-Oe6wkVrsB0NWF+HHeifrEogjxdGPINRDJGkh9p+GoHs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix index 7c04933fb6..462768eed7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "mkdocs-minify"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "byrnereese"; repo = "${pname}-plugin"; rev = "refs/tags/${version}"; - sha256 = "sha256-ABoLt5sFpt8Hm07tkqeAcs63ZvJ4vTbGw4QRYVYpMEA="; + hash = "sha256-ajXkEKLBC86Y8YzDCZXd6x6QtLLrCDJkb6kDrRE536o="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-redirects/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-redirects/default.nix index d50ee643f3..9a428f158e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-redirects/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-redirects/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "mkdocs"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-+Ti+Z5gL5vVlQDt+KRw9nNHHKhRtEfguQe1K001DK9E="; + hash = "sha256-+Ti+Z5gL5vVlQDt+KRw9nNHHKhRtEfguQe1K001DK9E="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index 46e3d41061..cb2f6979db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "mkdocs-swagger-ui-tag"; - version = "0.5.1"; + version = "0.5.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-CAIQbSg8o+FxPqb/O9ML1b6OxmmH4c+RRU4ecHyfn8w="; + hash = "sha256-qurnqgpsppO4LPg8fN6HobUoNHQTDI6OmEDjVtObA78="; }; propagatedBuildInputs = [ mkdocs beautifulsoup4 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ml-collections/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ml-collections/default.nix index d317aa22cc..692bafc64a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ml-collections/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ml-collections/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "ml_collections"; - sha256 = "sha256-P+/McuxDOqHl0yMHo+R0u7Z/QFvoFOpSohZr/J2+aMw="; + hash = "sha256-P+/McuxDOqHl0yMHo+R0u7Z/QFvoFOpSohZr/J2+aMw="; }; # The pypi source archive does not include requirements.txt or diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix index 375c56b688..59aa62baf7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.30.0"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Ln1R9uLcbMIxbnLc9BNSF8WByPTx+d3hBmqrqeCyLHo="; + hash = "sha256-oRazzUW7+1CaFyO/1DiL21ZqPlBF483lOQ5mf1kUmKY="; }; propagatedBuildInputs = [ 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 d8b2a5212e..6f9294e83b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "rasbt"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-7G4tIoQGS7/YPpAhUn0CRf8fl/DdjdqySPWgJEL0trA="; + hash = "sha256-7G4tIoQGS7/YPpAhUn0CRf8fl/DdjdqySPWgJEL0trA="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mnemonic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mnemonic/default.nix index 0bba28020a..f040a1c1da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mnemonic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mnemonic/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "trezor"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "sha256-YYgWlYfVd1iALOziaUI8uVYjJDCIVk/dXcUmJd2jcvQ="; + hash = "sha256-YYgWlYfVd1iALOziaUI8uVYjJDCIVk/dXcUmJd2jcvQ="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mock-ssh-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mock-ssh-server/default.nix new file mode 100644 index 0000000000..46608965c1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mock-ssh-server/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, paramiko +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mock-ssh-server"; + version = "0.9.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "carletes"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-yJd+WDidW5ouofytAKTlSiZhIQg2cLs8BvEp15qwtjo="; + }; + + propagatedBuildInputs = [ + paramiko + ]; + + # Tests are running into a timeout on Hydra, they work locally + doCheck = false; + + pythonImportsCheck = [ + "mockssh" + ]; + + meta = with lib; { + description = "Python mock SSH server for testing purposes"; + homepage = "https://github.com/carletes/mock-ssh-server"; + changelog = "https://github.com/carletes/mock-ssh-server/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mock/default.nix index f8684475de..e12ed6d6b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mock/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { patches = [ (fetchpatch { url = "https://github.com/testing-cabal/mock/commit/f3e3d82aab0ede7e25273806dc0505574d85eae2.patch"; - sha256 = "sha256-wPrv1/WeICZHn31UqFlICFsny2knvn3+Xg8BZoaGbwQ="; + hash = "sha256-wPrv1/WeICZHn31UqFlICFsny2knvn3+Xg8BZoaGbwQ="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mockito/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mockito/default.nix index 658dd02e3c..981665f7b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mockito/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mockito/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-QJq2BMnr4bt9wY7GsO2YqK1RJ7CCc/WASyL00bUeUiI="; + hash = "sha256-QJq2BMnr4bt9wY7GsO2YqK1RJ7CCc/WASyL00bUeUiI="; }; propagatedBuildInputs = lib.optionals (!isPy3k) [ funcsigs ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moderngl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moderngl/default.nix index 71855b544d..3f2185fac8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moderngl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moderngl/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "moderngl"; - version = "5.7.4"; + version = "5.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IPghv2aygRvIZI189/ZEAq//dhn+onH0Km7oX+A+QEE="; + hash = "sha256-eudtjF6NanAFFDHqHOVLfcBBX02mpIIPW3gqvZV7Dds="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix index 8bb104da18..36294fab76 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "moderngl"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-jsASGYrsH9UNanswX2bZyWS3co/2Y1joaQ98virWcBE="; + hash = "sha256-jsASGYrsH9UNanswX2bZyWS3co/2Y1joaQ98virWcBE="; }; propagatedBuildInputs = [ numpy moderngl pyglet pillow pyrr glcontext ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/monero/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/monero/default.nix index 2147e56139..adc34fa173 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/monero/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/monero/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "monero-ecosystem"; repo = "monero-python"; rev = "v${version}"; - sha256 = "sha256-WIF3pFBOLgozYTrQHLzIRgSlT3dTZTe+7sF/dVjVdTo="; + hash = "sha256-WIF3pFBOLgozYTrQHLzIRgSlT3dTZTe+7sF/dVjVdTo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix index e5a8ccd467..a0d8cf600d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mongoengine"; - version = "0.25.0"; + version = "0.26.0"; disabled = isPy27; src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-2UPjyKJGiW8UfWgMu8WKZJ5l+p4vTR57GxMFC5amb4A="; + hash = "sha256-mPz9Nyoyke++e9vBWSKunc9VGHCP8pbmldgKty5HIMA="; }; propagatedBuildInputs = [ 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 e425cef6e6..9a0437ea05 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 @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PgFsXmdAmHXK0wZ6xLTu94RdME1L2H1Mb6V+qFlGXSk="; + hash = "sha256-PgFsXmdAmHXK0wZ6xLTu94RdME1L2H1Mb6V+qFlGXSk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix index 3719544927..a4a02d65ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-WmJX5Ah47wUgsYA5kOPiIwOkG1cUAGwyo/2DBLJuoas="; + hash = "sha256-WmJX5Ah47wUgsYA5kOPiIwOkG1cUAGwyo/2DBLJuoas="; }; nativeBuildInouts = [ 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 3860a22e20..b029f9cad4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix @@ -4,6 +4,9 @@ , fetchPypi , pythonOlder +# build +, setuptools + # runtime , aws-xray-sdk , boto3 @@ -18,6 +21,7 @@ , jinja2 , jsondiff , openapi-spec-validator +, pyparsing , python-dateutil , python-jose , pyyaml @@ -36,16 +40,20 @@ buildPythonPackage rec { pname = "moto"; - version = "4.0.12"; - format = "setuptools"; + version = "4.1.3"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-MPjzFljxjNsV62JsjLOgdSDw2MIZMib7yzMmrhL7okY="; + hash = "sha256-yCAMyqlEDC6dqgvV4L12inGdtaLILqjXgvDj+gmjxeI="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aws-xray-sdk boto3 @@ -60,6 +68,7 @@ buildPythonPackage rec { jinja2 jsondiff openapi-spec-validator + pyparsing python-dateutil python-jose pyyaml @@ -147,6 +156,7 @@ buildPythonPackage rec { meta = with lib; { description = "Allows your tests to easily mock out AWS Services"; homepage = "https://github.com/spulec/moto"; + changelog = "https://github.com/getmoto/moto/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mouseinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mouseinfo/default.nix index 6f5f5cbe86..f5c76b8752 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mouseinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mouseinfo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "asweigart"; repo = "mouseinfo"; rev = "1876ad5cd311b4352d46bc64a12edfb4da49974e"; - sha256 = "sha256-UTaHTJE0xFihN9r+DY/WhekZ7S/CXtMFbqAayzexRxk="; + hash = "sha256-UTaHTJE0xFihN9r+DY/WhekZ7S/CXtMFbqAayzexRxk="; }; patches = [ 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 282d4a71c9..f00666502f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mpd2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mpd2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-bxv/2TuaMvwBipu/NIdQW1Lg11fsNAZpBcYKkS1JI4Q="; + hash = "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 ce073ed27c..97a7aed915 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-F4WPLrxiMiDQEg0fqNQo0DPd50nEvDWzPYGmatf5NIA="; + hash = "sha256-F4WPLrxiMiDQEg0fqNQo0DPd50nEvDWzPYGmatf5NIA="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mplfinance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mplfinance/default.nix index b1d0bf2b9a..dfad66f7d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mplfinance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mplfinance/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-pATiprTELt8GrEkeKjILPfpdNDVoex5t+Mc+6Gg7cPY="; + hash = "sha256-pATiprTELt8GrEkeKjILPfpdNDVoex5t+Mc+6Gg7cPY="; }; propagatedBuildInputs = [ matplotlib pandas ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mpv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mpv/default.nix index 01d9d58b23..c79842de3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mpv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mpv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "jaseg"; repo = "python-mpv"; rev = "v${version}"; - sha256 = "sha256-UCJ1PknnWQiFciTEMxTUqDzz0Z8HEWycLuQqYeyQhoM="; + hash = "sha256-UCJ1PknnWQiFciTEMxTUqDzz0Z8HEWycLuQqYeyQhoM="; }; buildInputs = [ mpv ]; @@ -23,7 +23,8 @@ buildPythonPackage rec { ''; # tests impure, will error if it can't load libmpv.so - checkPhase = "${python.interpreter} -c 'import mpv'"; + doCheck = false; + pythonImportsCheck = [ "mpv" ]; meta = with lib; { description = "A python interface to the mpv media player"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ms-active-directory/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ms-active-directory/default.nix index 3262ba31cb..b8459dc6d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ms-active-directory/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ms-active-directory/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zorn96"; repo = "ms_active_directory"; rev = "v${version}"; - sha256 = "sha256-mErQib8xTgo29iPAtiLnhxLXyFboAzyEW9A/QMseM6k="; + hash = "sha256-mErQib8xTgo29iPAtiLnhxLXyFboAzyEW9A/QMseM6k="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix index a811018da2..3a95fcb86e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-xnarpWsMzjeD3htcXs/oKNuZgWeHUSbKS0fcZDZFE1Q="; + hash = "sha256-xnarpWsMzjeD3htcXs/oKNuZgWeHUSbKS0fcZDZFE1Q="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix index 1442bc6165..17f5795102 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-xmfTGAUTQi+cdUW+XuxdKW3Ls1fgb3LtOcxoN5dVbmk="; + hash = "sha256-xmfTGAUTQi+cdUW+XuxdKW3Ls1fgb3LtOcxoN5dVbmk="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msgspec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msgspec/default.nix index 78aa7eb6e6..10e0e6b23e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msgspec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msgspec/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jcrist"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-TGCdsimcoY3441/nOXxHGqYM4q8uoWd78HtUts6EOJY="; + hash = "sha256-Sq0hV5ZftUCIR/6QOWvdfzg8UHYLZXo5ba5ydTnjqPg="; }; # Requires libasan to be accessible diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mt-940/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mt-940/default.nix index b99954e554..ae45522903 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mt-940/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mt-940/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ydTOaijDmA2ogIONzRMMoz+5jr99qxWM1zzGGzg7f2Q="; + hash = "sha256-ydTOaijDmA2ogIONzRMMoz+5jr99qxWM1zzGGzg7f2Q="; }; propagatedBuildInputs = lib.optional (!isPy3k) enum34; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mujson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mujson/default.nix index 10f0e40b76..c37c38a7ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mujson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mujson/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-J9nPGxDkLQje6AkL9cewNqmQ7Z+00TXBEr3p71E2cnE="; + hash = "sha256-J9nPGxDkLQje6AkL9cewNqmQ7Z+00TXBEr3p71E2cnE="; }; # LICENSE file missing from src diff --git a/third_party/nixpkgs/pkgs/development/python-modules/multiprocess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/multiprocess/default.nix index 6d0780370f..962a70726a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/multiprocess/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/multiprocess/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "uqfoundation"; repo = pname; rev = "refs/tags/multiprocess-${version}"; - sha256 = "sha256-pjYOEOI5No9gT0XchmH6FSJ9uDqEnaLj/PyHT2a90jo="; + hash = "sha256-pjYOEOI5No9gT0XchmH6FSJ9uDqEnaLj/PyHT2a90jo="; }; propagatedBuildInputs = [ 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 bebd6a73e7..a64a3e928c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/multiset/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/multiset/default.nix @@ -1,22 +1,38 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , setuptools-scm -, pytest-runner -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "multiset"; version = "3.0.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "e45671cae8385a8e6248a9b07a3a83280c2d0cc4312713058cfbacdc5ec9973e"; + hash = "sha256-5FZxyug4Wo5iSKmwejqDKAwtDMQxJxMFjPus3F7Jlz4="; }; - buildInputs = [ setuptools-scm pytest-runner ]; - nativeCheckInputs = [ pytest ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + postPatch = '' + # Drop broken version specifier + sed -i '/python_requires/d' setup.cfg + ''; + + pythonImportsCheck = [ + "multiset" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "An implementation of a multiset"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/multitasking/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/multitasking/default.nix index c59cfe2508..a186325b39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/multitasking/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/multitasking/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { # GitHub source releases aren't tagged src = fetchPypi { inherit pname version; - sha256 = "sha256-TWvDzGX5stynL7Wnh4UKiNro9iDCs2rptVJI5RvNYCY="; + hash = "sha256-TWvDzGX5stynL7Wnh4UKiNro9iDCs2rptVJI5RvNYCY="; }; doCheck = false; # No tests included diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mutag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mutag/default.nix index b9701073e0..3ceb5e966c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mutag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mutag/default.nix @@ -14,7 +14,7 @@ buildPythonPackage { owner = "aroig"; repo = "mutag"; rev = "2ffa0258cadaf79313241f43bf2c1caaf197d9c2"; - sha256 = "sha256-YT3DGvYPyTuB70gg6p/3oXcTahEPcNuSIqe56xu3rSs="; + hash = "sha256-YT3DGvYPyTuB70gg6p/3oXcTahEPcNuSIqe56xu3rSs="; }; propagatedBuildInputs = [ pyparsing ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix index 0fc32322c2..705c3583a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch # docs , python @@ -32,6 +33,15 @@ buildPythonPackage rec { sphinx-rtd-theme ]; + patches = [ + (fetchpatch { + # docs: Make extlinks compatible with sphinx 6.0 + # https://github.com/quodlibet/mutagen/pull/590 + url = "https://github.com/quodlibet/mutagen/commit/37b4e6bddc03e1f715425c418ea84bac15116907.patch"; + hash = "sha256-CnGfHY4RhRhOLvlRTH/NZwzCnAL3VhU6xosuh6fkqGQ="; + }) + ]; + postInstall = '' ${python.pythonForBuild.interpreter} setup.py build_sphinx --build-dir=$doc ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix index a2a49021c7..ea4019b2af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-kr7JUorjTScok8yvK1J9+FwxT/KM+7MFY0BGewldg0w="; + hash = "sha256-kr7JUorjTScok8yvK1J9+FwxT/KM+7MFY0BGewldg0w="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix index 0c64f0549e..c6a944f167 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-wlQ/mo9MBQo0t1p0h6/TJir3I87DKYAUc022T3hZjH8="; + hash = "sha256-wlQ/mo9MBQo0t1p0h6/TJir3I87DKYAUc022T3hZjH8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myhome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myhome/default.nix index dfdf81a08a..d716d66680 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myhome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myhome/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "speijnik"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DJzwvgvSA9Q0kpueUoQV64pdDDNA7WzGu7r+g5aqutk="; + hash = "sha256-DJzwvgvSA9Q0kpueUoQV64pdDDNA7WzGu7r+g5aqutk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myjwt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myjwt/default.nix index 807e205eb0..a54ab560a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myjwt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myjwt/default.nix @@ -6,6 +6,7 @@ , cryptography , exrex , fetchFromGitHub +, poetry-core , pyopenssl , pyperclip , pytest-mock @@ -18,18 +19,28 @@ buildPythonPackage rec { pname = "myjwt"; - version = "1.6.0"; - format = "setuptools"; + version = "1.6.1"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "mBouamama"; repo = "MyJWT"; rev = "refs/tags/${version}"; - sha256 = "sha256-A9tsQ6L+y3doL5pJbau3yKnmQtX2IPXWyW/YCLhS7nc="; + hash = "sha256-qdDA8DpJ9kAPTvCkQcPBHNlUqxwsS0vAESglvUygXhg="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "1.6.0" "${version}" \ + --replace 'cryptography = "^39.0.2"' 'cryptography = "^39.0.0"' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ click colorama @@ -47,11 +58,6 @@ buildPythonPackage rec { requests-mock ]; - postPatch = '' - # Remove all version pinning (E.g., tornado==5.1.1 -> tornado) - sed -i -e "s/==[0-9.]*//" requirements.txt - ''; - pythonImportsCheck = [ "myjwt" ]; @@ -59,6 +65,7 @@ buildPythonPackage rec { meta = with lib; { description = "CLI tool for testing vulnerabilities of JSON Web Tokens (JWT)"; homepage = "https://github.com/mBouamama/MyJWT"; + changelog = "https://github.com/tyki6/MyJWT/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; # Build failures 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 a02a6dce39..8ec6e1e384 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 @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.12.5"; + version = "7.13.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-Ij01EExSc4pU8eC+JPhSB8YKXkspusMRgdPhdgbUEKk="; + hash = "sha256-9D2w1rnYf7aKOABXmePghR695dlq37bci+bVOWrQCYw="; }; nativeBuildInputs = [ 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 2bd02f1ff7..be04a270bb 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 @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-fXWgeWUbEFB2d2o1pUBeP6dzuKFnEY8bcS5EPppsGKI="; + hash = "sha256-fXWgeWUbEFB2d2o1pUBeP6dzuKFnEY8bcS5EPppsGKI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix index 6bee65c7fe..e7debfaceb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix @@ -1,47 +1,72 @@ { lib , stdenv -, fetchFromGitHub -, attrs , buildPythonPackage -, filelock -, lxml -, mypy-extensions -, psutil -, py -, pytest-forked -, pytest-xdist -, pytestCheckHook -, python +, fetchFromGitHub +, fetchpatch , pythonOlder + +# build-system , setuptools -, six -, typed-ast -, typing-extensions -, tomli +, types-psutil , types-setuptools , types-typed-ast -, types-psutil -, virtualenv + +# propagates +, mypy-extensions +, tomli +, typing-extensions + +# optionals +, lxml +, psutil + +# tests +, attrs +, filelock +, pytest-xdist +, pytest-forked +, pytestCheckHook +, py +, six }: buildPythonPackage rec { pname = "mypy"; - version = "0.991"; + version = "1.0.1"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "python"; repo = "mypy"; rev = "refs/tags/v${version}"; - hash = "sha256-ljnMlQUlz4oiZqlqOlqJOumrP6wKLDGiDtT3Y5OEQog="; + hash = "sha256-vxPEUDC6fkYYiOl5nHf0qwMgPDC+9Vw56eTUQ174raQ="; }; + patches = [ + # Fix compatibility with setupptools>=67.4.0 + (fetchpatch { + # https://github.com/python/mypy/pull/14781 + url = "https://github.com/python/mypy/commit/ab7b69a0532a5fe976c9c2a1b713d82d630692a4.patch"; + hash = "sha256-dtzmoOZP3tOtxrBVhgqpdv+rnrTjTKHxQhBieuJXRtA="; + }) + (fetchpatch { + # https://github.com/python/mypy/pull/14787 + url = "https://github.com/AlexWaygood/mypy/commit/8e459eab40ac0fae9740e985ee4aeb348cde28c5.patch"; + hash = "sha256-R7DU6MFnaeHPobUb8ADhssTKDwdPBXBhDN2mxrrQ51M="; + }) + ]; + nativeBuildInputs = [ + mypy-extensions setuptools - types-typed-ast - types-setuptools types-psutil + types-setuptools + types-typed-ast + typing-extensions + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; propagatedBuildInputs = [ @@ -49,17 +74,24 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals (pythonOlder "3.11") [ tomli - ] ++ lib.optionals (pythonOlder "3.8") [ - typed-ast ]; passthru.optional-dependencies = { - dmypy = [ psutil ]; - reports = [ lxml ]; + dmypy = [ + psutil + ]; + reports = [ + lxml + ]; }; - # TODO: enable tests - doCheck = false; + # Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled + # version is also the default in the wheels on Pypi that include binaries. + # is64bit: unfortunately the build would exhaust all possible memory on i686-linux. + env.MYPY_USE_MYPYC = stdenv.buildPlatform.is64bit; + + # when testing reduce optimisation level to reduce build time by 20% + env.MYPYC_OPT_LEVEL = 1; pythonImportsCheck = [ "mypy" @@ -73,13 +105,25 @@ buildPythonPackage rec { "mypy.report" ]; - # Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled - # version is also the default in the wheels on Pypi that include binaries. - # is64bit: unfortunately the build would exhaust all possible memory on i686-linux. - MYPY_USE_MYPYC = stdenv.buildPlatform.is64bit; + checkInputs = [ + attrs + filelock + pytest-xdist + pytest-forked + pytestCheckHook + py + setuptools + six + tomli + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); - # when testing reduce optimisation level to drastically reduce build time - MYPYC_OPT_LEVEL = 1; + disabledTestPaths = [ + # fails to find tyoing_extensions + "mypy/test/testcmdline.py" + "mypy/test/testdaemon.py" + # fails to find setuptools + "mypyc/test/test_commandline.py" + ]; meta = with lib; { description = "Optional static typing for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix index a671cb2af8..c1f75bb76b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "python"; repo = "mypy_extensions"; rev = version; - sha256 = "sha256-JjhbxX5DBAbcs1o2fSWywz9tot792q491POXiId+NyI="; + hash = "sha256-JjhbxX5DBAbcs1o2fSWywz9tot792q491POXiId+NyI="; }; propagatedBuildInputs = lib.optional (pythonOlder "3.5") typing; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix index a8d25b0be1..a96bd21cc0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { # Allow for clang to be used to build native extensions (fetchpatch { url = "https://github.com/mysql/mysql-connector-python/commit/fd24ce9dc8c60cc446a8e69458f7851d047c7831.patch"; - sha256 = "sha256-WvU1iB53MavCsksKCjGvUl7R3Ww/38alxxMVzjpr5Xg="; + hash = "sha256-WvU1iB53MavCsksKCjGvUl7R3Ww/38alxxMVzjpr5Xg="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix index 0d043e789d..7b85fcf54b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-godX5Bn7Ed1sXtJXbsksPvqpOg98OeJjWG0e53nD14I="; + hash = "sha256-godX5Bn7Ed1sXtJXbsksPvqpOg98OeJjWG0e53nD14I="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myst-docutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myst-docutils/default.nix index 6746b314c0..ad86e90303 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myst-docutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myst-docutils/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Dxg5TtQaK4plvRmXZa7AqPFIv/jvUOpV8M/BJohiXj0="; + hash = "sha256-Dxg5TtQaK4plvRmXZa7AqPFIv/jvUOpV8M/BJohiXj0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix index 8d9bc3ff72..4beda44ad3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-FN9yXz4Ay17+9PhjvwwnNJDIxmLf7jntins3S/JWGTM="; + hash = "sha256-FN9yXz4Ay17+9PhjvwwnNJDIxmLf7jntins3S/JWGTM="; }; nativeBuildInputs = [ flit-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myst-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myst-parser/default.nix index 4437c9edcb..c5811db921 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myst-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myst-parser/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "myst-parser"; - version = "0.18.1"; + version = "0.19.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,15 +28,9 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-wgRZwafAF05LtwjH6SVKzsY7bKeZ6lUlM3dB5PdOn1E="; + hash = "sha256-dmvtRvVOF6lxeC+CC/dwkIs4VRDAZtlmblh9uaV+lW0="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "docutils>=0.15,<0.19" "docutils>=0.15" \ - --replace "sphinx>=4,<6" "sphinx" - ''; - nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ @@ -49,14 +43,16 @@ buildPythonPackage rec { typing-extensions ]; - pythonImportsCheck = [ "myst_parser" ]; - nativeCheckInputs = [ beautifulsoup4 pytest-param-files pytest-regressions sphinx-pytest pytestCheckHook + ] ++ markdown-it-py.optional-dependencies.linkify; + + pythonImportsCheck = [ + "myst_parser" ]; disabledTests = [ @@ -69,11 +65,15 @@ buildPythonPackage rec { "test_docutils_roles" # sphinx 6.0 expectation mismatches "test_sphinx_directives" + # sphinx 5.3 expectation mismatches + "test_render" + "test_includes" ]; meta = with lib; { description = "Sphinx and Docutils extension to parse MyST"; homepage = "https://myst-parser.readthedocs.io/"; + changelog = "https://raw.githubusercontent.com/executablebooks/MyST-Parser/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ loicreynier ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nad-receiver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nad-receiver/default.nix index 3d21379c24..ed836bded2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nad-receiver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nad-receiver/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "joopert"; repo = "nad_receiver"; rev = version; - sha256 = "sha256-jRMk/yMA48ei+g/33+mMYwfwixaKTMYcU/z/VOoJbvY="; + hash = "sha256-jRMk/yMA48ei+g/33+mMYwfwixaKTMYcU/z/VOoJbvY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/namedlist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/namedlist/default.nix index 0bba6233f8..86d5a9f5b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/namedlist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/namedlist/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { # Deprecation warning using collections.abc, https://gitlab.com/ericvsmith/namedlist/-/merge_requests/1 (fetchpatch { url = "https://gitlab.com/ericvsmith/namedlist/-/commit/102d15b455e6f058b9c95fe135167be82b34c14a.patch"; - sha256 = "sha256-IfDgiObFFSOUnAlXR/+ye8uutGaFJ/AyQvCb76iNaMM="; + hash = "sha256-IfDgiObFFSOUnAlXR/+ye8uutGaFJ/AyQvCb76iNaMM="; }) ]; 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 d3780e0c3c..4453e33975 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nameparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nameparser/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-9LbHwQSNUovWqisnz0KgZEfSsx5FqVsgRJUTB48dhu8="; + hash = "sha256-9LbHwQSNUovWqisnz0KgZEfSsx5FqVsgRJUTB48dhu8="; }; LC_ALL="en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/napalm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/napalm/default.nix index 1c000f1676..eabbadc1d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/napalm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/napalm/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "napalm-automation"; repo = "napalm"; rev = version; - sha256 = "sha256-TNWRJtc6+VS6wgJGGvCPDoFQmOKQAyXdjFQo9bPJ2F8="; + hash = "sha256-TNWRJtc6+VS6wgJGGvCPDoFQmOKQAyXdjFQo9bPJ2F8="; }; patches = [ @@ -22,11 +22,11 @@ buildPythonPackage rec { (fetchpatch{ url = "https://github.com/napalm-automation/napalm/commit/4b8cc85db3236099a04f742cf71773e74d9dd70e.patch"; excludes = [ "requirements.txt" ]; - sha256 = "sha256-DBKp+wiKd+/j2xAqaQL3UCcGQd6wnWcNTsNXBBt9c98="; + hash = "sha256-DBKp+wiKd+/j2xAqaQL3UCcGQd6wnWcNTsNXBBt9c98="; }) (fetchpatch{ url = "https://github.com/napalm-automation/napalm/commit/4a8b5b1823335dd79aa5269c038a1f08ecd35cdd.patch"; - sha256 = "sha256-uiou/rzmnFf4wAvXwmUsGJx99GeHWKJB2JrMM1kLakM="; + hash = "sha256-uiou/rzmnFf4wAvXwmUsGJx99GeHWKJB2JrMM1kLakM="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix index f8d9b34166..dacfc5f284 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "napari-npe2"; - version = "0.6.1"; + version = "0.6.2"; format = "pyproject"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "napari"; repo = "npe2"; rev = "refs/tags/v${version}"; - hash = "sha256-1wGMd4box+ulHcEL4zoArJ3ez95s7GcbXa9bWfLbSCw="; + hash = "sha256-f4mSsURcf2xvvO/mrsLVpUt+ws73QHk2Ng/NwCR5Q48="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix index 4a01afaaf7..975e4a8d2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "natsort"; - version = "8.2.0"; + version = "8.3.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-V/hbcsaIsJ4FPNrDAt1bW1PfX3OuILSHT8v/2L94PRE="; + hash = "sha256-UXWVSS3eVwpP1ranb2REQMG6UeIzjIpnHX8Edf2o+f0="; }; propagatedBuildInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Natural sorting for Python"; homepage = "https://github.com/SethMMorton/natsort"; + changelog = "https://github.com/SethMMorton/natsort/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; }; 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 2735efd4ce..bba04a6968 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "nbclassic"; - version = "0.4.8"; + version = "0.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-x02KUA+OBY1GtXakHlvGQHEeEDLPdUHd5fc+pJSX4oM="; + hash = "sha256-QPEbvMWeiVbD1e8TLeyOWoU+iT7Pgx55HVTaDYpQ150="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbdime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbdime/default.nix index 40a0d63d48..1b8fe804a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbdime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbdime/default.nix @@ -20,6 +20,7 @@ , tornado , requests , gitpython +, jupyter-server , jupyter-server-mathjax , notebook , jinja2 @@ -91,5 +92,7 @@ buildPythonPackage rec { description = "Tools for diffing and merging of Jupyter notebooks."; license = licenses.bsd3; maintainers = with maintainers; [ tbenst ]; + # https://github.com/jupyter/nbdime/issues/645 + broken = lib.versionAtLeast jupyter-server.version "2"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix index ab2520279a..85489d4566 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.7.1"; + version = "5.7.3"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-OBCgEwRT7QMZcFIdIJibilkvPC5zKDqCgK40rh91s/g="; + hash = "sha256-SwIfyiTTp0e/TmJmlAM9eS1ZRwWCnl41sU7jNp+fZHc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix index 1e135a80d1..8fa86e50d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , coverage , ipykernel , jupyter-client @@ -15,11 +16,14 @@ buildPythonPackage rec { pname = "nbval"; - version = "0.9.6"; + version = "0.10.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "cfefcd2ef66ee2d337d0b252c6bcec4023384eb32e8b9e5fcc3ac80ab8cd7d40"; + hash = "sha256-tKzv3BEyrvihtbYr+ak9Eo66UoObKFTqPkJZj023vrM="; }; buildInputs = [ @@ -32,7 +36,6 @@ buildPythonPackage rec { jupyter-client nbformat pytest - six ]; nativeCheckInputs = [ @@ -51,6 +54,8 @@ buildPythonPackage rec { "tests/test_timeouts.py" # No value for us "tests/test_coverage.py" + # nbdime marked broken + "tests/test_nbdime_reporter.py" ]; # Some of the tests use localhost networking. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nclib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nclib/default.nix index e11f1f8f23..244f49a48e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nclib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nclib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-rA8oeYvMhw8HURxPLBRqpMHnAez/xBjyPFoKXIIvBjg="; + hash = "sha256-rA8oeYvMhw8HURxPLBRqpMHnAez/xBjyPFoKXIIvBjg="; }; # Project has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ndindex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ndindex/default.nix new file mode 100644 index 0000000000..6a749e4b8d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ndindex/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, cython + +# optional +, numpy + +# tests +, hypothesis +, pytest-cov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ndindex"; + version = "1.6"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Quansight-Labs"; + repo = "ndindex"; + rev = "refs/tags/${version}"; + hash = "sha256-QLWGgbF5nNTa1SsSkupo+fAs9K7eTexTK9n9yDLVgrQ="; + }; + + nativeBuildInputs = [ + cython + ]; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace "--cov=ndindex/ --cov-report=term-missing --flakes" "" + ''; + + passthru.optional-dependencies.arrays = [ + numpy + ]; + + pythonImportsCheck = [ + "ndindex" + ]; + + nativeCheckInputs = [ + hypothesis + pytest-cov # uses cov markers + pytestCheckHook + ] ++ passthru.optional-dependencies.arrays; + + pytestFlagsArray = [ + # pytest.PytestRemovedIn8Warning: Passing None has been deprecated. + "--deselect=ndindex/tests/test_ndindex.py::test_ndindex_invalid" + ]; + + meta = with lib; { + description = ""; + homepage = "https://github.com/Quansight-Labs/ndindex"; + changelog = "https://github.com/Quansight-Labs/ndindex/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nessclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nessclient/default.nix index c48fe4a746..6eb3d2598e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nessclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nessclient/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "nickw444"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-zjUYdSHIMCB4cCAsOOQZ9YgmFTskzlTUs5z/xPFt01Q="; + hash = "sha256-zjUYdSHIMCB4cCAsOOQZ9YgmFTskzlTUs5z/xPFt01Q="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix index 995641eb92..43253eecdc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-0mfMH/eUQD999pKWTR0qP6lBj/6io/aFmkOf9IL+8pA="; + hash = "sha256-0mfMH/eUQD999pKWTR0qP6lBj/6io/aFmkOf9IL+8pA="; }; # tests not packaged with source dist as of 1.3.2/1.3.2, and diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix index 1fd7e47ade..63273bfce6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-A4KwL/aiiEGfb/7IXexA9FH0G4dVVHFUxXXd2fD0rlM="; + hash = "sha256-A4KwL/aiiEGfb/7IXexA9FH0G4dVVHFUxXXd2fD0rlM="; }; nativeBuildInputs = [ setuptools cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netdata/default.nix index 18942bb014..1127a8ba15 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netdata/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-netdata"; rev = version; - sha256 = "sha256-vrXXvCoZ1jErlxTcjGbtA8Uio7UDxnt3aNb9FQ0PkrU="; + hash = "sha256-vrXXvCoZ1jErlxTcjGbtA8Uio7UDxnt3aNb9FQ0PkrU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netdisco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netdisco/default.nix index ef1ebbf68f..f44d54993d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netdisco/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netdisco/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-TbtZBILzd8zEYeAXQnB8y+jx0tGyhXivkdybf+vNy9I="; + hash = "sha256-TbtZBILzd8zEYeAXQnB8y+jx0tGyhXivkdybf+vNy9I="; }; propagatedBuildInputs = [ requests zeroconf ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netmiko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netmiko/default.nix index 97a6b7fac0..7258acb2aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netmiko/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netmiko/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-9e3iooZw09/TRwBhRoZl+A+bSQbtIOaw+02eHJvmevw="; + hash = "sha256-9e3iooZw09/TRwBhRoZl+A+bSQbtIOaw+02eHJvmevw="; }; buildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix index 01e21ae877..5342b12dc8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.8.8"; + version = "3.0"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Iw04gRevhw/OVkejxSQB/PdT6Ucg5uprQZelNVZIiF4="; + hash = "sha256-mpmSNFNTYYrpgznCtj2CAcOBwpRPOKKrSctFpMZn5BI="; }; propagatedBuildInputs = [ decorator setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix index 3e68892c8b..b804251ebc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-VBK+h5K/irI0T0eUaYC1iouzMUo/lJshLTe0h5CtnAQ="; + hash = "sha256-VBK+h5K/irI0T0eUaYC1iouzMUo/lJshLTe0h5CtnAQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nextcord/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nextcord/default.nix index f2a6137fae..d82708b39d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nextcord/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nextcord/default.nix @@ -9,14 +9,14 @@ , aiohttp , aiodns , brotli -, cchardet +, faust-cchardet , orjson , pynacl }: buildPythonPackage rec { pname = "nextcord"; - version = "2.4.0"; + version = "2.4.1"; format = "setuptools"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "nextcord"; repo = "nextcord"; rev = "refs/tags/v${version}"; - hash = "sha256-TePUsyQ4DCuvfRQD4KAUs94o3MJRmZmu6jMPv4lJtHE="; + hash = "sha256-9Zgdaw5JXr0xUhxuhBWyPwKN64NY76Z72KJ571Hko2w="; }; patches = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { aiodns aiohttp brotli - cchardet + faust-cchardet orjson pynacl ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/niaaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/niaaml/default.nix index 6385b07898..e97e2319bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/niaaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/niaaml/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "lukapecnik"; repo = "NiaAML"; rev = version; - sha256 = "sha256-B87pI1EpZj1xECrgTmzN5S35Cy1nPowBRyu1IDb5zCE="; + hash = "sha256-B87pI1EpZj1xECrgTmzN5S35Cy1nPowBRyu1IDb5zCE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nianet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nianet/default.nix new file mode 100644 index 0000000000..4adca2e5b7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/nianet/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, matplotlib +, niapy +, numpy +, poetry-core +, pytestCheckHook +, pythonOlder +, scikit-learn +, toml-adapt +, torch +}: + +buildPythonPackage rec { + pname = "nianet"; + version = "1.1.4"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "SasoPavlic"; + repo = pname; + rev = "version_${version}"; + sha256 = "sha256-FZipl6Z9AfiL6WH0kvUn8bVxt8JLdDVlmTSqnyxe0nY="; + }; + + nativeBuildInputs = [ + toml-adapt + poetry-core + ]; + + propagatedBuildInputs = [ + niapy + numpy + scikit-learn + torch + ]; + + # create niapy and torch dep version consistent + preBuild = '' + toml-adapt -path pyproject.toml -a change -dep niapy -ver X + toml-adapt -path pyproject.toml -a change -dep torch -ver X + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nianet" + ]; + + meta = with lib; { + description = "Designing and constructing neural network topologies using nature-inspired algorithms"; + homepage = "https://github.com/SasoPavlic/NiaNet"; + changelog = "https://github.com/SasoPavlic/NiaNet/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ firefly-cpp ]; + }; +} 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 54b92a1787..2c1f0b2ae2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nibabel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nibabel/default.nix @@ -1,31 +1,81 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 -, packaging -, pytestCheckHook -, nose +, pythonOlder +, hatchling +, hatch-vcs , numpy -, h5py +, packaging +, importlib-resources , pydicom +, pillow +, h5py , scipy +, git +, pytest-doctestplus +, pytest-httpserver +, pytest-xdist +, pytestCheckHook }: buildPythonPackage rec { pname = "nibabel"; - version = "4.0.2"; - disabled = isPy27; + version = "5.0.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RcSbU0k1G0X2wEWpGqArTw02dob/MoRjLvlaxluTB4Y="; + hash = "sha256-SvZQFbTMmZQEyvA04cFcGrZ1h5XCXWkH/3T127/p9D4="; }; - propagatedBuildInputs = [ numpy scipy h5py packaging pydicom ]; + nativeBuildInputs = [ + hatchling + hatch-vcs + ]; + + propagatedBuildInputs = [ + numpy + packaging + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources + ]; + + passthru.optional-dependencies = rec { + all = dicom + ++ dicomfs + ++ minc2 + ++ spm + ++ zstd; + dicom = [ + pydicom + ]; + dicomfs = [ + pillow + ] ++ dicom; + minc2 = [ + h5py + ]; + spm = [ + scipy + ]; + zstd = [ + # TODO: pyzstd + ]; + }; nativeCheckInputs = [ + git + pytest-doctestplus + pytest-httpserver + pytest-xdist pytestCheckHook - ]; + ] ++ passthru.optional-dependencies.all; + + preCheck = '' + export PATH=$out/bin:$PATH + ''; disabledTests = [ # https://github.com/nipy/nibabel/issues/951 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Nikola/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nikola/default.nix similarity index 79% rename from third_party/nixpkgs/pkgs/development/python-modules/Nikola/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/nikola/default.nix index 4a549cee2c..2f39dcce71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Nikola/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nikola/default.nix @@ -14,7 +14,7 @@ , ipykernel , jinja2 , lxml -, Mako +, mako , markdown , micawber , mock @@ -26,7 +26,7 @@ , pygal , pygments , pyphen -, PyRSS2Gen +, pyrss2gen , pytestCheckHook , pythonOlder , requests @@ -36,17 +36,18 @@ , typogrify , unidecode , watchdog -, Yapsy +, yapsy }: buildPythonPackage rec { - pname = "Nikola"; + pname = "nikola"; version = "8.2.3"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-c8eadkmYWS88nGwi6QwPqHg7FBXlkdazKSrbWDMw/UA="; + pname = "Nikola"; + inherit version; + hash = "sha256-c8eadkmYWS88nGwi6QwPqHg7FBXlkdazKSrbWDMw/UA="; }; propagatedBuildInputs = [ @@ -62,7 +63,7 @@ buildPythonPackage rec { ipykernel jinja2 lxml - Mako + mako markdown micawber natsort @@ -73,14 +74,14 @@ buildPythonPackage rec { pygal pygments pyphen - PyRSS2Gen + pyrss2gen requests ruamel-yaml toml typogrify unidecode watchdog - Yapsy + yapsy ]; nativeCheckInputs = [ @@ -97,6 +98,11 @@ buildPythonPackage rec { disabledTests = [ # AssertionError "test_compiling_markdown" + # Date formatting slightly differs from expectation + "test_format_date_long" + "test_format_date_timezone" + "test_format_date_locale_variants" + "test_format_date_locale_variants" ]; pythonImportsCheck = [ "nikola" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix index f0cbc4398a..5a79242daa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.9.2"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jajTg12SzXuKbMkkVaSJ1+f1mUz2T8cbzmU+NidzueQ="; + hash = "sha256-zH8QaOA4B2Un6tG9NjQ2+I9ejSHou1ezI7MLkm/HVTo="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix index 125667cd04..4252df40fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-44QnQ/tmBGTdKd5z3Pye9m0nO+ELzGQFn/Ic1e8ellU="; + hash = "sha256-44QnQ/tmBGTdKd5z3Pye9m0nO+ELzGQFn/Ic1e8ellU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nitime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nitime/default.nix index 183e2dfcfb..6ef5b735af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nitime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nitime/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-bn2QrbsfqUJim84vH5tt5T6h3YsGAlgu9GCMiNQ0OHQ="; + hash = "sha256-bn2QrbsfqUJim84vH5tt5T6h3YsGAlgu9GCMiNQ0OHQ="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nitransforms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nitransforms/default.nix index 695c674e0d..09c69f9efb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nitransforms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nitransforms/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-iV9TEIGogIfbj+fmOGftoQqEdtZiewbHEw3hYlMEP4c="; + hash = "sha256-iV9TEIGogIfbj+fmOGftoQqEdtZiewbHEw3hYlMEP4c="; }; buildInputs = [ setuptools-scm toml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nkdfu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nkdfu/default.nix index d95b688ed9..340af28126 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nkdfu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nkdfu/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-8l913dOCxHKFtpQ83p9RV3sUlu0oT5PVi14FSuYJ9fg="; + hash = "sha256-8l913dOCxHKFtpQ83p9RV3sUlu0oT5PVi14FSuYJ9fg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix index 42067f594e..93f540d4af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "nocasedict"; - version = "1.1.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rFUd5pK+aupbQ6w/LDN4DflAATrG3QcY+1Usi1YLpmE="; + hash = "sha256-M797DqUO7mutFtx0AP2J3S1Tedm6nPF2NL8qWa42/wo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nocaselist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nocaselist/default.nix index ef9d5e904d..ffa66704c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nocaselist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nocaselist/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-UnKyMuCCRmlqsm/g670ouJidrJ7lcytQJklQMjtRPSM="; + hash = "sha256-UnKyMuCCRmlqsm/g670ouJidrJ7lcytQJklQMjtRPSM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nocturne/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nocturne/default.nix index 42424f1dac..036c3af91e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nocturne/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nocturne/default.nix @@ -6,7 +6,7 @@ , lib , nlohmann_json , pybind11 -, PyVirtualDisplay +, pyvirtualdisplay , sfml , substituteAll }: @@ -42,8 +42,8 @@ buildPythonPackage rec { buildInputs = [ sfml ]; - # hydra-core and PyVirtualDisplay are not declared as dependences but they are requirements - propagatedBuildInputs = [ hydra-core PyVirtualDisplay ]; + # hydra-core and pyvirtualdisplay are not declared as dependences but they are requirements + propagatedBuildInputs = [ hydra-core pyvirtualdisplay ]; # Test suite requires hydra-submitit-launcher which is not packaged as of 2022-01-02 doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notebook-shim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notebook-shim/default.nix index 94d4f9fc75..985cc63158 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notebook-shim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notebook-shim/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "jupyter"; repo = "notebook_shim"; rev = "refs/tags/v${version}"; - sha256 = "sha256-/z4vXSBqeL2wSqJ0kFNgU0TSGUGByhxHNya8EO55+7s="; + hash = "sha256-/z4vXSBqeL2wSqJ0kFNgU0TSGUGByhxHNya8EO55+7s="; }; nativeBuildInputs = [ hatchling ]; 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 e1c0210bec..5e0d4a1b06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-wYl+UxfiJfx4tFVJpqtLZo5MmW/QOgTpOP5eevK//9A="; + hash = "sha256-wYl+UxfiJfx4tFVJpqtLZo5MmW/QOgTpOP5eevK//9A="; }; LC_ALL = "en_US.utf8"; @@ -62,6 +62,7 @@ buildPythonPackage rec { "sock_server" "test_list_formats" # tries to find python MIME type "KernelCullingTest" # has a race condition failing on slower hardware + "test_connections" # tornado.simple_httpclient.HTTPTimeoutError: Timeout during request" ] ++ lib.optionals stdenv.isDarwin [ "test_delete" "test_checkpoints_follow_file" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notion-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notion-client/default.nix index 16405ff27e..2ed0b0f8c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notion-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notion-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "ramnes"; repo = "notion-sdk-py"; rev = version; - sha256 = "sha256-zfG1OgH/2ytDUC+ogIY9/nP+xkgjiMt9+HVcWEMXoj8="; + hash = "sha256-zfG1OgH/2ytDUC+ogIY9/nP+xkgjiMt9+HVcWEMXoj8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nptyping/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nptyping/default.nix index 517512f6b7..c449c8b0ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nptyping/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nptyping/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nptyping"; - version = "2.4.1"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "ramonhagenaars"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jV2MVMP/tlYN3djoViemGaJyzREoOJJamwG97WFhIvc="; + hash = "sha256-hz4YrcvARCAA7TXapmneIwle/F4pzcIYLPSmiFHC0VQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nsz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nsz/default.nix index 29284c97ea..266fb86864 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nsz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nsz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "nicoboss"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-It815Uxxs4T9BM9EypAfPuq4Oy8rgGLpKA79m2xM8N4="; + hash = "sha256-It815Uxxs4T9BM9EypAfPuq4Oy8rgGLpKA79m2xM8N4="; }; propagatedBuildInputs = [pycryptodome enlighten zstandard ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix index f161cfd154..d668ba7217 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-uEGl245tmc+W/9G+IclSNu76VTJ7w3zw6BQkhmGgEnY="; + hash = "sha256-uEGl245tmc+W/9G+IclSNu76VTJ7w3zw6BQkhmGgEnY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ntlm-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ntlm-auth/default.nix deleted file mode 100644 index d3d64bcbe2..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/ntlm-auth/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, buildPythonPackage -, cryptography -, fetchFromGitHub -, mock -, pytestCheckHook -, pythonOlder -, requests -}: - -buildPythonPackage rec { - pname = "ntlm-auth"; - version = "1.5.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "jborean93"; - repo = "ntlm-auth"; - rev = "v${version}"; - hash = "sha256-CRBR2eXUGngU7IvGuRfBnvH6QZhhwyh1dgd47VZxtwE="; - }; - - propagatedBuildInputs = [ - cryptography - ]; - - nativeCheckInputs = [ - mock - pytestCheckHook - requests - ]; - - pythonImportsCheck = [ - "ntlm_auth" - ]; - - disabledTests = [ - # Tests are outdated as module will be replaced by pyspnego - "test_authenticate_message" - "test_authenticate_without_domain_workstation" - "test_create_authenticate_message" - "test_get_" - "test_lm_v" - "test_nt_" - "test_ntlm_context" - "test_ntowfv" - ]; - - meta = with lib; { - description = "Calculates NTLM Authentication codes"; - homepage = "https://github.com/jborean93/ntlm-auth"; - changelog = "https://github.com/jborean93/ntlm-auth/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ elasticdog ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix index ff26bb6ad0..9eb5faa606 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix @@ -10,8 +10,9 @@ }: buildPythonPackage rec { - version = "1.4.8"; - pname = "Nuitka"; + pname = "nuitka"; + version = "1.1.5"; + format = "setuptools"; src = fetchFromGitHub { owner = "Nuitka"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix index 438ee8afba..82ba5a8cec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-fnwLDwgEBao6HdnTKxypCzvwO6sXuOVNsF4beDAaCYg="; + hash = "sha256-fnwLDwgEBao6HdnTKxypCzvwO6sXuOVNsF4beDAaCYg="; }; propagatedBuildInputs = [ docopt ]; 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 9c60eac411..fae84969a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix @@ -37,12 +37,16 @@ in buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "setuptools<60" "setuptools" + --replace 'max_numpy_run_version = "1.24"' 'max_numpy_run_version = "1.25"' + substituteInPlace numba/__init__.py \ + --replace "elif numpy_version > (1, 23):" "elif numpy_version > (1, 24):" ''; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; - nativeBuildInputs = lib.optionals cudaSupport [ + nativeBuildInputs = [ + numpy + ] ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; @@ -65,6 +69,8 @@ in buildPythonPackage rec { url = "https://github.com/numba/numba/commit/993e8c424055a7677b2755b184fc9e07549713b9.patch"; hash = "sha256-IhIqRLmP8gazx+KWIyCxZrNLMT4jZT8CWD3KcH4KjOo="; }) + # Backport numpy 1.24 support from https://github.com/numba/numba/pull/8691 + ./numpy-1.24.patch ] ++ lib.optionals cudaSupport [ (substituteAll { src = ./cuda_path.patch; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numba/numpy-1.24.patch b/third_party/nixpkgs/pkgs/development/python-modules/numba/numpy-1.24.patch new file mode 100644 index 0000000000..8a0214b79f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/numba/numpy-1.24.patch @@ -0,0 +1,644 @@ +From c3e6994e07fb6ac57be5d9d33d9046c5453b2256 Mon Sep 17 00:00:00 2001 +From: Graham Markall +Date: Thu, 24 Nov 2022 15:41:24 +0000 +Subject: [PATCH 01/13] CUDA intrinsics tests: correct np.float -> np.float16 + +I believe this was written in error and should always have been float16. +--- + numba/cuda/tests/cudapy/test_intrinsics.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/numba/cuda/tests/cudapy/test_intrinsics.py b/numba/cuda/tests/cudapy/test_intrinsics.py +index 6e5fc0a0e..46fe8c607 100644 +--- a/numba/cuda/tests/cudapy/test_intrinsics.py ++++ b/numba/cuda/tests/cudapy/test_intrinsics.py +@@ -619,7 +619,7 @@ class TestCudaIntrinsic(CUDATestCase): + arg2 = np.float16(4.) + compiled[1, 1](ary, arg1, arg2) + np.testing.assert_allclose(ary[0], arg2) +- arg1 = np.float(5.) ++ arg1 = np.float16(5.) + compiled[1, 1](ary, arg1, arg2) + np.testing.assert_allclose(ary[0], arg1) + +@@ -631,7 +631,7 @@ class TestCudaIntrinsic(CUDATestCase): + arg2 = np.float16(4.) + compiled[1, 1](ary, arg1, arg2) + np.testing.assert_allclose(ary[0], arg1) +- arg1 = np.float(5.) ++ arg1 = np.float16(5.) + compiled[1, 1](ary, arg1, arg2) + np.testing.assert_allclose(ary[0], arg2) + +-- +2.39.1 + +From 550fc6a25a82f76bc1f06bdea39177df635038c2 Mon Sep 17 00:00:00 2001 +From: Graham Markall +Date: Thu, 22 Dec 2022 13:02:22 +0000 +Subject: [PATCH 02/13] TestLinalgSvd.test_no_input_mutation: use + reconstruction if necessary + +This test only checked for a plain match when comparing outputs. +However, in some cases a reconstruction check can be necessary, as in +`test_linalg_svd`. +--- + numba/tests/test_linalg.py | 61 ++++++++++++++++++++------------------ + 1 file changed, 32 insertions(+), 29 deletions(-) + +diff --git a/numba/tests/test_linalg.py b/numba/tests/test_linalg.py +index db183059d..b1d4f0a83 100644 +--- a/numba/tests/test_linalg.py ++++ b/numba/tests/test_linalg.py +@@ -1122,6 +1122,32 @@ class TestLinalgSvd(TestLinalgBase): + Tests for np.linalg.svd. + """ + ++ # This checks that A ~= U*S*V**H, i.e. SV decomposition ties out. This is ++ # required as NumPy uses only double precision LAPACK routines and ++ # computation of SVD is numerically sensitive. Numba uses type-specific ++ # routines and therefore sometimes comes out with a different answer to ++ # NumPy (orthonormal bases are not unique, etc.). ++ ++ def check_reconstruction(self, a, got, expected): ++ u, sv, vt = got ++ ++ # Check they are dimensionally correct ++ for k in range(len(expected)): ++ self.assertEqual(got[k].shape, expected[k].shape) ++ ++ # Columns in u and rows in vt dictates the working size of s ++ s = np.zeros((u.shape[1], vt.shape[0])) ++ np.fill_diagonal(s, sv) ++ ++ rec = np.dot(np.dot(u, s), vt) ++ resolution = np.finfo(a.dtype).resolution ++ np.testing.assert_allclose( ++ a, ++ rec, ++ rtol=10 * resolution, ++ atol=100 * resolution # zeros tend to be fuzzy ++ ) ++ + @needs_lapack + def test_linalg_svd(self): + """ +@@ -1150,34 +1176,8 @@ class TestLinalgSvd(TestLinalgBase): + # plain match failed, test by reconstruction + use_reconstruction = True + +- # if plain match fails then reconstruction is used. +- # this checks that A ~= U*S*V**H +- # i.e. SV decomposition ties out +- # this is required as numpy uses only double precision lapack +- # routines and computation of svd is numerically +- # sensitive, numba using the type specific routines therefore +- # sometimes comes out with a different answer (orthonormal bases +- # are not unique etc.). + if use_reconstruction: +- u, sv, vt = got +- +- # check they are dimensionally correct +- for k in range(len(expected)): +- self.assertEqual(got[k].shape, expected[k].shape) +- +- # regardless of full_matrices cols in u and rows in vt +- # dictates the working size of s +- s = np.zeros((u.shape[1], vt.shape[0])) +- np.fill_diagonal(s, sv) +- +- rec = np.dot(np.dot(u, s), vt) +- resolution = np.finfo(a.dtype).resolution +- np.testing.assert_allclose( +- a, +- rec, +- rtol=10 * resolution, +- atol=100 * resolution # zeros tend to be fuzzy +- ) ++ self.check_reconstruction(a, got, expected) + + # Ensure proper resource management + with self.assertNoNRTLeak(): +@@ -1238,8 +1238,11 @@ class TestLinalgSvd(TestLinalgBase): + got = func(X, False) + np.testing.assert_allclose(X, X_orig) + +- for e_a, g_a in zip(expected, got): +- np.testing.assert_allclose(e_a, g_a) ++ try: ++ for e_a, g_a in zip(expected, got): ++ np.testing.assert_allclose(e_a, g_a) ++ except AssertionError: ++ self.check_reconstruction(X, got, expected) + + + class TestLinalgQr(TestLinalgBase): +-- +2.39.1 + +From c9ca2d1ae5e09ace729cddf6fba08effcd69a0b7 Mon Sep 17 00:00:00 2001 +From: Graham Markall +Date: Thu, 24 Nov 2022 21:39:27 +0000 +Subject: [PATCH 03/13] test_comp_nest_with_dependency: skip on NumPy 1.24 + +Setting an array element with a sequence is removed in NumPy 1.24. +--- + numba/tests/test_comprehension.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/numba/tests/test_comprehension.py b/numba/tests/test_comprehension.py +index 2cdd3dc25..092ed51da 100644 +--- a/numba/tests/test_comprehension.py ++++ b/numba/tests/test_comprehension.py +@@ -11,6 +11,7 @@ from numba import jit, typed + from numba.core import types, utils + from numba.core.errors import TypingError, LoweringError + from numba.core.types.functions import _header_lead ++from numba.np.numpy_support import numpy_version + from numba.tests.support import tag, _32bit, captured_stdout + + +@@ -360,6 +361,7 @@ class TestArrayComprehension(unittest.TestCase): + self.check(comp_nest_with_array_conditional, 5, + assert_allocate_list=True) + ++ @unittest.skipUnless(numpy_version < (1, 24), 'Removed in NumPy 1.24') + def test_comp_nest_with_dependency(self): + def comp_nest_with_dependency(n): + l = np.array([[i * j for j in range(i+1)] for i in range(n)]) +-- +2.39.1 + +From e69ad519352ac5a1f7714083968fcbac3ba92f95 Mon Sep 17 00:00:00 2001 +From: Graham Markall +Date: Thu, 24 Nov 2022 16:48:37 +0000 +Subject: [PATCH 04/13] Avoid use of np.bool in stencilparfor.py + +--- + numba/stencils/stencilparfor.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/numba/stencils/stencilparfor.py b/numba/stencils/stencilparfor.py +index 5f30893b3..4f23ed903 100644 +--- a/numba/stencils/stencilparfor.py ++++ b/numba/stencils/stencilparfor.py +@@ -21,6 +21,7 @@ from numba.core.ir_utils import (get_call_table, mk_unique_var, + find_callname, require, find_const, GuardException) + from numba.core.errors import NumbaValueError + from numba.core.utils import OPERATORS_TO_BUILTINS ++from numba.np import numpy_support + + + def _compute_last_ind(dim_size, index_const): +@@ -264,7 +265,11 @@ class StencilPass(object): + dtype_g_np_assign = ir.Assign(dtype_g_np, dtype_g_np_var, loc) + init_block.body.append(dtype_g_np_assign) + +- dtype_np_attr_call = ir.Expr.getattr(dtype_g_np_var, return_type.dtype.name, loc) ++ return_type_name = numpy_support.as_dtype( ++ return_type.dtype).type.__name__ ++ if return_type_name == 'bool': ++ return_type_name = 'bool_' ++ dtype_np_attr_call = ir.Expr.getattr(dtype_g_np_var, return_type_name, loc) + dtype_attr_var = ir.Var(scope, mk_unique_var("$np_attr_attr"), loc) + self.typemap[dtype_attr_var.name] = types.functions.NumberClass(return_type.dtype) + dtype_attr_assign = ir.Assign(dtype_np_attr_call, dtype_attr_var, loc) +-- +2.39.1 + +From dd96d5996abd8646443501f2bbd7d4e1a9c0eec4 Mon Sep 17 00:00:00 2001 +From: Graham Markall +Date: Thu, 24 Nov 2022 15:46:52 +0000 +Subject: [PATCH 05/13] test_hypot: Tweak regex so it matches NumPy 1.24 + +The modified regex matches the existing message produced by NumPy < +1.24, and the new improved message in 1.24. +--- + numba/tests/test_mathlib.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/numba/tests/test_mathlib.py b/numba/tests/test_mathlib.py +index a3f535316..05e3d68f5 100644 +--- a/numba/tests/test_mathlib.py ++++ b/numba/tests/test_mathlib.py +@@ -516,7 +516,7 @@ class TestMathLib(TestCase): + with warnings.catch_warnings(): + warnings.simplefilter("error", RuntimeWarning) + self.assertRaisesRegexp(RuntimeWarning, +- 'overflow encountered in .*_scalars', ++ 'overflow encountered in .*scalar', + naive_hypot, val, val) + + def test_hypot_npm(self): +-- +2.39.1 + +From b755c22caeec9e6b0e0606f0cee245648914d592 Mon Sep 17 00:00:00 2001 +From: Graham Markall +Date: Thu, 24 Nov 2022 11:29:53 +0000 +Subject: [PATCH 06/13] Don't test summing with timedelta dtype + +This always produced invalid results (though they were consistent +between Numba and NumPy) but now this fails in NumPy 1.24 with an +exception: + +``` +TypeError: The `dtype` and `signature` arguments to ufuncs only select +the general DType and not details such as the byte order or time unit. +You can avoid this error by using the scalar types `np.float64` or the +dtype string notation. +``` + +Note that the exception message is misleading, and using the dtype +string notation does not provide a workaround. +--- + numba/tests/test_array_methods.py | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +diff --git a/numba/tests/test_array_methods.py b/numba/tests/test_array_methods.py +index eee5cfeff..a2312adba 100644 +--- a/numba/tests/test_array_methods.py ++++ b/numba/tests/test_array_methods.py +@@ -1193,7 +1193,7 @@ class TestArrayMethods(MemoryLeakMixin, TestCase): + pyfunc = array_sum_dtype_kws + cfunc = jit(nopython=True)(pyfunc) + all_dtypes = [np.float64, np.float32, np.int64, np.int32, np.uint32, +- np.uint64, np.complex64, np.complex128, TIMEDELTA_M] ++ np.uint64, np.complex64, np.complex128] + all_test_arrays = [ + [np.ones((7, 6, 5, 4, 3), arr_dtype), + np.ones(1, arr_dtype), +@@ -1207,8 +1207,7 @@ class TestArrayMethods(MemoryLeakMixin, TestCase): + np.dtype('uint32'): [np.float64, np.int64, np.float32], + np.dtype('uint64'): [np.float64, np.int64], + np.dtype('complex64'): [np.complex64, np.complex128], +- np.dtype('complex128'): [np.complex128], +- np.dtype(TIMEDELTA_M): [np.dtype(TIMEDELTA_M)]} ++ np.dtype('complex128'): [np.complex128]} + + for arr_list in all_test_arrays: + for arr in arr_list: +@@ -1216,15 +1215,15 @@ class TestArrayMethods(MemoryLeakMixin, TestCase): + subtest_str = ("Testing np.sum with {} input and {} output" + .format(arr.dtype, out_dtype)) + with self.subTest(subtest_str): +- self.assertPreciseEqual(pyfunc(arr, dtype=out_dtype), +- cfunc(arr, dtype=out_dtype)) ++ self.assertPreciseEqual(pyfunc(arr, dtype=out_dtype), ++ cfunc(arr, dtype=out_dtype)) + + def test_sum_axis_dtype_kws(self): + """ test sum with axis and dtype parameters over a whole range of dtypes """ + pyfunc = array_sum_axis_dtype_kws + cfunc = jit(nopython=True)(pyfunc) + all_dtypes = [np.float64, np.float32, np.int64, np.int32, np.uint32, +- np.uint64, np.complex64, np.complex128, TIMEDELTA_M] ++ np.uint64, np.complex64, np.complex128] + all_test_arrays = [ + [np.ones((7, 6, 5, 4, 3), arr_dtype), + np.ones(1, arr_dtype), +@@ -1238,9 +1237,7 @@ class TestArrayMethods(MemoryLeakMixin, TestCase): + np.dtype('uint32'): [np.float64, np.int64, np.float32], + np.dtype('uint64'): [np.float64, np.uint64], + np.dtype('complex64'): [np.complex64, np.complex128], +- np.dtype('complex128'): [np.complex128], +- np.dtype(TIMEDELTA_M): [np.dtype(TIMEDELTA_M)], +- np.dtype(TIMEDELTA_Y): [np.dtype(TIMEDELTA_Y)]} ++ np.dtype('complex128'): [np.complex128]} + + for arr_list in all_test_arrays: + for arr in arr_list: +-- +2.39.1 + +From 65df00379df1276b7045b44818347a119bb32361 Mon Sep 17 00:00:00 2001 +From: Graham Markall +Date: Thu, 24 Nov 2022 10:03:54 +0000 +Subject: [PATCH 07/13] Replace use of deprecated np.bool with np.bool_ + +np.bool was removed in NumPy 1.24. +--- + numba/tests/test_np_functions.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/numba/tests/test_np_functions.py b/numba/tests/test_np_functions.py +index 4cdaf548b..e195ac781 100644 +--- a/numba/tests/test_np_functions.py ++++ b/numba/tests/test_np_functions.py +@@ -932,11 +932,11 @@ class TestNPFunctions(MemoryLeakMixin, TestCase): + yield np.inf, None + yield np.PINF, None + yield np.asarray([-np.inf, 0., np.inf]), None +- yield np.NINF, np.zeros(1, dtype=np.bool) +- yield np.inf, np.zeros(1, dtype=np.bool) +- yield np.PINF, np.zeros(1, dtype=np.bool) ++ yield np.NINF, np.zeros(1, dtype=np.bool_) ++ yield np.inf, np.zeros(1, dtype=np.bool_) ++ yield np.PINF, np.zeros(1, dtype=np.bool_) + yield np.NINF, np.empty(12) +- yield np.asarray([-np.inf, 0., np.inf]), np.zeros(3, dtype=np.bool) ++ yield np.asarray([-np.inf, 0., np.inf]), np.zeros(3, dtype=np.bool_) + + pyfuncs = [isneginf, isposinf] + for pyfunc in pyfuncs: +-- +2.39.1 + +From 065475bd8d5f39ad0a2b0d154ca283dec10bf5d0 Mon Sep 17 00:00:00 2001 +From: Graham Markall +Date: Thu, 24 Nov 2022 09:56:06 +0000 +Subject: [PATCH 08/13] Overload np.MachAr only for NumPy < 1.24 + +--- + numba/np/arraymath.py | 4 ++++ + numba/tests/test_np_functions.py | 4 +++- + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/numba/np/arraymath.py b/numba/np/arraymath.py +index 9885526ee..f6e5f5560 100644 +--- a/numba/np/arraymath.py ++++ b/numba/np/arraymath.py +@@ -4177,6 +4177,10 @@ iinfo = namedtuple('iinfo', _iinfo_supported) + # This module is imported under the compiler lock which should deal with the + # lack of thread safety in the warning filter. + def _gen_np_machar(): ++ # NumPy 1.24 removed np.MachAr ++ if numpy_version >= (1, 24): ++ return ++ + np122plus = numpy_version >= (1, 22) + w = None + with warnings.catch_warnings(record=True) as w: +diff --git a/numba/tests/test_np_functions.py b/numba/tests/test_np_functions.py +index e195ac781..e8a9bccd0 100644 +--- a/numba/tests/test_np_functions.py ++++ b/numba/tests/test_np_functions.py +@@ -4775,6 +4775,7 @@ def foo(): + eval(compile(funcstr, '', 'exec')) + return locals()['foo'] + ++ @unittest.skipIf(numpy_version >= (1, 24), "NumPy < 1.24 required") + def test_MachAr(self): + attrs = ('ibeta', 'it', 'machep', 'eps', 'negep', 'epsneg', 'iexp', + 'minexp', 'xmin', 'maxexp', 'xmax', 'irnd', 'ngrd', +@@ -4817,7 +4818,8 @@ def foo(): + cfunc = jit(nopython=True)(iinfo) + cfunc(np.float64(7)) + +- @unittest.skipUnless(numpy_version >= (1, 22), "Needs NumPy >= 1.22") ++ @unittest.skipUnless((1, 22) <= numpy_version < (1, 24), ++ "Needs NumPy >= 1.22, < 1.24") + @TestCase.run_test_in_subprocess + def test_np_MachAr_deprecation_np122(self): + # Tests that Numba is replaying the NumPy 1.22 deprecation warning +-- +2.39.1 + +From 4925287144b9dca5624886ac44a27831178a7198 Mon Sep 17 00:00:00 2001 +From: Graham Markall +Date: Fri, 25 Nov 2022 10:55:04 +0000 +Subject: [PATCH 09/13] _internal.c: Remove NPY_API_VERSION checks + +The API version has long since been greater than 0x7 / 0x8 for any +supported NumPy. +--- + numba/np/ufunc/_internal.c | 14 -------------- + 1 file changed, 14 deletions(-) + +diff --git a/numba/np/ufunc/_internal.c b/numba/np/ufunc/_internal.c +index 98a643788..3ab725f8f 100644 +--- a/numba/np/ufunc/_internal.c ++++ b/numba/np/ufunc/_internal.c +@@ -285,9 +285,7 @@ static struct _ufunc_dispatch { + PyCFunctionWithKeywords ufunc_accumulate; + PyCFunctionWithKeywords ufunc_reduceat; + PyCFunctionWithKeywords ufunc_outer; +-#if NPY_API_VERSION >= 0x00000008 + PyCFunction ufunc_at; +-#endif + } ufunc_dispatch; + + static int +@@ -303,10 +301,8 @@ init_ufunc_dispatch(int *numpy_uses_fastcall) + if (strncmp(crnt_name, "accumulate", 11) == 0) { + ufunc_dispatch.ufunc_accumulate = + (PyCFunctionWithKeywords)crnt->ml_meth; +-#if NPY_API_VERSION >= 0x00000008 + } else if (strncmp(crnt_name, "at", 3) == 0) { + ufunc_dispatch.ufunc_at = crnt->ml_meth; +-#endif + } else { + result = -1; + } +@@ -351,9 +347,7 @@ init_ufunc_dispatch(int *numpy_uses_fastcall) + && (ufunc_dispatch.ufunc_accumulate != NULL) + && (ufunc_dispatch.ufunc_reduceat != NULL) + && (ufunc_dispatch.ufunc_outer != NULL) +-#if NPY_API_VERSION >= 0x00000008 + && (ufunc_dispatch.ufunc_at != NULL) +-#endif + ); + } + return result; +@@ -425,13 +419,11 @@ dufunc_outer_fast(PyDUFuncObject * self, + } + + +-#if NPY_API_VERSION >= 0x00000008 + static PyObject * + dufunc_at(PyDUFuncObject * self, PyObject * args) + { + return ufunc_dispatch.ufunc_at((PyObject*)self->ufunc, args); + } +-#endif + + static PyObject * + dufunc__compile_for_args(PyDUFuncObject * self, PyObject * args, +@@ -609,11 +601,9 @@ static struct PyMethodDef dufunc_methods[] = { + {"outer", + (PyCFunction)dufunc_outer, + METH_VARARGS | METH_KEYWORDS, NULL}, +-#if NPY_API_VERSION >= 0x00000008 + {"at", + (PyCFunction)dufunc_at, + METH_VARARGS, NULL}, +-#endif + {"_compile_for_args", + (PyCFunction)dufunc__compile_for_args, + METH_VARARGS | METH_KEYWORDS, +@@ -643,11 +633,9 @@ static struct PyMethodDef dufunc_methods_fast[] = { + {"outer", + (PyCFunction)dufunc_outer_fast, + METH_FASTCALL | METH_KEYWORDS, NULL}, +-#if NPY_API_VERSION >= 0x00000008 + {"at", + (PyCFunction)dufunc_at, + METH_VARARGS, NULL}, +-#endif + {"_compile_for_args", + (PyCFunction)dufunc__compile_for_args, + METH_VARARGS | METH_KEYWORDS, +@@ -791,9 +779,7 @@ MOD_INIT(_internal) + if (PyModule_AddIntMacro(m, PyUFunc_One) + || PyModule_AddIntMacro(m, PyUFunc_Zero) + || PyModule_AddIntMacro(m, PyUFunc_None) +-#if NPY_API_VERSION >= 0x00000007 + || PyModule_AddIntMacro(m, PyUFunc_ReorderableNone) +-#endif + ) + return MOD_ERROR_VAL; + +-- +2.39.1 + +From 783ef5a297f15d16eec61fe38d13648b876e3750 Mon Sep 17 00:00:00 2001 +From: Graham Markall +Date: Tue, 3 Jan 2023 17:08:44 +0000 +Subject: [PATCH 10/13] init_ufunc_dispatch: Handle unexpected ufunc methods + gracefully + +If an unexpected ufunc method was encountered, `init_ufunc_dispatch()` +would return an error code indicating failure without setting an +exception, leading to errors like + +``` +SystemError: initialization of _internal failed without raising an +exception +``` + +as reported in Issue #8615. + +This commit fixes the issue by setting an appropriate exception in this +case. +--- + numba/np/ufunc/_internal.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/numba/np/ufunc/_internal.c b/numba/np/ufunc/_internal.c +index 3ab725f8f..6ce8989cd 100644 +--- a/numba/np/ufunc/_internal.c ++++ b/numba/np/ufunc/_internal.c +@@ -337,6 +337,8 @@ init_ufunc_dispatch(int *numpy_uses_fastcall) + *numpy_uses_fastcall = crnt->ml_flags & METH_FASTCALL; + } + else if (*numpy_uses_fastcall != (crnt->ml_flags & METH_FASTCALL)) { ++ PyErr_SetString(PyExc_RuntimeError, ++ "ufunc.at() flags do not match numpy_uses_fastcall"); + return -1; + } + } +@@ -349,7 +351,11 @@ init_ufunc_dispatch(int *numpy_uses_fastcall) + && (ufunc_dispatch.ufunc_outer != NULL) + && (ufunc_dispatch.ufunc_at != NULL) + ); ++ } else { ++ char const * const fmt = "Unexpected ufunc method %s()"; ++ PyErr_Format(PyExc_RuntimeError, fmt, crnt_name); + } ++ + return result; + } + +-- +2.39.1 + +From 5c259e46a8e510c2b82c7ff449b167d3b430294b Mon Sep 17 00:00:00 2001 +From: Graham Markall +Date: Tue, 3 Jan 2023 17:11:10 +0000 +Subject: [PATCH 11/13] init_ufunc_dispatch: Update for NumPy 1.24 + +NumPy 1.24 adds a new method, `resolve_dtypes()`, and a private method +`_resolve_dtypes_and_context()`. We handle these by just ignoring them +(ignoring all private methods in general) in order to provide the same +level of functionality in Numba as for NumPy 1.23. + +There is further room to build new functionality on top of this: + +- Providing an implementation of `resolve_dtypes()` for `DUFunc` + objects. +- Using the `resolve_dtypes()` method in place of logic in Numba that + implements a similar dtype resolution process. +--- + numba/np/ufunc/_internal.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/numba/np/ufunc/_internal.c b/numba/np/ufunc/_internal.c +index 6ce8989cd..e860081fb 100644 +--- a/numba/np/ufunc/_internal.c ++++ b/numba/np/ufunc/_internal.c +@@ -322,10 +322,15 @@ init_ufunc_dispatch(int *numpy_uses_fastcall) + } else if (strncmp(crnt_name, "reduceat", 9) == 0) { + ufunc_dispatch.ufunc_reduceat = + (PyCFunctionWithKeywords)crnt->ml_meth; ++ } else if (strncmp(crnt_name, "resolve_dtypes", 15) == 0) { ++ /* Ignored */ + } else { + result = -1; + } + break; ++ case '_': ++ // We ignore private methods ++ break; + default: + result = -1; /* Unknown method */ + } +-- +2.39.1 + +From 3736714982be943eb94f4a259368b1dce525ea64 Mon Sep 17 00:00:00 2001 +From: Graham Markall +Date: Wed, 11 Jan 2023 16:25:19 +0000 +Subject: [PATCH 12/13] Update comment on skipped test + +PR #8691 feedback. +--- + numba/tests/test_comprehension.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/numba/tests/test_comprehension.py b/numba/tests/test_comprehension.py +index 092ed51da..9327b4ed3 100644 +--- a/numba/tests/test_comprehension.py ++++ b/numba/tests/test_comprehension.py +@@ -361,7 +361,9 @@ class TestArrayComprehension(unittest.TestCase): + self.check(comp_nest_with_array_conditional, 5, + assert_allocate_list=True) + +- @unittest.skipUnless(numpy_version < (1, 24), 'Removed in NumPy 1.24') ++ @unittest.skipUnless(numpy_version < (1, 24), ++ 'Setting an array element with a sequence is removed ' ++ 'in NumPy 1.24') + def test_comp_nest_with_dependency(self): + def comp_nest_with_dependency(n): + l = np.array([[i * j for j in range(i+1)] for i in range(n)]) +-- +2.39.1 + +From 3cbab7ee436e3452e7d078f8283136671a36d944 Mon Sep 17 00:00:00 2001 +From: Graham Markall +Date: Fri, 27 Jan 2023 12:06:57 +0000 +Subject: [PATCH 13/13] Correct name of ufunc method in fastcall flags error + +The name of the method should be given, which was never `at()`. +--- + numba/np/ufunc/_internal.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/numba/np/ufunc/_internal.c b/numba/np/ufunc/_internal.c +index e860081fb..0a33de170 100644 +--- a/numba/np/ufunc/_internal.c ++++ b/numba/np/ufunc/_internal.c +@@ -342,8 +342,9 @@ init_ufunc_dispatch(int *numpy_uses_fastcall) + *numpy_uses_fastcall = crnt->ml_flags & METH_FASTCALL; + } + else if (*numpy_uses_fastcall != (crnt->ml_flags & METH_FASTCALL)) { +- PyErr_SetString(PyExc_RuntimeError, +- "ufunc.at() flags do not match numpy_uses_fastcall"); ++ PyErr_Format(PyExc_RuntimeError, ++ "ufunc.%s() flags do not match numpy_uses_fastcall", ++ crnt_name); + return -1; + } + } +-- +2.39.1 + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix index 9a9b51aa70..54fb320caf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-bAWLMh3oShcpKZsOrk1lKy5I6hyn+d8NplyxNHDmNes="; + hash = "sha256-bAWLMh3oShcpKZsOrk1lKy5I6hyn+d8NplyxNHDmNes="; }; nativeBuildInputs = [ @@ -51,6 +51,10 @@ buildPythonPackage rec { "test_encode_decode" "test_legacy_codec_broken" "test_bytes" + + # ValueError: setting an array element with a sequence. The requested array has an inhomogeneous shape after 1 dimensions. The detected shape was (3,) + inhomogeneous part. + # with numpy 1.24 + "test_non_numpy_inputs" ]; meta = with lib;{ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix index 585e539bd6..972a7d5d3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-V4t46ssFKayaui8X3MNj1Yx8PFcIcQwY+MHpll8ugaw="; + hash = "sha256-V4t46ssFKayaui8X3MNj1Yx8PFcIcQwY+MHpll8ugaw="; }; propagatedBuildInputs = [ 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 5640c01d64..d18a93e150 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,14 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.23.5"; + version = "1.24.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-Gxdm1vOXwYFT1AAV3fx53bcVyrrcBNLSKNTlqLxN7Ro="; + hash = "sha256-ADqfUw6IDLLNF3y6GvciC5qkLe+cSvwqL8Pua+frKyI="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpydoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpydoc/default.nix index 0ac923f486..f189c16eaf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpydoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpydoc/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname; inherit version; - sha256 = "sha256-sNt7daMjZ6DiXCOzl4QsZeNEoSBlJNFsgGnwockbX0w="; + hash = "sha256-sNt7daMjZ6DiXCOzl4QsZeNEoSBlJNFsgGnwockbX0w="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpyro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpyro/default.nix index b3c68b4e6e..667aa9d470 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpyro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpyro/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "numpyro"; - version = "0.10.1"; + version = "0.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit version pname; - hash = "sha256-36iW8ByN9D3dQWY68rPi/Erqc0ieZpR06DMpsYOykVA="; + hash = "sha256-01fdGgFZ+G1FwjNwitM6PT1TQx0FtLvs4dBorkFoqo4="; }; propagatedBuildInputs = [ 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 7ec78dab79..f901ada884 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "nunavut"; - version = "2.0.0"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EOkxTliGcGwe0GWfNt9t4gosxrMq7748hcB0Snemtzw="; + hash = "sha256-Rrt26sEdT3EM1KQHnHQogodj+7QwRJ05f8t7Tn679ZE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix index 64ecf95ef5..a7309398de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "nvidia-ml-py"; - version = "11.515.75"; + version = "11.525.84"; format = "setuptools"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-48dfBtWjIB3FETbgDljFwTKzvl1gTYbBQ0Jq205BxJA="; + hash = "sha256-WckO3WyKdkWL3JVFrLDc+Iv4igrYi2A3v8wFZDqkvVU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix index d64eed0e20..a35d615973 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "blockdiag"; repo = pname; rev = version; - sha256 = "sha256-uKrdkXpL5YBr953sRsHknYg+2/WwrZmyDf8BMA2+0tU="; + hash = "sha256-uKrdkXpL5YBr953sRsHknYg+2/WwrZmyDf8BMA2+0tU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oath/default.nix index fed667302f..525988d2dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oath/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-vWsg0g8sTj9TUj7pACEdynWu7KcvT1qf2NyswXX+HAs="; + hash = "sha256-vWsg0g8sTj9TUj7pACEdynWu7KcvT1qf2NyswXX+HAs="; }; nativeCheckInputs = [ pytestCheckHook 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 84d56962cc..957d582071 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/objax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/objax/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "google"; repo = "objax"; rev = "v${version}"; - sha256 = "sha256-/6tZxVDe/3C53Re14odU9VA3mKvSj9X3/xt6bHFLHwQ="; + hash = "sha256-/6tZxVDe/3C53Re14odU9VA3mKvSj9X3/xt6bHFLHwQ="; }; # Avoid propagating the dependency on `jaxlib`, see diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix index d07bf32831..d145610dc3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "csingley"; repo = pname; rev = version; - sha256 = "sha256-NsImnD+erhpakQnl1neuHfSKiV6ipNBMPGKMDM0gwWc="; + hash = "sha256-NsImnD+erhpakQnl1neuHfSKiV6ipNBMPGKMDM0gwWc="; }; nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/omnikinverter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/omnikinverter/default.nix index 7bc4f64086..869c9988cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/omnikinverter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/omnikinverter/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "omnikinverter"; - version = "0.8.1"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-omnikinverter"; - rev = "v${version}"; - hash = "sha256-OQWk+ae+hSLLdH0uLVPauoNeQpXgxkvflXFyaiFe108="; + rev = "refs/tags/v${version}"; + hash = "sha256-V7rppl1u5QTzxkeLYgCFwgU6XuVENtb7EW/n+glwtSk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/online-judge-api-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/online-judge-api-client/default.nix index fb8e70e825..5a96133a0d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/online-judge-api-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/online-judge-api-client/default.nix @@ -26,7 +26,7 @@ in buildPythonPackage rec { owner = "online-judge-tools"; repo = "api-client"; rev = "refs/tags/v${version}"; - sha256 = "sha256-P0pIjd/YS155dSDpY/ekMp8HnJcM35waV7aoTQiEWHo="; + hash = "sha256-P0pIjd/YS155dSDpY/ekMp8HnJcM35waV7aoTQiEWHo="; }; patches = [ ./fix-paths.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onlykey-solo-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onlykey-solo-python/default.nix index b3f21afdad..ad01e5b2f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/onlykey-solo-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/onlykey-solo-python/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-88DuhgX4FCwzIKzw4RqWgMtjRdf5huVlKEHAAEminuQ="; + hash = "sha256-88DuhgX4FCwzIKzw4RqWgMtjRdf5huVlKEHAAEminuQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix index 29a2f385cc..2b9bce8801 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix @@ -30,7 +30,7 @@ in buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-10MH23XpAv/uDW/2tRFGS2lKU8hnaNBwbIBIgVc7Jpk="; + hash = "sha256-10MH23XpAv/uDW/2tRFGS2lKU8hnaNBwbIBIgVc7Jpk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onnxconverter-common/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onnxconverter-common/default.nix index d19702f214..d45d82da0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/onnxconverter-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/onnxconverter-common/default.nix @@ -9,22 +9,22 @@ , onnxruntime }: -buildPythonPackage { +buildPythonPackage rec { pname = "onnxconverter-common"; - version = "1.12.2"; # Upstream no longer seems to push tags + version = "1.13.0"; format = "setuptools"; src = fetchFromGitHub { owner = "microsoft"; repo = "onnxconverter-common"; - rev = "814cdf494d987900d30b16971c0e8334aaca9ae6"; - hash = "sha256-XA/kl8aT1wLthl1bMihtv/1ELOW1sGO/It5XfJtD+sY="; + rev = "refs/tags/v${version}"; + hash = "sha256-VT9ly0d0Yhw1J6C521oUyaCx4WtFSdpyk8EdIKlre3c="; }; propagatedBuildInputs = [ numpy - packaging # undeclared dependency + packaging protobuf onnx ]; @@ -42,6 +42,8 @@ buildPythonPackage { meta = { description = "ONNX Converter and Optimization Tools"; + homepage = "https://github.com/microsoft/onnxconverter-common"; + changelog = "https://github.com/microsoft/onnxconverter-common/releases/tag/v${version}"; maintainers = with lib.maintainers; [ fridh ]; license = with lib.licenses; [ mit ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oocsi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oocsi/default.nix index c558ebcc1a..0739098913 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oocsi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oocsi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-AgDBsPoi0aQ6uglc7Zl4gxVmeyDCysoef5vZpxgwE/Q="; + hash = "sha256-AgDBsPoi0aQ6uglc7Zl4gxVmeyDCysoef5vZpxgwE/Q="; }; # Tests are not shipped diff --git a/third_party/nixpkgs/pkgs/development/python-modules/open-garage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/open-garage/default.nix index 0cb71a86fe..3064bceda1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/open-garage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/open-garage/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyOpenGarage"; rev = version; - sha256 = "sha256-iJ7HcJhpTceFpHTUdNZOYDuxUWZGWPmZ9lxD3CyGvk8="; + hash = "sha256-iJ7HcJhpTceFpHTUdNZOYDuxUWZGWPmZ9lxD3CyGvk8="; }; propagatedBuildInputs = [ 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 92f2e327eb..fea465286a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.27.0"; + version = "0.27.1"; format = "setuptools"; disabled = pythonOlder "3.7.1"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-pXttGvnApYuwkWU7kCDNjw0rjHD5AyUvujfvpDVjgxM="; + hash = "sha256-GGwRx5yF/xdtnJiKF1junxuebaaBkGhx+DR4pqChcS4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openaiauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openaiauth/default.nix new file mode 100644 index 0000000000..bfe13d57dd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/openaiauth/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "openaiauth"; + version = "0.3.2"; + + src = fetchPypi { + inherit version; + pname = "OpenAIAuth"; + hash = "sha256-CPcBgGvxRO677EdPI3lNtJXkCW7el6N6N2GeaDo5ApU="; + }; + + propagatedBuildInputs = [ requests ]; + + doCheck = false; + + pythonImportsCheck = [ + "OpenAIAuth" + ]; + + meta = with lib; { + description = "A Python library for authenticating with the OpenAI API"; + license = licenses.mit; + maintainers = with maintainers; [ realsnick ]; + homepage = "https://github.com/acheong08/OpenAIAuth"; + changelog = "https://github.com/acheong08/OpenAIAuth/releases/tag/${version}"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openapi-spec-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openapi-spec-validator/default.nix index 296bcd7b99..4624bdaae4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "p1c2u"; repo = pname; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-t7u0p6V2woqIFsqywv7k5s5pbbnmcn45YnlFWH1PEi4="; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opencensus-context/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opencensus-context/default.nix index 692b2c3079..0379b27519 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opencensus-context/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opencensus-context/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-oDEIw8ENjIC7Xd9cih8DMWH6YZcqmRf5ubOhhRfwCIw="; + hash = "sha256-oDEIw8ENjIC7Xd9cih8DMWH6YZcqmRf5ubOhhRfwCIw="; }; pythonNamespaces = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opencensus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opencensus/default.nix index 7cf85104b6..c8340a0142 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opencensus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opencensus/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "opencensus"; - version = "0.11.0"; + version = "0.11.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AmIWq6uJ2U2FBJLz3GWVAFXsT4QRX6bHvq/7pEo0bkI="; + hash = "sha256-tS3WtAE8Ezpr6fD/LpBoxkAdMzKw7MX67z3WxCFm9vM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openevsewifi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openevsewifi/default.nix index 98beb5ea18..86bb9636a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openevsewifi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openevsewifi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "miniconfig"; repo = "python-openevse-wifi"; rev = "v${version}"; - sha256 = "sha256-7+BC5WG0JoyHNjgsoJBQRVDpmdXMJCV4bMf6pIaS5qo="; + hash = "sha256-7+BC5WG0JoyHNjgsoJBQRVDpmdXMJCV4bMf6pIaS5qo="; }; nativeBuildInputs = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { (fetchpatch { name = "switch-to-poetry-core.patch"; url = "https://github.com/miniconfig/python-openevse-wifi/commit/1083868dd9f39a8ad7bb17f02cea1b8458e5b82d.patch"; - sha256 = "sha256-XGeyi/PchBju1ICgL/ZCDGCbWwIJmLAcHuKaj+kDsI0="; + hash = "sha256-XGeyi/PchBju1ICgL/ZCDGCbWwIJmLAcHuKaj+kDsI0="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix index a8239d1d4b..f8286a92a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "3.0.10"; + version = "3.1.1"; disabled = isPy27; # 2.6.4 was final python2 release src = fetchPypi { inherit pname version; - sha256 = "sha256-5HgFYnrrz4YO207feYexMJwbNjLzdQU47ZYrvMO9dEk="; + hash = "sha256-8G1E4slzeBBovOXs+GCgm82xx/XOH6zV6aqCySyTrnI="; }; nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openrazer/common.nix b/third_party/nixpkgs/pkgs/development/python-modules/openrazer/common.nix index 4d0fa4ed18..ff67aa88a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openrazer/common.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openrazer/common.nix @@ -7,7 +7,7 @@ owner = "openrazer"; repo = "openrazer"; rev = "v${version}"; - sha256 = "sha256-6YU2tl17LpDZe9pQ1a+B2SGIhqGdwME3Db6umVz7RLc="; + hash = "sha256-6YU2tl17LpDZe9pQ1a+B2SGIhqGdwME3Db6umVz7RLc="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openshift/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openshift/default.nix index 6a58985845..72578e1825 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openshift/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openshift/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "openshift"; repo = "openshift-restclient-python"; rev = "v${version}"; - sha256 = "sha256-9mMHih2xuQve8hEnc5x4f9Pd4wX7IMy3vrxxGFCG+8o="; + hash = "sha256-9mMHih2xuQve8hEnc5x4f9Pd4wX7IMy3vrxxGFCG+8o="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openstackdocstheme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openstackdocstheme/default.nix index 79d1a50996..2d2fbc0dbd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openstackdocstheme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openstackdocstheme/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-yB1CdOqWV7hEfUYdtqQ/fd4sNfy7Sp7YJbRQhK5egLk="; + hash = "sha256-yB1CdOqWV7hEfUYdtqQ/fd4sNfy7Sp7YJbRQhK5egLk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openstep-plist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openstep-plist/default.nix index a85be4dc2b..7e0cdfb71a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openstep-plist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openstep-plist/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "openstep_plist"; inherit version; - sha256 = "sha256-GK/z1e3tnr++3+ukRKPASDJGl7+KObsENhwN1Tv+qws="; + hash = "sha256-GK/z1e3tnr++3+ukRKPASDJGl7+KObsENhwN1Tv+qws="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openwrt-luci-rpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openwrt-luci-rpc/default.nix index 086649173f..a58d9c08c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openwrt-luci-rpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openwrt-luci-rpc/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "openwrt-luci-rpc"; - version = "1.1.12"; + version = "1.1.16"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vLRmv8xxbjBp6TDFExfprqw3JGi8qCVZ5bV7AgVZnuA="; + hash = "sha256-ZvPMJbYCNKMXuTrHwXQvBZ/mMenYTsV1X4COiVxvJGY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix index dc07fcffac..deea9fecbf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "optuna"; - version = "3.0.5"; + version = "3.1.0"; disabled = isPy27; src = fetchFromGitHub { owner = "optuna"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-TfAWL81a7GIePkPm+2uXinBP5jwnhWCZPp5GJjXOC6g="; + hash = "sha256-dNS3LEWP/Ul1z60iZirFEX30Frc5ZFQLNTgUkT9vLNQ="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ordered-set/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ordered-set/default.nix index 9859e10651..d0ac537171 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ordered-set/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ordered-set/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-aUqORMh2V8WSku3nKJHrkdNBMfZTFGOqswCRkcdzZKg="; + hash = "sha256-aUqORMh2V8WSku3nKJHrkdNBMfZTFGOqswCRkcdzZKg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix index 4890614ed5..2836b39e07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix @@ -16,24 +16,24 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.8.4"; + version = "3.8.6"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ijl"; repo = pname; - rev = version; - hash = "sha256-XQBiE8hmLC/AIRt0eJri/ilPHUEYiOxd0onRBQsx+pM="; + rev = "refs/tags/${version}"; + hash = "sha256-LwLuMcnAubO7U1/KSe6tHaSP9+bi6gDfvGobixzL2gM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-O2W9zO7qHWG+78T+uECICAmecaSIbTTJPktJIPZYElE="; + hash = "sha256-8T//q6nQoZhh8oJWDCeQf3gYRew58dXAaxkYELY4CJM="; }; - format = "pyproject"; - nativeBuildInputs = [ cffi ] ++ (with rustPlatform; [ @@ -41,7 +41,9 @@ buildPythonPackage rec { maturinBuildHook ]); - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + ]; nativeCheckInputs = [ numpy @@ -52,7 +54,9 @@ buildPythonPackage rec { xxhash ]; - pythonImportsCheck = [ pname ]; + pythonImportsCheck = [ + "orjson" + ]; meta = with lib; { description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/osc-lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/osc-lib/default.nix index f2b789f26d..f9cc5d0416 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/osc-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/osc-lib/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "openstack"; repo = "osc-lib"; rev = "65c73fd5030276e34f3d52c03ddb9d27cd8ec6f5"; - sha256 = "sha256-CLE9lrMMlvVrihe+N4wvIKe8t9IZ1TpHHVdn2dnvAOI="; + hash = "sha256-CLE9lrMMlvVrihe+N4wvIKe8t9IZ1TpHHVdn2dnvAOI="; }; # fake version to make pbr.packaging happy and not reject it... diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix index b48a5f2348..3531f409f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "oslo-concurrency"; - version = "5.1.0"; + version = "5.1.1"; src = fetchPypi { pname = "oslo.concurrency"; inherit version; - sha256 = "sha256-iyF2xXzFSWkrXCAbTJWqV4rnzN+lwPgUxXgY1pptTVE="; + hash = "sha256-EQ+2Adgi3UsI7qJ5d9cNAfnxzR6vbezQQqIfQ78/KyU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-config/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-config/default.nix index abdafc4481..b70de2a16e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-config/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "oslo-config"; - version = "9.0.0"; + version = "9.1.1"; src = fetchPypi { pname = "oslo.config"; inherit version; - sha256 = "sha256-O2tjxDzx4JNEuoULyxHW8rkgEIb76wqXqJUOfqw/JkU="; + hash = "sha256-sHZUtT2HeSro5zmWKtcpxSnJk4oRjYkezp7jHVlxa8k="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-context/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-context/default.nix index 6904cbf87c..35664a9041 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-context/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-context/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Ly55FxBE79GAfFVxPtLH9AaLGNc9AngZFlxIGbKHz68="; + hash = "sha256-Ly55FxBE79GAfFVxPtLH9AaLGNc9AngZFlxIGbKHz68="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix index e1a4a368a5..659d8b816b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "oslo.db"; inherit version; - sha256 = "sha256-Gd7FAkDwj7q1rnZzVOtZF1oUdz8CcdeDpX/KxJ5KbaE="; + hash = "sha256-Gd7FAkDwj7q1rnZzVOtZF1oUdz8CcdeDpX/KxJ5KbaE="; }; nativeBuildInputs = [ pbr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-i18n/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-i18n/default.nix index 7a5aee1e16..bfa6084481 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-i18n/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-i18n/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "oslo-i18n"; - version = "5.1.0"; + version = "6.0.0"; src = fetchPypi { pname = "oslo.i18n"; inherit version; - sha256 = "6bf111a6357d5449640852de4640eae4159b5562bbba4c90febb0034abc095d0"; + hash = "sha256-7RBoa3X3xgeCUXemaRVfTiWc459hQ6N19jWbvKpKNc0="; }; postPatch = '' @@ -32,7 +32,14 @@ buildPythonPackage rec { ]; checkPhase = '' - stestr run + runHook preCheck + + stestr run -e <(echo " + # test counts warnings which no longer matches in python 3.11 + oslo_i18n.tests.test_message.MessageTestCase.test_translate_message_bad_translation + ") + + runHook postCheck ''; pythonImportsCheck = [ "oslo_i18n" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix index 3cede81560..3591669291 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "oslo.serialization"; inherit version; - sha256 = "sha256-irvaixdjoGBx/CjF2Km+VHuihfSDDminD/iP4R8Wv0M="; + hash = "sha256-irvaixdjoGBx/CjF2Km+VHuihfSDDminD/iP4R8Wv0M="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-utils/default.nix index 91a71620bd..f076574bfd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-utils/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "oslo.utils"; inherit version; - sha256 = "sha256-drwBCNUKypcraP7IKY55G1+8vrmlGifGmGtBsKamLus="; + hash = "sha256-drwBCNUKypcraP7IKY55G1+8vrmlGifGmGtBsKamLus="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix index 330385625d..fec12037e2 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix @@ -11,7 +11,7 @@ , pythonOlder , rasterio , requests -, Rtree +, rtree , scikit-learn , scipy , shapely @@ -38,7 +38,7 @@ buildPythonPackage rec { numpy pandas requests - Rtree + rtree shapely folium scikit-learn diff --git a/third_party/nixpkgs/pkgs/development/python-modules/osmpythontools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/osmpythontools/default.nix index d273002ca2..5ceef2be37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/osmpythontools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/osmpythontools/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "mocnik-science"; repo = "osm-python-tools"; rev = "v${version}"; - sha256 = "sha256-lTDA1Rad9aYI/ymU/0xzdJHmebUGcpVJ0GW7D0Ujdko="; + hash = "sha256-lTDA1Rad9aYI/ymU/0xzdJHmebUGcpVJ0GW7D0Ujdko="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/outcome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/outcome/default.nix index 474b0ab1bf..66597cb067 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/outcome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/outcome/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-b4K9PeRdowPPH3ceyvoWM3UKNYQ2qLtg4Goc63RdJnI="; + hash = "sha256-b4K9PeRdowPPH3ceyvoWM3UKNYQ2qLtg4Goc63RdJnI="; }; nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ovh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ovh/default.nix index 9b07161238..a8b769ff90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ovh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ovh/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-IQzwu0gwfPNPOLQLCO99KL5Hu2094Y+acQBFXVGzHhU="; + hash = "sha256-IQzwu0gwfPNPOLQLCO99KL5Hu2094Y+acQBFXVGzHhU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/owslib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/owslib/default.nix index 5369d7b08b..e79f244786 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/owslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/owslib/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, lxml , pyproj , pytestCheckHook , python-dateutil @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "owslib"; - version = "0.28.0"; + version = "0.28.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "geopython"; repo = "OWSLib"; rev = "refs/tags/${version}"; - hash = "sha256-o/sNhnEZ9e0BsftN9AhJKuUjKHAHNRPe0grxdAWRVao="; + hash = "sha256-qiH6teCJ/4oftSRyBTtiJdlmJn02VwacU72dWi6OXdc="; }; postPatch = '' @@ -31,6 +32,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + lxml pyproj python-dateutil pytz 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 219bb1f291..5e171a1b0f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/p1monitor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/p1monitor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "p1monitor"; - version = "2.2.1"; + version = "2.3.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-p1monitor"; rev = "refs/tags/v${version}"; - hash = "sha256-jmSSejflez3AmIp7PY6m0+vW8YZuNgUj8lwyu0roLYc="; + hash = "sha256-4/zaD+0Tuy5DvcwmH5BurGWCCjQlRYOJT77toEPS06k="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/packaging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/packaging/default.nix index 237f43bc7e..408a3ba0c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/packaging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/packaging/default.nix @@ -1,47 +1,46 @@ { lib , buildPythonPackage , fetchPypi -, pyparsing +, flit-core +, pretend , pytestCheckHook , pythonOlder -, pretend -, setuptools }: let packaging = buildPythonPackage rec { pname = "packaging"; - version = "21.3"; + version = "23.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3UfEKSfYmrkR5gZRiQfMLTofOLvQJjhZcGQ/nFuOz+s="; + hash = "sha256-tq0pf4kH3g+i/hzL0m/a84f19Hxydf7fjM6J+ZRGz5c="; }; nativeBuildInputs = [ - setuptools + flit-core ]; - propagatedBuildInputs = [ pyparsing ]; - nativeCheckInputs = [ pytestCheckHook pretend ]; - # Prevent circular dependency + # Prevent circular dependency with pytest doCheck = false; + pythonImportsCheck = [ "packaging" ]; + passthru.tests = packaging.overridePythonAttrs (_: { doCheck = true; }); meta = with lib; { description = "Core utilities for Python packages"; homepage = "https://github.com/pypa/packaging"; license = with licenses; [ bsd2 asl20 ]; - maintainers = with maintainers; [ bennofs ]; + maintainers = with maintainers; [ bennofs SuperSandro2000 ]; }; }; in diff --git a/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix index 4ae637f5bc..2d33c3f572 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { version = "1.44.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WVfMELOoml7Hx78jy6TAwlFRLuSQu9dtsb6Khs6/cgI="; + hash = "sha256-WVfMELOoml7Hx78jy6TAwlFRLuSQu9dtsb6Khs6/cgI="; }; nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pad4pi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pad4pi/default.nix index a0ac82a9f1..356a599b0d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pad4pi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pad4pi/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-+oVYlqF5PQAFz4EO1ap6pjmYTLg9xQy6UbQja4utt2Q="; + hash = "sha256-+oVYlqF5PQAFz4EO1ap6pjmYTLg9xQy6UbQja4utt2Q="; }; propagatedBuildInputs = [ rpi-gpio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paho-mqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paho-mqtt/default.nix index b94428ebbe..2712aded53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paho-mqtt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paho-mqtt/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "eclipse"; repo = "paho.mqtt.python"; rev = "v${version}"; - sha256 = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg="; + hash = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pandas-stubs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pandas-stubs/default.nix index 9e80c0a050..605986514a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pandas-stubs/default.nix @@ -19,7 +19,7 @@ , types-pytz , typing-extensions , xarray -, XlsxWriter +, xlsxwriter }: buildPythonPackage rec { @@ -59,7 +59,7 @@ buildPythonPackage rec { tabulate typing-extensions xarray - XlsxWriter + xlsxwriter ]; disabledTests = [ 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 6c6fb3b29c..b852a7f82c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -20,7 +20,7 @@ , pytestCheckHook , pytest-xdist , pytest-asyncio -, XlsxWriter +, xlsxwriter # Darwin inputs , runtimeShell , libcxx @@ -28,13 +28,13 @@ buildPythonPackage rec { pname = "pandas"; - version = "1.5.2"; + version = "1.5.3"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-IguY0VzuCyzYOaY1i9Hyc9A1a/lkwaGusy1H2wIVSIs="; + hash = "sha256-dKP9flp+wFLxgyc9x7Cs06hj7fdSD106F2XAT/2zsLE="; }; nativeBuildInputs = [ cython ]; @@ -49,12 +49,13 @@ buildPythonPackage rec { nativeCheckInputs = [ glibcLocales - hypothesis + # hypothesis indirectly depends on pandas to build its documentation + (hypothesis.override { enableDocumentation = false; }) jinja2 pytest-asyncio pytest-xdist pytestCheckHook - XlsxWriter + xlsxwriter ]; # Doesn't work with -Werror,-Wunused-command-line-argument diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pandoc-xnos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pandoc-xnos/default.nix index dcc1e47090..ad2aa6dd43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pandoc-xnos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pandoc-xnos/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "tomduck"; repo = pname; rev = version; - sha256 = "sha256-beiGvN0DS6s8wFjcDKozDuwAM2OApX3lTRaUDRUqLeU="; + hash = "sha256-beiGvN0DS6s8wFjcDKozDuwAM2OApX3lTRaUDRUqLeU="; }; nativeBuildInputs = [ 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 9afafa5c66..f1c26beaa6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix @@ -11,7 +11,7 @@ , nbclient , nbformat , pyarrow -, PyGithub +, pygithub , pytest-mock , pytestCheckHook , pythonOlder @@ -54,7 +54,7 @@ buildPythonPackage rec { gcsfs ]; github = [ - PyGithub + pygithub ]; hdfs = [ pyarrow diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix index 6e33c6f520..74d6d186bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-kIIR+cXLUtyLJ5YmhyCV88zhXahok/U7QXbezt3PyF0="; + hash = "sha256-kIIR+cXLUtyLJ5YmhyCV88zhXahok/U7QXbezt3PyF0="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parse-type/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parse-type/default.nix index 8dc5ded974..e795ab3d49 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parse-type/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parse-type/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "jenisys"; repo = "parse_type"; rev = "v${version}"; - sha256 = "sha256-v79zzAAwXYoK2N8ZPl1L90qOwMRexAV2wCTMvo4vrSc="; + hash = "sha256-v79zzAAwXYoK2N8ZPl1L90qOwMRexAV2wCTMvo4vrSc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parsedmarc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parsedmarc/default.nix index c07a773eee..5002f56409 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parsedmarc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parsedmarc/default.nix @@ -7,6 +7,7 @@ , pythonOlder # pythonPackages +, hatchling , dnspython , expiringdict , publicsuffix2 @@ -40,20 +41,26 @@ let in buildPythonPackage rec { pname = "parsedmarc"; - version = "8.2.0"; + version = "8.4.2"; disabled = pythonOlder "3.7"; + format = "pyproject"; + src = fetchPypi { inherit pname version; - sha256 = "eb82328dffb4a62ddaefbcc22efd5a2694350504a56d41ba1e161f2d998dcbff"; + hash = "sha256-6dP9zQI0jYiE+lUhmFBNp8Sv9povm9Pa4R4TuzAmEQk="; }; postPatch = '' - substituteInPlace setup.py \ + substituteInPlace pyproject.toml \ --replace "elasticsearch<7.14.0" "elasticsearch" ''; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ dnspython expiringdict @@ -91,6 +98,7 @@ buildPythonPackage rec { }; meta = { + changelog = "https://github.com/domainaware/parsedmarc/blob/master/CHANGELOG.md#${lib.replaceStrings [ "." ] [ "" ] version}"; description = "Python module and CLI utility for parsing DMARC reports"; homepage = "https://domainaware.github.io/parsedmarc/"; maintainers = with lib.maintainers; [ talyz ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parsimonious/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parsimonious/default.nix index 5a51270e20..b156321cef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parsimonious/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parsimonious/default.nix @@ -26,6 +26,14 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # test_benchmarks.py tests are actually benchmarks and may fail due to + # something being unexpectedly slow on a heavily loaded build machine + "test_lists_vs_dicts" + "test_call_vs_inline" + "test_startswith_vs_regex" + ]; + postPatch = '' substituteInPlace setup.py \ --replace "regex>=2022.3.15" "regex" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix index bd2e3ad90a..fe31d7d746 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-jAe+KQu1nwNYiRWSHinopQACrK8s3F+g4BFPkXCfr6A="; + hash = "sha256-jAe+KQu1nwNYiRWSHinopQACrK8s3F+g4BFPkXCfr6A="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parsy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parsy/default.nix index 74e62d1ce0..25092eb9e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parsy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parsy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { repo = "parsy"; owner = "python-parsy"; rev = "v${version}"; - sha256 = "sha256-FislrLb+u4T5m/eEER7kazZHJKEwPHe+Vg/YDJp4PyM="; + hash = "sha256-FislrLb+u4T5m/eEER7kazZHJKEwPHe+Vg/YDJp4PyM="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/partd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/partd/default.nix index 2e62b2ee59..d633b8dfce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/partd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/partd/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-zpGrzcYXjWaLyqQxeRpakX2QI0HLGT9UP+RF1JRmBIU="; + hash = "sha256-zpGrzcYXjWaLyqQxeRpakX2QI0HLGT9UP+RF1JRmBIU="; }; nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix index f4b7c6e05d..43eff770c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-n+DtrYmLg8DD4ZnIQrJ+0hZkXS4Xd1ey3Wc4TUETxkE="; + hash = "sha256-n+DtrYmLg8DD4ZnIQrJ+0hZkXS4Xd1ey3Wc4TUETxkE="; }; propagatedBuildInputs = [ six ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pathos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pathos/default.nix index 333f1be21c..6f60593054 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pathos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pathos/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "uqfoundation"; repo = pname; rev = "refs/tags/pathos-${version}"; - sha256 = "sha256-Jc7pMVjOUSaZydRh87FsHivEAXpX9v6EbZNkHwPeq/Q="; + hash = "sha256-Jc7pMVjOUSaZydRh87FsHivEAXpX9v6EbZNkHwPeq/Q="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pathspec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pathspec/default.nix index 66facfd1e1..539da37ba0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pathspec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pathspec/default.nix @@ -2,27 +2,36 @@ , buildPythonPackage , fetchPypi , pythonOlder -, setuptools +, flit-core +, unittestCheckHook }: buildPythonPackage rec { pname = "pathspec"; - version = "0.10.3"; + version = "0.11.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ViAN5Ad9nQeRRlqpCVoB1CGGHkBbUJaVUFHe79aX1vY="; + hash = "sha256-ZNM41OCRTpHBeSMh5pB7Wlk/GrGFHef8JpVXohsw67w="; }; nativeBuildInputs = [ - setuptools + flit-core + ]; + + pythonImportsCheck = [ + "pathspec" + ]; + + checkInputs = [ + unittestCheckHook ]; meta = { description = "Utility library for gitignore-style pattern matching of file paths"; homepage = "https://github.com/cpburnz/python-path-specification"; + changelog = "https://github.com/cpburnz/python-pathspec/blob/v${version}/CHANGES.rst"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ copumpkin ]; }; 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 22de8feb0e..22f2f1ab14 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/patrowl4py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/patrowl4py/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Patrowl"; repo = "Patrowl4py"; rev = version; - sha256 = "sha256-ZGvntLbXIWmL0WoT+kQoNT6gDPgsSKwHQQjYlarvnKo="; + hash = "sha256-ZGvntLbXIWmL0WoT+kQoNT6gDPgsSKwHQQjYlarvnKo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/patsy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/patsy/default.nix index e4d389022d..f9020c0c16 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/patsy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/patsy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-vcGAAYdeMZvJHIEsHrahC+S7E8uB63Y/RmF53KO2cnc="; + hash = "sha256-vcGAAYdeMZvJHIEsHrahC+S7E8uB63Y/RmF53KO2cnc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pbr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pbr/default.nix index ff77f7526b..13b61c8923 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pbr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pbr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pbr"; - version = "5.11.0"; + version = "5.11.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uXvGaVsq/wIUQTPC5zmdWIUiPUK3kS/67CyjiY5nO/4="; + hash = "sha256-rvxRZ1sLUz1Wu1/RyMbAUi/jGJZnmILhxMY9XkoPzLM="; }; # importlib-metadata could be added here if it wouldn't cause an infinite recursion diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pcodedmp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pcodedmp/default.nix index 84f230f585..c87cebe0f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pcodedmp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pcodedmp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "bontchev"; repo = pname; rev = version; - sha256 = "sha256-SYOFGMvrzxDPMACaCvqwU28Mh9LEuvFBGvAph4X+geo="; + hash = "sha256-SYOFGMvrzxDPMACaCvqwU28Mh9LEuvFBGvAph4X+geo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdfminer-six/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdfminer-six/default.nix index a0b7d76564..cd378941b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdfminer-six/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdfminer-six/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - sha256 = "sha256-OyEeQBuYfj4iEcRt2/daSaUfTOjCVSCyHW2qffal+Bk="; + hash = "sha256-OyEeQBuYfj4iEcRt2/daSaUfTOjCVSCyHW2qffal+Bk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdfposter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdfposter/default.nix index 6c3c4ccf09..e2f5211eca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdfposter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdfposter/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-yWFtHgVKAWs4dRlSk8t8cB2KBJeBOa0Frh3BLR9txS0="; + hash = "sha256-yWFtHgVKAWs4dRlSk8t8cB2KBJeBOa0Frh3BLR9txS0="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdfx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdfx/default.nix index b61a22cb51..1ee1cb4804 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdfx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdfx/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "metachris"; repo = "pdfx"; rev = "v${version}"; - sha256 = "sha256-POpP6XwcqwvImrtIiDjpnHoNE0MKapuPjxojo+ocBK0="; + hash = "sha256-POpP6XwcqwvImrtIiDjpnHoNE0MKapuPjxojo+ocBK0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix new file mode 100644 index 0000000000..b5fba325b7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub + +# propagates +, importlib-metadata + +# tests +, editables +, git +, pytestCheckHook +, setuptools +}: + +buildPythonPackage rec { + pname = "pdm-backend"; + version = "2.0.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pdm-project"; + repo = "pdm-backend"; + rev = "refs/tags/${version}"; + hash = "sha256-3Wgc4kKQcE2FzfcqTs9jtfJ1Oj+qtHiDM4q8KuMNAak="; + }; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ + importlib-metadata + ]; + + pythonImportsCheck = [ + "pdm.backend" + ]; + + nativeCheckInputs = [ + editables + git + pytestCheckHook + setuptools + ]; + + meta = with lib; { + homepage = "https://github.com/pdm-project/pdm-backend"; + changelog = "https://github.com/pdm-project/pdm-backend/releases/tag/${version}"; + description = "Yet another PEP 517 backend."; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} 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 50f6be3be6..f07e3ca82f 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 @@ -9,13 +9,12 @@ buildPythonPackage rec { pname = "pdm-pep517"; - version = "1.0.6"; + version = "1.1.2"; format = "pyproject"; - disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pEB3A9UPpNZxODo1SGiwWhMGDBvzgmTLtd3Jpz5KHcU="; + hash = "sha256-1PpzWmRffpWmvrNKK19+jgDZPdBDnXPzHMguQLW4/c4="; }; preCheck = '' @@ -26,7 +25,6 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ - setuptools pytestCheckHook git setuptools diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix index a096973a93..a6a7da5826 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "pdoc"; rev = "v${version}"; - sha256 = "sha256-SaLrE/eHxKnlm6BZYbcZZrbrUZMeHJ4eCcqMsFvyZ7I="; + hash = "sha256-SaLrE/eHxKnlm6BZYbcZZrbrUZMeHJ4eCcqMsFvyZ7I="; }; nativeBuildInputs = [ @@ -46,11 +46,16 @@ buildPythonPackage rec { # This test seems to be sensitive to ordering of dictionary items and the version of dependencies. # the only difference between the stored snapshot and the produced documentation is a debug javascript comment "html-demopackage_dir" + # snapshot tests mismatch with latest pygments version + "test_snapshots" ]; + pytestFlagsArray = [ ''-m "not slow"'' # skip tests marked slow ]; + __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "pdoc" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdoc3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdoc3/default.nix index 740ce08af4..1c3e5ef08a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdoc3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdoc3/default.nix @@ -4,7 +4,7 @@ , fetchPypi , fetchpatch , pythonOlder -, Mako +, mako , markdown , setuptools-git , setuptools-scm @@ -42,7 +42,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - Mako + mako markdown ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix index 03591377a0..7259a886e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "12.2.7"; + version = "13.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CtOicqS4PBDcsLrIyu3vek5Gi73vfE2vZfIo83mJgS4="; + hash = "sha256-JwmShU/YJhJvNofKrE8/e3/PKFSEGWWhHO8heEWTZac="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pecan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pecan/default.nix index 63bae07aec..c0954ec3ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pecan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pecan/default.nix @@ -2,7 +2,7 @@ , fetchPypi , buildPythonPackage , logutils -, Mako +, mako , webtest , pythonOlder , pytestCheckHook @@ -23,12 +23,12 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SbJV5wHD8UYWBfWw6PVPDCGSLXhF1BTCTdZAn+aV1VA="; + hash = "sha256-SbJV5wHD8UYWBfWw6PVPDCGSLXhF1BTCTdZAn+aV1VA="; }; propagatedBuildInputs = [ logutils - Mako + mako webtest six ]; @@ -44,6 +44,16 @@ buildPythonPackage rec { pytestFlagsArray = [ "--pyargs pecan" + # tests fail with sqlalchemy 2.0 + ] ++ lib.optionals (lib.versionAtLeast sqlalchemy.version "2.0") [ + # The 'sqlalchemy.orm.mapper()' function is removed as of SQLAlchemy + # 2.0. Use the 'sqlalchemy.orm.registry.map_imperatively()` method + # of the ``sqlalchemy.orm.registry`` class to perform classical + # mapping. + # https://github.com/pecan/pecan/issues/143 + "--deselect=pecan/tests/test_jsonify.py::TestJsonifySQLAlchemyGenericEncoder::test_result_proxy" + "--deselect=pecan/tests/test_jsonify.py::TestJsonifySQLAlchemyGenericEncoder::test_row_proxy" + "--deselect=pecan/tests/test_jsonify.py::TestJsonifySQLAlchemyGenericEncoder::test_sa_object" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pep517/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pep517/default.nix index fe40559493..bb60adfc4b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pep517/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pep517/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-rmmSfFwXK+Gt2SA3JtS4TPPrrR7c1fcfzcdG5m6Cn1k="; + hash = "sha256-rmmSfFwXK+Gt2SA3JtS4TPPrrR7c1fcfzcdG5m6Cn1k="; }; nativeBuildInputs = [ 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 63b00e896f..574bffb88b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "nschloe"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-bu6eYQukhLE8sLkS3PbqTgXOqJFXJYXTcXAhmjaq48g="; + hash = "sha256-bu6eYQukhLE8sLkS3PbqTgXOqJFXJYXTcXAhmjaq48g="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix index eb9b8cbdd6..0555e53e47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-D4QPoiJHvKpRQJTafzsmxgI1lCmrEtLNiL4GtJozYpA="; + hash = "sha256-D4QPoiJHvKpRQJTafzsmxgI1lCmrEtLNiL4GtJozYpA="; }; nativeCheckInputs = [ 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 314d3fdfb0..429303a713 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.119"; + version = "2.1.123"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QughY8G0Z9/371tlG0VMUqeKW/Nndv9mMbR1AIBlmTA="; + hash = "sha256-XPjHql8hrgxmJuD/whe/+wUuAd7zj/db9zkJX9eEKIo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pgcli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pgcli/default.nix index ac291d7af7..9ed6cd9b52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pgcli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pgcli/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-zESNlRWfwJA9NhgpkneKCW7aV1LWYNR2cTg8jiv2M/E="; + hash = "sha256-zESNlRWfwJA9NhgpkneKCW7aV1LWYNR2cTg8jiv2M/E="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix index 1bb3413240..62feab353d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ZEQ7vJrQm1fQ9Ny7OO/0TVKFO3QYyepS9YV6vhu1NOw="; + hash = "sha256-ZEQ7vJrQm1fQ9Ny7OO/0TVKFO3QYyepS9YV6vhu1NOw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phe/default.nix index 0e589a04db..fa4c43c59c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phe/default.nix @@ -13,7 +13,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-mS+3CR0kJ/DZczlG+PNQrN1NHQEgV/Kq02S6eflwM5w="; + hash = "sha256-mS+3CR0kJ/DZczlG+PNQrN1NHQEgV/Kq02S6eflwM5w="; }; buildInputs = [ click gmpy2 numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phone-modem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phone-modem/default.nix index 0202e2c411..635d1ce2d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phone-modem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phone-modem/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "phone_modem"; inherit version; - sha256 = "sha256-7NahK9l67MdT/dDVXsq+y0Z4cZxZ/WUW2kPpE4Wz6j0="; + hash = "sha256-7NahK9l67MdT/dDVXsq+y0Z4cZxZ/WUW2kPpE4Wz6j0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix index 742648026a..8975be61f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "class-registry"; - version = "3.0.5"; + version = "4.0.6"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "todofixthis"; repo = pname; - rev = version; - sha256 = "0gpvq4a6qrr2iki6b4vxarjr1jrsw560m2qzm5bb43ix8c8b7y3q"; + rev = "refs/tags/${version}"; + hash = "sha256-kSEHgzBgnAq5rMv2HbmGl+9CUzsmzUzPQWr+5q8mcsA="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/piccata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/piccata/default.nix index 8ce8e1fe95..b43c5fd4b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/piccata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/piccata/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "NordicSemiconductor"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Vuhwt+esTkvyEIRVYaRGvNMTAXVWBBv/6lpaxN5RrBA="; + hash = "sha256-Vuhwt+esTkvyEIRVYaRGvNMTAXVWBBv/6lpaxN5RrBA="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/piccolo-theme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/piccolo-theme/default.nix index 4a0e3bf0f9..eded0ac8fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/piccolo-theme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/piccolo-theme/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "piccolo_theme"; inherit version; - sha256 = "sha256-PGPf05TQfC6Somn2PR07Y2qiOuyg+37U1l16m2LKykU="; + hash = "sha256-PGPf05TQfC6Somn2PR07Y2qiOuyg+37U1l16m2LKykU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/piep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/piep/default.nix index 196619f525..691733bfb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/piep/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/piep/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-aM7KQJZr1P0Hs2ReyRj2ItGUo+fRJ+TU3lLAU2Mu8KA="; + hash = "sha256-aM7KQJZr1P0Hs2ReyRj2ItGUo+fRJ+TU3lLAU2Mu8KA="; }; propagatedBuildInputs = [ pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix index 3ac0b61fc3..e0a8fc10f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pika"; repo = "pika"; rev = "refs/tags/${version}"; - sha256 = "sha256-j+5AF/+MlyMl3JXh+bo7pHxohbso17CJokcDR7uroz8="; + hash = "sha256-j+5AF/+MlyMl3JXh+bo7pHxohbso17CJokcDR7uroz8="; }; propagatedBuildInputs = [ gevent tornado twisted ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix index f16ef44655..746496ff28 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix @@ -17,7 +17,7 @@ import ../pillow/generic.nix (rec { owner = "uploadcare"; repo = "pillow-simd"; rev = "v${version}"; - sha256 = "sha256-qTZYhgHjVMXqoYl3mG1xVrFaWrPidSY8HlyFQizV27Y="; + hash = "sha256-qTZYhgHjVMXqoYl3mG1xVrFaWrPidSY8HlyFQizV27Y="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix index 67f4dd004a..8873b27d5e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Pint"; - sha256 = "sha256-OHzwQHjcff5KcIAzuq1Uq2HYKrBsTuPUkiseRdViYGc="; + hash = "sha256-OHzwQHjcff5KcIAzuq1Uq2HYKrBsTuPUkiseRdViYGc="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip-requirements-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pip-requirements-parser/default.nix index 51af23fdc5..21d0679ce8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pip-requirements-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pip-requirements-parser/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , packaging +, pyparsing , pytestCheckHook , pythonOlder , setuptools-scm @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "pip-requirements-parser"; - version = "32.0.0"; + version = "32.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nexB"; repo = pname; - rev = "v${version}"; - hash = "sha256-Wu4C93PWujygKIzXqUjCmKWcllr+hkuvnqDuw6/D9Do="; + rev = "refs/tags/v${version}"; + hash = "sha256-UMrwDXxk+sD3P2jk7s95y4OX6DRBjWWZZ8IhkR6tnZ4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -31,6 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging + pyparsing ]; nativeCheckInputs = [ @@ -41,6 +43,12 @@ buildPythonPackage rec { "pip_requirements_parser" ]; + disabledTests = [ + "test_RequirementsFile_to_dict" + "test_RequirementsFile_dumps_unparse" + "test_legacy_version_is_deprecated" + ]; + meta = with lib; { description = "Module to parse pip requirements"; homepage = "https://github.com/nexB/pip-requirements-parser"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pip/default.nix index 0c24448700..ebac5724d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pip/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pip"; - version = "22.3.1"; + version = "23.0.1"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-mrfd3VWqb4SgSjBJAxBhYegABdJa7pVXL7wA5uZtF/A="; + hash = "sha256-BSonlwKmegrlrQTTIL0avPi61/TY2M0f7kOZpSzPRQk="; name = "${pname}-${version}-source"; }; @@ -47,6 +47,7 @@ buildPythonPackage rec { description = "The PyPA recommended tool for installing Python packages"; license = with lib.licenses; [ mit ]; homepage = "https://pip.pypa.io/"; + changelog = "https://pip.pypa.io/en/stable/news/#v${lib.replaceStrings [ "." ] [ "-" ] version}"; priority = 10; }; } 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 cf0af0d1de..5ee12b7a22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix @@ -1,29 +1,29 @@ { lib +, argcomplete , buildPythonPackage , fetchFromGitHub -, pythonOlder , hatchling -, userpath -, argcomplete -, packaging , importlib-metadata +, packaging , pip +, platformdirs , pytestCheckHook +, pythonOlder +, userpath }: buildPythonPackage rec { pname = "pipx"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; - # no tests in the pypi tarball, so we directly fetch from github src = fetchFromGitHub { owner = "pipxproject"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-6cKKVOgHIoKNfGqvDWK5cwBGBDkgfyRuBRDV6fruBoA="; + hash = "sha256-lm/Q+8nNubhaUR1pUbSIoD4DEUEkK+pQvvUdWNquW4Q="; }; nativeBuildInputs = [ @@ -31,9 +31,10 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - userpath argcomplete packaging + platformdirs + userpath ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; @@ -51,6 +52,7 @@ buildPythonPackage rec { # start local pypi server and use in tests "--net-pypiserver" ]; + disabledTests = [ # disable tests which are difficult to emulate due to shell manipulations "path_warning" @@ -74,9 +76,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = - "Install and Run Python Applications in Isolated Environments"; + description = "Install and run Python applications in isolated environments"; homepage = "https://github.com/pipxproject/pipx"; + changelog = "https://github.com/pypa/pipx/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ yshym ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pkce/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pkce/default.nix index 38a0058be4..ecd128744d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pkce/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pkce/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "RomeoDespres"; repo = pname; rev = version; - sha256 = "sha256-dOHCu0pDXk9LM4Yobaz8GAfVpBd8rXlty+Wfhx+WPME="; + hash = "sha256-dOHCu0pDXk9LM4Yobaz8GAfVpBd8rXlty+Wfhx+WPME="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix index 91f8db998a..d5b5815c3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "matze"; repo = "pkgconfig"; rev = "v${version}"; - sha256 = "sha256-uuLUGRNLCR3NS9g6OPCI+qG7tPWsLhI3OE5WmSI3vm8="; + hash = "sha256-uuLUGRNLCR3NS9g6OPCI+qG7tPWsLhI3OE5WmSI3vm8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix index e095248ac0..9fd8fa40dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pkginfo"; - version = "1.9.2"; + version = "1.9.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rAPjfk1gGq7kD4CH9j/EoqbJgU3aLI+mqrGxgpZTvfo="; + hash = "sha256-j9WJbocYpDcvDqnMnZb2QXybmG4jpNEW3aJrYswp0EY="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix index 3c2d4bd749..0fae6102ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix @@ -11,7 +11,7 @@ }: let pname = "plantuml-markdown"; - version = "3.8.0"; + version = "3.8.1"; in buildPythonPackage { inherit pname version; @@ -20,7 +20,7 @@ buildPythonPackage { owner = "mikitex70"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-6zGE3j+AfS5r3dj+4mfT4juxKUODEOgGlnn3wtvPcEk="; + hash = "sha256-cDijr9BX7Mqgml76TU5dNWLWeF6LYb/gUeIrIJtqqCo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plantuml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plantuml/default.nix index f887453bd6..b9d7c15f83 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plantuml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plantuml/default.nix @@ -14,7 +14,7 @@ buildPythonPackage { owner = "dougn"; repo = "python-plantuml"; rev = "93e1aac25b17d896b0d05d0a1aa352c7bd11dd31"; - sha256 = "sha256-aPXPqoKlu8VLi0Jn84brG7v3qM9L18Ut4sabYYGb3qQ="; + hash = "sha256-aPXPqoKlu8VLi0Jn84brG7v3qM9L18Ut4sabYYGb3qQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plaster/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plaster/default.nix index 40362c65db..f3ba127b0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plaster/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plaster/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-+L78VL+MEUfBCrQCl+yEwmdvotTqXW9STZQ2qAB075g="; + hash = "sha256-+L78VL+MEUfBCrQCl+yEwmdvotTqXW9STZQ2qAB075g="; }; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix index db4810513d..c807faff9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "2.6.2"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-yGpDAwn8Kt6vF2K2zbAs8+fowhYQmvsm/87WJofuhME="; + hash = "sha256-RiZ26BGqS8nN5qHpUt7LIXSck/cGM8qlet3uL81TyPo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/playwright/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/playwright/default.nix index 741b655df8..71d50c67f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/playwright/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/playwright/default.nix @@ -144,7 +144,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-python"; rev = "v${version}"; - sha256 = "sha256-cI/4GdkmTikoP9O0Skh/0jCxxRypRua0231iKcxtBcY="; + hash = "sha256-cI/4GdkmTikoP9O0Skh/0jCxxRypRua0231iKcxtBcY="; }; patches = [ 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 88f3fb89a8..7ca7e075ea 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.13.2"; + version = "4.13.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = "refs/tags/${version}"; - hash = "sha256-5YwINPgQ4efZBvu5McsLYicW/7keKSi011lthJUR9zw="; + hash = "sha256-yq1tQ6xJn+IxrKXwUVeLhki6sdkwzu9hHSILsLJdPPY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plexwebsocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plexwebsocket/default.nix index 86bd3c0bdb..430394c416 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plexwebsocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plexwebsocket/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "jjlawren"; repo = "python-plexwebsocket"; rev = "v${version}"; - sha256 = "sha256-u9zO3d0d4Qg+u4ezVRGkNDpJqHkYIMrEMJzBK5WKk8Y="; + hash = "sha256-u9zO3d0d4Qg+u4ezVRGkNDpJqHkYIMrEMJzBK5WKk8Y="; }; propagatedBuildInputs = [ aiohttp ]; 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 05e7e15a00..201f2fcfc4 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.11.0"; + version = "5.13.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Tv70ecLsHYbc2shAW2ynDKZWSad0COOafoSh6i22x4c="; + hash = "sha256-kO6aH+4N2jDigw4SmFUIHqF70bBqVTpiti3hXK/xohk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plum-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plum-py/default.nix index d1ef4c9caa..d6020cabc9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plum-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plum-py/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchFromGitLab, isPy3k, pytest, baseline }: +{ lib +, buildPythonPackage +, fetchFromGitLab +, isPy3k +, pytestCheckHook +, baseline +}: buildPythonPackage rec { pname = "plum-py"; @@ -9,13 +15,24 @@ buildPythonPackage rec { owner = "dangass"; repo = "plum"; rev = version; - sha256 = "sha256-jCZUNT1HpSr0khHsjnxEzN2LCzcDV6W27PjVkwFJHUg="; + hash = "sha256-jCZUNT1HpSr0khHsjnxEzN2LCzcDV6W27PjVkwFJHUg="; }; + postPatch = '' + # Drop broken version specifier + sed -i "/python_requires =/d" setup.cfg + ''; + pythonImportsCheck = [ "plum" ]; - nativeCheckInputs = [ pytest baseline ]; - checkPhase = "pytest tests"; + nativeCheckInputs = [ + baseline + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests" + ]; meta = with lib; { description = "Classes and utilities for packing/unpacking bytes"; 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 2fe218080c..6bc5ec7da7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix @@ -1,24 +1,26 @@ { lib , buildPythonPackage , fetchFromGitHub +, hatchling +, hatch-vcs , openssh , ps , psutil , pytest-mock , pytest-timeout , pytestCheckHook -, setuptools-scm }: buildPythonPackage rec { pname = "plumbum"; - version = "1.8.0"; + version = "1.8.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "tomerfiliba"; repo = "plumbum"; rev = "refs/tags/v${version}"; - sha256 = "sha256-SqZO9qYOtBB+KWP0DLsImI64QTTpYKzWMYwSua9k2S0="; + hash = "sha256-5nRI9y2Y7itkqDdLRSX4qWfh96WmhqdP1Eo7HLoRHaQ="; }; postPatch = '' @@ -29,7 +31,8 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ - setuptools-scm + hatchling + hatch-vcs ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plux/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plux/default.nix index ec235c7b99..5f6ac1e851 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plux/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plux/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { repo = "plux"; # Request for proper tags: https://github.com/localstack/plux/issues/4 rev = "a412ab0a0d7d17c3b5e1f560b7b31dc1876598f7"; - sha256 = "sha256-zFwrRc93R4cXah7zYXjVLBIeBpDedsInxuyXOyBI8SA="; + hash = "sha256-zFwrRc93R4cXah7zYXjVLBIeBpDedsInxuyXOyBI8SA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plyer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plyer/default.nix index 3bf0739eba..f190dcb6b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plyer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plyer/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { # fix naming of the DOCUMENTS dir (fetchpatch { url = "https://github.com/rski/plyer/commit/99dabb2d62248fc3ea5705c2720abf71c9fc378b.patch"; - sha256 = "sha256-bbnw0TxH4FGTso5dopzquDCjrjZAy+6CJauqi/nfstA="; + hash = "sha256-bbnw0TxH4FGTso5dopzquDCjrjZAy+6CJauqi/nfstA="; }) # fix handling of the ~/.config/user-dirs.dir file (fetchpatch { url = "https://github.com/rski/plyer/commit/f803697a1fe4fb5e9c729ee6ef1997b8d64f3ccd.patch"; - sha256 = "sha256-akuh//P5puz2PwcBRXZQ4KoGk+fxi4jn2H3pTIT5M78="; + hash = "sha256-akuh//P5puz2PwcBRXZQ4KoGk+fxi4jn2H3pTIT5M78="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plyvel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plyvel/default.nix index 09a1c31297..2d412c12d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plyvel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plyvel/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-zZGOCzFpCrzT0gKodCyvlRqy/hVz3nr3HDhFaEf5ICs="; + hash = "sha256-zZGOCzFpCrzT0gKodCyvlRqy/hVz3nr3HDhFaEf5ICs="; }; buildInputs = [ pkgs.leveldb ] ++ lib.optional isPy3k pytest; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Pmw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pmw/default.nix similarity index 80% rename from third_party/nixpkgs/pkgs/development/python-modules/Pmw/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/pmw/default.nix index f88346d664..de33eecf08 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Pmw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pmw/default.nix @@ -1,12 +1,13 @@ { lib , buildPythonPackage , fetchPypi, tkinter }: buildPythonPackage rec { - pname = "Pmw"; + pname = "pmw"; version = "2.1.1"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-lIQSRXz8zwx3XdCOCRP7APkIlqM8eXN9VxxzEq6vVcY="; + pname = "Pmw"; + inherit version; + hash = "sha256-lIQSRXz8zwx3XdCOCRP7APkIlqM8eXN9VxxzEq6vVcY="; }; propagatedBuildInputs = [ tkinter ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix index 82438a6954..9e7e7bd978 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix @@ -1,6 +1,8 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonOlder , build , git @@ -15,7 +17,7 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.4.0"; + version = "1.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,9 +26,23 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - hash = "sha256-SCzs2v0LIgx3vBYTavPqc7uwAQdWsdmkbDyHgIjOxrk="; + hash = "sha256-h3d0h+WCrrNlfPOlUx6Rj0aG6untD6MiunqvPj4yT+0="; }; + # revert update of vendored dependencies to unbreak e.g. zeroconf on x86_64-darwin + patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + (fetchpatch { + url = "https://github.com/python-poetry/poetry-core/commit/80d7dcdc722dee0e09e5f3303b663003d794832c.patch"; + revert = true; + hash = "sha256-CPjkNCmuAiowp/kyKqnEfUQNmXK95RMJOIa24nG6xi8="; + }) + (fetchpatch { + url = "https://github.com/python-poetry/poetry-core/commit/43fd7fe62676421b3661c96844b5d7cf49b87c07.patch"; + revert = true; + hash = "sha256-fXq8L23qjLraLeMzB1bwW1jU0eGd236/GHIoYKwOuL0="; + }) + ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/poetry-plugin-export/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/poetry-plugin-export/default.nix index 8711a4a527..3073a35ea3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/poetry-plugin-export/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/poetry-plugin-export/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "poetry-plugin-export"; - version = "1.2.0"; + version = "1.3.0"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-xrAGjHFYRT6n+r/16b0xyoI7+1Q1Hsw3lEK92UabIqo="; + hash = "sha256-rqUs73pTpc18HsloLGRBYA6v/qyk/eUH7uEZYlAgFa0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/poetry-semver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/poetry-semver/default.nix index 1e144bf36c..8c0c11f99e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/poetry-semver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/poetry-semver/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-2Am2Eqons5vy0PydMbT0gJsOlyZGxfGc+kbHJbdjiBA="; + hash = "sha256-2Am2Eqons5vy0PydMbT0gJsOlyZGxfGc+kbHJbdjiBA="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/polarizationsolver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/polarizationsolver/default.nix index c8f47db632..363dcdc490 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/polarizationsolver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/polarizationsolver/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "reinholdt"; repo = pname; rev = "00424ac4d1862257a55e4b16543f63ace3fe8c22"; - sha256 = "sha256-LACf8Xw+o/uJ3+PD/DE/o7nwKY7fv3NyYbpjCrTTnBU="; + hash = "sha256-LACf8Xw+o/uJ3+PD/DE/o7nwKY7fv3NyYbpjCrTTnBU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix index 5424152a1e..0fa5319071 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix @@ -12,7 +12,7 @@ let version = "0.15.13"; rootSource = fetchzip { url = "https://github.com/pola-rs/${pname}/archive/refs/tags/py-${version}.tar.gz"; - sha256 = "sha256-bk2opNLN3L+fkzXVfUU5O37UmA27ijmnAElCHjsuI+o="; + hash = "sha256-bk2opNLN3L+fkzXVfUU5O37UmA27ijmnAElCHjsuI+o="; }; in buildPythonPackage { @@ -35,7 +35,7 @@ buildPythonPackage { cd py-polars ''; name = "${pname}-${version}"; - sha256 = "sha256-u7ascftUPz8K+gWwjjxdXXFJf++M+8P9QE/KVJkO5DM="; + hash = "sha256-u7ascftUPz8K+gWwjjxdXXFJf++M+8P9QE/KVJkO5DM="; }; cargoRoot = "py-polars"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/polib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/polib/default.nix index 6190824e68..c96b90b6c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/polib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/polib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "polib"; - version = "1.1.1"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "e02c355ae5e054912e3b0d16febc56510eff7e49d60bf22aecb463bd2f2a2dfa"; + hash = "sha256-8++Urv7W4YPjQqiiaa4fxHQroZMYatdvF1k4Yh2/wms="; }; # error: invalid command 'test' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/polyline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/polyline/default.nix index 249512cedb..37bc3bc2e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/polyline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/polyline/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "polyline"; - version = "1.4.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0x60lm3ccq9zrcqlzyk041xgr1mi0k9lzyyv3cbbdiq9kb88jzvw"; + hash = "sha256-FJK4/K3CFD+K7cZz08bZXfRRMfHGLrjVHIGDsk53FIY="; }; propagatedBuildInputs = [ six ]; 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 deb91a2b1e..65d9ea010e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix @@ -9,6 +9,7 @@ , pytestCheckHook , python-dateutil , pythonOlder +, semver , rich , tomlkit , typing-extensions @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "23.3.3"; + version = "23.3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Wd02dlRIRBBJ2cKNxIZxOoWjp1aPxqmc37tvUbc/pJk="; + hash = "sha256-Eb9mX04ws+FhiRw5j1XsEhjm5ZdYFCbA5pntgb4z//M="; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ buildPythonPackage rec { httpx packaging python-dateutil + semver rich typing-extensions tomlkit diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pooch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pooch/default.nix index 3c6f4ff900..7dd3569519 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pooch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pooch/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-V9IOxLEN1pTSsFu2S8axCcboWmwUBXlM6H7Ys0GrP0Q="; + hash = "sha256-V9IOxLEN1pTSsFu2S8axCcboWmwUBXlM6H7Ys0GrP0Q="; }; nativeBuildInputs = [ setuptools-scm ]; 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 adbbd3bf52..455ee183a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pot/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "POT"; inherit version; - sha256 = "sha256-PKmuPI83DPy7RkOgHHPdPJJz5NT/fpr123AVTzTLwgQ="; + hash = "sha256-PKmuPI83DPy7RkOgHHPdPJJz5NT/fpr123AVTzTLwgQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix index de97627f6d..426450ab40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-UIx9/IZg6Wv596wHzQb0CO6zwmQXUaFEPKBojo2LXmA="; + hash = "sha256-UIx9/IZg6Wv596wHzQb0CO6zwmQXUaFEPKBojo2LXmA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pox/default.nix index f0a825068b..7f1ac48797 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-6CUiUpdjjW49SUFfjPtlQHpdFeVvL7f+nZueMFDGXuE="; + hash = "sha256-6CUiUpdjjW49SUFfjPtlQHpdFeVvL7f+nZueMFDGXuE="; }; # Test sare failing the sandbox diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ppft/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ppft/default.nix index d53ac9acdd..1dce18366b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ppft/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ppft/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-+TPwQE8+gIvIYHRayzt5zU/jHqGaIIiaZF+QBBW+YPE="; + hash = "sha256-+TPwQE8+gIvIYHRayzt5zU/jHqGaIIiaZF+QBBW+YPE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/primer3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/primer3/default.nix index d3d44259fe..6a82ba130a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/primer3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/primer3/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "libnano"; repo = "primer3-py"; rev = "refs/tags/v${version}"; - sha256 = "sha256-o9B8TN3mOchOO7dz34mI3NDtIhHSlA9+lMNsYcxhTE0="; + hash = "sha256-o9B8TN3mOchOO7dz34mI3NDtIhHSlA9+lMNsYcxhTE0="; }; nativeBuildInputs = [ cython ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prison/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prison/default.nix index de61fbd252..320764a88e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prison/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prison/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "betodealmeida"; repo = "python-rison"; rev = version; - sha256 = "sha256-qor40vUQeTdlO3vwug3GGNX5vkNaF0H7EWlRdsY4bvc="; + hash = "sha256-qor40vUQeTdlO3vwug3GGNX5vkNaF0H7EWlRdsY4bvc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix index 417113537b..fbf7599b31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { # support for LDAPCompareRequest. (fetchpatch { url = "https://github.com/mayflower/privacyidea-ldap-proxy/commit/a13356717379b174f1a6abf767faa0dbd459f5dd.patch"; - sha256 = "sha256-SBTj9ayQ8JFD8BoYIl77nxWVV3PXnHZ8JMlJnxd/nEk="; + hash = "sha256-SBTj9ayQ8JFD8BoYIl77nxWVV3PXnHZ8JMlJnxd/nEk="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proglog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proglog/default.nix index 3b630f7190..d22951ac7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proglog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proglog/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ZYwoycguTK6y8l9Ij/+c6s4i+NabFdDByG1kJ15N2rQ="; + hash = "sha256-ZYwoycguTK6y8l9Ij/+c6s4i+NabFdDByG1kJ15N2rQ="; }; propagatedBuildInputs = [ tqdm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix index f9e11f0966..0d6c6bb58d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "prometheus-client"; - version = "0.15.0"; + version = "0.16.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "prometheus"; repo = "client_python"; rev = "refs/tags/v${version}"; - hash = "sha256-LabvQMNiRH4jclMnN0P4M3w25NQasNQEu1HWvRDQQ2o="; + hash = "sha256-FYQE0toy5VFKNVadSsxG/5NCRANYJOcVR4bGPrCAxvc="; }; nativeCheckInputs = [ @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Prometheus instrumentation library for Python applications"; homepage = "https://github.com/prometheus/client_python"; + changelog = "https://github.com/prometheus/client_python/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prometheus-flask-exporter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prometheus-flask-exporter/default.nix index e84e0a2026..ac50bf781c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prometheus-flask-exporter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prometheus-flask-exporter/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "rycus86"; repo = "prometheus_flask_exporter"; rev = version; - sha256 = "sha256-l9Iw9fvXQMXzq1y/4Dml8uLPJWyqX6SDIXptJVw3cVQ="; + hash = "sha256-l9Iw9fvXQMXzq1y/4Dml8uLPJWyqX6SDIXptJVw3cVQ="; }; propagatedBuildInputs = [ flask prometheus-client ]; 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 afe14d81d7..bd676fc23c 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 @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.36"; + version = "3.0.38"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - sha256 = "sha256-PhY/JUvvWgOxRjl9fBljvT4oEvCWS7miTm7HYf0o22M="; + hash = "sha256-I6xdUFOKmjjIveBf7LR9C0A+zQZihXqG+Ib3mFY9W5s="; }; propagatedBuildInputs = [ @@ -48,6 +48,7 @@ buildPythonPackage rec { with a nice interactive Python shell (called ptpython) built on top. ''; homepage = "https://github.com/jonathanslenders/python-prompt-toolkit"; + changelog = "https://github.com/prompt-toolkit/python-prompt-toolkit/blob/${version}/CHANGELOG"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/protego/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/protego/default.nix index 12489fa64b..6db79056d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/protego/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/protego/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-32ZtQwTat3Ti3J/rIIuxrI1x6lzuwS9MmeujD71kL/I="; + hash = "sha256-32ZtQwTat3Ti3J/rIIuxrI1x6lzuwS9MmeujD71kL/I="; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix index b4f4facda1..3d3469e3f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-DozaPVpjTZiVt1xXPJNSwWSGy3XesOB4tf2jTbQkMWU="; + hash = "sha256-DozaPVpjTZiVt1xXPJNSwWSGy3XesOB4tf2jTbQkMWU="; }; propagatedBuildInputs = [ protobuf ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-client/default.nix index fbd69dbd54..ae29bf631a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proton-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ProtonMail"; repo = "proton-python-client"; rev = version; - sha256 = "sha256-mhPq9O/LCu3+E1jKlaJmrI8dxbA9BIwlc34qGwoxi5g="; + hash = "sha256-mhPq9O/LCu3+E1jKlaJmrI8dxbA9BIwlc34qGwoxi5g="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/protonvpn-nm-lib/default.nix index 89a4bf789c..884decc2fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/protonvpn-nm-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/protonvpn-nm-lib/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "ProtonVPN"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-xpK3l8BI6/DUt46VR8DS89hzdHUljAbrYhEyf00giGg="; + hash = "sha256-xpK3l8BI6/DUt46VR8DS89hzdHUljAbrYhEyf00giGg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proxy_tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proxy_tools/default.nix index e4596956dd..03f3f92f9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proxy_tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proxy_tools/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-zLN1H1KcBH4tilhEDYayBTA88P6BRveE0cvNlPCigBA="; + hash = "sha256-zLN1H1KcBH4tilhEDYayBTA88P6BRveE0cvNlPCigBA="; }; # no tests in pypi 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 72c0514225..b697c66613 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-pSRtLmg6ly4hh6hxS1ws+BVsBkYp+amxqHPBcw2eJFo="; + hash = "sha256-pSRtLmg6ly4hh6hxS1ws+BVsBkYp+amxqHPBcw2eJFo="; }; outputs = [ "out" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ptyprocess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ptyprocess/default.nix index d969a679a1..496f8161e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ptyprocess/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ptyprocess/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # Remove after https://github.com/pexpect/ptyprocess/pull/64 is merged. (fetchpatch { url = "https://github.com/pexpect/ptyprocess/commit/40c1ccf3432a6787be1801ced721540e34c6cd87.patch"; - sha256 = "sha256-IemngBqBq3QRCmVscWtsuXHiFgvTOJIIB9SyAvsqHd0="; + hash = "sha256-IemngBqBq3QRCmVscWtsuXHiFgvTOJIIB9SyAvsqHd0="; }) ]; 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 b2c7030587..fc00d00c75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-zBdOHO69TmIixbePT0FfEugHU8mrdas1QVm0y1lQsIQ="; + hash = "sha256-zBdOHO69TmIixbePT0FfEugHU8mrdas1QVm0y1lQsIQ="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix index 919ab61c60..8e40d18221 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-xXXEp8oYGcJLTfoBDUSZrIHSgDvB2EHbVMHoG4Hk+t8="; + hash = "sha256-xXXEp8oYGcJLTfoBDUSZrIHSgDvB2EHbVMHoG4Hk+t8="; }; # Disable tests as they require docker, docker-compose and a dedicated diff --git a/third_party/nixpkgs/pkgs/development/python-modules/purl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/purl/default.nix index 9519d8bf21..6c180222e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/purl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/purl/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "codeinthehole"; repo = "purl"; rev = version; - sha256 = "sha256-Jb3JRW/PtQ7NlO4eQ9DmTPu/sjvFTg2mztphoIF79gc="; + hash = "sha256-Jb3JRW/PtQ7NlO4eQ9DmTPu/sjvFTg2mztphoIF79gc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/push-receiver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/push-receiver/default.nix index fe0582f096..c8ab6b64ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/push-receiver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/push-receiver/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "push_receiver"; - sha256 = "sha256-Tknmra39QfA+OgrRxzKDLbkPucW8zgdHqz5FGQnzYOw="; + hash = "sha256-Tknmra39QfA+OgrRxzKDLbkPucW8zgdHqz5FGQnzYOw="; }; propagatedBuildInputs = [ 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 cbc7a2c0b4..2931c00a5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pvo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pvo/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-pvoutput"; rev = "v${version}"; - sha256 = "sha256-2/O81MnFYbdOrzLiTSoX7IW+3ZGyyE/tIqgKr/sEaHI="; + hash = "sha256-2/O81MnFYbdOrzLiTSoX7IW+3ZGyyE/tIqgKr/sEaHI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pweave/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pweave/default.nix index c9e2ff020f..bea63909ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pweave/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pweave/default.nix @@ -11,11 +11,12 @@ }: buildPythonPackage rec { - pname = "Pweave"; + pname = "pweave"; version = "0.30.3"; src = fetchPypi { - inherit pname version; + pname = "Pweave"; + inherit version; sha256 = "5e5298d90e06414a01f48e0d6aa4c36a70c5f223d929f2a9c7e2d388451c7357"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix index a9b5b7f0ae..42cd7035cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , debugger , fetchPypi -, Mako +, mako , packaging , pysocks , pygments @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-7qZ9GC+RcEiDkpmNmy8d67dYiTgFBVAfB3B2RfrH5xI="; + hash = "sha256-7qZ9GC+RcEiDkpmNmy8d67dYiTgFBVAfB3B2RfrH5xI="; }; postPatch = '' @@ -52,7 +52,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - Mako + mako packaging pysocks pygments diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-cid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-cid/default.nix index 3f8d07adbf..9e34693eb0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-cid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-cid/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ipld"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aN7ee25ghKKa90+FoMDCdGauToePc5AzDLV3tONvh4U="; + hash = "sha256-aN7ee25ghKKa90+FoMDCdGauToePc5AzDLV3tONvh4U="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-ecc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-ecc/default.nix index 71103c0d66..226b22a45d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-ecc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-ecc/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = "py_ecc"; rev = "v${version}"; - sha256 = "sha256-638otYA3e/Ld4mcM69yrqHQnGoK/Sfl/UA9FWnjgO/U="; + hash = "sha256-638otYA3e/Ld4mcM69yrqHQnGoK/Sfl/UA9FWnjgO/U="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-eth-sig-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-eth-sig-utils/default.nix index 3ef63cd192..3db7298840 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-eth-sig-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-eth-sig-utils/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "rmeissner"; repo = "py-eth-sig-utils"; rev = "v${version}"; - sha256 = "sha256-PNvEHH5w2ptntRGzqWrqlbIzJJsT60OXg/Dh5f6Wq9k="; + hash = "sha256-PNvEHH5w2ptntRGzqWrqlbIzJJsT60OXg/Dh5f6Wq9k="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-libzfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-libzfs/default.nix index 21663ba802..1eacc39b8a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-libzfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-libzfs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "truenas"; repo = pname; rev = "TS-${version}"; - sha256 = "sha256-BJG+cw07Qu4aL99pVKNd7JAgr+w/6Uv2eI46EB615/I="; + hash = "sha256-BJG+cw07Qu4aL99pVKNd7JAgr+w/6Uv2eI46EB615/I="; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-multiaddr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-multiaddr/default.nix index 4bf9e79739..b631dbdc31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-multiaddr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-multiaddr/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "multiformats"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cGM7iYQPP+UOkbTxRhzuED0pkcydFCO8vpx9wTc0/HI="; + hash = "sha256-cGM7iYQPP+UOkbTxRhzuED0pkcydFCO8vpx9wTc0/HI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-multicodec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-multicodec/default.nix index f0c34a70ef..6619a5c3e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-multicodec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-multicodec/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "multiformats"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2aK+bfhqCMqSO+mtrHIfNQmQpQHpwd7yHseI/3O7Sp4="; + hash = "sha256-2aK+bfhqCMqSO+mtrHIfNQmQpQHpwd7yHseI/3O7Sp4="; }; # Error when not substituting: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix index 202d270216..a23ff548cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "multiformats"; repo = pname; rev = "v${version}"; - sha256 = "sha256-z1lmSypGCMFWJNzNgV9hx/IStyXbpd5jvrptFpewuOA="; + hash = "sha256-z1lmSypGCMFWJNzNgV9hx/IStyXbpd5jvrptFpewuOA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-sonic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-sonic/default.nix index 14c7831967..a3e7cd5036 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-sonic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-sonic/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "py-sonic"; - version = "0.8.0"; + version = "1.0.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-BzHBoN7zfZ6Bh1IC1TG5NSa6EiFNje2hQY+lSA/PV+c="; + hash = "sha256-9ho0F5kf74pCsLujwLt+pU+Ikxu70/kk+WP7lnD7CiE="; }; # package has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-sr25519-bindings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-sr25519-bindings/default.nix index 650e259f98..caa7708b8b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-sr25519-bindings/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-sr25519-bindings/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "polkascan"; repo = "py-sr25519-bindings"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Lu3J0+YeQHHKItOZTT24DlQAUJuE9fd+py6Eb46/MSE="; + hash = "sha256-Lu3J0+YeQHHKItOZTT24DlQAUJuE9fd+py6Eb46/MSE="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-tree-sitter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-tree-sitter/default.nix index c8b914aed7..f8c1997220 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-tree-sitter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-tree-sitter/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "tree-sitter"; repo = "py-tree-sitter"; rev = "v${version}"; - sha256 = "sha256-mdV5zGvVI1MltmOD1BtXxsKB/yigk8d56WwLlX6Uizg="; + hash = "sha256-mdV5zGvVI1MltmOD1BtXxsKB/yigk8d56WwLlX6Uizg="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py17track/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py17track/default.nix index 12bd7446e1..6541a1abaf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py17track/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py17track/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-T0Jjdu6QC8rTqZwe4cdsBbs0hQXUY6CkrImCgYwWL9o="; + hash = "sha256-T0Jjdu6QC8rTqZwe4cdsBbs0hQXUY6CkrImCgYwWL9o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py4j/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py4j/default.nix index 3f7a7e1882..7365db7cd3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py4j/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py4j/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-C25TFbs62lz2KsZR0Qe7LrwC3vPe6dlUjjuqxkTqjbs="; + hash = "sha256-C25TFbs62lz2KsZR0Qe7LrwC3vPe6dlUjjuqxkTqjbs="; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pySmartDL/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pySmartDL/default.nix index 5c43fb756c..66503bba99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pySmartDL/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pySmartDL/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "iTaybb"; repo = pname; rev = "b93df794e1e60017c42d9520ac097b6fd38c2e8b"; - sha256 = "sha256-Etyv3xCB1cGozWDsskygwcTHJfC+V5hvqBNQAF8SIMM="; + hash = "sha256-Etyv3xCB1cGozWDsskygwcTHJfC+V5hvqBNQAF8SIMM="; }); doCheck = false; 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 ab8492beab..b9d5b1a238 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.9.0"; + version = "4.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-OaJMNJqb3h16aZJYma8eXTEkAEbb8NgpVEEHmGvpxQg="; + hash = "sha256-uzdhNCMl5NdOSHVMZe4BcpCjHQCyaTqlTdWTtzPqj04="; }; passthru.optional-dependencies = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix index acfab6791a..5ecedd0d4c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-DSJsHGdE+y4wizkUEGabHfXP6CY3/8te1Im/grLS63g="; + hash = "sha256-DSJsHGdE+y4wizkUEGabHfXP6CY3/8te1Im/grLS63g="; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyads/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyads/default.nix index 6e9d738666..bdedb2392a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyads/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyads/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "stlehmann"; repo = pname; rev = version; - sha256 = "sha256-eNouFJQDgp56fgkA7wZKfosKWOKU6OvXRjFwjCMvZqI="; + hash = "sha256-eNouFJQDgp56fgkA7wZKfosKWOKU6OvXRjFwjCMvZqI="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyairnow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyairnow/default.nix index e398643aa5..f425eaeaa1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyairnow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyairnow/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for EPA AirNow Air Quality API"; homepage = "https://github.com/asymworks/pyairnow"; + changelog = "https://github.com/asymworks/pyairnow/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; 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 09a113a421..a5c7f58f99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyamg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyamg/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-N608Hcr/JDXCq3yOw2lCrwcmxWPTUFm80Y6wdHP3GC4="; + hash = "sha256-N608Hcr/JDXCq3yOw2lCrwcmxWPTUFm80Y6wdHP3GC4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyarr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyarr/default.nix index 0150e0cc9b..41fa4afc21 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyarr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyarr/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-3DX02V3Srpx6hqimWbesxfkDqslVH4+8uXY7XYDmjX0="; + hash = "sha256-3DX02V3Srpx6hqimWbesxfkDqslVH4+8uXY7XYDmjX0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyasn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyasn/default.nix index 3054af1b4e..0fe2d58f95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyasn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyasn/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-6UK1SRY2Pse4tw6urs0OtOQe8bz0ojl7KabXFfzN+SU="; + hash = "sha256-6UK1SRY2Pse4tw6urs0OtOQe8bz0ojl7KabXFfzN+SU="; }; datasrc = fetchFromGitHub { owner = "hadiasghari"; repo = "pyasn"; rev = "${version}"; - sha256 = "sha256-R7Vi1Mn44Mg3HQLDk9O43MkXXwbLRr/jjVKSHJvgYj0"; + hash = "sha256-R7Vi1Mn44Mg3HQLDk9O43MkXXwbLRr/jjVKSHJvgYj0"; }; postInstall = '' 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 56e6059c27..405c39398d 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.6.2"; + version = "3.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "MatsNl"; repo = "pyatag"; rev = "refs/tags/${version}"; - sha256 = "sha256-yJEPDNjEv2lGrBQ78sl7nseVRemsG7hTdBGH5trciYU="; + hash = "sha256-hyGos0LFVKv63jf1ODPFfk+R47oyHea+8MGvxeKpop8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix index 365a8565db..048acc08e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-JrzMgeQkPRwP9Uh+a0gd5jKfzWXHk2XCZ87zjzY6K1Y="; + hash = "sha256-JrzMgeQkPRwP9Uh+a0gd5jKfzWXHk2XCZ87zjzY6K1Y="; }; buildInputs = [ pkgs.portaudio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyautogui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyautogui/default.nix index d9747d4338..8443284964 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyautogui/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyautogui/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "asweigart"; repo = "pyautogui"; rev = "5e4acb870f2e7ce0ea1927cc5188bc2f5ab7bbbc"; - sha256 = "sha256-R9tcTqxUaqw63FLOGFRaO/Oz6kD7V6MPHdQ8A29NdXw="; + hash = "sha256-R9tcTqxUaqw63FLOGFRaO/Oz6kD7V6MPHdQ8A29NdXw="; }; nativeCheckInputs = [ xvfb-run scrot ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyavm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyavm/default.nix index 9c343c53fe..ec95e2de17 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyavm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyavm/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyAVM"; inherit version; - sha256 = "sha256-gV78ypvYwohHmdjP3lN5F97PfmxuV91tvw5gsYeZ7i8="; + hash = "sha256-gV78ypvYwohHmdjP3lN5F97PfmxuV91tvw5gsYeZ7i8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix index 3ae7a77478..77ce5686a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "appknox"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NtAsO/I1jDEv676yhAgLguQnB/kHdAqPoLt2QFWbvmw="; + hash = "sha256-NtAsO/I1jDEv676yhAgLguQnB/kHdAqPoLt2QFWbvmw="; }; propagatedBuildInputs = [ asn1crypto click lxml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybalboa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybalboa/default.nix index 7c6a477c7c..38435c6d22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybalboa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybalboa/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pybalboa"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "garbled1"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-08FMNRArzmfmLH6y5Z8QPcRVZJIvU3VIOvdTry3iBGI="; + hash = "sha256-7vjdRGnEnMf32pZwoKRxX16hxkyf0CXlncpbBJMQtfI="; }; nativeBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = " Python module to interface with a Balboa Spa"; homepage = "https://github.com/garbled1/pybalboa"; + changelog = "https://github.com/garbled1/pybalboa/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix index bd0c899ce6..8231aed035 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-dtB035p7mJs1iZJqsZRmd7uzmez+IwcUsTFX4mM2Ee0="; + hash = "sha256-dtB035p7mJs1iZJqsZRmd7uzmez+IwcUsTFX4mM2Ee0="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix index be47a00080..862cff1b8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ryIiWpFoh0KSmyLI4LDn+EkXEYwDIr8/A7opoZJ+bo4="; + hash = "sha256-ryIiWpFoh0KSmyLI4LDn+EkXEYwDIr8/A7opoZJ+bo4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybullet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybullet/default.nix index c93cc59d91..4e9e848070 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybullet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybullet/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-G8ua+4eghr4bLeGPCE0f2rgZTaG/cfJkdDyia6o5w1E="; + hash = "sha256-G8ua+4eghr4bLeGPCE0f2rgZTaG/cfJkdDyia6o5w1E="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycairo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycairo/default.nix index 23450ed37c..84c64b79df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycairo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycairo/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pygobject"; repo = "pycairo"; rev = "refs/tags/v${version}"; - sha256 = "sha256-tkyVTJUdL2pBpBUpWsiDPKnd5OV88w3TdEOMxMc+hPM="; + hash = "sha256-tkyVTJUdL2pBpBUpWsiDPKnd5OV88w3TdEOMxMc+hPM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycangjie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycangjie/default.nix index 24c73a152d..5fd7e130c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycangjie/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycangjie/default.nix @@ -20,7 +20,7 @@ buildPythonPackage { owner = "Cangjians"; repo = "pycangjie"; rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3"; - sha256 = "sha256-sS0Demzm89WtEIN4Efz0OTsUQ/c3gIX+/koekQGOca4="; + hash = "sha256-sS0Demzm89WtEIN4Efz0OTsUQ/c3gIX+/koekQGOca4="; }; nativeBuildInputs = [ pkg-config libtool autoconf automake cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycarwings2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycarwings2/default.nix index d89035bac2..0158e2c018 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycarwings2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycarwings2/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "filcole"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kqj/NZXqgPUsOnnzMPmIlICHek7RBxksmL3reNBK+bo="; + hash = "sha256-kqj/NZXqgPUsOnnzMPmIlICHek7RBxksmL3reNBK+bo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycec/default.nix index c33b3c1fad..58da1c55b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycec/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "konikvranik"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H18petSiUdftZN8Q3fPmfSJA3OZks+gI+FAq9LwkRsk="; + hash = "sha256-H18petSiUdftZN8Q3fPmfSJA3OZks+gI+FAq9LwkRsk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycfdns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycfdns/default.nix index df7979be38..e1af0553f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycfdns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycfdns/default.nix @@ -17,6 +17,11 @@ buildPythonPackage rec { hash = "sha256-f6kxYX/dg16OWYpw29dH4Z26ncLZCYyHKGc4fzoCld0="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'version="master",' 'version="${version}",' + ''; + propagatedBuildInputs = [ aiohttp async-timeout diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pychannels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pychannels/default.nix index 8923e5c9c6..d498fba21c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pychannels/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pychannels/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "fancybits"; repo = pname; rev = version; - sha256 = "sha256-E+VL4mJ2KxS5bJZc3Va+wvyVjT55LJz+1wHkxDRa85s="; + hash = "sha256-E+VL4mJ2KxS5bJZc3Va+wvyVjT55LJz+1wHkxDRa85s="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyclimacell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyclimacell/default.nix index 31343ce7b7..0f8c84a016 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyclimacell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyclimacell/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "raman325"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jWHjnebg4Aar48gid7bB7XYXOQtSqbmVmASsZd0YoPc="; + hash = "sha256-jWHjnebg4Aar48gid7bB7XYXOQtSqbmVmASsZd0YoPc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix index ecba98c85e..961953ceda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pycm"; - version = "3.7"; + version = "3.8"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sepandhaghighi"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-Yow5MVbaBgKA7U6RNpS/Yh1mG3XSLKPSDsUeBRSln1U="; + hash = "sha256-L0WPZomOU/I/x8QrdAerG0S2wnHyP661XTaDzzWeruk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix index 14e62474e9..89b1eef76b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qvTMXpQhC3Yx8LwbQDiELhgdkGzjirKT30N1NkXF5ps="; + hash = "sha256-qvTMXpQhC3Yx8LwbQDiELhgdkGzjirKT30N1NkXF5ps="; }; propagatedNativeBuildInputs = [ cffi ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycocotools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycocotools/default.nix index d6c757ed2e..b2279b8e4c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycocotools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycocotools/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-f+CJsFzBjoBtzzvXZHCNhtq5IqEA83NOt3+3enCh0Yw="; + hash = "sha256-f+CJsFzBjoBtzzvXZHCNhtq5IqEA83NOt3+3enCh0Yw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycognito/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycognito/default.nix index 2f1143b5ff..22947f9e13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycognito/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycognito/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pvizeli"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-WepDna9f3Z3dBxWdE6G7nbl3yPK5vMG+7X1rxbZwdjE="; + hash = "sha256-WepDna9f3Z3dBxWdE6G7nbl3yPK5vMG+7X1rxbZwdjE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycoin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycoin/default.nix index 1758eac9a2..46c6777f9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycoin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycoin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-PQOWR1teLZ2npQV+q3K+DgiFBejkRoB4gQYjaHLFQqI="; + hash = "sha256-PQOWR1teLZ2npQV+q3K+DgiFBejkRoB4gQYjaHLFQqI="; }; propagatedBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycomfoconnect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycomfoconnect/default.nix index 79cc0334c2..a325583648 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycomfoconnect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycomfoconnect/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "michaelarnauts"; repo = "comfoconnect"; rev = "refs/tags/${version}"; - sha256 = "sha256-I/0vCgSEi6mgYg1fMH4Ha7PoonewtqYYsvXZT8y4rJE="; + hash = "sha256-I/0vCgSEi6mgYg1fMH4Ha7PoonewtqYYsvXZT8y4rJE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycotap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycotap/default.nix index df7591459e..4fb1ff112a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycotap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycotap/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-+Tjs1JMczRnZWY+2M9Xqu3k48IuEcXMV5SUmqmJ3yew="; + hash = "sha256-+Tjs1JMczRnZWY+2M9Xqu3k48IuEcXMV5SUmqmJ3yew="; }; meta = with lib; { 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 946f58ba05..95f74e68bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycountry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycountry/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-shY6JGxYWJTYCPGHg+GRN8twoMGPs2dI3AH8bxCcFkY="; + hash = "sha256-shY6JGxYWJTYCPGHg+GRN8twoMGPs2dI3AH8bxCcFkY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycritty/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycritty/default.nix index e02a69933f..726e47bf1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycritty/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycritty/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Lh2zAEJTyzI8dJTNuyaf7gzhySMpui+CF9qRiubwFhE="; + hash = "sha256-Lh2zAEJTyzI8dJTNuyaf7gzhySMpui+CF9qRiubwFhE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycsdr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycsdr/default.nix index 14958299c3..3ee5b1449a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycsdr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycsdr/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "jketterl"; repo = "pycsdr"; rev = version; - sha256 = "sha256-OyfcXCcbvOOhBUkbAba3ayPzpH5z2nJWHbR6GcrCMy8="; + hash = "sha256-OyfcXCcbvOOhBUkbAba3ayPzpH5z2nJWHbR6GcrCMy8="; }; propagatedBuildInputs = [ csdr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyctr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyctr/default.nix index 3817342be3..bf72bf6b3a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyctr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyctr/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-05lMcsIeJIHI3LwHQTjr4M+bn1FG+GQscuGq34XxjK8="; + hash = "sha256-05lMcsIeJIHI3LwHQTjr4M+bn1FG+GQscuGq34XxjK8="; }; propagatedBuildInputs = [ pycryptodomex ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix index 49fc12e172..06f3afb64d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix @@ -2,7 +2,7 @@ , addOpenGLRunpath , fetchPypi , fetchFromGitHub -, Mako +, mako , boost , numpy , pytools @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-zZLnJGu0WsNFKVWhEHFBEmdM3ztKni9P8lpBWcaE5rs="; + hash = "sha256-zZLnJGu0WsNFKVWhEHFBEmdM3ztKni9P8lpBWcaE5rs="; }; preConfigure = with lib.versions; '' @@ -71,7 +71,7 @@ buildPythonPackage rec { cudatoolkit compyte python - Mako + mako ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix index 68e710cf34..f9dd03be57 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qGOtGP9Hj1VFkkBXiHza5CLhsnRuQWdGFfaHSY6luIo="; + hash = "sha256-qGOtGP9Hj1VFkkBXiHza5CLhsnRuQWdGFfaHSY6luIo="; }; patches = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { (fetchpatch { name = "curl-3.83.patch"; url = "https://github.com/pycurl/pycurl/commit/d47c68b1364f8a1a45ab8c584c291d44b762f7b1.patch"; - sha256 = "sha256-/lGq7O7ZyytzBAxWJPigcWdvypM7OHLBcp9ItmX7z1g="; + hash = "sha256-/lGq7O7ZyytzBAxWJPigcWdvypM7OHLBcp9ItmX7z1g="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydal/default.nix index 0420c3fd4f..b5de4635b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydal/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-fD6JHHD42JGONidvIQoZWbt7rfOydvRxkZhv/PW2o5A="; + hash = "sha256-fD6JHHD42JGONidvIQoZWbt7rfOydvRxkZhv/PW2o5A="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydanfossair/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydanfossair/default.nix index 11332ecb6f..5ce5ebffea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydanfossair/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydanfossair/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "JonasPed"; repo = "pydanfoss-air"; rev = "v${version}"; - sha256 = "sha256-WTRiEQbd3wwNAz1gk0rS3khy6lg61rcGZQTMlBc0uO8="; + hash = "sha256-WTRiEQbd3wwNAz1gk0rS3khy6lg61rcGZQTMlBc0uO8="; }; # Project has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix index 93af15c4e0..2de8e95d8b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix @@ -26,11 +26,12 @@ , ujson , orjson , hypothesis +, libxcrypt }: buildPythonPackage rec { pname = "pydantic"; - version = "1.10.4"; + version = "1.10.5"; outputs = [ "out" @@ -44,13 +45,17 @@ buildPythonPackage rec { owner = "samuelcolvin"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-BFyv1uVq2pLcJeS5955G/pDA3ce9YTqZ6F7kAkwnuvY="; + hash = "sha256-hcjnFqHTQiCIJh7L9JfpHHTm8GEZ+Vac6HO59cbEpWM="; }; postPatch = '' sed -i '/flake8/ d' Makefile ''; + buildInputs = lib.optionals (pythonOlder "3.9") [ + libxcrypt + ]; + nativeBuildInputs = [ cython ] ++ lib.optionals withDocs [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index 93869a3930..830d7bde55 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pydata-sphinx-theme"; - version = "0.13.0"; + version = "0.13.1"; format = "wheel"; @@ -22,7 +22,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "pydata_sphinx_theme"; - sha256 = "sha256-+ITUC7adMdlk/xnWBk97zqqmNBk1/bwJLVwknR/wC1I="; + hash = "sha256-zinB3nlh1hbfol9MOpYZgY1LstSpmF7QeDZ68pT7zMI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydeck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydeck/default.nix index f38723f3fa..1a0e86e5f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydeck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydeck/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { # fixes build with latest setuptools (fetchpatch { url = "https://github.com/visgl/deck.gl/commit/9e68f73b28aa3bf0f2a887a4d8ccd2dc35677039.patch"; - sha256 = "sha256-YVVoVbVdY5nV+17OwYIs9AwKGyzgKZHi655f4BLcdMU="; + hash = "sha256-YVVoVbVdY5nV+17OwYIs9AwKGyzgKZHi655f4BLcdMU="; stripLen = 2; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix index 3ccb8960f5..a0d41e0a56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "108"; + version = "110"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-CPFkfVwvk0AO/DoE1Nj1jLdLvuOpRzndmRK/M6SSGtk="; + hash = "sha256-2eHKFq+urzJS3K55O0hca0h4ElowJZD6nIkYkzyBFCM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydevd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydevd/default.nix index f595eb5d0b..bb98d2bf55 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydevd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydevd/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "fabioz"; repo = "PyDev.Debugger"; rev = "pydev_debugger_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-+yRngN10654trB09ZZa8QQsTPdM7VxVj7r6jh7OcgAA="; + hash = "sha256-+yRngN10654trB09ZZa8QQsTPdM7VxVj7r6jh7OcgAA="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydexcom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydexcom/default.nix index f79cfc9493..412373f09a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydexcom/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydexcom/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "gagebenne"; repo = pname; rev = version; - sha256 = "sha256-ItDGnUUUTwCz4ZJtFVlMYjjoBPn2h8QZgLzgnV2T/Qk="; + hash = "sha256-ItDGnUUUTwCz4ZJtFVlMYjjoBPn2h8QZgLzgnV2T/Qk="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydigiham/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydigiham/default.nix index da8056e8a2..8ae69c9bf5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydigiham/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydigiham/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "jketterl"; repo = "pydigiham"; rev = version; - sha256 = "sha256-kiEvQl3SuDnHI4Fh97AarsszHGFt7tbWBvBRW84Qv18="; + hash = "sha256-kiEvQl3SuDnHI4Fh97AarsszHGFt7tbWBvBRW84Qv18="; }; propagatedBuildInputs = [ digiham ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydispatcher/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydispatcher/default.nix index 1705fe918f..ad39feabd0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydispatcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydispatcher/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "2.0.6"; + version = "2.0.7"; pname = "pydispatcher"; src = fetchPypi { pname = "PyDispatcher"; inherit version; - hash = "sha256-PX5PQ8cAAKHcox+SaU6Z0BAZNPpuq11UVadYhY2G35U="; + hash = "sha256-t3fGrQgNwbrXSkwp1qRpFPpnAaxw+UsNZvvP3mL1vjE="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix index 4a5b693ef4..62905e2a08 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix @@ -1,32 +1,49 @@ { lib , buildPythonPackage -, isPy3k +, pythonOlder , fetchFromGitHub +, poetry-core , snowballstemmer +, tomli , pytestCheckHook }: buildPythonPackage rec { pname = "pydocstyle"; - version = "6.1.1"; - disabled = !isPy3k; + version = "6.3.0"; + format = "pyproject"; - format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "PyCQA"; - repo = pname; - rev = version; - sha256 = "sha256-j0WMD2qKDdMaKG2FxrrM/O7zX4waJ1afaRPRv70djkE="; + repo = "pydocstyle"; + rev = "refs/tags/${version}"; + hash = "sha256-MjRrnWu18f75OjsYIlOLJK437X3eXnlW8WkkX7vdS6k="; }; + nativeBuildInputs = [ + poetry-core + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0-dev"' 'version = "${version}"' + ''; + propagatedBuildInputs = [ snowballstemmer + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + passthru.optional-dependencies.toml = [ + tomli ]; nativeCheckInputs = [ pytestCheckHook - ]; + ] ++ passthru.optional-dependencies.toml; disabledTestPaths = [ "src/tests/test_integration.py" # runs pip install @@ -35,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python docstring style checker"; homepage = "https://github.com/PyCQA/pydocstyle"; + changelog = "https://github.com/PyCQA/pydocstyle/blob/${version}/docs/release_notes.rst"; license = licenses.mit; maintainers = with maintainers; [ dzabraev ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydsdl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydsdl/default.nix index b1c6fab9f8..00b74059c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydsdl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydsdl/default.nix @@ -9,7 +9,7 @@ owner = "UAVCAN"; repo = pname; rev = version; - sha256 = "sha256-5AwwqduIvLSZk6WcI59frwRKwjniQXfNWWVsy6V6I1E="; + hash = "sha256-5AwwqduIvLSZk6WcI59frwRKwjniQXfNWWVsy6V6I1E="; }; # allow for writable directory for darwin 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 265493d01d..69314340cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-e/Ssfd5llioA7ccLULlRdHR113IbR4AJ4/HmzQuU7vI="; + hash = "sha256-e/Ssfd5llioA7ccLULlRdHR113IbR4AJ4/HmzQuU7vI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyeapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyeapi/default.nix index b33e4d7035..f7923144ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyeapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyeapi/default.nix @@ -41,12 +41,12 @@ buildPythonPackage rec { (fetchpatch { name = "fix-collection-usage.patch"; url = "https://github.com/arista-eosplus/pyeapi/commit/81754f57eb095703cc474f527a0915360af76f68.patch"; - sha256 = "sha256-ZNBTPRNmXCFVJeRAJxzIHmCOXZiGwU6t4ekSupU3BX8="; + hash = "sha256-ZNBTPRNmXCFVJeRAJxzIHmCOXZiGwU6t4ekSupU3BX8="; }) (fetchpatch { name = "fix-collection-usage-2.patch"; url = "https://github.com/arista-eosplus/pyeapi/commit/cc9c584e4a3167e3c1624cccb6bc0d9c9bcdbc1c.patch"; - sha256 = "sha256-EY0i1Skm1llEQAAzvrb2yelhhLBkqKAFJB5ObAIxAYo="; + hash = "sha256-EY0i1Skm1llEQAAzvrb2yelhhLBkqKAFJB5ObAIxAYo="; excludes = [ ".github/workflows/ci.yml" ]; @@ -54,7 +54,7 @@ buildPythonPackage rec { (fetchpatch { name = "fix-collection-usage-3.patch"; url = "https://github.com/arista-eosplus/pyeapi/commit/dc35ab076687ea71665ae9524480b05a4e893909.patch"; - sha256 = "sha256-xPaYULCPTxiQGB9Im/qLet+XebW9wq+TAfrxcgQxcoE="; + hash = "sha256-xPaYULCPTxiQGB9Im/qLet+XebW9wq+TAfrxcgQxcoE="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyebus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyebus/default.nix index 5506c1fbf3..8659f0a38e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyebus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyebus/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-6ooOSJAIi8vYmCjDHnbMGQJfPqPmzA5thDSg+iM7T+8="; + hash = "sha256-6ooOSJAIi8vYmCjDHnbMGQJfPqPmzA5thDSg+iM7T+8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyeclib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyeclib/default.nix index 4741f4a399..b9061f3a5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyeclib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyeclib/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "openstack"; repo = "pyeclib"; rev = "b50040969a03f7566ffcb468336e875d21486113"; - sha256 = "sha256-nYYjocStC0q/MC6pum3J4hlXiu/R5xODwIE97Ho3iEY="; + hash = "sha256-nYYjocStC0q/MC6pum3J4hlXiu/R5xODwIE97Ho3iEY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyefergy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyefergy/default.nix index 7b7e587fed..87f2abda0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyefergy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyefergy/default.nix @@ -22,6 +22,12 @@ buildPythonPackage rec { hash = "sha256-AdoM+PcVoajxhnEfkyN9UuNufChu8XGmZDLNC3mjrps="; }; + postPatch = '' + # setuptools.extern.packaging.version.InvalidVersion: Invalid version: 'master' + substituteInPlace setup.py \ + --replace 'version="master",' 'version="${version}",' + ''; + propagatedBuildInputs = [ aiohttp iso4217 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyeight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyeight/default.nix index c550da4761..3dec94efd3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyeight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyeight/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mezz64"; repo = "pyEight"; rev = version; - sha256 = "sha256-JYmhEZQw11qPNV2jZhP+0VFb387kNom70R3C13PM7kc="; + hash = "sha256-JYmhEZQw11qPNV2jZhP+0VFb387kNom70R3C13PM7kc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyemby/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyemby/default.nix index d197b62b21..db1ec84013 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyemby/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyemby/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "mezz64"; repo = pname; rev = version; - sha256 = "sha256-EpmXdyKtfb/M8rTv6YrfNCpDmKei2AD5DBcdVvqCVWw="; + hash = "sha256-EpmXdyKtfb/M8rTv6YrfNCpDmKei2AD5DBcdVvqCVWw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyenvisalink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyenvisalink/default.nix index d0237e4f26..8ea5a09e0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyenvisalink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyenvisalink/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-CQvomHYNMrf0oQjNCcLyisxIV2+3TOgEPzA9seZYsOs="; + hash = "sha256-CQvomHYNMrf0oQjNCcLyisxIV2+3TOgEPzA9seZYsOs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyevilgenius/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyevilgenius/default.nix index b59f2ad4fe..079b182544 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyevilgenius/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyevilgenius/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-wjC32oq/lW3Z4XB+4SILRKIOuCgBKk1gruOo4uc/4/o="; + hash = "sha256-wjC32oq/lW3Z4XB+4SILRKIOuCgBKk1gruOo4uc/4/o="; }; propagatedBuildInputs = [ 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 840a74f252..b0fc0a773e 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 @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-9ghL8a+l+/TGHPffRDcPpROCGvGIsC4+GbXvtm2Klp8="; + hash = "sha256-9ghL8a+l+/TGHPffRDcPpROCGvGIsC4+GbXvtm2Klp8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel/default.nix index 83b5254d39..5efcb6d936 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-+/Du5dk7ls728ZqfAHA/IsCmTxlyjZG5VCgAmlISlwk="; + hash = "sha256-+/Du5dk7ls728ZqfAHA/IsCmTxlyjZG5VCgAmlISlwk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix index 4f7e62450a..3965a31e58 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix @@ -3,6 +3,7 @@ , fetchPypi , nose , numpy +, setuptools , setuptools-scm , six , glibcLocales @@ -11,15 +12,16 @@ buildPythonPackage rec { pname = "pyfaidx"; - version = "0.7.1"; - format = "setuptools"; + version = "0.7.2.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OXdjK3/SkEn4sRA11+neoOLF2pwjX5grTD+uBv8foj8="; + hash = "sha256-MPDSCp49UzU/sg62m34i5vAaU+1PIbPhfdQI8L5QUaA="; }; nativeBuildInputs = [ + setuptools setuptools-scm ]; 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 f833e8c24e..416ec7c39b 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 = "5.0.0"; + version = "5.1.0"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GdHY8e5SCJHXi27QXCB44HktVF+D3uM0YfuqXMcuGH0="; + hash = "sha256-MWxgJmQNFKa0+95x/ZZ0V20bVxDe2o+r3oqtUdeF28M="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix index 976ecfa5c6..e47184f9b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-CRVekKDG0MHy0fNmgYCn3pX7n4P+9RN6ES+wWXjocyA="; + hash = "sha256-CRVekKDG0MHy0fNmgYCn3pX7n4P+9RN6ES+wWXjocyA="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfido/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfido/default.nix index a850030274..d6f5207bce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfido/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfido/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-hh2g46GVCkiMHElEP6McY8FdzGNzZV7pgA5DQhodP20="; + hash = "sha256-hh2g46GVCkiMHElEP6McY8FdzGNzZV7pgA5DQhodP20="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfireservicerota/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfireservicerota/default.nix index 9f6d85fc56..deda70651a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfireservicerota/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfireservicerota/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-3+QK1BVuWYii0oYT4xXMOYJZmVKrB4EmqE0EkdFlZvE="; + hash = "sha256-3+QK1BVuWYii0oYT4xXMOYJZmVKrB4EmqE0EkdFlZvE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix index e59381a136..1459c88a68 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ChrisMandich"; repo = "PyFlume"; rev = "v${version}"; - sha256 = "sha256-Ka90n9Esv6tm310DjYeosBUhudeVoEJzt45L40+0GwQ="; + hash = "sha256-Ka90n9Esv6tm310DjYeosBUhudeVoEJzt45L40+0GwQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygal/default.nix index 29b3743be0..6c5de6581d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygal/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-KSP5XS5RWTCqWplyGdzO+/PZK36vX8HJ/ruVsJk1/bI="; + hash = "sha256-KSP5XS5RWTCqWplyGdzO+/PZK36vX8HJ/ruVsJk1/bI="; }; postPatch = '' 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 80a8f4eaad..e7539a8145 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 @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pygame-gui"; - version = "067"; + version = "068"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "MyreMylar"; repo = "pygame_gui"; rev = "refs/tags/v_${version}"; - sha256 = "sha256-ZBd9jq+20A8kxsvZxuCIfyzuZvk5/73vhh4xmExuwGQ="; + hash = "sha256-BCgSCOnuIqjpROpEtkzkvIXK7dIO0dNYsPmQSwXfmTQ="; }; propagatedBuildInputs = [ pygame python-i18n ]; 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 7155ec3778..140b233e34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix @@ -1,12 +1,16 @@ { stdenv, lib, substituteAll, fetchFromGitHub, buildPythonPackage, python, pkg-config, libX11 , SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, libpng, libjpeg, portmidi, freetype, fontconfig , AppKit -, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { pname = "pygame"; - version = "2.1.2"; + version = "2.2.0"; + + disabled = pythonOlder "3.6"; + + format = "setuptools"; src = fetchFromGitHub { owner = pname; @@ -15,7 +19,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-v1z6caEMJNXqbcbTmFXoy3KQewHiz6qK4vhNU6Qbukk="; + hash = "sha256-SMkY3uN3kAlb/pbm047W0G8MJ7G8mCsfGVSPhzd5aEo="; postFetch = "rm -rf $out/docs/reST"; }; @@ -76,7 +80,5 @@ buildPythonPackage rec { license = licenses.lgpl21Plus; maintainers = with maintainers; [ emilytrau ]; platforms = platforms.unix; - # fatal error: longintrepr.h: No such file or directory. - broken = pythonAtLeast "3.11"; # At 2022-02-27 }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame/fix-dependency-finding.patch b/third_party/nixpkgs/pkgs/development/python-modules/pygame/fix-dependency-finding.patch index a756cb8e5d..5e39dff135 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygame/fix-dependency-finding.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame/fix-dependency-finding.patch @@ -1,11 +1,11 @@ diff --git a/buildconfig/config_darwin.py b/buildconfig/config_darwin.py -index c785e183..37d5cea4 100644 +index 9503ea70..d0d3ab6e 100644 --- a/buildconfig/config_darwin.py +++ b/buildconfig/config_darwin.py -@@ -146,16 +146,8 @@ def main(): +@@ -140,16 +140,8 @@ def main(auto_config=False): ]) - print ('Hunting dependencies...') + print('Hunting dependencies...') - incdirs = ['/usr/local/include', '/opt/homebrew/include'] - incdirs.extend(['/usr/local/include/SDL2', '/opt/homebrew/include/SDL2', '/opt/local/include/SDL2']) - @@ -22,10 +22,10 @@ index c785e183..37d5cea4 100644 for d in DEPS: if isinstance(d, (list, tuple)): diff --git a/buildconfig/config_unix.py b/buildconfig/config_unix.py -index 5c50bcdc..2fd69e2d 100644 +index 3eba5b5c..53cc6233 100644 --- a/buildconfig/config_unix.py +++ b/buildconfig/config_unix.py -@@ -210,18 +210,8 @@ def main(): +@@ -240,11 +240,8 @@ def main(auto_config=False): if not DEPS[0].found: raise RuntimeError('Unable to run "sdl-config". Please make sure a development version of SDL is installed.') @@ -34,13 +34,6 @@ index 5c50bcdc..2fd69e2d 100644 - for extrabase in extrabases: - incdirs += [extrabase + d for d in origincdirs] - libdirs += [extrabase + d for d in origlibdirs] -- incdirs += ["/usr"+d for d in origincdirs] -- libdirs += ["/usr"+d for d in origlibdirs] -- incdirs += ["/usr/local"+d for d in origincdirs] -- libdirs += ["/usr/local"+d for d in origlibdirs] -- if localbase: -- incdirs = [localbase+d for d in origincdirs] -- libdirs = [localbase+d for d in origlibdirs] + incdirs = @buildinputs_include@ + libdirs = @buildinputs_lib@ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix index 1ef91e080f..68636139c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz"; - sha256 = "sha256-BpETor1dz8qdMM8iYijlthnsrPF0FS8b1FDvuXxFB9s="; + hash = "sha256-BpETor1dz8qdMM8iYijlthnsrPF0FS8b1FDvuXxFB9s="; }; # force rebuild of headers needed for install diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygdbmi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygdbmi/default.nix index af32883575..d1b5b31ed9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygdbmi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygdbmi/default.nix @@ -3,20 +3,21 @@ , buildPythonPackage , fetchFromGitHub , gdb +, pytest }: buildPythonPackage rec { pname = "pygdbmi"; - version = "0.10.0.0"; + version = "0.11.0.0"; src = fetchFromGitHub { owner = "cs01"; repo = "pygdbmi"; - rev = version; - sha256 = "0a6b3zyxwdcb671c6lrwxm8fhvsbjh0m8hf1r18m9dha86laimjr"; + rev = "refs/tags/v${version}"; + hash = "sha256-JqEDN8Pg/JttyYQbwkxKkLYuxVnvV45VlClD23eaYyc="; }; - nativeCheckInputs = [ gdb ]; + nativeCheckInputs = [ gdb pytest ]; # tests require gcc for some reason doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygetwindow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygetwindow/default.nix index 3ca4621157..3ffd83ee00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygetwindow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygetwindow/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-F4lDVefSswXNgy1xdwg4QBfBaYqQziT29/vwJC3Qpog="; + hash = "sha256-F4lDVefSswXNgy1xdwg4QBfBaYqQziT29/vwJC3Qpog="; }; doCheck = false; 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 bf35421b6b..a9b9ed15b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix @@ -6,7 +6,7 @@ , cffi , fetchPypi , isPyPy -, libgit2 +, libgit2_1_5 , pycparser , pytestCheckHook , pythonOlder @@ -25,11 +25,11 @@ buildPythonPackage rec { }; preConfigure = lib.optionalString stdenv.isDarwin '' - export DYLD_LIBRARY_PATH="${libgit2}/lib" + export DYLD_LIBRARY_PATH="${libgit2_1_5}/lib" ''; buildInputs = [ - libgit2 + libgit2_1_5 ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyGithub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygithub/default.nix similarity index 88% rename from third_party/nixpkgs/pkgs/development/python-modules/pyGithub/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/pygithub/default.nix index 7facf0c003..798bd09972 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyGithub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygithub/default.nix @@ -10,8 +10,8 @@ }: buildPythonPackage rec { - pname = "PyGithub"; - version = "1.57"; + pname = "pygithub"; + version = "1.58.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "PyGithub"; repo = "PyGithub"; rev = "refs/tags/v${version}"; - sha256 = "sha256-7CNvSOwDXXcJ082/Fmgr6OtTQeA30yDjt/Oq2nx4vEk="; + hash = "sha256-DZmKF0C5zexTQ/kbDtTg0FLEocNU4dYMOFCJyvuiV98="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyglet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyglet/default.nix index 82ccd411e8..cddd855bec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyglet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyglet/default.nix @@ -18,13 +18,13 @@ }: buildPythonPackage rec { - version = "2.0.2.1"; + version = "2.0.4"; pname = "pyglet"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WonGjdooD3Yb3rAha536An+y4nUZoOo8FvZViyBPHl8="; + hash = "sha256-+JGAjBv2XHzFExsLJrBH6uXPN8fiUycJZKxLLwFHdPI="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix index 199082cae1..5560e855d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pygls"; - version = "1.0.0"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "openlawlibrary"; repo = "pygls"; - rev = "v${version}"; - hash = "sha256-31J4+giK1RDBS52Q/Ia3Y/Zak7fp7gRVTQ7US/eFjtM="; + rev = "refs/tags/v${version}"; + hash = "sha256-ovm897Vu6HRziGee3NioM1BA65mLe3F5Z2k0E+A35Gs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygmars/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygmars/default.nix index 4b0a701c79..63b4eadd51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygmars/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygmars/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "nexB"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-PiH1lV1Vt9VTSOB+jep8FHIdk8qnauxj4nP3CIi/m7o="; + hash = "sha256-PiH1lV1Vt9VTSOB+jep8FHIdk8qnauxj4nP3CIi/m7o="; }; dontConfigure = true; 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 22193faab8..5015acb03f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygments/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygments/default.nix @@ -10,12 +10,12 @@ let pygments = buildPythonPackage rec { pname = "pygments"; - version = "2.13.0"; + version = "2.14.0"; src = fetchPypi { pname = "Pygments"; inherit version; - sha256 = "sha256-VqhQiulfmOK5vfk6a+WuP32K+Fi0PgLFov8INya+QME="; + hash = "sha256-s+0GqeismpquWm9dvniopYZV0XtDuTwHjwlN3Edq4pc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygmo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygmo/default.nix index b06cb54300..15fe2d6747 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygmo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygmo/default.nix @@ -18,13 +18,13 @@ toPythonModule (stdenv.mkDerivation rec { pname = "pygmo"; - version = "2.18.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "esa"; repo = "pygmo2"; - rev = "v${version}"; - sha256 = "sha256-he7gxRRJd6bBrD0Z0i+CQTr5JH4P3Im/beNGO+HfmNM="; + rev = "refs/tags/v${version}"; + hash = "sha256-gjmZf66AcNaAMqyLerBgRu5RUzV6qrT7DigTNE39AwI="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix index 43f6b20732..6ef799c997 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "GenericMappingTools"; repo = "pygmt"; rev = "refs/tags/v${version}"; - sha256 = "sha256-wbqJaibRZW7qiNyLArr7I/dzHprILHQpORtdHWkIfSE="; + hash = "sha256-wbqJaibRZW7qiNyLArr7I/dzHprILHQpORtdHWkIfSE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygti/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygti/default.nix index 29fc09120f..5493a243ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygti/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygti/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vigonotion"; repo = "pygti"; rev = "refs/tags/v${version}"; - sha256 = "sha256-5Pc6gAI3xICS+f7tYwC9OVOAHJSW8AGPOvPYs0/6/iI="; + hash = "sha256-5Pc6gAI3xICS+f7tYwC9OVOAHJSW8AGPOvPYs0/6/iI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygtkspellcheck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygtkspellcheck/default.nix index 0f3017f437..767eb706bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygtkspellcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygtkspellcheck/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-hIHf1LBmFhPWN138jaAAOpmx+frbe6XM22+jG+OWcvw="; + hash = "sha256-hIHf1LBmFhPWN138jaAAOpmx+frbe6XM22+jG+OWcvw="; }; nativeBuildInputs = [ gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygtrie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygtrie/default.nix index c7738a9f3e..2261129674 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygtrie/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygtrie/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IDUUrYJutAPasdLi3dA04NFTS75NvgITuwWT9mvrpOI="; + hash = "sha256-IDUUrYJutAPasdLi3dA04NFTS75NvgITuwWT9mvrpOI="; }; meta = { homepage = "https://github.com/mina86/pygtrie"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhanko-certvalidator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhanko-certvalidator/default.nix index 1375b44258..9509f82494 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhanko-certvalidator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhanko-certvalidator/default.nix @@ -5,16 +5,18 @@ , aiohttp , asn1crypto , cryptography +, freezegun , oscrypto , requests , uritools , openssl +, pytest-asyncio , pytestCheckHook }: buildPythonPackage rec { pname = "pyhanko-certvalidator"; - version = "0.19.5"; + version = "0.20.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +26,7 @@ buildPythonPackage rec { owner = "MatthiasValvekens"; repo = "certvalidator"; rev = version; - sha256 = "sha256-UxlBggKgqvbKioG98UaKvhW0YgEa6PqV913nqYvTx1I="; + hash = "sha256-0RSveoSZb7R6d4cMlF1mIrDfnTx2DYNwfTMMtmg+RpM="; }; propagatedBuildInputs = [ @@ -37,12 +39,12 @@ buildPythonPackage rec { nativeCheckInputs = [ aiohttp + freezegun + pytest-asyncio pytestCheckHook ]; disabledTestPaths = [ - # Test looks for libcrypto.so.1.1 - "dev/stress_test.py" # Requests "tests/test_crl_client.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhanko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhanko/default.nix index 2fd3373abd..a7f6d4aaf7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhanko/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhanko/default.nix @@ -17,24 +17,21 @@ , pytest-aiohttp , requests-mock , pytestCheckHook -# Flags to add to the library -, extraPubkeyAlgsSupport ? false + +# optionals +, defusedxml , oscrypto -, opentypeSupport ? false , fonttools , uharfbuzz -, imageSupport ? false , pillow , python-barcode -, pkcs11Support ? false , python-pkcs11 -, asyncHttpSupport ? false , aiohttp }: buildPythonPackage rec { pname = "pyhanko"; - version = "0.12.1"; + version = "0.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -43,35 +40,48 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MatthiasValvekens"; repo = "pyHanko"; - rev = version; - sha256 = "sha256-W60NTKEtCqJ/QdtNiieKUsrl2jIjIH86Wych68R3mBc="; + rev = "refs/tags/${version}"; + hash = "sha256-tvb2zdmIN6MkezmLNkyCcP8EfqxrbPg/FEqgW16Ka6Q="; }; propagatedBuildInputs = [ + asn1crypto click + cryptography pyhanko-certvalidator pytz pyyaml qrcode + requests tzlocal - ] ++ lib.optionals (extraPubkeyAlgsSupport) [ - oscrypto - ] ++ lib.optionals (opentypeSupport) [ - fonttools - uharfbuzz - ] ++ lib.optionals (imageSupport) [ - pillow - python-barcode - ] ++ lib.optionals (pkcs11Support) [ - python-pkcs11 - ] ++ lib.optionals (asyncHttpSupport) [ - aiohttp ]; + passthru.optional-dependencies = { + extra_pubkey_algs = [ + oscrypto + ]; + xmp = [ + defusedxml + ]; + opentype = [ + fonttools + uharfbuzz + ]; + image-support = [ + pillow + python-barcode + ]; + pkcs11 = [ + python-pkcs11 + ]; + async_http = [ + aiohttp + ]; + }; + postPatch = '' substituteInPlace setup.py \ --replace ", 'pytest-runner'" "" \ - --replace "pytest-aiohttp~=0.3.0" "pytest-aiohttp~=1.0.3" ''; nativeCheckInputs = [ @@ -82,15 +92,11 @@ buildPythonPackage rec { pytest-aiohttp requests-mock pytestCheckHook - ]; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); - disabledTestPaths = lib.optionals (!opentypeSupport) [ - "pyhanko_tests/test_stamp.py" - "pyhanko_tests/test_text.py" - ] ++ lib.optionals (!imageSupport) [ - "pyhanko_tests/test_barcode.py" - ] ++ lib.optionals (!pkcs11Support) [ - "pyhanko_tests/test_pkcs11.py" + disabledTestPaths = [ + # ModuleNotFoundError: No module named 'csc_dummy' + "pyhanko_tests/test_csc.py" ]; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix index 38b71b80e7..edc05d1aca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-HMJqZn0yzN2dP5WTRCbem1Xw8nyH2Hy7oVP4kEKHHAo="; + hash = "sha256-HMJqZn0yzN2dP5WTRCbem1Xw8nyH2Hy7oVP4kEKHHAo="; }; propagatedBuildInputs = [ 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 51c8dae89f..3d56007686 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhocon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhocon/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "chimpler"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-H460j/DjY1lltapva3l87oyOJVjzUE9Q/oKti3SsUyU="; + hash = "sha256-H460j/DjY1lltapva3l87oyOJVjzUE9Q/oKti3SsUyU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix index dafdefb75b..299918b5a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "picklepete"; repo = pname; rev = version; - sha256 = "sha256-2E1pdHHt8o7CGpdG+u4xy5OyNCueUGVw5CY8oicYd5w="; + hash = "sha256-2E1pdHHt8o7CGpdG+u4xy5OyNCueUGVw5CY8oicYd5w="; }; propagatedBuildInputs = [ 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 400791197b..e7e9747d7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.3.3"; + version = "1.3.4"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-zbqgwCukTmvCIXpAvaKQl7voOI4ATqsT9NPUyRhw2EE="; + hash = "sha256-P/5kCXmUWQ/2yvzu/Pr0XBY8zm3fMMyoapGmdtRmxXo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyintesishome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyintesishome/default.nix index 3eb0b22b52..ceac634b32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyintesishome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyintesishome/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "jnimmo"; repo = "pyIntesisHome"; rev = "refs/tags/${version}"; - sha256 = "sha256-+pXGB7mQszbBp4KhOYzDKoGFoUHATWLbOU6QwMIpGWU="; + hash = "sha256-+pXGB7mQszbBp4KhOYzDKoGFoUHATWLbOU6QwMIpGWU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyjet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyjet/default.nix index f7a2b7941a..102ccaf06c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyjet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyjet/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-0g0fCf0FIwde5Vsc/BJxjgMcs5llpD8JqOgFbMjOooc="; + hash = "sha256-0g0fCf0FIwde5Vsc/BJxjgMcs5llpD8JqOgFbMjOooc="; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyjnius/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyjnius/default.nix index 84f7a337a6..5d8d7f7da0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyjnius/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyjnius/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-/AY3zaSuEo7EqWrDJ9NS6H6oZnZLAdliZyhwvlOana4="; + hash = "sha256-/AY3zaSuEo7EqWrDJ9NS6H6oZnZLAdliZyhwvlOana4="; }; propagatedBuildInputs = [ six diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyjsparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyjsparser/default.nix index 7382f82c36..227cc14b4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyjsparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyjsparser/default.nix @@ -13,7 +13,7 @@ let pyjsparser = buildPythonPackage rec { owner = "PiotrDabkowski"; repo = pname; rev = "5465d037b30e334cb0997f2315ec1e451b8ad4c1"; - sha256 = "sha256-Hqay9/qsjUfe62U7Q79l0Yy01L2Bnj5xNs6427k3Br8="; + hash = "sha256-Hqay9/qsjUfe62U7Q79l0Yy01L2Bnj5xNs6427k3Br8="; }; nativeCheckInputs = [ pytestCheckHook js2py ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix index 721274c236..ac0a493cd6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyJWT"; inherit version; - sha256 = "sha256-aShcfjH8RPaKH+swnpSODfUyWdV5KV5s/isXkjKfBf0="; + hash = "sha256-aShcfjH8RPaKH+swnpSODfUyWdV5KV5s/isXkjKfBf0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykaleidescape/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykaleidescape/default.nix index d0eccbc183..b11f99b741 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykaleidescape/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykaleidescape/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pykaleidescape"; - version = "1.0.1"; + version = "2022.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SteveEasley"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KM/gtpsQ27QZz2uI1t/yVN5no0zp9LZag1duAJzK55g="; + hash = "sha256-h5G7wV4Z+sf8Qq4GNFsp8DVDSgQgS0dLGf+DzK/egYM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix index 99467ae52e..4a2300cda4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-eAtpPQVVuFfXqrMeNdQpO/Tr253sekW6S7I7RAD2Jtw="; + hash = "sha256-eAtpPQVVuFfXqrMeNdQpO/Tr253sekW6S7I7RAD2Jtw="; }; buildInputs = [ openmp ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykerberos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykerberos/default.nix index 67246ffbb1..bb16c04bec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykerberos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykerberos/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-nXAevY/FlsmdMVXVukWBO9WQjSbvg7oK3SUO22IqvtQ="; + hash = "sha256-nXAevY/FlsmdMVXVukWBO9WQjSbvg7oK3SUO22IqvtQ="; }; nativeBuildInputs = [ krb5 ]; # for krb5-config diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix index fac61d0b5d..dd6566548b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jodal"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-bvRjFpXufGygTgPfEOJOCXFbMy3dNlrTHlGoaIG/Fbs="; + hash = "sha256-bvRjFpXufGygTgPfEOJOCXFbMy3dNlrTHlGoaIG/Fbs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykmtronic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykmtronic/default.nix index 29a3f04e32..67f6da455e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykmtronic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykmtronic/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-8qLyBJp7C93x0PWbgDAtNEDJ5VLNfwZ3DRZfudRCBgo="; + hash = "sha256-8qLyBJp7C93x0PWbgDAtNEDJ5VLNfwZ3DRZfudRCBgo="; }; propagatedBuildInputs = [ aiohttp lxml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykodi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykodi/default.nix index 73508e3479..75dda69262 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykodi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykodi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-2fFkbZZ3RXMolaaGpkvvVfSYtNNB1bTsoRCin3GnVKM="; + hash = "sha256-2fFkbZZ3RXMolaaGpkvvVfSYtNNB1bTsoRCin3GnVKM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykoplenti/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykoplenti/default.nix index ba39dc536e..474b526abd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykoplenti/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykoplenti/default.nix @@ -6,20 +6,33 @@ , prompt-toolkit , pycryptodome , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pykoplenti"; version = "1.0.0"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "stegm"; repo = pname; - rev = "v${version}"; - sha256 = "12nsyz8a49vhby1jp991vaky82fm93jrgcsjzwa2rixwg1zql4sw"; + rev = "refs/tags/v${version}"; + hash = "sha256-XBOKf3i8xywU/1Kzl+VI1Qnkp9ohpSuDX3AnotD32oo="; }; + nativeBuildInputs = [ + setuptools + ]; + + postPatch = '' + # remove with 1.1.0 + substituteInPlace setup.cfg \ + --replace 'version = unreleased' 'version = ${version}' + ''; + propagatedBuildInputs = [ aiohttp click diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykulersky/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykulersky/default.nix index 9a4318a1a6..51973fde07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykulersky/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykulersky/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "emlove"; repo = pname; rev = version; - sha256 = "sha256-voD4tR+k5TKGjLXFK94GJy4+wUoP2cSFc5BWkCiinOg="; + hash = "sha256-voD4tR+k5TKGjLXFK94GJy4+wUoP2cSFc5BWkCiinOg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykwalify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykwalify/default.nix index 383de0aee3..41d6a09821 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykwalify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykwalify/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-eWsq0+1MuZuIMItTP7L1WcMPpu+0+p/aETR/SD0kWIQ="; + hash = "sha256-eWsq0+1MuZuIMItTP7L1WcMPpu+0+p/aETR/SD0kWIQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint-venv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint-venv/default.nix index ea361ed88e..e980c9573c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylint-venv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint-venv/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pylint-venv"; - version = "2.3.0"; + version = "3.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "jgosmann"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-x36OsTRzrN3NWrMpJ34ZHRsw4cQlo49AnJNr5kP8/aQ="; + hash = "sha256-GkUdIG+Mp2/POOPJZ/vtONYrd26GB44dxh9455aWZuU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix index bdc49c0413..39207c063f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix @@ -2,9 +2,7 @@ , lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder -, installShellFiles , astroid , dill , isort @@ -24,7 +22,7 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.15.9"; + version = "2.16.2"; format = "pyproject"; disabled = pythonOlder "3.7.2"; @@ -33,24 +31,10 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - hash = "sha256-T+om5rrG0Gjyr05L5X4j82/S11Q7JBUDNOm4gVEQ494="; + hash = "sha256-xNCGf4CsxEKScIn6dl2Ka31P6bhMo5fTs9TIQz+vPiM="; }; - patches = [ - (fetchpatch { - name = "fix-dummy-plugin-tests.patch"; - url = "https://github.com/PyCQA/pylint/commit/e75089bae209d1b9ca72903c0d65530b02f67fdf.patch"; - hash = "sha256-4ErlCMLTI5xIu1dCvcJsvo03dwcgLLbFFQ5M7DFdL3o="; - }) - (fetchpatch { - name = "fix-pythonpath-tests.patch"; - url = "https://github.com/PyCQA/pylint/commit/6725f761f2ac7a853e315790b496a2eb4d926694.patch"; - hash = "sha256-Xaeub7uUaC07BBuusA6+neGiXFWWfVNBkGXmYJe7ot4="; - }) - ]; - nativeBuildInputs = [ - installShellFiles setuptools ]; @@ -67,12 +51,6 @@ buildPythonPackage rec { typing-extensions ]; - postInstall = '' - mkdir -p $out/share/emacs/site-lisp - cp -v "elisp/"*.el $out/share/emacs/site-lisp/ - installManPage man/*.1 - ''; - nativeCheckInputs = [ gitpython # https://github.com/PyCQA/pylint/blob/main/requirements_test_min.txt @@ -84,6 +62,14 @@ buildPythonPackage rec { typing-extensions ]; + pytestFlagsArray = [ + # DeprecationWarning: pyreverse will drop support for resolving and + # displaying implemented interfaces in pylint 3.0. The + # implementation relies on the '__implements__' attribute proposed + # in PEP 245, which was rejected in 2006. + "-W" "ignore::DeprecationWarning" + ]; + dontUseSetuptoolsCheck = true; preCheck = '' @@ -107,6 +93,10 @@ buildPythonPackage rec { "test_output_of_callback_options" # Failed: DID NOT WARN. No warnings of type (,) were emitted. The list of emitted warnings is: []. "test_save_and_load_not_a_linter_stats" + # Truncated string expectation mismatch + "test_truncated_compare" + # AssertionError: assert [('specializa..., 'Ancestor')] == [('aggregatio..., 'Ancestor')] + "test_functional_relation_extraction" ] ++ lib.optionals stdenv.isDarwin [ "test_parallel_execution" "test_py3k_jobs_option" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylnk3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylnk3/default.nix index bfb1803198..ed50da8b07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylnk3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylnk3/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "pylnk3"; - sha256 = "sha256-yu4BNvYai3iBVNyOfAOsLd5XrcFw8cR4arRyFJHKbpk="; + hash = "sha256-yu4BNvYai3iBVNyOfAOsLd5XrcFw8cR4arRyFJHKbpk="; }; 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 02139d3682..5793cccd55 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 @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pylsp-mypy"; - version = "0.6.5"; + version = "0.6.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Richardk2n"; repo = "pylsp-mypy"; rev = "refs/tags/${version}"; - hash = "sha256-LQ9Kw/dG3XA67WaVObE72fxERb21eZzk+MCqIp2Qy0o="; + hash = "sha256-9B+GSEoQEqd1W/g0oup4xULKWOF0TgSG5DfBtyWA3vs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylsqpack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylsqpack/default.nix index 2b5e9f3757..73e54377e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylsqpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylsqpack/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-tnps4/aTfYUGgYJ3FL5zCqNhwEnjd1Lj7Z3xHn8jL/s="; + hash = "sha256-tnps4/aTfYUGgYJ3FL5zCqNhwEnjd1Lj7Z3xHn8jL/s="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylti/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylti/default.nix index b68695ad42..69e4af22cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylti/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylti/default.nix @@ -21,7 +21,7 @@ }: buildPythonPackage rec { - pname = "PyLTI"; + pname = "pylti"; version = "0.7.0"; disabled = !isPy27; @@ -38,7 +38,8 @@ buildPythonPackage rec { ]; src = fetchPypi { - inherit pname version; + pname = "PyLTI"; + inherit version; sha256 = "80938a235b1ab390f6889a95237d087ea7adde5cc50fcae9c80c49898e8ee78e"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylutron/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylutron/default.nix index e394986163..dfcc0a0579 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylutron/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylutron/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-DKwjBQXC7O/8bFxq5shJJxRV3HYgBeS7tJXg4m3vQMY="; + hash = "sha256-DKwjBQXC7O/8bFxq5shJJxRV3HYgBeS7tJXg4m3vQMY="; }; # Project has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylxd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylxd/default.nix index 6017d80199..bde5935d56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylxd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylxd/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "lxc"; repo = "pylxd"; rev = version; - sha256 = "sha256-eDRCJYjmBndMnSNuS6HD/2p/KhzqJq2qPAzMk7kC5UM="; + hash = "sha256-eDRCJYjmBndMnSNuS6HD/2p/KhzqJq2qPAzMk7kC5UM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylyrics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylyrics/default.nix index df511b1c4c..2528885e19 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylyrics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylyrics/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "PyLyrics"; inherit version; extension = "zip"; - sha256 = "sha256-xfNujvDtO0h6kkLONMGfloTkGKW7/9XTZ9wdFgS0zQs="; + hash = "sha256-xfNujvDtO0h6kkLONMGfloTkGKW7/9XTZ9wdFgS0zQs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix index 33799515c0..c976a53d68 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pymanopt"; - version = "2.0.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-VwCUqKI1PkR8nUVaa73bkTw67URKPaza3VU9g+rB+Mg="; + hash = "sha256-nbSxqMmYWi71s74bbB9LAlPKEslTqG/j266cLfNHrwg="; }; propagatedBuildInputs = [ numpy scipy torch ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymarshal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymarshal/default.nix index c273b379a8..57a806c60b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymarshal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymarshal/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "stargateaudio"; repo = pname; rev = version; - sha256 = "sha256-Ds8JV2mtLRcKXBvPs84Hdj3MxxqpeV5muKCSlAFCj1A="; + hash = "sha256-Ds8JV2mtLRcKXBvPs84Hdj3MxxqpeV5muKCSlAFCj1A="; }; postPatch = '' 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 d9b51d9d07..c8ccad6a52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-dU561/kOBW++mrfzX/kqNVPgi7m/QniBrCJxBD/fZ1Y="; + hash = "sha256-dU561/kOBW++mrfzX/kqNVPgi7m/QniBrCJxBD/fZ1Y="; }; 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 7515c8fe9d..4e00ecc836 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.7"; + version = "0.3.8"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1xreFjoHmdMirpxjVya30cw31fBaCPt877yqTr9By+A="; + hash = "sha256-CBPBmzghuc+kvBt50qmU+jHyUdGgLgNX3jcVm9CC7/Q="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix index b7f31adc8e..a58d565922 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { (fetchpatch { url = "https://github.com/inducer/pymbolic/commit/cb3d999e4788dad3edf053387b6064adf8b08e19.patch"; excludes = [ ".github/workflows/ci.yml" ]; - sha256 = "sha256-P0YjqAo0z0LZMIUTeokwMkfP8vxBXi3TcV4BSFaO1lU="; + hash = "sha256-P0YjqAo0z0LZMIUTeokwMkfP8vxBXi3TcV4BSFaO1lU="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix index 69f3f62fb5..05da3476ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -38,14 +38,14 @@ let in buildPythonPackage rec { pname = "pymdown-extensions"; - version = "9.9"; + version = "9.9.2"; format = "pyproject"; src = fetchFromGitHub { owner = "facelessuser"; repo = "pymdown-extensions"; rev = "refs/tags/${version}"; - sha256 = "sha256-JZtze6KjiBJGEQzA8lsTShhZu96wxAr4KeKzCe0A18Q="; + hash = "sha256-ld3NuBTjDJUN4ZK+eTwmmfzcB8XCtg8xaLMECo95+Cg="; }; nativeBuildInputs = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix index 9c7d2914cb..92451d351a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-VI9xhr2LlsvAac9kmo6ON33OSax0SGcJhJ/mOpnK1oQ="; + hash = "sha256-VI9xhr2LlsvAac9kmo6ON33OSax0SGcJhJ/mOpnK1oQ="; }; nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymetno/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymetno/default.nix index d11cf4917d..3b7a1ddb06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymetno/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymetno/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "PyMetno"; rev = "refs/tags/${version}"; - sha256 = "sha256-Do9RQS4gE2BapQtKQsnMzJ8EJzzxkCBA5r3z1zHXIsA="; + hash = "sha256-Do9RQS4gE2BapQtKQsnMzJ8EJzzxkCBA5r3z1zHXIsA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymitv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymitv/default.nix index 32f90d07dc..bc53a9e79a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymitv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymitv/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-0n4IS5W3nvYwKdl6FVf4upRrFDGdYHohsaXadFy8d8w="; + hash = "sha256-0n4IS5W3nvYwKdl6FVf4upRrFDGdYHohsaXadFy8d8w="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymoo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymoo/default.nix index 786c9ab463..134319d0a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymoo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymoo/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { owner = "anyoptimization"; repo = "pymoo"; rev = version; - sha256 = "sha256-dzKr+u84XmPShWXFjH7V9KzwJPGZz3msGOe1S7FlGTQ="; + hash = "sha256-dzKr+u84XmPShWXFjH7V9KzwJPGZz3msGOe1S7FlGTQ="; }; pymoo_data = fetchFromGitHub { owner = "anyoptimization"; repo = "pymoo-data"; rev = "33f61a78182ceb211b95381dd6d3edee0d2fc0f3"; - sha256 = "sha256-iGWPepZw3kJzw5HKV09CvemVvkvFQ38GVP+BAryBSs0="; + hash = "sha256-iGWPepZw3kJzw5HKV09CvemVvkvFQ38GVP+BAryBSs0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymsgbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymsgbox/default.nix index 760a339b90..a04923c181 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymsgbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymsgbox/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-IZQifei/96PW2lQYSHBaFV3LsqBu4SDZ8oCh1/USY/8="; + hash = "sha256-IZQifei/96PW2lQYSHBaFV3LsqBu4SDZ8oCh1/USY/8="; }; propagatedBuildInputs = [ tkinter ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymsteams/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymsteams/default.nix index 45aecdb00b..3672ce6285 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymsteams/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymsteams/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "rveachkc"; repo = pname; rev = version; - sha256 = "sha256-H1AEjUnEK+seKsnFnHpn1/aHxXcbyz67NbzhlGDtbk4="; + hash = "sha256-H1AEjUnEK+seKsnFnHpn1/aHxXcbyz67NbzhlGDtbk4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymumble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymumble/default.nix index 558d5c6bd9..ffb2f33b1b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymumble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymumble/default.nix @@ -1,23 +1,26 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub , isPy27 -, lib , opuslib , protobuf , pytestCheckHook , pycrypto +, pythonOlder }: buildPythonPackage rec { pname = "pymumble"; - version = "1.6.1"; - disabled = isPy27; + version = "1.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "azlux"; repo = "pymumble"; - rev = version; - sha256 = "1qbsd2zvwd9ksclgiyrl1z79ms0zximm4527mnmhvq36lykgki7s"; + rev = "refs/tags/${version}"; + hash = "sha256-NMp1yZ+R9vmne7old7z9UvcxSi6C044g68ZQsofT0gA="; }; postPatch = '' @@ -42,8 +45,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Python 3 version of pymumble, Mumble library used for multiple uses like making mumble bot."; + description = "Library to create mumble bots"; homepage = "https://github.com/azlux/pymumble"; + changelog = "https://github.com/azlux/pymumble/releases/tag/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ thelegy infinisil ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymvglive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymvglive/default.nix index e2c2e8f05a..f80a920631 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymvglive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymvglive/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { - pname = "PyMVGLive"; + pname = "pymvglive"; version = "1.1.4"; src = fetchPypi { - inherit pname version; + pname = "PyMVGLive"; + inherit version; sha256 = "0sh4xm74im9qxzpbrlc5h1vnpgvpybnpvdcav1iws0b561zdr08c"; }; 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 885486cbbc..f0d3436f35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "5.4.0"; + version = "5.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pynamodb"; repo = "PynamoDB"; rev = "refs/tags/${version}"; - hash = "sha256-N+WpQil/OJ2p81Dc2b6c5K03NjAUdpbS+gjPzdqLY4w="; + hash = "sha256-C44jMn8kwoM/dO43g9aQyqKGTrGV8oHrMhd8SZRpc/s="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix index dd290ad578..694459bf00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "pynest2d"; rev = version; - sha256 = "sha256-QQdTDhO4i9NVhegGTmdEQSNv3gooaZzTX/Rv86h3GEo="; + hash = "sha256-QQdTDhO4i9NVhegGTmdEQSNv3gooaZzTX/Rv86h3GEo="; }; propagatedBuildInputs = [ libnest2d sip_4 clipper ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynvim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynvim/default.nix index 6ae98eff28..a59c1a34b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynvim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynvim/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-OnlTeL3l6AkvvrOhqZvpxhPSaFVC8dsOXG/UZ+7Vbf8="; + hash = "sha256-OnlTeL3l6AkvvrOhqZvpxhPSaFVC8dsOXG/UZ+7Vbf8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix index bad74b2aed..c3f75acfc5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-0CeyG5WxCIufwngRf59ht8Z/jjOnh+n4P3NfD3GsMtA="; + hash = "sha256-0CeyG5WxCIufwngRf59ht8Z/jjOnh+n4P3NfD3GsMtA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynws/default.nix index 15044872a9..3931c416ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynws/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynws/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hAUD92wlQZ0BZ++e/KdIOgTzavmUkrH3esDhI3mbl5Y="; + hash = "sha256-hAUD92wlQZ0BZ++e/KdIOgTzavmUkrH3esDhI3mbl5Y="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynx584/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynx584/default.nix index 2ac855773e..e5f3a81218 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynx584/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynx584/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "kk7ds"; repo = pname; rev = version; - sha256 = "sha256-nF8+LbKqy/GrnPpykS5wEQMPoFYxi40pfM3Ys/UXCeo="; + hash = "sha256-nF8+LbKqy/GrnPpykS5wEQMPoFYxi40pfM3Ys/UXCeo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyocd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyocd/default.nix index d6bd079a04..699b6c3cf5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyocd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyocd/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { (fetchpatch { name = "libusb-package-optional.patch"; url = "https://github.com/pyocd/pyOCD/commit/0b980cf253e3714dd2eaf0bddeb7172d14089649.patch"; - sha256 = "sha256-B2+50VntcQELeakJbCeJdgI1iBU+h2NkXqba+LRYa/0="; + hash = "sha256-B2+50VntcQELeakJbCeJdgI1iBU+h2NkXqba+LRYa/0="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyocr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyocr/default.nix index 2922c03b05..fb82fc0530 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyocr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyocr/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "OpenPaperwork"; repo = "pyocr"; rev = version; - sha256 = "sha256-gIn50H9liQcTb7SzoWnBwm5LTvkr+R+5OPvITls1B/w="; + hash = "sha256-gIn50H9liQcTb7SzoWnBwm5LTvkr+R+5OPvITls1B/w="; }; patches = [ 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 ad24fbcbd2..8a23301415 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix @@ -5,7 +5,7 @@ , appdirs , cffi , decorator -, Mako +, mako , mesa_drivers , numpy , ocl-icd @@ -31,7 +31,7 @@ in buildPythonPackage rec { appdirs cffi decorator - Mako + mako numpy platformdirs pytools @@ -40,7 +40,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Sj2w/mG1zclSZ1Jt7r1xp+HXlWlNSw/idh8GMLzKNiE="; + hash = "sha256-Sj2w/mG1zclSZ1Jt7r1xp+HXlWlNSw/idh8GMLzKNiE="; }; # py.test is not needed during runtime, so remove it from `install_requires` diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix index 21812dd47f..65b04ab3c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyOpenGL-accelerate"; inherit version; - sha256 = "sha256-rYowAlbsolIoJh3hb3QeUaMPNPHhsc9oNZ9cYtvNzcM="; + hash = "sha256-rYowAlbsolIoJh3hb3QeUaMPNPHhsc9oNZ9cYtvNzcM="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix index 5ba33acd23..ecc0e307e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyOpenGL"; inherit version; - sha256 = "sha256-jqbIdzkn7adAW//G9buTvoFWmnsFyMrFDNlOlp3OXic="; + hash = "sha256-jqbIdzkn7adAW//G9buTvoFWmnsFyMrFDNlOlp3OXic="; }; propagatedBuildInputs = [ pillow ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyoutbreaksnearme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyoutbreaksnearme/default.nix index ff2a4a4323..4a653d0fe6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyoutbreaksnearme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyoutbreaksnearme/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-D7oXkKDSg+yF+j1WyG/VVY12hLU6oyhEtxLrF6IkMSA="; + hash = "sha256-D7oXkKDSg+yF+j1WyG/VVY12hLU6oyhEtxLrF6IkMSA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyowm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyowm/default.nix index 3282120a52..c43107599d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyowm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyowm/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "csparpa"; repo = pname; rev = version; - sha256 = "sha256-cSOhm3aDksLBChZzgw1gjUjLQkElR2/xGFMOb9K9RME="; + hash = "sha256-cSOhm3aDksLBChZzgw1gjUjLQkElR2/xGFMOb9K9RME="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyp/default.nix index fa7fcc6902..74782267db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyp/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyp"; - version = "1.0.0"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hauntsaninja"; repo = pname; - rev = "v${version}"; - sha256 = "09k7y77h7g4dg0x6lg9pn2ga9z7xiy4vlj15fj0991ffsi4ydqgm"; + rev = "refs/tags/v${version}"; + hash = "sha256-A1Ip41kxH17BakHEWEuymfa24eBEl5FIHAWL+iZFM4I="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ 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 fcf33dc941..e621a80d7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyparsing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyparsing/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pyparsing"; repo = pname; rev = "pyparsing_${version}"; - sha256 = "sha256-aCRyJQyLf8qQ6NO41q+HC856TjIHzIt0vyVBLV+3teE="; + hash = "sha256-aCRyJQyLf8qQ6NO41q+HC856TjIHzIt0vyVBLV+3teE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix index 3c6abd0cc7..eb614ec424 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { repo = pname; owner = "dcantrell"; rev = "v${version}"; - sha256 = "sha256-LfBLR0A/wnfBtXISAAY6Nl4vnk1rtY03F+PT8UIMrEs="; + hash = "sha256-LfBLR0A/wnfBtXISAAY6Nl4vnk1rtY03F+PT8UIMrEs="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypcap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypcap/default.nix index 77d27bdff1..ef973625ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypcap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypcap/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { repo = pname; # No release was tagged and PyPI doesn't contain tests. rev = "968859f0ffb5b7c990506dffe82457b7de23a026"; - sha256 = "sha256-NfyEC3qEBm6TjebcDIsoz8tJWaJ625ZFPfx7AMyynWE="; + hash = "sha256-NfyEC3qEBm6TjebcDIsoz8tJWaJ625ZFPfx7AMyynWE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypdf/default.nix new file mode 100644 index 0000000000..ad58e6c119 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypdf/default.nix @@ -0,0 +1,92 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# build-system +, flit-core + +# docs +, sphinxHook +, sphinx-rtd-theme +, myst-parser + +# propagates +, typing-extensions + +# optionals +, pycryptodome +, pillow + +# tests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pypdf"; + version = "3.5.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "py-pdf"; + repo = "pypdf"; + rev = "refs/tags/${version}"; + # fetch sample files used in tests + fetchSubmodules = true; + hash = "sha256-2Ewa6mTLSNiUFIplfmZDRXmoiX1IQMwg4wq5dAU0O+4="; + }; + + outputs = [ + "out" + "doc" + ]; + + nativeBuildInputs = [ + flit-core + + # docs + sphinxHook + sphinx-rtd-theme + myst-parser + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--disable-socket" "" + ''; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ + typing-extensions + ]; + + passthru.optional-dependencies = rec { + full = crypto ++ image; + crypto = [ + pycryptodome + ]; + image = [ + pillow + ]; + }; + + pythonImportsCheck = [ + "pypdf" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ passthru.optional-dependencies.full; + + pytestFlagsArray = [ + # don't access the network + "-m" "'not enable_socket'" + ]; + + meta = with lib; { + description = "A pure-python PDF library capable of splitting, merging, cropping, and transforming the pages of PDF files"; + homepage = "https://github.com/py-pdf/pypdf"; + changelog = "https://github.com/py-pdf/pypdf/blob/${src.rev}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix index a93653e7e8..9708ee4c69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix @@ -1,23 +1,26 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , pythonOlder -, glibcLocales , typing-extensions , unittestCheckHook }: buildPythonPackage rec { pname = "PyPDF2"; - version = "2.11.1"; + version = "3.0.1"; + + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PHut1RLCFxHrF4nC6tv5YnkonA+URS7lSoZHO/vv1zI="; + hash = "sha256-p0QI9pumJx9xuTUu9O0D3FOjGqQE0ptdMfU7/s/uFEA="; }; - LC_ALL = "en_US.UTF-8"; - buildInputs = [ glibcLocales ]; + nativeBuildInputs = [ + flit-core + ]; propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ typing-extensions diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypdf3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypdf3/default.nix index a4273497e3..0ac738f513 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypdf3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypdf3/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyPDF3"; inherit version; - sha256 = "sha256-yUbzJzQZ43JY415yJz9JkEqxVyPYenYcERXvmXmfjF8="; + hash = "sha256-yUbzJzQZ43JY415yJz9JkEqxVyPYenYcERXvmXmfjF8="; }; LC_ALL = "en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypemicro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypemicro/default.nix index e1d9d68e92..6accd0e943 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypemicro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypemicro/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pypemicro"; - version = "0.1.9"; + version = "0.1.11"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HouDBlqfokKhbdWWDCfaUJrqIEC5f+sSnVmsrRseFmU="; + hash = "sha256-KE085u9yIPsuEr41GNWwHFm6KAHggvqGqP9ChGRoLE0="; }; pythonImportsCheck = [ "pypemicro" ]; 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 9b337bf274..e039863351 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "mozillazg"; repo = "python-pinyin"; rev = "refs/tags/v${version}"; - sha256 = "sha256-gt0jrDPr6FeLB5P9HCSosCHb/W1sAKSusTrCpkqO26E="; + hash = "sha256-gt0jrDPr6FeLB5P9HCSosCHb/W1sAKSusTrCpkqO26E="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypiserver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypiserver/default.nix index c4a058dff1..e1bb5cd068 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypiserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypiserver/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-1tV3pVEC5sIjT0tjbujU7l41Jx7PQ1dCn4B1r94C9xE="; + hash = "sha256-1tV3pVEC5sIjT0tjbujU7l41Jx7PQ1dCn4B1r94C9xE="; }; nativeBuildInputs = [ setuptools-git ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypng/default.nix index ce8b8deffa..c79ec4f92a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypng/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypng/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "drj11"; repo = "pypng"; rev = "refs/tags/${pname}-${version}"; - sha256 = "sha256-JU1GCSTm2s6Kczn6aRcF5DizPJVpizNtnAMJxTBi9vo="; + hash = "sha256-JU1GCSTm2s6Kczn6aRcF5DizPJVpizNtnAMJxTBi9vo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypoolstation/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypoolstation/default.nix index 5c4703193a..02ce9804d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypoolstation/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypoolstation/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyPoolstation"; inherit version; - sha256 = "sha256-2smgsR5f2fzmutr4EjhyrFWrO9odTba0ux+0B6k3+9Y="; + hash = "sha256-2smgsR5f2fzmutr4EjhyrFWrO9odTba0ux+0B6k3+9Y="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix index 19e76acb9d..1cfb6d8568 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-izMaWtJdkLHMQbyq7o7n46xB8dOHXZ5uO0UXt+twjL4="; + hash = "sha256-izMaWtJdkLHMQbyq7o7n46xB8dOHXZ5uO0UXt+twjL4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyprecice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyprecice/default.nix index d9172c9595..0f82bf1a4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyprecice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyprecice/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyprecice"; - version = "2.5.0.1"; + version = "2.5.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "precice"; repo = "python-bindings"; rev = "refs/tags/v${version}"; - hash = "sha256-0dxWtlN3x3orBgtCTxTsql39+MBVsgeHO7gXjOO8qcA="; + hash = "sha256-ppDilMwRxVsikTFQMNRYL0G1/HvVomz2S/2yx43u000="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix index d0617dfced..6ca6ac25a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "pyproject-api"; - version = "1.2.1"; + version = "1.5.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pyproject-api"; rev = "refs/tags/${version}"; - hash = "sha256-IRNg0/lTWoS8znsbipZNoeun+uOpZtCApL4HkF2lwhU="; + hash = "sha256-VO+huA9i7uMpCVaWHC29XlfestSu+N9vWWHteY21uqs="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyproject-metadata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyproject-metadata/default.nix index 4704b4ef15..0111ad3e52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyproject-metadata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyproject-metadata/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyproject-metadata"; - version = "0.6.1"; + version = "0.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi rec { inherit pname version; - hash = "sha256-tfsJVDpkqRFl3+hXlnWfnkFe3Clr602zPR7PeGaoYr0="; + hash = "sha256-CpTxixCLmyHzomo9VB8FbDTtyxfchyoUShVhj+1672c="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyprosegur/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyprosegur/default.nix index 4e62265776..a1167b8344 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyprosegur/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyprosegur/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "dgomes"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Spxzyn0gZ1TIHrtt7W0j6VwKnm2Km5vLGZZ//HINyBA="; + hash = "sha256-Spxzyn0gZ1TIHrtt7W0j6VwKnm2Km5vLGZZ//HINyBA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix index e530df116c..9590b7d07b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix @@ -4,7 +4,7 @@ , django , fetchFromGitHub , jinja2 -, Mako +, mako , nose , pyramid , pyramid_mako @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "kakulukia"; repo = "pypugjs"; rev = "v${version}"; - sha256 = "sha256-6tIhKCa8wg01gNFygCS6GdUHfbWBu7wOZeMkCExRR34="; + hash = "sha256-6tIhKCa8wg01gNFygCS6GdUHfbWBu7wOZeMkCExRR34="; }; propagatedBuildInputs = [ six charset-normalizer ]; @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeCheckInputs = [ django jinja2 - Mako + mako nose tornado pyramid diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypytools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypytools/default.nix index fdaeb031f9..ecc86e4fe2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypytools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypytools/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { (fetchpatch { name = "support-later-python.patch"; url = "https://github.com/antocuni/pypytools/commit/c6aed496ec35a6ef7ce9e95084849eebc16bafef.patch"; - sha256 = "sha256-YoYRZmgueQmxRtGaeP4zEVxuA0U7TB0PmoYHHVI7ICQ="; + hash = "sha256-YoYRZmgueQmxRtGaeP4zEVxuA0U7TB0PmoYHHVI7ICQ="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqldb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqldb/default.nix index b4ff71cb03..4f67362409 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqldb/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "amazon-qldb-driver-python"; rev = "v${version}"; - sha256 = "sha256-TKf43+k428h8T6ye6mJrnK9D4J1xpIu0QacM7lWJF7w="; + hash = "sha256-TKf43+k428h8T6ye6mJrnK9D4J1xpIu0QacM7lWJF7w="; }; propagatedBuildInputs = [ boto3 amazon-ion ionhash ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix index 1aef6e13d2..0227aa1023 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyqt-builder"; - version = "1.14.0"; + version = "1.14.1"; src = fetchPypi { pname = "PyQt-builder"; inherit version; - sha256 = "sha256-Z1WTHG0viUBVPgM00QyTPOXMGLZEJelP2hrM9P93T1k="; + hash = "sha256-g7w+MAr/i0FAWAS2qcKRM4mrWcSK2fDLhYSm73O8pQI="; }; propagatedBuildInputs = [ packaging sip ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/pyqt6-sip.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/pyqt6-sip.nix index 3518c9820a..e0ee6cb7b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/pyqt6-sip.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/pyqt6-sip.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyQt6_sip"; inherit version; - sha256 = "sha256-bYej7lhy11EbdpV9aKMhCTUsrzt6QqAdnuIAMrNQ2Xk="; + hash = "sha256-bYej7lhy11EbdpV9aKMhCTUsrzt6QqAdnuIAMrNQ2Xk="; }; # There is no test code and the check phase fails with: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/sip.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/sip.nix index 6cb1433e33..ea8a518afd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/sip.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/sip.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyQt5_sip"; inherit version; - sha256 = "sha256-tHEP2FtX7e9xbMVfrkW/1b+sb8e6kQNvHcw/Mxyg6zk="; + hash = "sha256-tHEP2FtX7e9xbMVfrkW/1b+sb8e6kQNvHcw/Mxyg6zk="; }; # There is no test code and the check phase fails with: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt6-charts.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt6-charts.nix new file mode 100644 index 0000000000..66df9bbf0f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt6-charts.nix @@ -0,0 +1,77 @@ +{ lib +, buildPythonPackage +, fetchPypi +, sip +, pyqt-builder +, qt6Packages +, pythonOlder +, pyqt6 +, python +}: + +buildPythonPackage rec { + pname = "PyQt6_Charts"; + version = "6.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-tG6xKEBRagOcNvcLs/hCMzf5j94ma1gs6tQEm3e0P2Q="; + }; + + # fix include path and increase verbosity + postPatch = '' + sed -i \ + '/\[tool.sip.project\]/a\ + verbose = true\ + sip-include-dirs = [\"${pyqt6}/${python.sitePackages}/PyQt6/bindings\"]' \ + pyproject.toml + ''; + + enableParallelBuilding = true; + # HACK: paralellize compilation of make calls within pyqt's setup.py + # pkgs/stdenv/generic/setup.sh doesn't set this for us because + # make gets called by python code and not its build phase + # format=pyproject means the pip-build-hook hook gets used to build this project + # pkgs/development/interpreters/python/hooks/pip-build-hook.sh + # does not use the enableParallelBuilding flag + preBuild = '' + export MAKEFLAGS+="''${enableParallelBuilding:+-j$NIX_BUILD_CORES}" + ''; + + dontWrapQtApps = true; + + nativeBuildInputs = with qt6Packages; [ + qtcharts + sip + qmake + pyqt-builder + ]; + + buildInputs = with qt6Packages; [ + qtcharts + ]; + + propagatedBuildInputs = [ + pyqt6 + ]; + + dontConfigure = true; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ + "PyQt6.QtCharts" + ]; + + meta = with lib; { + description = "Python bindings for Qt6 QtCharts"; + homepage = "https://riverbankcomputing.com/"; + license = licenses.gpl3Only; + platforms = platforms.mesaPlatforms; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt6-webengine.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt6-webengine.nix index 564d1a1432..b53714ca32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt6-webengine.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt6-webengine.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-THHBMIYKvNEeBMr7IuM5g/qaOu6DI8UZCbFaFwGCjiE="; + hash = "sha256-THHBMIYKvNEeBMr7IuM5g/qaOu6DI8UZCbFaFwGCjiE="; }; # fix include path and increase verbosity diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix index 23cceed4e7..2b7b4a1377 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix @@ -58,6 +58,9 @@ buildPythonPackage rec { # upstream doesn't consider it serious. # https://github.com/pyqtgraph/pyqtgraph/issues/2110 "test_PolyLineROI" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # https://github.com/pyqtgraph/pyqtgraph/issues/2645 + "test_rescaleData" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyquaternion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyquaternion/default.nix index feee5dcc6b..512038a8ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyquaternion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyquaternion/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-sfYa8hnLL+lmtft5oZISTy5jo/end6w8rfKVexqBvqg="; + hash = "sha256-sfYa8hnLL+lmtft5oZISTy5jo/end6w8rfKVexqBvqg="; }; # The VERSION.txt file is required for setup.py 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 72ba19f8a2..02a659e88c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyquil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyquil/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "pyquil"; - version = "3.3.3"; + version = "3.3.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jA6nYQSfdxd9FCTMQlYTe/EbV39vV0h9F9Fgf1M0+SY="; + hash = "sha256-iHyYX9e3O611OzBMafqn4V+yR1y8y4twiJehYDYlvdg="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrad/default.nix index dfcff9feb9..36bc915696 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrad/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrad/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pyradius"; repo = pname; rev = version; - sha256 = "sha256-oqgkE0xG/8cmLeRZdGoHkaHbjtByeJwzBJwEdxH8oNY="; + hash = "sha256-oqgkE0xG/8cmLeRZdGoHkaHbjtByeJwzBJwEdxH8oNY="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyradios/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyradios/default.nix index 15677945b0..8ed0fef4a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyradios/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyradios/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-O30ExmvWu4spwDytFVPWGjR8w3XSTaWd2Z0LGQibq9g="; + hash = "sha256-O30ExmvWu4spwDytFVPWGjR8w3XSTaWd2Z0LGQibq9g="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix index 715dce1fbd..f4031db0d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyramid_chameleon"; inherit version; - sha256 = "sha256-0XZ5KlDrAV14ZbRL2bJKe9BIn6mlzrvRe54FBIzvkBc="; + hash = "sha256-0XZ5KlDrAV14ZbRL2bJKe9BIn6mlzrvRe54FBIzvkBc="; }; patches = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { (fetchpatch { name = "support-later-limiter.patch"; url = "https://github.com/Pylons/pyramid_chameleon/commit/36348bf4c01f52c3461e7ba4d20b1edfc54dba50.patch"; - sha256 = "sha256-cPS7JhcS8nkBS1T0OdZke25jvWHT0qkPFjyPUDKHBGU="; + hash = "sha256-cPS7JhcS8nkBS1T0OdZke25jvWHT0qkPFjyPUDKHBGU="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix index 2d23256ff8..61a95bae84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Tl2rYH/GifNfB9w4nG9UIqAQz0O6kujCED/4iZnPKDw="; + hash = "sha256-Tl2rYH/GifNfB9w4nG9UIqAQz0O6kujCED/4iZnPKDw="; }; propagatedBuildInputs = [ pyramid ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix index a4de687eed..be9c76eeb8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix @@ -4,7 +4,7 @@ , fetchpatch , webtest , pyramid -, Mako +, mako }: buildPythonPackage rec { @@ -26,7 +26,7 @@ buildPythonPackage rec { ]; buildInputs = [ webtest ]; - propagatedBuildInputs = [ pyramid Mako ]; + propagatedBuildInputs = [ pyramid mako ]; meta = with lib; { homepage = "https://github.com/Pylons/pyramid_mako"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrdfa3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrdfa3/default.nix index 610eaa39bd..398da02405 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrdfa3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrdfa3/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "pyRdfa3"; - sha256 = "sha256-FXZjqSuH3zRbb2m94jXf9feXiRYI4S/h5PqNrWhxMa4="; + hash = "sha256-FXZjqSuH3zRbb2m94jXf9feXiRYI4S/h5PqNrWhxMa4="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyreadstat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyreadstat/default.nix index 6bc583ca6e..33e1e8dc01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyreadstat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyreadstat/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyreadstat"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Roche"; repo = "pyreadstat"; rev = "refs/tags/v${version}"; - hash = "sha256-Rw+v1+KpjSSZoqhlENKcJiaFhAvcNRbZ3+MA2dOsj4Q="; + hash = "sha256-7DpmWIRzhB32YZCDpR+rEIAzn5OuZqt7wvS0GnxnT/g="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrect/default.nix index f7c4a1b565..ac0b6b598d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyRect"; inherit version; - sha256 = "sha256-9lFV9t+bkptnyv+9V8CUfFrlRJ07WA0XgHS/+0egm3g="; + hash = "sha256-9lFV9t+bkptnyv+9V8CUfFrlRJ07WA0XgHS/+0egm3g="; }; nativeCheckInputs = [ pytestCheckHook pygame ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyregion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyregion/default.nix index 9e8fd5f789..115729b647 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyregion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyregion/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "astropy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xo+XbBJ2HKql9rd7Ma84JofRg8M4u6vmz44Qo8JhEBc="; + hash = "sha256-xo+XbBJ2HKql9rd7Ma84JofRg8M4u6vmz44Qo8JhEBc="; }; propagatedBuildInputs = [ @@ -36,11 +36,11 @@ buildPythonPackage rec { patches = [ (fetchpatch { url = "https://github.com/astropy/pyregion/pull/157/commits/082649730d353a0d0c0ee9619be1aa501aabba62.patch"; - sha256 = "sha256-4mHZt3S29ZfK+QKavm6DLBwVxGl/ga7W7GEcQ5ewxuo="; + hash = "sha256-4mHZt3S29ZfK+QKavm6DLBwVxGl/ga7W7GEcQ5ewxuo="; }) (fetchpatch { url = "https://github.com/astropy/pyregion/pull/157/commits/c448a465dd56887979da62aec6138fc89bb37b19.patch"; - sha256 = "sha256-GEtvScmVbAdE4E5Xx0hNOPommvzcnJ3jNZpBmY3PbyE="; + hash = "sha256-GEtvScmVbAdE4E5Xx0hNOPommvzcnJ3jNZpBmY3PbyE="; }) ]; @@ -48,7 +48,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-astropy ]; - disabledTests = lib.optional (!stdenv.hostPlatform.isDarwin) [ + disabledTests = lib.optionals (!stdenv.hostPlatform.isDarwin) [ # Skipping 2 tests because it's failing. Domain knowledge was unavailable on decision. # Error logs: https://gist.github.com/superherointj/3f616f784014eeb2e3039b0f4037e4e9 "test_calculate_rotation_angle" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrevolve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrevolve/default.nix index 3d6a5f52dc..767d94ac0d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrevolve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrevolve/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "devitocodes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5a4zvyf2vfz8aI6vFMI2vxekYrcUi/YuPFvZnUOx+Zs="; + hash = "sha256-5a4zvyf2vfz8aI6vFMI2vxekYrcUi/YuPFvZnUOx+Zs="; }; nativeBuildInputs = [ versioneer cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrmvtransport/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrmvtransport/default.nix index 42d4771c76..888ad2f43c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrmvtransport/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrmvtransport/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "cgtobi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nFxGEyO+wyRzPayjjv8WNIJ+XIWbVn0dyyjQKHiyr40="; + hash = "sha256-nFxGEyO+wyRzPayjjv8WNIJ+XIWbVn0dyyjQKHiyr40="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { (fetchpatch { name = "update-tests.patch"; url = "https://github.com/cgtobi/PyRMVtransport/commit/fe93b3d9d625f9ccf8eb7b0c39e0ff41c72d2e77.patch"; - sha256 = "sha256-t+GP5VG1S86vVSsisl85ZHBtOqxIi7QS83DA+HgRet4="; + hash = "sha256-t+GP5VG1S86vVSsisl85ZHBtOqxIi7QS83DA+HgRet4="; }) ]; 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 8897ae9535..58598e1460 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "2.0.100"; + version = "2.0.101"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyrogram"; repo = "pyrogram"; rev = "v${version}"; - hash = "sha256-WlKzBhToSrBl6T8XFlqi3p0ABDufBGdhmK/0Fn7V61A="; + hash = "sha256-HFOT8PqK7n42j2H8EJ5c7h9PL28icQwYErPNcxPgoM8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix index 97abb766fb..37de503347 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-GimUdzcGu7SZXDGpe8lPFBgxSSO9EEjG2WSDcEA3ZEA="; + hash = "sha256-GimUdzcGu7SZXDGpe8lPFBgxSSO9EEjG2WSDcEA3ZEA="; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrss2gen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrss2gen/default.nix index 4a7dc788ca..00c823475a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrss2gen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrss2gen/default.nix @@ -4,11 +4,12 @@ }: buildPythonPackage rec { - pname = "PyRSS2Gen"; + pname = "pyrss2gen"; version = "1.1"; src = fetchPypi { - inherit pname version; + pname = "PyRSS2Gen"; + inherit version; sha256 = "1rvf5jw9hknqz02rp1vg8abgb1lpa0bc65l7ylmlillqx7bswq3r"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyruckus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyruckus/default.nix index 336be72a92..d2b896605f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyruckus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyruckus/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "gabe565"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-SVE5BrCCQgCrhOC0CSGgbZ9TEY3iZ9Rp/xMUShPAxxM="; + hash = "sha256-SVE5BrCCQgCrhOC0CSGgbZ9TEY3iZ9Rp/xMUShPAxxM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix index abb0d4fd8b..86a81d14d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pysam-developers"; repo = "pysam"; rev = "refs/tags/v${version}"; - sha256 = "sha256-7yEZJ+iIw4qOxsanlKQlqt1bfi8MvyYjGJWiVDmXBrc="; + hash = "sha256-7yEZJ+iIw4qOxsanlKQlqt1bfi8MvyYjGJWiVDmXBrc="; }; nativeBuildInputs = [ samtools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix index 5f67dc1a10..3cd65c271e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix @@ -5,7 +5,7 @@ , fetchFromGitHub , fetchPypi , importlib-resources -, mock +, poetry-core , pyasn1 , pymongo , pyopenssl @@ -16,7 +16,6 @@ , requests , responses , setuptools -, six , substituteAll , xmlschema , xmlsec @@ -28,23 +27,27 @@ let src = fetchPypi { pname = "pymongo"; inherit version; - sha256 = "sha256-ConK3ABipeU2ZN3gQ/bAlxcrjBxfAJRJAJUoL/mZWl8="; + hash = "sha256-ConK3ABipeU2ZN3gQ/bAlxcrjBxfAJRJAJUoL/mZWl8="; }; }); in buildPythonPackage rec { pname = "pysaml2"; - version = "7.2.1"; - format = "setuptools"; + version = "7.4.1"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "IdentityPython"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lnaizwbtBYdKx1puizah+UWsw54NVW6UhEw/eStl1WI="; + hash = "sha256-QHAbm6u5oH3O7MEVFE+sW98raquv89KJ8gonk3Yyu/0="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ cryptography defusedxml @@ -53,14 +56,12 @@ in buildPythonPackage rec { pytz requests setuptools - six xmlschema ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; nativeCheckInputs = [ - mock pyasn1 pymongo3 pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/hardcode-xmlsec1-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/hardcode-xmlsec1-path.patch index d984c55a8a..ba93280327 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/hardcode-xmlsec1-path.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/hardcode-xmlsec1-path.patch @@ -6,12 +6,12 @@ index 59fe2dee..0c24fbcc 100644 :return: full name of the xmlsec1 binary found. If no binaries are found then an exception is raised. """ -- if os.name == 'posix': -- bin_name = ['xmlsec1'] -- elif os.name == 'nt': -- bin_name = ['xmlsec.exe', 'xmlsec1.exe'] +- if os.name == "posix": +- bin_name = ["xmlsec1"] +- elif os.name == "nt": +- bin_name = ["xmlsec.exe", "xmlsec1.exe"] - else: # Default !? -- bin_name = ['xmlsec1'] +- bin_name = ["xmlsec1"] - - if paths: - for bname in bin_name: @@ -23,7 +23,7 @@ index 59fe2dee..0c24fbcc 100644 - except OSError: - pass - -- for path in os.environ['PATH'].split(os.pathsep): +- for path in os.environ["PATH"].split(os.pathsep): - for bname in bin_name: - fil = os.path.join(path, bname) - try: @@ -32,7 +32,7 @@ index 59fe2dee..0c24fbcc 100644 - except OSError: - pass - -- raise SigverError('Cannot find {binary}'.format(binary=bin_name)) +- raise SigverError(f"Cannot find {bin_name}") + return '@xmlsec@/bin/xmlsec1' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysatochip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysatochip/default.nix index f76d889ada..4547fa827b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysatochip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysatochip/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-+Z3D6ITZouhLbEotvJ9MDfg6QOhjGVKrLi1QL1kOdkE="; + hash = "sha256-+Z3D6ITZouhLbEotvJ9MDfg6QOhjGVKrLi1QL1kOdkE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyscf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscf/default.nix index 362cb5daba..e984e57673 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyscf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyscf/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { patches = [ (fetchpatch { name = "libxc-6"; # https://github.com/pyscf/pyscf/pull/1467 url = "https://github.com/pyscf/pyscf/commit/ebcfacc90e119cd7f9dcdbf0076a84660349fc79.patch"; - sha256 = "sha256-O+eDlUKJeThxQcHrMGqxjDfRCmCNP+OCgv/L72jAF/o="; + hash = "sha256-O+eDlUKJeThxQcHrMGqxjDfRCmCNP+OCgv/L72jAF/o="; })]; # setup.py calls Cmake and passes the arguments in CMAKE_CONFIGURE_ARGS to cmake. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyschemes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyschemes/default.nix index f6d1a62059..384e375ecb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyschemes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyschemes/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { # https://github.com/spy16/pyschemes/pull/6 (fetchpatch { url = "https://github.com/spy16/pyschemes/commit/23011128c6c22838d4fca9e00fd322a20bb566c4.patch"; - sha256 = "sha256-vDaWxMrn2aC2wmd035EWRZ3cd/XME81z/BWG0f2T9jc="; + hash = "sha256-vDaWxMrn2aC2wmd035EWRZ3cd/XME81z/BWG0f2T9jc="; }) ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix index 8fbd0801dd..0457edb145 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy3k -, EasyProcess +, easyprocess , entrypoint2 , jeepney , mss @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - EasyProcess + easyprocess entrypoint2 pillow ] ++ lib.optionals (isPy3k) [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyscreeze/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscreeze/default.nix index b7059eecce..4d09929bf0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyscreeze/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyscreeze/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "asweigart"; repo = "pyscreeze"; rev = "28ab707dceecbdd135a9491c3f8effd3a69680af"; - sha256 = "sha256-gn3ydjf/msdhIhngGlhK+jhEyFy0qGeDr58E7kM2YZs="; + hash = "sha256-gn3ydjf/msdhIhngGlhK+jhEyFy0qGeDr58E7kM2YZs="; }; pythonImportsCheck = [ "pyscreeze" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyscss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscss/default.nix index ca40ac09ca..21b0f169cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyscss/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyscss/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { repo = "pyScss"; owner = "Kronuz"; rev = "refs/tags/v${version}"; - sha256 = "sha256-z0y4z+/JE6rZWHAvps/taDZvutyVhxxs2gMujV5rNu4="; + hash = "sha256-z0y4z+/JE6rZWHAvps/taDZvutyVhxxs2gMujV5rNu4="; }; nativeCheckInputs = [ pytestCheckHook ]; 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 90202829fc..64b9b97d4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysdl2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysdl2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-kIp946iMKyKiwhppkXxTIVKJW9GkkFJ6Jw7hTK1A5kc="; + hash = "sha256-kIp946iMKyKiwhppkXxTIVKJW9GkkFJ6Jw7hTK1A5kc="; }; # Deliberately not in propagated build inputs; users can decide diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix index 93ec0535b8..16e02df479 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-tgMpI+BenXXsF6WvmphCnEbSg5rfr4BgTVLg+qzXoy8="; + hash = "sha256-tgMpI+BenXXsF6WvmphCnEbSg5rfr4BgTVLg+qzXoy8="; }; propagatedBuildInputs = [ 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 5885491a61..2ab7236c2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysiaalarm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysiaalarm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-hS0OaafYjRdPVSCOHfb2zKp0tEOl1LyMJpwnpvsvALs="; + hash = "sha256-hS0OaafYjRdPVSCOHfb2zKp0tEOl1LyMJpwnpvsvALs="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix index 0584147474..1ad2d01238 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "PySide"; repo = "Apiextractor"; rev = version; - sha256 = "sha256-YH8aYyzv59xiIglZbdNgOPnmEQwNE2GmotAFFfFdMlg="; + hash = "sha256-YH8aYyzv59xiIglZbdNgOPnmEQwNE2GmotAFFfFdMlg="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyside/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyside/default.nix index 451c71e7eb..82cc62f2c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyside/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyside/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "PySide"; repo = "PySide"; rev = version; - sha256 = "sha256-14XbihJRMk9WaeK6NUBV/4OMFZF8EBIJgEJEaCU8Ecg="; + hash = "sha256-14XbihJRMk9WaeK6NUBV/4OMFZF8EBIJgEJEaCU8Ecg="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix index f1e002daf4..3d47ccd58f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { owner = "PySide"; repo = "Generatorrunner"; rev = version; - sha256 = "sha256-JAghKY033RTD5b2elitzVQbbN3PMmT3BHwpqx8N5EYg="; + hash = "sha256-JAghKY033RTD5b2elitzVQbbN3PMmT3BHwpqx8N5EYg="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-qradar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-qradar/default.nix index 212bb09746..7f4a467b3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-qradar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-qradar/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma-backend-qradar"; - version = "0.3.0"; + version = "0.3.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "nNipsx-Sec"; repo = "pySigma-backend-qradar"; rev = "refs/tags/v${version}"; - hash = "sha256-4QiPBgzlZG3aeYwn9zodZCXY6mjOktgdPWR5ikg/Y30="; + hash = "sha256-VymaxX+iqrRlf+WEt4xqEvNt5kg8xI5O/MoYahayu0o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix index 3f49622ac1..7fcd0092a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-splunk"; - version = "0.3.7"; + version = "1.0.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-splunk"; rev = "refs/tags/v${version}"; - hash = "sha256-8baldryXORVpm8B85avwFJvGdqdAkO67BlIM2ERiSzI="; + hash = "sha256-SWD3Jw1wehWLvWkLA7rotweExYCrabq7men22D0zN5w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix index da424e133c..d438078e3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-crowdstrike"; - version = "0.1.8"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-crowdstrike"; rev = "refs/tags/v${version}"; - hash = "sha256-ZSTnQmdLcMa1XwbQxGpE734yN92zDy72SX9feTL9wjI="; + hash = "sha256-KHHs39RGksE7Rww8nHHo73+WOUzZaNiD4sZMhBPqqYQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix index 274236cb39..ccb8e6245e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-sysmon"; - version = "1.0.1"; + version = "1.0.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-sysmon"; rev = "refs/tags/v${version}"; - hash = "sha256-aRgnjqSrzmzDCICRiozTGkFmWuCzBpo8k9/YLcylg3w="; + hash = "sha256-W3Osv0RApm6sCVdsLXUB79H3g62yUID4dtBi5Ywk5NY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix index 33f1b2ee76..4a05c5067e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-windows"; - version = "1.0.1"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-windows"; rev = "refs/tags/v${version}"; - hash = "sha256-0fUtUw0f/1eX+tt9klqa20dwTKAi86w5CDYYFmwCwFk="; + hash = "sha256-jXUTGt/kbw6XfxA7A+t9km5GdltV1VRBTUf4lw1AwO4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma/default.nix index 67d037789c..35f450460f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma/default.nix @@ -2,16 +2,19 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, packaging , poetry-core , pyparsing , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , pyyaml +, requests }: buildPythonPackage rec { pname = "pysigma"; - version = "0.8.12"; + version = "0.9.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,22 +23,35 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-OAhKeAKRT2/A6VO+PxUBi7bkaQVNRT59boyLPGdO+Yw="; + hash = "sha256-mmKTHPCr/m/tsY/EkpkxXk6nqCcbWCK2Y3tQ5NM4NCg="; }; nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "packaging" ]; propagatedBuildInputs = [ + packaging pyparsing pyyaml + requests ]; nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ + # require network connection + "test_sigma_plugin_directory_default" + "test_sigma_plugin_installation" + ]; + pythonImportsCheck = [ "sigma" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysimplegui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysimplegui/default.nix index 3028f0cac9..827c3ececf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysimplegui/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysimplegui/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PySimpleGUI"; inherit version; - sha256 = "sha256-+IyCwwGlGuo1vmBdwGC8zrDctmguFigFRIhHAatLI7o="; + hash = "sha256-+IyCwwGlGuo1vmBdwGC8zrDctmguFigFRIhHAatLI7o="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyskyqhub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyskyqhub/default.nix index 6f60fec79f..216e998a49 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyskyqhub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyskyqhub/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "RogerSelwyn"; repo = "skyq_hub"; rev = version; - sha256 = "sha256-yXqtABbsCh1yb96lsEA0gquikVenGLCo6J93AeXAC8k="; + hash = "sha256-yXqtABbsCh1yb96lsEA0gquikVenGLCo6J93AeXAC8k="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix index f1e2a90daa..97133b20ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "22.5.0"; + version = "22.5.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { repo = "pyslurm"; owner = "PySlurm"; rev = "refs/tags/v${version}"; - hash = "sha256-Uh0P7Kevcc78vWT/Zk+MUCKh2AlDiRR3MO/nOke2yP0="; + hash = "sha256-sPZELCxe2e7/gUmRxvP2aOwqsbaR/x+0grHwuDdx0Dg="; }; buildInputs = [ cython slurm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysma/default.nix index 605e1b5dfe..3c62126d1d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysma/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysma/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-4u564tLk91duYv1IClHddur6t+Rbla/e9P0yWAxw2sw="; + hash = "sha256-4u564tLk91duYv1IClHddur6t+Rbla/e9P0yWAxw2sw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmartapp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmartapp/default.nix index b14d0bf5af..84c79409aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysmartapp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmartapp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "andrewsayre"; repo = pname; rev = version; - sha256 = "sha256-zYjv7wRxQTS4PnNaY69bw9xE6I4DZMocwUzEICBfwqM="; + hash = "sha256-zYjv7wRxQTS4PnNaY69bw9xE6I4DZMocwUzEICBfwqM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmartthings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmartthings/default.nix index cfdc691539..5f87883969 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysmartthings/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmartthings/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "andrewsayre"; repo = pname; rev = version; - sha256 = "sha256-AzAiMn88tRRPwMpwSnKoS1XUERHbKz0sVm/TjcbTsGs="; + hash = "sha256-AzAiMn88tRRPwMpwSnKoS1XUERHbKz0sVm/TjcbTsGs="; }; 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 ebada417bc..cf17860c3f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysml/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mtdcr"; repo = pname; rev = version; - sha256 = "sha256-pUbRttH/ksYcE1qZJAQWhuKk4+40w5xsul0TTqq1g3s="; + hash = "sha256-pUbRttH/ksYcE1qZJAQWhuKk4+40w5xsul0TTqq1g3s="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysnow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysnow/default.nix index d3ad4bee17..52613d602d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysnow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysnow/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { (fetchpatch { name = "switch-to-poetry-core.patch"; url = "https://github.com/rbw/pysnow/commit/f214a203432b329df5317f3a25b2c0d9b55a9029.patch"; - sha256 = "sha256-ViRR+9WStlaQwyrLGk/tMOUAcEMY+kB61ZEKGMQJ30o="; + hash = "sha256-ViRR+9WStlaQwyrLGk/tMOUAcEMY+kB61ZEKGMQJ30o="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysol-cards/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysol-cards/default.nix index 7be154a315..5759b47005 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysol-cards/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysol-cards/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pysol-cards"; - version = "0.14.2"; + version = "0.14.3"; src = fetchPypi { inherit version; pname = "pysol_cards"; - sha256 = "sha256-wI3oV1d7w+7JcMOt08RbNlMWzChErNYIO7Vuox1A6vA="; + hash = "sha256-sPv9OGFb/G/XVdq1hQWprhYtDaGGbCXKkUGTi1gj8GE="; }; propagatedBuildInputs = [ six random2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix index b9c4a1e9b1..778b862ac2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "amelchio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gBOknYHL5nQWFVhCbLN0Ah+1fovcNY4P2myryZnUadk="; + hash = "sha256-gBOknYHL5nQWFVhCbLN0Ah+1fovcNY4P2myryZnUadk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyspcwebgw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyspcwebgw/default.nix index 612a22d74a..5aff4d2ccd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyspcwebgw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyspcwebgw/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mbrrg"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-Pjv8AxXuwi48Z8U+LSZZ+OhXrE3KlX7jlmnXTBLxXOs="; + hash = "sha256-Pjv8AxXuwi48Z8U+LSZZ+OhXrE3KlX7jlmnXTBLxXOs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyspnego/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyspnego/default.nix index b6c9dfcd1a..c553b6242b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyspnego/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyspnego/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyspnego"; - version = "0.7.0"; + version = "0.8.0"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jborean93"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-FtXHbPilQKqo/pmFAYRCoSHkq2fIhP9DYi8kNNBz7uM="; + hash = "sha256-3nFxUu2P8dGt80HRGYOliGHXLrtc83C96kJW27CgXV0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysqlcipher3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysqlcipher3/default.nix index cc8a53e8fc..76db9500ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysqlcipher3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysqlcipher3/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pysqlcipher3"; - version = "1.1.0"; + version = "1.2.0"; disabled = pythonOlder "3.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Lo75+2y2jZJrQZj9xrJvVRGWmOo8fI5iXzEURn00Y3E="; + hash = "sha256-PIAzgSZVlH6/KagJrFEGsrxpvgJ06szva1j0WAyNBsU="; }; buildInputs = [ sqlcipher ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pystemd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pystemd/default.nix index 0d46312152..3e1455128f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pystemd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pystemd/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { version = "0.10.0"; src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-10qBS/2gEIXbGorZC+PLJ9ryOlGrawPn4p7IEfoq6Fk="; + hash = "sha256-10qBS/2gEIXbGorZC+PLJ9ryOlGrawPn4p7IEfoq6Fk="; }; disabled = python.pythonOlder "3.4"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pystemmer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pystemmer/default.nix index 738b67a099..0df510e0b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pystemmer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pystemmer/default.nix @@ -9,15 +9,10 @@ }: buildPythonPackage rec { - pname = "PyStemmer"; + pname = "pystemmer"; version = "2.2.0"; format = "setuptools"; - src' = fetchPypi { - inherit pname version; - sha256 = "sha256-4hcbkbhrscap3d8J6Mhn5Ij4vWm94H0EEKNc3O4NhXw="; - }; - src = fetchFromGitHub { owner = "snowballstem"; repo = "pystemmer"; @@ -52,10 +47,6 @@ buildPythonPackage rec { "-L${libstemmer}/lib" ]; - #preBuild = '' - # cython src/Stemmer.pyx - #''; - pythonImportsCheck = [ "Stemmer" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix index 03fb3213d1..cf6a79853c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "moses-palmer"; repo = "pystray"; rev = "v${version}"; - sha256 = "sha256-8B178MSe4ujlnGBmQhIu+BoAh1doP9V5cL0ermLQTvs="; + hash = "sha256-8B178MSe4ujlnGBmQhIu+BoAh1doP9V5cL0ermLQTvs="; }; nativeBuildInputs = [ gobject-introspection sphinx ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytapo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytapo/default.nix index 1a8ee768fb..03799b568e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytapo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytapo/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pytapo"; - version = "2.9.2"; + version = "3.1.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-LW14uDQBqIVsigOzO0bNTpjY7Fk0IWAeDMPEuWM/nOo="; + hash = "sha256-e5XeXPwf2QSZ/xgaPBPoRBaTvC8oNYI9/b190wSI4oQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyte/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyte/default.nix index 604df3ed09..d74ec86528 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyte/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyte/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "selectel"; repo = pname; rev = version; - sha256 = "sha256-gLvsW4ou6bGq9CxT6XdX+r2ViMk7z+aejemrdLwJb3M="; + hash = "sha256-gLvsW4ou6bGq9CxT6XdX+r2ViMk7z+aejemrdLwJb3M="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytensor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytensor/default.nix index aed37ab142..68edd7b9ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytensor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytensor/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "pytensor"; - version = "2.9.1"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = pname; rev = "refs/tags/rel-${version}"; - hash = "sha256-vuZHiDbGg55lXr9BwPT66Hy8RUe/RfYVaV57i/YlBwg="; + hash = "sha256-sk/HGfiiNKrgnf5fPaxoOySvAEpnAXnLFmK0yah51ww="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix index 5054e11f45..b7c25bbf17 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "madmaze"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CyKXtaIE/8iPLqi0GHVUgTeJDYZyWBjkRvOKJJKCxZo="; + hash = "sha256-CyKXtaIE/8iPLqi0GHVUgTeJDYZyWBjkRvOKJJKCxZo="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix index 1e1f386eef..a111c8953d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-hePGbO7eTOZo9HOzzzd/yyqjxI4k8oqqN3roYATM4hE="; + hash = "sha256-hePGbO7eTOZo9HOzzzd/yyqjxI4k8oqqN3roYATM4hE="; }; nativeBuildInputs = [ 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 fb86c3b043..7908a04fa4 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,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, Mako +, mako , parse , parse-type , poetry-core @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - Mako + mako parse parse-type typing-extensions 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 b72063a233..9df7b9a07f 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 @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-dFXmylelRMG/3YtWrOCMHBzkxlcqiquPG9NR3CWhC2s="; + hash = "sha256-dFXmylelRMG/3YtWrOCMHBzkxlcqiquPG9NR3CWhC2s="; }; 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 9efd9f49f2..2a6ad34d70 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 @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "celery"; repo = "pytest-celery"; rev = "v${version}"; - sha256 = "sha256-vzWwkOS3BLOInaFDk+PegvEmC88ZZ1sG1CmHwhn7r9w="; + hash = "sha256-vzWwkOS3BLOInaFDk+PegvEmC88ZZ1sG1CmHwhn7r9w="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-cid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cid/default.nix index ba55304009..c46d4409a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-cid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cid/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ntninja"; repo = pname; rev = "1ff9ec43ac9eaf76352ea7e7a060cd081cb8b68a"; # Version has no git tag - sha256 = "sha256-H2RtMGYWukowTTfqZSx+hikxzkqw1v5bA4AfZfiVl8U="; + hash = "sha256-H2RtMGYWukowTTfqZSx+hikxzkqw1v5bA4AfZfiVl8U="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix index 6cf3db2bd2..debbe626ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Stranger6667"; repo = "pytest-click"; rev = "v${version}"; - sha256 = "sha256-A/RF+SgPu2yYF3eHEFiZwKJW2VwQ185Ln6S3wn2cS0k="; + hash = "sha256-A/RF+SgPu2yYF3eHEFiZwKJW2VwQ185Ln6S3wn2cS0k="; }; buildInputs = [ pytest ]; 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 88e77f9f7c..dd93d6bac2 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 @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-mWt5795kM829AIiHLbxfs+1/4VeLaM27pjTxS7jdBHA="; + hash = "sha256-mWt5795kM829AIiHLbxfs+1/4VeLaM27pjTxS7jdBHA="; }; buildInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix index e57292b774..bca05a0010 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "gabrielcnr"; repo = "pytest-datadir"; rev = "refs/tags/${version}"; - sha256 = "sha256-HyJ0rU1nHqRv8SHFS8m3GZ5409+JZIkoDgIVjy4ol54="; + hash = "sha256-HyJ0rU1nHqRv8SHFS8m3GZ5409+JZIkoDgIVjy4ol54="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix index 5215dad5ab..3142319420 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pytest-datafiles"; - version = "2.0.1"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "omarkohl"; repo = pname; - rev = version; - sha256 = "sha256-M0Lnsqi05Xs0uN6LlafNS7HJZOut+nrMZyvGPMMhIkc="; + rev = "refs/tags/${version}"; + hash = "sha256-YFD8M5TG6VtLRX04R3u0jtYDDlaK32D4ArWxS6x2b/E="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix index 91e59bf903..8cecd7f7f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { # Fix build with pytest >= 6.2.0, https://github.com/RKrahl/pytest-dependency/pull/51 (fetchpatch { url = "https://github.com/RKrahl/pytest-dependency/commit/0930889a13e2b9baa7617f05dc9b55abede5209d.patch"; - sha256 = "sha256-xRreoIz8+yW0mAUb4FvKVlPjALzMAZDmdpbmDKRISE0="; + hash = "sha256-xRreoIz8+yW0mAUb4FvKVlPjALzMAZDmdpbmDKRISE0="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix index dea7f772f7..f5b20cb1b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-xOL0uwv/xDf1GtIXSoo+cd+Bu8L2iUYE5gSvGPvmh8M="; + hash = "sha256-xOL0uwv/xDf1GtIXSoo+cd+Bu8L2iUYE5gSvGPvmh8M="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix index f8dbcffa9d..347ac2257e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.21.2"; + version = "0.21.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Colin-b"; repo = "pytest_httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-pIYSXmOxLfWknWTfrnhslx76UMSSlnqzFE7qvJo1mz4="; + hash = "sha256-+jOPbEul/mkZbaR6ZqwLTgVtemi18vOYgqJcgv6JSII="; }; buildInputs = [ @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Send responses to httpx"; homepage = "https://github.com/Colin-b/pytest_httpx"; + changelog = "https://github.com/Colin-b/pytest_httpx/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; 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 cde2bf81a6..23ac11d84a 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 @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pytest-localserver"; - version = "0.7.0"; + version = "0.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8ZtJDHyh7QW/5LxrSQgRgFph5ycfBCTTwPpNQ4k6Xc0="; + hash = "sha256-53tGVVy0OJMdIZxUvPn1lTwEB9ZFQ2pgK1cwur/T/js="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Plugin for the pytest testing framework to test server connections locally"; homepage = "https://github.com/pytest-dev/pytest-localserver"; + changelog = "https://github.com/pytest-dev/pytest-localserver/blob/v${version}/CHANGES"; license = licenses.mit; maintainers = with maintainers; [ siriobalmelli ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix index 6f7ccd02e9..26cf78d0f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-LVcWgRJOj/X04rnA0EfTfQSZ1rbY8vSaG1DN2ZMQRGk="; + hash = "sha256-LVcWgRJOj/X04rnA0EfTfQSZ1rbY8vSaG1DN2ZMQRGk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix index e4d368bf61..5e869b9a06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-+EWPZCMj8Toso+LmFQn3dnlmtSe02K3M1QMsPntP09s="; + hash = "sha256-+EWPZCMj8Toso+LmFQn3dnlmtSe02K3M1QMsPntP09s="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix index 46ba61cef6..7fdcfdad10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix @@ -10,11 +10,12 @@ buildPythonPackage rec { pname = "pytest-order"; - version = "1.0.1"; + version = "1.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Xda5KfvX6qbQ7gdYb2XGI7q7Cv5ytIQ8XxUFXWs7Gx8="; + hash = "sha256-E50lswgmt47rtCci90fqsUxEuIBZ16cdT3nRSgVyaaU="; }; buildInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-param-files/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-param-files/default.nix index 0cbdcf92dd..bf629cc356 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-param-files/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-param-files/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "chrisjsewell"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Q7wWoggJN2w2a2umQHx5TsVcugqpovBEtOKruNMZQ8A="; + hash = "sha256-Q7wWoggJN2w2a2umQHx5TsVcugqpovBEtOKruNMZQ8A="; }; format = "flit"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-plt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-plt/default.nix index b1546e3684..4893635c22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-plt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-plt/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-IkTNlierFXIG9WSVUfVoirfQ6z7JOYlCaa5NhnBSuxc="; + hash = "sha256-IkTNlierFXIG9WSVUfVoirfQ6z7JOYlCaa5NhnBSuxc="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix index 11b91e191a..0656175a08 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-2I6DwQI8ZBVIqew1Z3B87udhZjKphq8TNCbUp00GaTI="; + hash = "sha256-2I6DwQI8ZBVIqew1Z3B87udhZjKphq8TNCbUp00GaTI="; }; nativeBuildInputs = [ pytest-runner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-pytestrail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-pytestrail/default.nix new file mode 100644 index 0000000000..9378454cfc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-pytestrail/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools-scm +, pytest +, testrail-api +}: + +buildPythonPackage rec { + pname = "pytest-pytestrail"; + version = "0.10.5"; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + src = fetchFromGitHub { + owner = "tolstislon"; + repo = "pytest-pytestrail"; + rev = version; + sha256 = "sha256-y34aRxQ8mu6b6GBRMFVzn1shMVc7TumdjRS3daMEZJM="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + testrail-api + ]; + + # all tests require network accesss + doCheck = false; + + pythonImportsCheck = [ + "pytest_pytestrail" + ]; + + meta = with lib; { + description = "Pytest plugin for interaction with TestRail"; + homepage = "https://github.com/tolstislon/pytest-pytestrail"; + changelog = "https://github.com/tolstislon/pytest-pytestrail/releases/tag/${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ aanderse ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix index 0a7c190763..16f85581ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-UFF8ldnaImXU6al4kGjf720mbwXE6Nut9VlvNVrMVoY="; + hash = "sha256-UFF8ldnaImXU6al4kGjf720mbwXE6Nut9VlvNVrMVoY="; }; buildInputs = [ pytest ]; 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 1dc250da2a..2b3860c93f 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 @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "wimglenn"; repo = "pytest-raisin"; rev = "v${version}"; - sha256 = "sha256-BI0SWy671DYDTPH4iO811ku6SzpH4ho7eQFUA8PmxW8="; + hash = "sha256-BI0SWy671DYDTPH4iO811ku6SzpH4ho7eQFUA8PmxW8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix index 223024fe64..153bd7da3a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-2+beu5NTp6+YTMnt2+s1d91Nu8wVKaeePSH2jtm0VgU="; + hash = "sha256-2+beu5NTp6+YTMnt2+s1d91Nu8wVKaeePSH2jtm0VgU="; }; disabled = pythonOlder "3.5"; 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 73337221c2..a9e56d3c43 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 @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pytest-regressions"; - version = "2.4.1"; + version = "2.4.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Jk0j6BMt7rV0Qc9Ga3tdtEV5fzRucrZyyVt/UqR78Bs="; + hash = "sha256-6riee6SqM5vf4HsxBH6OanCx54RudKi7/DGliNAecwM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix index c6e8b7e915..3282733383 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-rerunfailures"; - version = "11.0"; + version = "11.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zuWeTm8Nc65j+6CZhlMUupuRW3GTSVQREPoBL/tu+xM="; + hash = "sha256-rKtEft/3wpp2uEECB8SNoBQGoWFlPJmjJc9XA9ROsWI="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-runner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-runner/default.nix index baca23d774..ddea7f405b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-runner/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-tNhTYu0ptMNIZ43nl99Djw8FCUl924xkcJbAKm2HtoU="; + hash = "sha256-tNhTYu0ptMNIZ43nl99Djw8FCUl924xkcJbAKm2HtoU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix index ae907034a7..a62bd2ada9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "yunstanford"; repo = pname; rev = "v${version}"; - sha256 = "sha256-82Xq/jyxTXyZVHqn7G+S9K++InDdORCO9oFqgaIgY7s="; + hash = "sha256-82Xq/jyxTXyZVHqn7G+S9K++InDdORCO9oFqgaIgY7s="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix index 707c002380..72936dff17 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "joseph-roitman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-0PZu9wL29iEppLxxbl4D0E4WfOHe61KUUld003cRBRU="; + hash = "sha256-0PZu9wL29iEppLxxbl4D0E4WfOHe61KUUld003cRBRU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix index bcd4abb4d4..89395ad803 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pytest-socket"; - version = "0.5.1"; + version = "0.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "miketheman"; repo = pname; - rev = version; - hash = "sha256-QKHnuq2pqWMVUhF9nnhJggEK6SSyp6zBEfQX9tGND2E="; + rev = "refs/tags/${version}"; + hash = "sha256-RPHpqknjpuAMXYg4nFOtLp8CXh10/w0RuO/bseTBN5o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-subtesthack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-subtesthack/default.nix index 6981fcb454..775b3cc552 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-subtesthack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-subtesthack/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-67UEIDycAf3TedKvp0dofct7HtG+H8DD9Tmy3oEnYgA="; + hash = "sha256-67UEIDycAf3TedKvp0dofct7HtG+H8DD9Tmy3oEnYgA="; }; buildInputs = [ pytest ]; 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 60947ed117..0da33a7700 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,14 +8,14 @@ buildPythonPackage rec { pname = "pytest-subtests"; - version = "0.9.0"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wDF81fal6z6Vfonb5PwzIqmv3botuEFDVe0qLLkahE4="; + hash = "sha256-2ZYaZ8F5HoweMtznpw7R5U87HmQQh/IJTy03CHq3+xc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix index a738aacaca..16f2acda86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-xHk0lfPDLhFPD1QWKQlGwxbrlq1aNoTc2t2pJn5Zsrg="; + hash = "sha256-xHk0lfPDLhFPD1QWKQlGwxbrlq1aNoTc2t2pJn5Zsrg="; }; buildInputs = [ pytest ]; 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 b41c6f173f..77c8c0cf22 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 @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-wHygdATGEvirviIpSyPDaOLlEEtSHBeQGVVh834aw9k="; + hash = "sha256-wHygdATGEvirviIpSyPDaOLlEEtSHBeQGVVh834aw9k="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix index 8d120459f0..1c4a5b9033 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pytest-xdist"; - version = "3.1.0"; - disabled = pythonOlder "3.6"; + version = "3.2.0"; + disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-QP2481RJIcXfzUhqwIDOIocOcdgs7W0uePqXwq3dSAw="; + hash = "sha256-+hD5WiVkzZFlLy0TJyUYPDtZDZ/c3sCdNnc4bs9MHOk="; }; nativeBuildInputs = [ @@ -65,6 +65,7 @@ buildPythonPackage rec { setupHook = ./setup-hook.sh; meta = with lib; { + changelog = "https://github.com/pytest-dev/pytest-xdist/blob/v${version}/CHANGELOG.rst"; description = "Pytest xdist plugin for distributed testing and loop-on-failing modes"; homepage = "https://github.com/pytest-dev/pytest-xdist"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix index bed5643194..734acd5f8f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytest-xprocess"; - version = "0.21.0"; + version = "0.22.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+UcL/PiE9ymetrgqQ9KYwxi45T7DFO5iTJh+DofBtEk="; + hash = "sha256-WZ7iW5OOjyWeGNnFtNY4SIT4pqKMpR7tMtDZUmvc93w="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix index f4038c5577..ba067c1965 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytest -, PyVirtualDisplay +, pyvirtualdisplay , isPy27 }: @@ -19,7 +19,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; propagatedBuildInputs = [ - PyVirtualDisplay + pyvirtualdisplay ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix index b329fee256..80ea02356c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "7.2.0"; + version = "7.2.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-xAFOtA4Q8R81WtTjwvssbG0ZGcc/O1pDPeRwggLK3lk="; + hash = "sha256-1F4JUvNyckGRi4/Q83b1/2swHMB3fG+aVWk1yS2KfUI="; }; outputs = [ @@ -72,7 +72,7 @@ buildPythonPackage rec { # - files are not needed after tests are finished pytestRemoveBytecodePhase () { # suffix is defined at: - # https://github.com/pytest-dev/pytest/blob/7.2.0/src/_pytest/assertion/rewrite.py#L51-L53 + # https://github.com/pytest-dev/pytest/blob/7.2.1/src/_pytest/assertion/rewrite.py#L51-L53 find $out -name "*-pytest-*.py[co]" -delete } preDistPhases+=" pytestRemoveBytecodePhase" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-arango/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-arango/default.nix index 1763ed44d1..0912daa20f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-arango/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-arango/default.nix @@ -22,7 +22,7 @@ in buildPythonPackage rec { pname = "python-arango"; - version = "7.5.4"; + version = "7.5.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "ArangoDB-Community"; repo = "python-arango"; rev = "refs/tags/${version}"; - hash = "sha256-b3UZuH2hpulRSThReBkDwh0MLJmc95HeWInmmMAl4g0="; + hash = "sha256-cd2xE5rYLl3NOv/DZjmHRPCe224k4XyPjo9aXV1ZhvU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-awair/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-awair/default.nix index a3de0366c4..fb65b6f848 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-awair/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-awair/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ahayworth"; repo = "python_awair"; rev = version; - sha256 = "sha256-zdZyA6adM4bfEYupdZl7CzMjwyfRkQBrntNh0MusynE="; + hash = "sha256-zdZyA6adM4bfEYupdZl7CzMjwyfRkQBrntNh0MusynE="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-barcode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-barcode/default.nix index dc54f7075f..5e97286bd4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-barcode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-barcode/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-JBs0qlxctqmImIL5QJsBgpA6LF0ZtCGL42Cc271f/fk="; + hash = "sha256-JBs0qlxctqmImIL5QJsBgpA6LF0ZtCGL42Cc271f/fk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix index 446fbfcd9c..c1c10cfc90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.28.3"; + version = "0.29.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6gzmVOuJfNpNJlea4Am20HI98mgcKkwtU/28l7qg20Y="; + hash = "sha256-tsTd9EJkwI98ynXu/vz5hX+X55vxOkhIfeawQNn2f6Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-binance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-binance/default.nix index 3641ac73b2..eb582c47c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-binance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-binance/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-binance"; - version = "1.0.16"; + version = "1.0.17"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "sammchardy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2v3qeykjQR/CUOC6F0Xomm49Q+wrYJS8vmL3+u6ew0M="; + hash = "sha256-e88INUEkjOSVOD0KSs9LmstuQ7dQZdJk8K6VqFEusww="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix index 164f2046c6..d4ef039120 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-mmqjD+/0jAwP0Yjm1RUNvdkeP9WxDS2514uYEqsUr4g="; + hash = "sha256-mmqjD+/0jAwP0Yjm1RUNvdkeP9WxDS2514uYEqsUr4g="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-codon-tables/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-codon-tables/default.nix index 715a982d9f..a3a5397c96 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-codon-tables/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-codon-tables/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "python_codon_tables"; inherit version; - sha256 = "sha256-pzPoR55nU8ObPv1iIE52qpqD5xGdYLm1uG3nCD6I46Y="; + hash = "sha256-pzPoR55nU8ObPv1iIE52qpqD5xGdYLm1uG3nCD6I46Y="; }; # no tests in tarball diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-crfsuite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-crfsuite/default.nix index 2e811525c3..2efaa484fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-crfsuite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-crfsuite/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-yqYmHWlVRmdW+Ya3/PvU/VBiKWPjvbXMGAwSnGKzp20="; + hash = "sha256-yqYmHWlVRmdW+Ya3/PvU/VBiKWPjvbXMGAwSnGKzp20="; }; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix index 4e67546fad..6b49888143 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix @@ -43,11 +43,11 @@ buildPythonPackage rec { # Should be fixed in the next release (fetchpatch { url = "https://src.fedoraproject.org/rpms/python-daemon/raw/rawhide/f/python-daemon-safe_hasattr.patch"; - sha256 = "sha256-p5epAlM/sdel01oZkSI1vahUZYX8r90WCJuvBnfMaus="; + hash = "sha256-p5epAlM/sdel01oZkSI1vahUZYX8r90WCJuvBnfMaus="; }) (fetchpatch { url = "https://src.fedoraproject.org/rpms/python-daemon/raw/rawhide/f/tests-remove-duplicate-mocking.patch"; - sha256 = "sha256-5b/dFR3Z8xaPw8AZU95apDZd4ZfmMQhAmavWkVaJog8="; + hash = "sha256-5b/dFR3Z8xaPw8AZU95apDZd4ZfmMQhAmavWkVaJog8="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-datemath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-datemath/default.nix index 9da7ed1c5a..3c12e92b90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-datemath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-datemath/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "nickmaccarthy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WVWGhyBguE1+KEMQu0N5QxO7IC4rPEJ/2L3VWUCQNi4="; + hash = "sha256-WVWGhyBguE1+KEMQu0N5QxO7IC4rPEJ/2L3VWUCQNi4="; }; patches = [ 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 a36f367ba4..f350f6df61 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 @@ -20,13 +20,13 @@ let ''; in buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.28.6"; + version = "0.28.7"; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-tNV1GQsUG5BGTNGB0VBUa0Yxqv/HsRSlRfEU4KNd29w="; + hash = "sha256-AxRgoXPiFFFHQSj5/jU55hwWzHtutfjmD2IKGxYwd0A="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-didl-lite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-didl-lite/default.nix index 4ea41cf68a..f808efe2c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-didl-lite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-didl-lite/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = pname; rev = version; - sha256 = "sha256-laKmWGDEzlBVJCUSKxekjPEXVlAz4MIzM7dNJfta/ek="; + hash = "sha256-laKmWGDEzlBVJCUSKxekjPEXVlAz4MIzM7dNJfta/ek="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix index 8038faf2ee..e98e7baac2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "0.21.0"; + version = "1.0.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-t30IJ0Y549NBRd+mxwCOZt8PBLe+enX9DVKSwZHXkEU="; + hash = "sha256-qN+WA0qubS1QpOvoIWMmxhw+tkg2d2UE/MpBDlk3o7o="; }; propagatedBuildInputs = [ click ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-gammu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-gammu/default.nix index 23ad1ac8b5..4fb5e25932 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-gammu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-gammu/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "gammu"; repo = pname; rev = version; - sha256 = "sha256-lFQBrKWwdvUScwsBva08izZVeVDn1u+ldzixtL9YTpA="; + hash = "sha256-lFQBrKWwdvUScwsBva08izZVeVDn1u+ldzixtL9YTpA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix index 1bf1431da1..156d2270d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-cHWOOH/A4MS628s5T2GsvmizSXCo/tfg98iUaf4XkSo="; + hash = "sha256-cHWOOH/A4MS628s5T2GsvmizSXCo/tfg98iUaf4XkSo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix index 4310b767aa..c8171d9e31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-6EmmiJjadC6zJM4+HhL8w2Xw1p7pG5LI0TS53bH61Tc="; + hash = "sha256-6EmmiJjadC6zJM4+HhL8w2Xw1p7pG5LI0TS53bH61Tc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-heatclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-heatclient/default.nix index 9756572223..82967242fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-heatclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-heatclient/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "python-heatclient"; - version = "3.1.0"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-/SW8hRj588N++4Cuz7elbU0qO++4Jhm1va069JnNmZo="; + hash = "sha256-LYjRjDeZp7LQeQFXLogyGy4LEgawTQED+5qRu799tWM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-hglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-hglib/default.nix index 41f25d8f70..b749223938 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-hglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-hglib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-sYvR7VPJDuV9VxTWata7crZOkw1K7KmDCJLAi7KNpgg="; + hash = "sha256-sYvR7VPJDuV9VxTWata7crZOkw1K7KmDCJLAi7KNpgg="; }; nativeCheckInputs = [ mercurial nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix index 1a9757dfc2..846361aa06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-4SAXjx5pRDhv4YVUgrUttyUa5izpYqpDKiiGJc2y8V0="; + hash = "sha256-4SAXjx5pRDhv4YVUgrUttyUa5izpYqpDKiiGJc2y8V0="; }; # win_inet_pton is required for windows support diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-http-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-http-client/default.nix index 2223a5db93..f2ecd21458 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-http-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-http-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sendgrid"; repo = "python-http-client"; rev = version; - sha256 = "sha256-8Qs5Jw0LMV2UucLnlFKJQ2PUhYaQx6uJdIV/4gaPH3w="; + hash = "sha256-8Qs5Jw0LMV2UucLnlFKJQ2PUhYaQx6uJdIV/4gaPH3w="; }; nativeCheckInputs = [ 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 68bcd7434d..22ccc599eb 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 @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "kontron"; repo = pname; rev = version; - sha256 = "sha256-IXEq3d1nXGEndciQw2MJ1Abc0vmEYez+k6aWGSWEzWA="; + hash = "sha256-IXEq3d1nXGEndciQw2MJ1Abc0vmEYez+k6aWGSWEzWA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix index 193717d6d8..9d3823957d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-yYmzZuwZSasN6g6Bosivexe5oOy3dP+l/cD5TkXC87g="; + hash = "sha256-yYmzZuwZSasN6g6Bosivexe5oOy3dP+l/cD5TkXC87g="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-jose/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-jose/default.nix index dd3d56c6c3..68150935da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-jose/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-jose/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mpdavis"; repo = pname; rev = version; - sha256 = "sha256-6VGC6M5oyGCOiXcYp6mpyhL+JlcYZKIqOQU9Sm/TkKM="; + hash = "sha256-6VGC6M5oyGCOiXcYp6mpyhL+JlcYZKIqOQU9Sm/TkKM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix index b49d8df61a..603bc629e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix @@ -1,27 +1,24 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 -, nose +, pytestCheckHook }: buildPythonPackage rec { - version = "2.0.4"; pname = "python-json-logger"; - disabled = isPy27; + version = "2.0.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dk12IXX5n8xGML1IU7CWMqy2CmIkrLJ84IzXDwsbgb0="; + hash = "sha256-I+fsAtNCN8WqHimgcBk6Tqh1g7tOf4/QbT3oJkxLLhw="; }; - nativeCheckInputs = [ nose ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { + description = "Json Formatter for the standard python logger"; homepage = "https://github.com/madzak/python-json-logger"; - description = "A python library adding a json log formatter"; license = licenses.bsdOriginal; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-jwt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-jwt/default.nix index 43ff058149..7e21b4f45a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-jwt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-jwt/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "GehirnInc"; repo = "python-jwt"; rev = "v${version}"; - sha256 = "sha256-N1J8yBVX/O+92cRp+q2gA2cFsd+C7JjUR9jo0VGoINg="; + hash = "sha256-N1J8yBVX/O+92cRp+q2gA2cFsd+C7JjUR9jo0VGoINg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix index e348b2b80b..ab7ae435f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-vp2r842f9A2lEFLhUcHyGZavAWT4Ke9mH+FAlGucdqo="; + hash = "sha256-vp2r842f9A2lEFLhUcHyGZavAWT4Ke9mH+FAlGucdqo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-keycloak/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-keycloak/default.nix index ea96e00abe..f3d105c6ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-keycloak/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-keycloak/default.nix @@ -25,7 +25,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' + --replace 'version = "0.0.0"' 'version = "${version}"' \ + --replace 'requests-toolbelt = "^0.9.1"' 'requests-toolbelt = "*"' ''; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-keystoneclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-keystoneclient/default.nix index f92816afc7..92b9f6364e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-keystoneclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-keystoneclient/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-keystoneclient"; - version = "5.0.1"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-qLv2cfVsJKpaN6IluY8plLggY9c+NIZlfrUAozpAbSk="; + hash = "sha256-ugm9/q+iohlkUKMnzT9G8qip3Z0huDj4y5sXqZdAxqE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-linux-procfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-linux-procfs/default.nix index 702be64075..4c025b1add 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-linux-procfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-linux-procfs/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/python/${pname}/${pname}.git"; rev = "v${version}"; - sha256 = "sha256-PPgMlL9oj4HYUsr444ZrGo1LSZBl9hL5SE98IASUpbc="; + hash = "sha256-PPgMlL9oj4HYUsr444ZrGo1LSZBl9hL5SE98IASUpbc="; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-logstash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-logstash/default.nix index 7930dcd33e..3f281d9696 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-logstash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-logstash/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-0E4c4R7MEH5KTzuAf8V9loEelkpVQIGzu7RHMvdO9fk="; + hash = "sha256-0E4c4R7MEH5KTzuAf8V9loEelkpVQIGzu7RHMvdO9fk="; }; # no tests 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 36c973db74..214ebf60a3 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 @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-t7ot9QAv0o0+54mklTK6rRH+ZI5PIRfPB5jnUgodpWs="; + hash = "sha256-t7ot9QAv0o0+54mklTK6rRH+ZI5PIRfPB5jnUgodpWs="; }; patches = [ @@ -21,7 +21,7 @@ buildPythonPackage rec { (fetchpatch { name = "fix-karate-test-networkx-2.7.patch"; url = "https://github.com/taynaud/python-louvain/pull/95/commits/c95d767e72f580cb15319fe08d72d87c9976640b.patch"; - sha256 = "sha256-9oJ9YvKl2sI8oGhfyauNS+HT4kXsDt0L8S2owluWdj0="; + hash = "sha256-9oJ9YvKl2sI8oGhfyauNS+HT4kXsDt0L8S2owluWdj0="; }) ]; 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 86a6995f05..67e242f495 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 @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = "python-lsp-black"; rev = "v${version}"; - sha256 = "sha256-qNA6Bj1VI0YEtRuvcMQZGWakQNNrJ2PqhozrLmQHPAg="; + hash = "sha256-qNA6Bj1VI0YEtRuvcMQZGWakQNNrJ2PqhozrLmQHPAg="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix index 358a647d52..f90591a7fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ahupp"; repo = "python-magic"; rev = version; - sha256 = "sha256-fZ+5xJ3P0EYK+6rQ8VzXv2zckKfEH5VUdISIR6ybIfQ="; + hash = "sha256-fZ+5xJ3P0EYK+6rQ8VzXv2zckKfEH5VUdISIR6ybIfQ="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix index 4716177f51..8c623f286f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { # https://github.com/mapnik/python-mapnik/issues/239 (fetchpatch { url = "https://github.com/koordinates/python-mapnik/commit/318b1edac16f48a7f21902c192c1dd86f6210a44.patch"; - sha256 = "sha256-cfU8ZqPPGCqoHEyGvJ8Xy/bGpbN2vSDct6A3N5+I8xM="; + hash = "sha256-cfU8ZqPPGCqoHEyGvJ8Xy/bGpbN2vSDct6A3N5+I8xM="; }) ./find-pycairo-with-pkg-config.patch # python-mapnik seems to depend on having the mapnik src directory diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-mpv-jsonipc/default.nix index 0dfe135814..4834b6bd9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-mpv-jsonipc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-mpv-jsonipc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "iwalton3"; repo = "python-mpv-jsonipc"; rev = "v${version}"; - sha256 = "sha256-W9TNtbRhQmwZXhi0TJIDkZRtWhi92/iwL056YIcWnLM="; + hash = "sha256-W9TNtbRhQmwZXhi0TJIDkZRtWhi92/iwL056YIcWnLM="; }; # 'mpv-jsonipc' does not have any tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-mystrom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-mystrom/default.nix index 4f3a39d5b7..e269ccc121 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-mystrom/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-mystrom/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Kqv5rUdwkynOzssID77gVYyzs0CDR/bUWh6zpt5zOP8="; + hash = "sha256-Kqv5rUdwkynOzssID77gVYyzs0CDR/bUWh6zpt5zOP8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-nmap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-nmap/default.nix index 1cb3559b04..a68794af5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-nmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-nmap/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-91r2uR3Y47DDH4adsyFj9iraaGlF5bfCX4S8D3+tO2Q="; + hash = "sha256-91r2uR3Y47DDH4adsyFj9iraaGlF5bfCX4S8D3+tO2Q="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-nomad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-nomad/default.nix index ffd93a2e28..e7e191c728 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-nomad/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-nomad/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-VpngJvm9eK60lPeFIbjnTwzWWoJ9tRBDYP5SghDMbAg="; + hash = "sha256-VpngJvm9eK60lPeFIbjnTwzWWoJ9tRBDYP5SghDMbAg="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-opendata-transport/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-opendata-transport/default.nix index 01733dece3..b633848e64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-opendata-transport/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-opendata-transport/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "python_opendata_transport"; inherit version; - sha256 = "sha256-CpzMMp2C3UOiUna9EcUucD/PKv7AZlkaU8QJfWntoi8="; + hash = "sha256-CpzMMp2C3UOiUna9EcUucD/PKv7AZlkaU8QJfWntoi8="; }; propagatedBuildInputs = [ 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 8e0317dbc6..d0cecb30bb 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 @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "python-openstackclient"; - version = "6.1.0"; + version = "6.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7ZF5GFG/eQmvQYnVmaV8iWYPhWldJPPumlZloeJkNLg="; + hash = "sha256-fFOr4bc7RT9Z2ntzZ5w7dZtI5RuLBUhktf3qLqgnJ9Y="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-osc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-osc/default.nix index 8c6fc7cc3d..27a5a084fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-osc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-osc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-69a3z4rjhzgPSOnW1zabrRwXahr2YI79eIi1C08OdK0="; + hash = "sha256-69a3z4rjhzgPSOnW1zabrRwXahr2YI79eIi1C08OdK0="; }; pythonImportsCheck = [ "pythonosc" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix index 183fb31d06..9bc33c5755 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-otbr-api"; - version = "1.0.7"; + version = "1.0.9"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-R6H+h6IbyI/Qhwb6ACT2sx/YWmLDMyg4gLMJdmNj2wk="; + hash = "sha256-Rg5+EOsxRse618WvP4+9ybiu0mJpizrzCmeIbRnFgaA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-pae/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-pae/default.nix index 92c7bd2cfb..73456cbd8f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-pae/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-pae/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "MatthiasValvekens"; repo = "python-pae"; rev = version; - sha256 = "sha256-D0X2T0ze79KR6Gno4UWpA/XvlkK6Y/jXUtLbzlOKr3E="; + hash = "sha256-D0X2T0ze79KR6Gno4UWpA/XvlkK6Y/jXUtLbzlOKr3E="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-pam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-pam/default.nix index b19d2c623d..22dcf9e467 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-pam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-pam/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "FirefighterBlu3"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-MR9LYXtkbltAmn7yoyyKZn4yMHyh3rj/i/pA8nJy2xU="; + hash = "sha256-MR9LYXtkbltAmn7yoyyKZn4yMHyh3rj/i/pA8nJy2xU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-pidfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-pidfile/default.nix index 6626f0b77b..f2ba27897b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-pidfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-pidfile/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-HhCX30G8dfV0WZ/++J6LIO/xvfyRkdPtJkzC2ulUKdA="; + hash = "sha256-HhCX30G8dfV0WZ/++J6LIO/xvfyRkdPtJkzC2ulUKdA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix index f2cd6d285b..9cb3baf066 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix @@ -21,7 +21,8 @@ let }; patches = [ (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/community/rapidjson/do-not-include-gtest-src-dir.patch"; + name = "do-not-include-gtest-src-dir.patch"; + url = "https://git.alpinelinux.org/aports/plain/community/rapidjson/do-not-include-gtest-src-dir.patch?id=9e5eefc7a5fcf5938a8dc8a3be8c75e9e6809909"; hash = "sha256-BjSZEwfCXA/9V+kxQ/2JPWbc26jQn35CfN8+8NW24s4="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix index 103349f7b6..44527977bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ redis - ] ++ lib.optional withDjango [ + ] ++ lib.optionals withDjango [ django-redis ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-sat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-sat/default.nix index bcffe6f865..d7f62a49f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-sat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-sat/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "pysathq"; repo = "pysat"; rev = version; - sha256 = "sha256-zGdgD+SgoMB7/zDQI/trmV70l91TB7OkDxaJ30W3dkI="; + hash = "sha256-zGdgD+SgoMB7/zDQI/trmV70l91TB7OkDxaJ30W3dkI="; }; propagatedBuildInputs = [ six pypblib ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix index 91a1ccb7e4..59d3058b17 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mdz"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-BGG5SQfVxhp6ID2Ob+afm75cInVixSPD5012K4HwthU="; + hash = "sha256-BGG5SQfVxhp6ID2Ob+afm75cInVixSPD5012K4HwthU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix index 28c06ea3d0..48528adf2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-tqEHqwYgasxTWdTFYyvZsi1EhwKnmzFpsMYuD7gIuyo="; + hash = "sha256-tqEHqwYgasxTWdTFYyvZsi1EhwKnmzFpsMYuD7gIuyo="; }; buildInputs = [ snappy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-string-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-string-utils/default.nix index 1185959f0c..d0164062b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-string-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-string-utils/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-3PkGCwPwdkfApgNAjciwP4B/O1SgXG4Z6xRGAlb6wMs="; + hash = "sha256-3PkGCwPwdkfApgNAjciwP4B/O1SgXG4Z6xRGAlb6wMs="; }; pythonImportsCheck = ["string_utils"]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-tado/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-tado/default.nix index 4aa201469a..2e518b6ece 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-tado/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-tado/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "wmalgadey"; repo = "PyTado"; rev = version; - sha256 = "sha256-n+H6H2ORLizv9cn1P5Cd8wHDWMNonPrs+x+XMQbEzZQ="; + hash = "sha256-n+H6H2ORLizv9cn1P5Cd8wHDWMNonPrs+x+XMQbEzZQ="; }; propagatedBuildInputs = [ requests ]; 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 d87ba9f761..ece7a81de4 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 @@ -1,6 +1,6 @@ { lib , aiolimiter -, APScheduler +, apscheduler , beautifulsoup4 , buildPythonPackage , cachetools @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "20.0"; + version = "20.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,12 +28,12 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-34Apzy7id+fDxTN935hPT0HeZNZMEdQqZ0aiV0trAxE="; + hash = "sha256-fRvusmf33QFBZc/Sq81Dx/MGBvcK514S5llJO0XbTgc="; }; propagatedBuildInputs = [ aiolimiter - APScheduler + apscheduler cachetools cryptography httpx diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram/default.nix index 0809a739be..a79362a934 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Na2NIiVgYexKbEqjN58hfkgxwFdCTL7Z7D3WEhL4wXA="; + hash = "sha256-Na2NIiVgYexKbEqjN58hfkgxwFdCTL7Z7D3WEhL4wXA="; }; patches = [ # Search for the system library first, and fallback to the embedded one if the system was not found (fetchpatch { url = "https://github.com/alexander-akhmetov/python-telegram/commit/b0af0985910ebb8940cff1b92961387aad683287.patch"; - sha256 = "sha256-ZqsntaiC2y9l034gXDMeD2BLO/RcsbBII8FomZ65/24="; + hash = "sha256-ZqsntaiC2y9l034gXDMeD2BLO/RcsbBII8FomZ65/24="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-trovo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-trovo/default.nix index b2f58f99f6..6c443400d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-trovo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-trovo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-g1RDHSNGbGT1G2ej7A8WzyR17FaNPySfsAuKbHddmtQ="; + hash = "sha256-g1RDHSNGbGT1G2ej7A8WzyR17FaNPySfsAuKbHddmtQ="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-vagrant/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-vagrant/default.nix index b8ae4eba78..a9d585c777 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-vagrant/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-vagrant/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qP6TzPL/N+zJXsL0nqdKkabOc6TbShapjdJtOXz9CeU="; + hash = "sha256-qP6TzPL/N+zJXsL0nqdKkabOc6TbShapjdJtOXz9CeU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-vipaccess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-vipaccess/default.nix index 58bf890921..a5a76bf452 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-vipaccess/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-vipaccess/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-vBFCRXwZ91C48GuOet2Obbo7gM02M2c9+7rhp0l6w54="; + hash = "sha256-vBFCRXwZ91C48GuOet2Obbo7gM02M2c9+7rhp0l6w54="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-whois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-whois/default.nix index 724884fe73..0a52e0b25c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-whois/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-whois/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-3TNtNRfqzip2iUBtt7uWraPF50MnQjFRru4+ZCJfYiA="; + hash = "sha256-3TNtNRfqzip2iUBtt7uWraPF50MnQjFRru4+ZCJfYiA="; }; propagatedBuildInputs = [ future ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-zbar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-zbar/default.nix index 178b1899ef..4d85b26875 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-zbar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-zbar/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "mchehab"; repo = "zbar"; rev = version; - sha256 = "sha256-FvV7TMc4JbOiRjWLka0IhtpGGqGm5fis7h870OmJw2U="; + hash = "sha256-FvV7TMc4JbOiRjWLka0IhtpGGqGm5fis7h870OmJw2U="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python3-application/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python3-application/default.nix index 22cb820ea6..f4b162a14a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python3-application/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python3-application/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "AGProjects"; repo = pname; rev = "release-${version}"; - sha256 = "sha256-XXAKp/RlBVs3KmcnuiexdYfxf0zt2A/DrsJzdC9I4vA="; + hash = "sha256-XXAKp/RlBVs3KmcnuiexdYfxf0zt2A/DrsJzdC9I4vA="; }; propagatedBuildInputs = [ zope_interface twisted ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python3-eventlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python3-eventlib/default.nix index 3c2413ff59..74abe97039 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python3-eventlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python3-eventlib/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "AGProjects"; repo = "python3-eventlib"; rev = version; - sha256 = "sha256-LFW3rCGa7A8tk6SjgYgjkLQ+72GE2WN8wG+XkXYTAoQ="; + hash = "sha256-LFW3rCGa7A8tk6SjgYgjkLQ+72GE2WN8wG+XkXYTAoQ="; }; propagatedBuildInputs = [ zope_interface twisted greenlet ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python3-gnutls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python3-gnutls/default.nix index cda8281139..4fcd528ad9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python3-gnutls/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python3-gnutls/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "AGProjects"; repo = "python3-gnutls"; rev = "324b78f7cd3d9fe58c89c7f0b2bf94199bd6a6e5"; # version not tagged - sha256 = "sha256-18T8bAHlNERHobsspUFvSC6ulN55nrFFb5aqNwU8T00="; + hash = "sha256-18T8bAHlNERHobsspUFvSC6ulN55nrFFb5aqNwU8T00="; }; propagatedBuildInputs = [ twisted pyopenssl service-identity ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pythonfinder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pythonfinder/default.nix index 54d7dabfe1..79fb7ce78c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pythonfinder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pythonfinder/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pythonfinder"; - version = "1.3.1"; + version = "1.3.2"; format = "pyproject"; src = fetchFromGitHub { owner = "sarugaku"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-N/q9zi2SX38ivSpnjrx+bEzdR9cS2ivSgy42SR8cl+Q="; + rev = "refs/tags/${version}"; + hash = "sha256-sfoAS3QpD78we8HcXpxjSyEIN1xLRVLExaM3oXe6tLU="; }; nativeBuildInputs = [ @@ -41,7 +41,13 @@ buildPythonPackage rec { pytest-timeout ]; - pytestFlagsArray = [ "--no-cov" ]; + pythonImportsCheck = [ + "pythonfinder" + ]; + + pytestFlagsArray = [ + "--no-cov" + ]; # these tests invoke git in a subprocess and # for some reason git can't be found even if included in nativeCheckInputs @@ -52,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/sarugaku/pythonfinder"; + changelog = "https://github.com/sarugaku/pythonfinder/blob/v${version}/CHANGELOG.rst"; description = "Cross Platform Search Tool for Finding Pythons"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; 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 da72cc0839..f1d84712b2 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 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "tpaviot"; repo = "pythonocc-core"; rev = "refs/tags/${version}"; - sha256 = "sha256-YybpwiCeBnwZfYS6ZxUbycHFn2DlqYxcNMylRN5ihFM="; + hash = "sha256-YybpwiCeBnwZfYS6ZxUbycHFn2DlqYxcNMylRN5ihFM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pythran/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pythran/default.nix index 0e09a198ab..ef03e76947 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pythran/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pythran/default.nix @@ -25,7 +25,7 @@ in buildPythonPackage rec { owner = "serge-sans-paille"; repo = "pythran"; rev = version; - sha256 = "sha256-F9gUZOTSuiqvfGoN4yQqwUg9mnCeBntw5eHO7ZnjpzI="; + hash = "sha256-F9gUZOTSuiqvfGoN4yQqwUg9mnCeBntw5eHO7ZnjpzI="; }; patches = [ 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 95e8725540..b2e8376347 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-fxtDqbslUyV/Otwy9MPIC8DSepTnEZiJKzeU8nlsnWI="; + hash = "sha256-fxtDqbslUyV/Otwy9MPIC8DSepTnEZiJKzeU8nlsnWI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytomlpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytomlpp/default.nix index f9782758f3..c0bcbe35b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytomlpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytomlpp/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-QyjIJCSgiSKjqMBvCbOlWYx6rBbKIoDvXez2YnYaPUo="; + hash = "sha256-QyjIJCSgiSKjqMBvCbOlWYx6rBbKIoDvXez2YnYaPUo="; }; buildInputs = [ pybind11 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix index 7008f72acb..7731809288 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-QQFzcWELsqA2hVl8UoUgXmWXx/F3OD2VyLhxJEsSwU4="; + hash = "sha256-QQFzcWELsqA2hVl8UoUgXmWXx/F3OD2VyLhxJEsSwU4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix index f1f4139cd8..80c887e497 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "1.9.0"; + version = "1.9.3"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-zlOIZYwNoUkznRcwNn8LQIEM4UuG6mPnqQIH+O4Jun4="; + hash = "sha256-Xftm2gLNXnBUEPX0ULjSx8LpS5t4k+g64cxUgCAaz2w="; }; preConfigure = '' 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 cc6b56d4cf..bf4f2c2df3 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 @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-zB0g6GJcqWRhjJZgUWmTdG4fhBBfFR6yEM2FEOVLWIs="; + hash = "sha256-zB0g6GJcqWRhjJZgUWmTdG4fhBBfFR6yEM2FEOVLWIs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-pfn-extras/default.nix index 4f61c14a59..3bd169bc1a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-pfn-extras/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-pfn-extras/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pfnet"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-x1aE/55+2QwYG3Hhy35j26jLAj9O5orrU/c4KlTTOcc="; + hash = "sha256-x1aE/55+2QwYG3Hhy35j26jLAj9O5orrU/c4KlTTOcc="; }; propagatedBuildInputs = [ numpy packaging torch typing-extensions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytraccar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytraccar/default.nix index 7b33eb0290..f854589103 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytraccar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytraccar/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-ngyLe6sbTTQ7n4WdV06OlQnn/vqkD+JUruyMYS1Ym+Q="; + hash = "sha256-ngyLe6sbTTQ7n4WdV06OlQnn/vqkD+JUruyMYS1Ym+Q="; }; nativeBuildInputs = [ 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 9156db165f..77c055b4e6 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.8.0"; + version = "4.9.0"; disabled = isPy27; # python2 pandas is too old src = fetchPypi { inherit pname version; - sha256 = "sha256-BLezPrbfwSCqictGQGiKi2MzNydrbdzqRP8Mf2tiQ9I="; + hash = "sha256-pU/B4xcUQrPI9cCApeId+Ae8T6rXeQzGK33bBZ6wqUs="; }; propagatedBuildInputs = [ requests lxml pandas ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytweening/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytweening/default.nix index d0ba980306..da9e2aaa32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytweening/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytweening/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-hTMoLPcLMd6KBJnhz0IJMLABPHhxGIcrLsiZOCeS4uY="; + hash = "sha256-hTMoLPcLMd6KBJnhz0IJMLABPHhxGIcrLsiZOCeS4uY="; }; pythonImportsCheck = [ "pytweening" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyu2f/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyu2f/default.nix index 6538782430..609d8bfceb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyu2f/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyu2f/default.nix @@ -4,6 +4,7 @@ , six , mock , pyfakefs +, pytest-forked , pytestCheckHook }: @@ -26,6 +27,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pyfakefs + pytest-forked pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyuavcan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyuavcan/default.nix index c3823a6c3c..f5152f8e9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyuavcan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyuavcan/default.nix @@ -10,7 +10,7 @@ owner = "UAVCAN"; repo = pname; rev = version; - sha256 = "0fmbmdnnh679zkllv5m6pkrasg7m9vjwabqnmz5m7flrgdh6h4qa"; + hash = "sha256-ChNoYHuZulPLrxYvxeVO9Tyt8rymlk3p/OkYaG2rqzo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyudev/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyudev/default.nix index b9c664de93..24f3b89a86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyudev/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyudev/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-sqOv4cmep1H4KWZSVX6sVZh02iobHsBiUXhwbsWjRfM="; + hash = "sha256-sqOv4cmep1H4KWZSVX6sVZh02iobHsBiUXhwbsWjRfM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyutil/default.nix index e639134992..c3b6310466 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyutil/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-6hbSxVtvg0Eh3rYyp0VLCg+uJdXRMLFfa+l667B2yfw="; + hash = "sha256-6hbSxVtvg0Eh3rYyp0VLCg+uJdXRMLFfa+l667B2yfw="; }; propagatedBuildInputs = [ simplejson ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyutilib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyutilib/default.nix index 2d738b8757..43295e0c90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyutilib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyutilib/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyUtilib"; inherit version; - sha256 = "sha256-08FPjtkCioMbK/Ubird3brqH5mz8WKBrmcNZqqZA8EA="; + hash = "sha256-08FPjtkCioMbK/Ubird3brqH5mz8WKBrmcNZqqZA8EA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyuv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyuv/default.nix index fc5b04417a..ddfbca300b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyuv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyuv/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { (fetchpatch { name = "fix-build-with-python3.10.patch"; url = "https://github.com/saghul/pyuv/commit/8bddcc27052017b5b9cb89c24dbfdf06737b0dd3.patch"; - sha256 = "sha256-J/3ky64Ff+gYpN3ksFLNuZ5xgPbBkyOl4LTY6fiHAgk="; + hash = "sha256-J/3ky64Ff+gYpN3ksFLNuZ5xgPbBkyOl4LTY6fiHAgk="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvera/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvera/default.nix index b6f1f851d7..b43840b079 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvera/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvera/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pavoni"; repo = pname; rev = version; - sha256 = "sha256-1+xIqOogRUt+blX7AZSKIiU8lpR4AzKIIW/smCSft94="; + hash = "sha256-1+xIqOogRUt+blX7AZSKIiU8lpR4AzKIIW/smCSft94="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix index 25e075b318..27203dfdf4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ulYOzCIpHkL/2nQExomoV4mLkU6e0ns4MHxEbjCPGrQ="; + hash = "sha256-ulYOzCIpHkL/2nQExomoV4mLkU6e0ns4MHxEbjCPGrQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index 2b4afb7802..8c1290c40e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.41"; + version = "9.2.42"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-NYNxuWvAvx5IW1gdWv+EF321yzUPaqFBRNKVwu4ogug="; + hash = "sha256-5pp66sI15sdavyZD+xrTFqhAgjT89KswBE0MQ09Fdl4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix index b238d82ec9..14773604be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "sha256-OZvYl8wl8kOIOfsWVn74XFKMX/jAmtoMTIEQpAZmTeo="; + hash = "sha256-OZvYl8wl8kOIOfsWVn74XFKMX/jAmtoMTIEQpAZmTeo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix index b8a793d7d7..71fe7601ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "libvips"; repo = "pyvips"; rev = "v${version}"; - sha256 = "sha256-9S7h3bkm+QP78cpemYS7l3c8t+wXsJ5MUAP2T50R/Mc="; + hash = "sha256-9S7h3bkm+QP78cpemYS7l3c8t+wXsJ5MUAP2T50R/Mc="; }; nativeBuildInputs = [ pkgconfig pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/PyVirtualDisplay/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvirtualdisplay/default.nix similarity index 74% rename from third_party/nixpkgs/pkgs/development/python-modules/PyVirtualDisplay/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/pyvirtualdisplay/default.nix index bc7469e1d6..90b3e0b118 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/PyVirtualDisplay/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvirtualdisplay/default.nix @@ -1,14 +1,15 @@ { lib, buildPythonPackage, fetchPypi, EasyProcess }: buildPythonPackage rec { - pname = "PyVirtualDisplay"; + pname = "pyvirtualdisplay"; version = "3.0"; propagatedBuildInputs = [ EasyProcess ]; src = fetchPypi { - inherit pname version; - sha256 = "sha256-CXVbw86263JfsH7KVCX0PyNY078I4A0qm3kqGu3RYVk="; + pname = "PyVirtualDisplay"; + inherit version; + hash = "sha256-CXVbw86263JfsH7KVCX0PyNY078I4A0qm3kqGu3RYVk="; }; # requires X server diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvis/default.nix index 1ac752f23d..5c9f054d76 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvis/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { owner = "WestHealth"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cER5XYxnURzRLtrisWBu2kxtOiRqgaRTJYyaCMh2qqE="; + hash = "sha256-cER5XYxnURzRLtrisWBu2kxtOiRqgaRTJYyaCMh2qqE="; }; patches = [ # Fix test: https://github.com/WestHealth/pyvis/issues/138 (fetchpatch { url = "https://github.com/WestHealth/pyvis/commit/eaa24b882401e2e74353efa78bf4e71a880cfc47.patch"; - sha256 = "sha256-hyDypavoCM36SiuQda1U4FLUPdAjTIMtaeZ0KqfHKzI="; + hash = "sha256-hyDypavoCM36SiuQda1U4FLUPdAjTIMtaeZ0KqfHKzI="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix index aabf04744a..30901bb689 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-omFFuM5D0tk0s8aCbXe5E84QXFKOsuSUyJCz41Jd3zM="; + hash = "sha256-omFFuM5D0tk0s8aCbXe5E84QXFKOsuSUyJCz41Jd3zM="; }; propagatedBuildInputs = [ param ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvo/default.nix index 64798acad2..72801ee306 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvo/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-R2ttLoFd6Ic0KZl49dzN5NtWAqPpXRaeki6X8CRGsCw="; + hash = "sha256-R2ttLoFd6Ic0KZl49dzN5NtWAqPpXRaeki6X8CRGsCw="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywavelets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywavelets/default.nix index 163f93288f..778148178c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywavelets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywavelets/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ZDevPd8IMRjCbY+Xq0OwckuVbJ+Vjp6niGWfaig0upM="; + hash = "sha256-ZDevPd8IMRjCbY+Xq0OwckuVbJ+Vjp6niGWfaig0upM="; }; nativeCheckInputs = [ nose pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix index e02d767ce9..0b32bf7f54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , decorator , fetchPypi -, FormEncode +, formencode , httpretty , libxml2 , lxml @@ -47,7 +47,7 @@ buildPythonPackage rec { nativeCheckInputs = [ decorator - FormEncode + formencode httpretty libxml2 lxml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix index 77e24c56b5..806f8e2138 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-bDbhZ5JoIZ5pO6lA2yvyVMJAygJmTeECtyaa/DxUVzE="; + hash = "sha256-bDbhZ5JoIZ5pO6lA2yvyVMJAygJmTeECtyaa/DxUVzE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix index 835ff62437..d4bbe0b590 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pywebview"; - version = "3.7.2"; + version = "4.0.2"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "r0x0r"; repo = "pywebview"; rev = "refs/tags/${version}"; - hash = "sha256-5e05XkyxvOGLaEwKljYFppHQ99BxDQ7wPkViRlRo1VI="; + hash = "sha256-awgX862p1jU/LWdg7QMC9by0OJMkzGwnC0yrc93I/c0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywilight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywilight/default.nix index 923e4b9a28..e25f24d403 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywilight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywilight/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-patCdQ7qLEfy+RpH9T/Fa8ubI7QF6OmLzFUokZc5syQ="; + hash = "sha256-patCdQ7qLEfy+RpH9T/Fa8ubI7QF6OmLzFUokZc5syQ="; }; 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 fb03693574..8d547239f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix @@ -9,7 +9,7 @@ , pixman , pythonOlder , udev -, wlroots +, wlroots_0_16 , wayland , pywayland , xkbcommon @@ -19,19 +19,19 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.15.24"; + version = "0.16.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TvYhxiAbK+mpcEE9y79WH96dzeDnvI0xPaUxSYQqyHE="; + hash = "sha256-GFJw88N0313PudM0o/jOvtoE3u8kSoV+lYgKlNya4wM="; }; nativeBuildInputs = [ pkg-config ]; propagatedNativeBuildInputs = [ cffi ]; - buildInputs = [ libinput libxkbcommon pixman xorg.libxcb udev wayland wlroots ]; + buildInputs = [ libinput libxkbcommon pixman xorg.libxcb udev wayland wlroots_0_16 ]; propagatedBuildInputs = [ cffi pywayland xkbcommon ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyworld/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyworld/default.nix index 4e22e5f5d9..760a196001 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyworld/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyworld/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Zo0JhCw8+nSx9u2r2wBYpkwE+c8XuTiD5tqBHhIErU0="; + hash = "sha256-Zo0JhCw8+nSx9u2r2wBYpkwE+c8XuTiD5tqBHhIErU0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyx/default.nix index 85fdafa506..1774e89ed7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyX"; inherit version; - sha256 = "sha256-TY4+RxzT6am9E9UIbN98CvGww/PhledPX2MxjcQKZtg="; + hash = "sha256-TY4+RxzT6am9E9UIbN98CvGww/PhledPX2MxjcQKZtg="; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyxattr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyxattr/default.nix index 1ad0391ea3..0fe64d2bf9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyxattr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyxattr/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-e/QM7FrpPdZWEocX29Joz8Ozso2VU214hndslPomeFU="; + hash = "sha256-e/QM7FrpPdZWEocX29Joz8Ozso2VU214hndslPomeFU="; }; # IOError: [Errno 95] Operation not supported (expected) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyxdg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyxdg/default.nix index 1a7f5b265e..9e3c24fdb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyxdg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyxdg/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "xdg"; repo = pname; rev = "rel-${version}"; - sha256 = "sha256-TrFQzfkXabmfpGYwhxD1UVY1F645KycfSPPrMJFAe+0="; + hash = "sha256-TrFQzfkXabmfpGYwhxD1UVY1F645KycfSPPrMJFAe+0="; }; # Tests failed (errors=4, failures=4) on NixOS diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyxiaomigateway/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyxiaomigateway/default.nix index 0d60916724..dd9ceacc1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyxiaomigateway/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyxiaomigateway/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "PyXiaomiGateway"; rev = version; - sha256 = "sha256-TAbZvs1RrUy9+l2KpfbBopc3poTy+M+Q3ERQLFYbQis="; + hash = "sha256-TAbZvs1RrUy9+l2KpfbBopc3poTy+M+Q3ERQLFYbQis="; }; propagatedBuildInputs = [ cryptography ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix index eee4bf5306..16ba6b4de9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Y8mj6OfZXyE1q3C8HyVzGySuZB6rLSsL/CV/7axxaec="; + hash = "sha256-Y8mj6OfZXyE1q3C8HyVzGySuZB6rLSsL/CV/7axxaec="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-include/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-include/default.nix index e6effdd727..92ec25186f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-include/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-include/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-9/vrjnG1C+Dm4HRy98edv7GhW63pyToHg2n/SeV+Z3E="; + hash = "sha256-9/vrjnG1C+Dm4HRy98edv7GhW63pyToHg2n/SeV+Z3E="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyyaml/default.nix index 10f78ab5e1..7c19e55a7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyyaml/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "yaml"; repo = "pyyaml"; rev = version; - sha256 = "sha256-wcII32mRgRRmAgojntyxBMQkjvxU2jylCgVzlHAj2Xc="; + hash = "sha256-wcII32mRgRRmAgojntyxBMQkjvxU2jylCgVzlHAj2Xc="; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix index ff5a106c09..c14c12c978 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "emlove"; repo = pname; rev = version; - sha256 = "sha256-FNiq/dbh5PMTxnKCKDSHEvllehAEUYvWZS+OyP3lSW8="; + hash = "sha256-FNiq/dbh5PMTxnKCKDSHEvllehAEUYvWZS+OyP3lSW8="; }; postPatch = '' 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 2d402b0764..30e7afd82b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qdarkstyle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qdarkstyle/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "QDarkStyle"; - sha256 = "sha256-YAWE1iU0Pg3dEo3gg5PTw1Y3eGpJgn8XTSmqfKqCecE="; + hash = "sha256-YAWE1iU0Pg3dEo3gg5PTw1Y3eGpJgn8XTSmqfKqCecE="; }; # No tests available diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qdldl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qdldl/default.nix index 7f531b75a1..25d28dc4d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qdldl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qdldl/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-acCS9uH8I/t3moCmLm/N/i66BcklhgJIxNZ1T0c2k48="; + hash = "sha256-acCS9uH8I/t3moCmLm/N/i66BcklhgJIxNZ1T0c2k48="; }; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qimage2ndarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qimage2ndarray/default.nix index 9c54df213d..2aead62789 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qimage2ndarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qimage2ndarray/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-NyUQJEbcimlrLsd1sdKvQ7E69qf56+6KNxFbuVQ6LFg="; + hash = "sha256-NyUQJEbcimlrLsd1sdKvQ7E69qf56+6KNxFbuVQ6LFg="; }; 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 d4ba547386..60d5efc9e3 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 @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = "refs/tags/${version}"; - sha256 = "sha256-ew9ucqOWDztjB+hJTh9WkJiutVBJyVQobtEcWeUwEcw="; + hash = "sha256-ew9ucqOWDztjB+hJTh9WkJiutVBJyVQobtEcWeUwEcw="; }; 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 7b62922193..880804ff85 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 @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Ijoqn6nANLsEVKA5nycd1xbW5htJ+TQm6LkiMUWTsSs="; + hash = "sha256-Ijoqn6nANLsEVKA5nycd1xbW5htJ+TQm6LkiMUWTsSs="; }; postPatch = '' 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 65287ce098..8e2de37788 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.19.2"; + version = "0.20.1"; disabled = pythonOlder "3.6"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-jfOyQ0wjYsJOAlix/P9dzBPmkv901eETmBYQzIHZqfg="; + hash = "sha256-BFiGMPiO9Xcl8EiTZYiwHCpo7z+tRaBkIb8GTo01rBA="; }; 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 fe04e74722..28d572afc3 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 @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-wK0ZRNnU7WJlTWRJ2ce6LN6WGKlkh5jBrbXMDYcPQJI="; + hash = "sha256-wK0ZRNnU7WJlTWRJ2ce6LN6WGKlkh5jBrbXMDYcPQJI="; }; 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 47ec6ff8fc..d92d27b772 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 @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-rUY5fnsWg2UisF0tGORvHot8laCs8eVAvuVKUOG5ibw="; + hash = "sha256-rUY5fnsWg2UisF0tGORvHot8laCs8eVAvuVKUOG5ibw="; }; propagatedBuildInputs = [ 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 870878be16..f68149529e 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.4.0"; + version = "0.5.0"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-7MksgbCID4x1qW06BCBzcbiS/eNHjZiDKIvKYTPx6cc="; + hash = "sha256-N4mf5ins0x+yUAIq+yyjSnUrHcaEhH/Jpid/QMhIjE0="; }; postPatch = '' 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 00200525f0..9539564132 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix @@ -28,7 +28,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.39.4"; + version = "0.41.1"; disabled = pythonOlder "3.6"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit"; rev = "refs/tags/${version}"; - sha256 = "sha256-4Lf+0Dq64J53qTEzr9gtuYwe1a+zIgHmgoKMTBEef8M="; + hash = "sha256-ICJJvbekvpaBMnSf+NHbTiarb+Ye3NtktcRYAq8KaCs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qmk-dotty-dict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qmk-dotty-dict/default.nix index 4e52dc9917..8b7a7b5536 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qmk-dotty-dict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qmk-dotty-dict/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-O2EeOTZgv6poNcaOlHhLroD+B7hJCXi17KsDoNL8fqI="; + hash = "sha256-O2EeOTZgv6poNcaOlHhLroD+B7hJCXi17KsDoNL8fqI="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qrcode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qrcode/default.nix index f354e707af..57aec55c46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qrcode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qrcode/default.nix @@ -1,28 +1,46 @@ { lib , buildPythonPackage , fetchPypi -, six -, pillow -, pymaging_png -, mock , setuptools +, pillow +, pypng +, typing-extensions +, mock +, pytestCheckHook }: buildPythonPackage rec { pname = "qrcode"; - version = "7.3.1"; + version = "7.4.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578"; + hash = "sha256-ndlpRUgn4Sfb2TaWsgdHI55tVA4IKTfJDxSslbMPWEU="; }; - propagatedBuildInputs = [ six pillow pymaging_png setuptools ]; - nativeCheckInputs = [ mock ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + typing-extensions + pypng + ]; + + passthru.optional-dependencies.pil = [ + pillow + ]; + + nativeCheckInputs = [ + mock + pytestCheckHook + ] ++ passthru.optional-dependencies.pil; meta = with lib; { - description = "Quick Response code generation for Python"; - homepage = "https://pypi.python.org/pypi/qrcode"; + description = "Python QR Code image generator"; + homepage = "https://github.com/lincolnloop/python-qrcode"; + changelog = "https://github.com/lincolnloop/python-qrcode/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; }; 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 1521f38367..01fc349c3a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qtpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qtpy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-BgPJyDzMA1pHF6EpCL9rxssiUJgn6i7A6Uwtp8ntV8U="; + hash = "sha256-BgPJyDzMA1pHF6EpCL9rxssiUJgn6i7A6Uwtp8ntV8U="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qualysclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qualysclient/default.nix index a613148169..d53c9e80a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qualysclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qualysclient/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "qualysclient"; - version = "0.0.4.8.2"; + version = "0.0.4.8.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "woodtechie1428"; repo = pname; - rev = "v${version}"; - sha256 = "0hrbp5ci1l06j709k5y3z3ad9dryvrkvmc2wyb4a01gw7qzry7ys"; + rev = "refs/tags/v${version}"; + hash = "sha256-+SZICysgSC4XeXC9CCl6Yxb47V9c1eMp7KcpH8J7kK0="; }; propagatedBuildInputs = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SDK for interacting with the Qualys API"; homepage = "https://qualysclient.readthedocs.io/"; + changelog = "https://github.com/woodtechie1428/qualysclient/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/quamash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quamash/default.nix index 5d0382fda6..bca7c8dc7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/quamash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/quamash/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { # add 3.10 compatibility, merged remove on next update (fetchpatch { url = "https://github.com/harvimt/quamash/pull/126/commits/1e9047bec739dbc9d6ab337fc1a111a8b1090244.patch"; - sha256 = "sha256-6gomY82AOKkrt32SEBKnRugzhnC5FAyKDs6K5xaxnRM="; + hash = "sha256-6gomY82AOKkrt32SEBKnRugzhnC5FAyKDs6K5xaxnRM="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix index b7b03c3b44..c355022323 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix @@ -34,9 +34,13 @@ buildPythonPackage rec { pytestCheckHook ]; + preCheck = lib.optionalString stdenv.isDarwin '' + ulimit -n 1024 + ''; + disabledTests = [ - # TypeError: () missing 1 required... - "test_print_with_style" + # RuntimeError: no running event loop + "test_blank_line_fix" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix index a6c2afa7d5..ad258fc123 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.7.4"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-bmr9/iqlp5GghY6DOpFhBH3k69ErqR3DHx7iAu3m6f0="; + hash = "sha256-T1w4QG0KBPBekETd+nMNbvPF2mgBZgQ/jhWcP9694mg="; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't diff --git a/third_party/nixpkgs/pkgs/development/python-modules/radian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/radian/default.nix new file mode 100644 index 0000000000..d348c6e0c5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/radian/default.nix @@ -0,0 +1,71 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pyte +, pexpect +, ptyprocess +, jedi +, git +, lineedit +, prompt-toolkit +, pygments +, rchitect +, six +, R +, rPackages +}: + +buildPythonPackage rec { + pname = "radian"; + version = "0.6.4"; + + src = fetchFromGitHub { + owner = "randy3k"; + repo = pname; + rev = "v${version}"; + sha256 = "QEHVdyVgsZxvs+d+xeeJqwx531+6e0uPi1J3t+hJ0d0="; + }; + + postPatch = '' + substituteInPlace setup.py --replace '"pytest-runner"' "" + ''; + + nativeBuildInputs = [ + R # needed at setup time to detect R_HOME + ]; + + propagatedBuildInputs = [ + lineedit + prompt-toolkit + pygments + rchitect + six + ] ++ (with rPackages; [ + reticulate + askpass + ]); + + nativeCheckInputs = [ + pytestCheckHook + pyte + pexpect + ptyprocess + jedi + git + ]; + + preCheck = '' + export HOME=$TMPDIR + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${R}/lib/R/lib + ''; + + pythonImportsCheck = [ "radian" ]; + + meta = with lib; { + description = "A 21 century R console"; + homepage = "https://github.com/randy3k/radian"; + license = licenses.mit; + maintainers = with maintainers; [ savyajha ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/radicale_infcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/radicale_infcloud/default.nix index 0bd4629b09..e862c70c12 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/radicale_infcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/radicale_infcloud/default.nix @@ -8,7 +8,7 @@ buildPythonPackage { owner = "Unrud"; repo = "RadicaleInfCloud"; rev = "53d3a95af5b58cfa3242cef645f8d40c731a7d95"; - sha256 = "sha256-xzBWIx2OOkCtBjlff1Z0VqgMhxWtgiOKutXUadT3tIo="; + hash = "sha256-xzBWIx2OOkCtBjlff1Z0VqgMhxWtgiOKutXUadT3tIo="; }; propagatedBuildInputs = [ radicale ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rangehttpserver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rangehttpserver/default.nix index 673661b07b..010b959eda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rangehttpserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rangehttpserver/default.nix @@ -2,20 +2,20 @@ , buildPythonPackage , fetchFromGitHub , setuptools -, nose +, pytestCheckHook , requests }: buildPythonPackage rec { pname = "rangehttpserver"; - version = "1.2.0"; + version = "1.3.3"; format = "pyproject"; src = fetchFromGitHub { owner = "danvk"; repo = "RangeHTTPServer"; - rev = version; - sha256 = "1sy9j6y8kp5jiwv2vd652v94kspp1yd4dwxrfqfn6zwnfyv2mzv5"; + rev = "refs/tags/${version}"; + hash = "sha256-ZXEbis37QO8t05JQ2qQQf5rkUSxq3DwzR3khAJkZ5W0="; }; nativeBuildInputs = [ @@ -23,16 +23,10 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - nose + pytestCheckHook requests ]; - checkPhase = '' - runHook preCheck - nosetests - runHook postCheck - ''; - pythonImportsCheck = [ "RangeHTTPServer" ]; @@ -40,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "SimpleHTTPServer with support for Range requests"; homepage = "https://github.com/danvk/RangeHTTPServer"; + changelog = "https://github.com/danvk/RangeHTTPServer/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix index 40a27eed93..00abec7fda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix @@ -19,11 +19,10 @@ buildPythonPackage rec { pname = "rapidfuzz"; version = "2.13.7"; + format = "pyproject"; disabled = pythonOlder "3.7"; - format = "pyproject"; - src = fetchFromGitHub { owner = "maxbachmann"; repo = "RapidFuzz"; @@ -70,6 +69,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + # segfaults + "test_cdist" + ]; + pythonImportsCheck = [ "rapidfuzz.fuzz" "rapidfuzz.string_metric" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ray/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/ray/binary-hashes.nix index 28f9e21033..33c7c66149 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ray/binary-hashes.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ray/binary-hashes.nix @@ -1,11 +1,11 @@ { - cp38 = { - sha256 = "da8adfa33ff54bc61cfe80334a0ee889e0060918db6ff9215aebe32e98b1f939"; - }; cp39 = { - sha256 = "cab13346650f88171b3f348ed352f04695b96d1ab1090ed3b80bdc93e897dbd4"; + sha256 = "596811ae6b41e50f038e0a7cdf0a5320151508d74bac84795bbccad4f6adc6a9"; }; cp310 = { - sha256 = "bcf3bff9517d77ea6c98592fa16e1cfb8bc0cfa345d3be69729bfa9c5bd78a7c"; + sha256 = "b19d381d425259c80b7a9b14aac9d898637ce262d91baeb9569999de3b043967"; + }; + cp311 = { + sha256 = "d86126b6ab5113a3be35281d5699bad731c8f90e02cf6561057017df9312f0a5"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ray/default.nix index c6b7641818..a8a8750ee3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ray/default.nix @@ -57,18 +57,18 @@ let pname = "ray"; - version = "2.0.0"; + version = "2.3.0"; in buildPythonPackage rec { inherit pname version; format = "wheel"; - disabled = pythonOlder "3.8" || pythonAtLeast "3.11"; + disabled = pythonOlder "3.9" || pythonAtLeast "3.12"; src = let pyShortVersion = "cp${builtins.replaceStrings ["."] [""] python.pythonVersion}"; - binary-hash = (import ./binary-hashes.nix)."${pyShortVersion}"; + binary-hash = (import ./binary-hashes.nix)."${pyShortVersion}" or {}; in fetchPypi ({ inherit pname version format; @@ -116,7 +116,11 @@ buildPythonPackage rec { pythonRelaxDepsHook ]; - pythonRelaxDeps = [ "grpcio" "click" "protobuf" ]; + pythonRelaxDeps = [ + "click" + "grpcio" + "protobuf" + ]; propagatedBuildInputs = [ attrs @@ -151,14 +155,16 @@ buildPythonPackage rec { postInstall = '' chmod +x $out/${python.sitePackages}/ray/core/src/ray/{gcs/gcs_server,raylet/raylet} - ln -sf ${redis}/bin/redis-server $out/${python.sitePackages}/ray/core/src/ray/thirdparty/redis/src/redis-server ''; - pythonImportsCheck = [ "ray" ]; + pythonImportsCheck = [ + "ray" + ]; meta = with lib; { description = "A unified framework for scaling AI and Python applications"; homepage = "https://github.com/ray-project/ray"; + changelog = "https://github.com/ray-project/ray/releases/tag/ray-${version}"; license = licenses.asl20; maintainers = with maintainers; [ billhuang ]; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rchitect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rchitect/default.nix new file mode 100644 index 0000000000..9e0b1b48d2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/rchitect/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cffi +, six +, pytestCheckHook +, pytest-mock +, R +, rPackages }: + +buildPythonPackage rec { + pname = "rchitect"; + version = "0.3.40"; + + src = fetchFromGitHub { + owner = "randy3k"; + repo = pname; + rev = "v${version}"; + sha256 = "yJMiPmusZ62dd6+5VkA2uSjq57a0C3arG8CgiUUHKpk="; + }; + + postPatch = '' + substituteInPlace setup.py --replace '"pytest-runner"' "" + ''; + + propagatedBuildInputs = [ + cffi + six + ] ++ (with rPackages; [ + reticulate + ]); + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + R + ]; + + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${R}/lib/R/lib + cd $TMPDIR + ''; + + pythonImportsCheck = [ "rchitect" ]; + + meta = with lib; { + description = "Interoperate R with Python"; + homepage = "https://github.com/randy3k/rchitect"; + license = licenses.mit; + maintainers = with maintainers; [ savyajha ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix index 1d1033944f..34070cc2d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-T5QAtDZtKfX1RG9Y54VJr6gzjmpZdAxzEV6fasQT3GQ="; + hash = "sha256-T5QAtDZtKfX1RG9Y54VJr6gzjmpZdAxzEV6fasQT3GQ="; }; # The package does not ship tests, and the setup machinary confuses 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 d3f0483eec..60ec1cb084 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/readchar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/readchar/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "magmax"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - sha256 = "sha256-QMaTZRS9iOSuax706Es9WhkwU3vdcNb14dbiSt48aN0="; + hash = "sha256-QMaTZRS9iOSuax706Es9WhkwU3vdcNb14dbiSt48aN0="; }; postPatch = '' 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 dd733c8ee6..983de37f39 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 @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "readme_renderer"; inherit version; - sha256 = "sha256-zWUxht/HMFVlbwkPIn9csioEbX9xqEHfowX1XJpRMnM="; + hash = "sha256-zWUxht/HMFVlbwkPIn9csioEbX9xqEHfowX1XJpRMnM="; }; propagatedBuildInputs = [ @@ -43,6 +43,9 @@ buildPythonPackage rec { disabledTests = [ # https://github.com/pypa/readme_renderer/issues/221 "test_GFM_" + # https://github.com/pypa/readme_renderer/issues/274 + "test_CommonMark_008.md" + "test_rst_008.rst" # Relies on old distutils behaviour removed by setuptools (TypeError: dist must be a Distribution instance) "test_valid_rst" "test_invalid_rst" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index 5dab116f14..0451d63cc3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-5e/82CWBYRGjd6t6iXuBkhUTj45eisyG+ZIYMo+VckA="; + hash = "sha256-5e/82CWBYRGjd6t6iXuBkhUTj45eisyG+ZIYMo+VckA="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix index fc3b22ec62..c3fd8eb735 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "recipe-scrapers"; - version = "14.26.0"; + version = "14.32.1"; format = "pyproject"; src = fetchFromGitHub { owner = "hhursev"; repo = "recipe-scrapers"; rev = "refs/tags/${version}"; - hash = "sha256-U7A9HmkXPcuYEsY/uGUVh3LYHDYhV/uizELh1/vXG+U="; + hash = "sha256-6iUagD1PTTAraBHOWLjHiLFFsImO30w84p+6IcIv52c="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/recommonmark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/recommonmark/default.nix index 7804029c0d..ebe070f273 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/recommonmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/recommonmark/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook -, CommonMark +, commonmark , docutils , sphinx , isPy3k @@ -20,7 +20,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ pytestCheckHook ]; - propagatedBuildInputs = [ CommonMark docutils sphinx ]; + propagatedBuildInputs = [ commonmark docutils sphinx ]; dontUseSetuptoolsCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix index 64d2457adb..c6321ebab6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aIrx54vnf85I/Kit/4njg/VIOu6H0SE7NdQ1GbeP8Cc="; + hash = "sha256-aIrx54vnf85I/Kit/4njg/VIOu6H0SE7NdQ1GbeP8Cc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/redis/default.nix index d16cff4f92..667531eba6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/redis/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "redis"; - version = "4.4.0"; + version = "4.5.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-e4yH0ZxF0/EnGxJIWNKlwTFgxOdNSDXignNAD6NNUig="; + hash = "sha256-Huw3Qc2kCNOl+Et40InIuNiV8hs7BQmINR6SX68gKGQ="; }; propagatedBuildInputs = [ @@ -61,12 +61,13 @@ buildPythonPackage rec { "redis.utils" ]; - # tests require a running redis + # Tests require a running redis doCheck = false; meta = with lib; { description = "Python client for Redis key-value store"; - homepage = "https://pypi.python.org/pypi/redis/"; + homepage = "https://github.com/redis/redis-py"; + changelog = "https://github.com/redis/redis-py/releases/tag/v${version}"; license = with licenses; [ mit ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reflink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reflink/default.nix index 1364f3a4b2..ccada2453a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reflink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reflink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ySU1gtskQTv9cDq/wbKkneePMbSQcjnyhumhkpoebjo="; + hash = "sha256-ySU1gtskQTv9cDq/wbKkneePMbSQcjnyhumhkpoebjo="; }; propagatedBuildInputs = [ cffi ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reikna/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reikna/default.nix index dd75551b34..316d81b706 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reikna/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reikna/default.nix @@ -4,7 +4,7 @@ , sphinx , pytest-cov , pytest -, Mako +, mako , numpy , funcsigs , withCuda ? false, pycuda @@ -17,12 +17,12 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-fpa1Pfo5EAafg7Pgha17G6k5G13fdErjclv0On/uYyI="; + hash = "sha256-fpa1Pfo5EAafg7Pgha17G6k5G13fdErjclv0On/uYyI="; }; nativeCheckInputs = [ sphinx pytest-cov pytest ]; - propagatedBuildInputs = [ Mako numpy funcsigs ] + propagatedBuildInputs = [ mako numpy funcsigs ] ++ lib.optional withCuda pycuda ++ lib.optional withOpenCL pyopencl; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/remote-pdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/remote-pdb/default.nix index 174b0bff31..cbaf07ebe2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/remote-pdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/remote-pdb/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { owner = "ionelmc"; repo = "python-remote-pdb"; rev = "v${version}"; - sha256 = "sha256-/7RysJOJigU4coC6d/Ob2lrtw8u8nLZI8wBk4oEEY3g="; + hash = "sha256-/7RysJOJigU4coC6d/Ob2lrtw8u8nLZI8wBk4oEEY3g="; }; meta = with lib; { description = "Remote vanilla PDB (over TCP sockets)."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix index f7d033b7ce..3aebea0e2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.5.3"; + version = "0.5.5"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-pPWnK5Xui339D10vS2QA2Og+Qg3JM8c3CbvRxksl0NY="; + hash = "sha256-Nu0U/I0dDwJ2wAk2Vj6nMt0/0galfTPurj8MqAUzSks="; }; postPatch = '' 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 4ae14db36e..45105965cb 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.63"; + version = "0.64"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fwestenberg"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qwS7frXRk4gCBoAyBFLlbpYsyQZYqMLGB/pdznwyCoA="; + hash = "sha256-3r5BwVlNolji2HIGjqv8gkizx4wWxrKYkiNmSJedKmI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reportengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reportengine/default.nix index 17720e8bec..79e1a908f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reportengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reportengine/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-jrt+ml8o1PUidV1bY0hCyNgcPaVTBloW574/i5Pl7iE="; + hash = "sha256-jrt+ml8o1PUidV1bY0hCyNgcPaVTBloW574/i5Pl7iE="; }; nativeBuildInputs = [ flit ]; 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 81aa02c634..9890eb98f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix @@ -16,7 +16,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-sTzr9OOXu6FFQrzQIzOLb/LBUaOhKqvKie7L+XLLNho="; + hash = "sha256-sTzr9OOXu6FFQrzQIzOLb/LBUaOhKqvKie7L+XLLNho="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix index 9efb54e353..e981591282 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SGvxQjpGlrkVPkiM750ybElv/Bbd6xSwyYh7RsYOKKE="; + hash = "sha256-SGvxQjpGlrkVPkiM750ybElv/Bbd6xSwyYh7RsYOKKE="; }; propagatedBuildInputs = [ zope_interface sphinx ]; 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 fb946fc1eb..680e865260 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 @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-6VWt8AwfCwxxXoKJeaI37Ev37nCCe9l/Xhe/gnYNyzA="; + hash = "sha256-6VWt8AwfCwxxXoKJeaI37Ev37nCCe9l/Xhe/gnYNyzA="; }; propagatedBuildInputs = [ zope_interface webob ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reqif/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reqif/default.nix index a419e70cf1..12357587b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reqif/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reqif/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , python , fetchFromGitHub -, poetry-core +, hatchling , beautifulsoup4 , lxml , jinja2 @@ -11,26 +11,25 @@ buildPythonPackage rec { pname = "reqif"; - version = "0.0.8"; + version = "0.0.27"; format = "pyproject"; src = fetchFromGitHub { owner = "strictdoc-project"; repo = pname; - rev = version; - sha256 = "sha256-PtzRJUvv+Oee08+sdakFviKIhwfLngyal1WSWDtMELg="; + rev = "refs/tags/${version}"; + hash = "sha256-K+su1fhXf/fzL+AI/me2imCNI9aWMcv9Qo1dDRNypso="; }; postPatch = '' substituteInPlace ./tests/unit/conftest.py --replace \ "os.path.abspath(os.path.join(__file__, \"../../../../reqif\"))" \ "\"${placeholder "out"}/${python.sitePackages}/reqif\"" - substituteInPlace pyproject.toml --replace "^" ">=" substituteInPlace requirements.txt --replace "==" ">=" ''; nativeBuildInputs = [ - poetry-core + hatchling ]; propagatedBuildInputs = [ 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 5cb90496ea..f85d2b2deb 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 @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "0.9.7"; + version = "0.9.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -34,8 +34,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "requests-cache"; repo = "requests-cache"; - rev = "v${version}"; - hash = "sha256-HSYu4jOEMXI/zGuWI7invYVvVeeM5+dDlc+9h8TOGms="; + rev = "refs/tags/v${version}"; + hash = "sha256-Xbzbwz80xY8IDPDhZEUhmmiCFJZvSQMQ6EmE4EL7QGo="; }; nativeBuildInputs = [ @@ -107,6 +107,7 @@ buildPythonPackage rec { meta = with lib; { description = "Persistent cache for requests library"; homepage = "https://github.com/reclosedev/requests-cache"; + changelog = "https://github.com/requests-cache/requests-cache/blob/v${version}/HISTORY.md"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix index 992dee5eda..031bf93faa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-WcnDJBmp+xroPsJC2Y6InEW9fXpl1IN1zCQ+wIRBZYs="; + hash = "sha256-WcnDJBmp+xroPsJC2Y6InEW9fXpl1IN1zCQ+wIRBZYs="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-oauthlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-oauthlib/default.nix index d34d6c5c40..225bf1ecbb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-oauthlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-oauthlib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-db6sSkeIHuuU1epdatMe+IhWr/4jMrmq+1LGRSzPDXo="; + hash = "sha256-db6sSkeIHuuU1epdatMe+IhWr/4jMrmq+1LGRSzPDXo="; }; propagatedBuildInputs = [ oauthlib requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests_ntlm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests_ntlm/default.nix index 2a34f73c0a..43a002e1e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests_ntlm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests_ntlm/default.nix @@ -1,20 +1,35 @@ { lib , buildPythonPackage , fetchPypi -, ntlm-auth +, setuptools +, cryptography +, pyspnego , requests }: buildPythonPackage rec { - pname = "requests_ntlm"; - version = "1.1.0"; + pname = "requests-ntlm"; + version = "1.2.0"; + + format = "pyproject"; src = fetchPypi { - inherit pname version; - sha256 = "9189c92e8c61ae91402a64b972c4802b2457ce6a799d658256ebf084d5c7eb71"; + pname = "requests_ntlm"; + inherit version; + hash = "sha256-M8KF9QdOMXy90zjRma+kanwBEy5cER02vUFVNOm5Fqg="; }; - propagatedBuildInputs = [ ntlm-auth requests ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + cryptography + pyspnego + requests + ]; + + pythonImportsCheck = [ "requests_ntlm" ]; # Tests require networking doCheck = false; @@ -22,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "HTTP NTLM authentication support for python-requests"; homepage = "https://github.com/requests/requests-ntlm"; + changelog = "https://github.com/requests/requests-ntlm/releases/tag/v${version}"; license = licenses.isc; maintainers = with maintainers; [ elasticdog ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix index d1c4806982..c86ed09091 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "requirements-detector"; - version = "1.0.3"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "landscapeio"; repo = pname; rev = version; - hash = "sha256-AEXCguf5Q9lU5ygFJUlbc1F637hkQ0wJybbRK7uhB9s="; + hash = "sha256-H+h/PN1TrlpDRgI7tMWUhXlxj4CChwcxIR/BvyO261c="; }; nativeBuildInputs = [ 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 e3b6d71d66..af6592cada 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 @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "madpah"; repo = pname; rev = "v${version}"; - sha256 = "sha256-e2dfVBMh1uGRMDw7OdPefO4/eRxc3BGwvy/D7u5ipkk="; + hash = "sha256-e2dfVBMh1uGRMDw7OdPefO4/eRxc3BGwvy/D7u5ipkk="; }; nativeBuildInputs = [ 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 97304376b0..dc809ecbde 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/resolvelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/resolvelib/default.nix @@ -25,6 +25,17 @@ buildPythonPackage rec { commentjson pytestCheckHook ]; + # TODO: reenable after updating to >= 1.0.0 + # https://github.com/sarugaku/resolvelib/issues/114 + disabledTests = [ + "shared_parent_dependency" + "deep_complex_conflict" + "shared_parent_dependency_with_swapping" + "spapping_and_rewinding" + "pruned_unresolved_orphan" + "conflict_common_parent" + "same-package" + ]; pythonImportsCheck = [ "resolvelib" 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 153fe4d8b4..9c49071ae3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "lundberg"; repo = pname; rev = version; - sha256 = "sha256-Qs3+NWMKiAFlKTTosdyHOxWRPKFlYQD20+MKiKR371U="; + hash = "sha256-Qs3+NWMKiAFlKTTosdyHOxWRPKFlYQD20+MKiKR371U="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix index 08c22ae267..ebb682a9c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-GyNcDJIjQatsUwOQiS656S+QubdQRgY+BHys+w8FDEU="; + hash = "sha256-GyNcDJIjQatsUwOQiS656S+QubdQRgY+BHys+w8FDEU="; }; nativeCheckInputs = [ nose testtools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/restview/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/restview/default.nix index c5f8f5b028..43e877686b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/restview/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/restview/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "restview"; - version = "3.0.0"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-K5iWEKrtL9Qtpk9s3FOc8+5wzjcLy6hy23JCGtUV3R4="; + hash = "sha256-jBoXHBWdRtFdVWn3cCGCiIOhIdb5uvdY1kH8HlSwWuU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix index c9c61e34d8..d0ba2a4da7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-dV8I9xdTWlXAUSj2vmwoJI+pr/JningWqrh+H59YFcE="; + hash = "sha256-dV8I9xdTWlXAUSj2vmwoJI+pr/JningWqrh+H59YFcE="; }; propagatedBuildInputs = [ six setuptools ]; 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 ed29754b66..55d37ab874 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-l6rPnb1L/YKbqtbmMJ+mVzqvG+P2+nNcirBeRs7LJhw="; + hash = "sha256-l6rPnb1L/YKbqtbmMJ+mVzqvG+P2+nNcirBeRs7LJhw="; }; propagatedBuildInputs = [ 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 8c02dd5393..fc829a40e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rflink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rflink/default.nix @@ -1,37 +1,29 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , async-timeout , docopt , pyserial , pyserial-asyncio , setuptools , pytestCheckHook -, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { pname = "rflink"; - version = "0.0.63"; + version = "0.0.65"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "aequitas"; repo = "python-rflink"; rev = "refs/tags/${version}"; - sha256 = "sha256-BNKcXtsBB90KQe4HXmfJ7H3yepk1dEkozSEy5v8KSAA="; + hash = "sha256-DUnhuA84nkmYkREa7vUiyLg7JUdEEeLewg3vFFlcar8="; }; - patches = [ - # https://github.com/aequitas/python-rflink/pull/70 - (fetchpatch { - name = "python311-compat.patch"; - url = "https://github.com/aequitas/python-rflink/commit/ba807ddd2fde823b8d50bc50bb500a691d9e331f.patch"; - hash = "sha256-4Wh7b7j8qsvzYKdFwaY+B5Jd8EkyjAe1awlY0BDu2YA="; - }) - ]; - propagatedBuildInputs = [ async-timeout docopt @@ -44,11 +36,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [ - # https://github.com/aequitas/python-rflink/issues/65 - "tests/test_proxy.py" - ]; - postPatch = '' substituteInPlace setup.py \ --replace "version=version_from_git()" "version='${version}'" @@ -61,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library and CLI tools for interacting with RFlink 433MHz transceiver"; homepage = "https://github.com/aequitas/python-rflink"; + changelog = "https://github.com/aequitas/python-rflink/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rich-rst/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rich-rst/default.nix index f278db19a2..91e8f2b34d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rich-rst/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rich-rst/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "wasi-master"; repo = pname; rev = "v${version}"; - sha256 = "sha256-s48hdJo1LIRXTf+PeSBa6y/AH1NLmnyAafFydJ+exDk="; + hash = "sha256-s48hdJo1LIRXTf+PeSBa6y/AH1NLmnyAafFydJ+exDk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix index b263a2d08c..120f23fe97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, CommonMark +, markdown-it-py , poetry-core , pygments , typing-extensions @@ -17,21 +17,22 @@ buildPythonPackage rec { pname = "rich"; - version = "13.0.0"; + version = "13.3.1"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Textualize"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Mc2ZTpn2cPGXIBblwwukJGiD8etdVi8ag9Xb77gG62A="; + hash = "sha256-1soeb3aD4wB4stILvfOga/YZtyH6jd0XvnxkLmbW4G0="; }; nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ - CommonMark + markdown-it-py pygments ] ++ lib.optionals (pythonOlder "3.9") [ typing-extensions @@ -50,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal"; homepage = "https://github.com/Textualize/rich"; + changelog = "https://github.com/Textualize/rich/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ris joelkoen ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix index 639d2637f8..b02f1f9a72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix @@ -7,11 +7,12 @@ , python-socketio , pythonOlder , requests +, websocket-client }: buildPythonPackage rec { pname = "ripe-atlas-cousteau"; - version = "1.5.1"; + version = "2.0.0"; format = "setuptools"; @@ -20,19 +21,20 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RIPE-NCC"; repo = pname; - rev = "v${version}"; - hash = "sha256-EHZt9Po/1wDwDacXUCVGcuVSOwcIkPCT2JCKGchu8G4="; + rev = "refs/tags/v${version}"; + hash = "sha256-z8ZXOiCVYughrbmXfnwtks7NPmYpII2BA0+8mr1cdSQ="; }; postPatch = '' substituteInPlace setup.py \ - --replace 'python-socketio[client]<5' 'python-socketio[client]<6' + --replace "websocket-client~=1.3.1" "websocket-client" ''; propagatedBuildInputs = [ python-dateutil requests python-socketio + websocket-client ] ++ python-socketio.optional-dependencies.client; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/riscof/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/riscof/default.nix index 52dce6a150..d774e0ed3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/riscof/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/riscof/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "riscof"; - version = "1.25.2"; + version = "1.25.3"; src = fetchFromGitHub { owner = "riscv-software-src"; repo = pname; - rev = "1.25.2"; - hash = "sha256-6jiKBGj4NN038/qq3ze+L0MYpQEEaN5xt4CTWu0i4qs="; + rev = "refs/tags/${version}"; + hash = "sha256-ToI2xI0fvnDR+hJ++T4ss5X3gc4G6Cj1uJHx0m2X7GY="; }; postPatch = "substituteInPlace riscof/requirements.txt --replace 'GitPython==3.1.17' GitPython"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix index fdfd6741f6..75dd855af3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "riscv-config"; - version = "3.5.0"; + version = "3.5.2"; src = fetchFromGitHub { owner = "riscv-software-src"; repo = pname; - rev = version; - hash = "sha256-HKmHrvOF4OOzoILrBJG46UOKow5gRxMcXXiI6f34dPc="; + rev = "refs/tags/${version}"; + hash = "sha256-K7W6yyqy/2c4WHyOojuvw2P/v7bND5K6WFfTujkofBw="; }; propagatedBuildInputs = [ cerberus pyyaml ruamel-yaml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix index 426ec492b0..d3f09388af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-H5gr6OARQ4d3qUMHJ5tAE0o5NfwPB5MS7imXJbivVBE="; + hash = "sha256-H5gr6OARQ4d3qUMHJ5tAE0o5NfwPB5MS7imXJbivVBE="; }; # The package does not ship tests, and the setup machinary confuses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rki-covid-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rki-covid-parser/default.nix index 0f7b47a012..d7e12ba229 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rki-covid-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rki-covid-parser/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "thebino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-e0MJjE4zgBPL+vt9EkgsdGrgqUyKK/1S9ZFxy56PUjc="; + hash = "sha256-e0MJjE4zgBPL+vt9EkgsdGrgqUyKK/1S9ZFxy56PUjc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rkm-codes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rkm-codes/default.nix index 5c3ddf70e9..558dcdc076 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rkm-codes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rkm-codes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "KenKundert"; repo = "rkm_codes"; rev = "v${version}"; - sha256 = "sha256-r4F72iHxH7BoPtgYm1RD6BeSZszKRrpeBQccmT4wzuw="; + hash = "sha256-r4F72iHxH7BoPtgYm1RD6BeSZszKRrpeBQccmT4wzuw="; }; format = "pyproject"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rlax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rlax/default.nix index ac4aac2be5..bb7044a89d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rlax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rlax/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "rlax"; - version = "0.1.4"; + version = "0.1.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-a4qyJ5W9fs4TSTQQZS/NptlcSr2Nhw0pvnk+sGEsbyY="; + hash = "sha256-GRqiGacyHZpVKUqfAteMjRV4EtdHkSgfFRj/H76bBVo="; }; buildInputs = [ 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 7999e59b2d..f03ba7019a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rlp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rlp/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = "pyrlp"; rev = "v${version}"; - sha256 = "sha256-GRCq4FU38e08fREg5fweig5Y60jLT2k3Yj1Jk8OA6XY="; + hash = "sha256-GRCq4FU38e08fREg5fweig5Y60jLT2k3Yj1Jk8OA6XY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rnginline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rnginline/default.nix index 20c5b22056..10beaf00bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rnginline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rnginline/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-j4W4zwHA4yA6iAFVa/LDKp00eeCX3PbmWkjd2LSUGfk="; + hash = "sha256-j4W4zwHA4yA6iAFVa/LDKp00eeCX3PbmWkjd2LSUGfk="; }; patches = [ @@ -23,7 +23,7 @@ buildPythonPackage rec { # https://github.com/h4l/rnginline/issues/3 (fetchpatch { url = "https://github.com/h4l/rnginline/commit/b1d1c8cda2a17d46627309950f2442021749c07e.patch"; - sha256 = "sha256-XbisEwun2wPOp7eqW2YDVdayJ4sjAMG/ezFwgoCKe9o="; + hash = "sha256-XbisEwun2wPOp7eqW2YDVdayJ4sjAMG/ezFwgoCKe9o="; name = "fix_tests_failing_collect.patch"; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix index 453a6e8e95..b808a407ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.4.9"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-6hv85lWr2/qRzLrER6IYdmcvgiPKi1tt4fQaiqGwFQY="; + hash = "sha256-mkCICKuo9NYkfjjbuDInq+ENwZsQJMf5C1HS+8nafJI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robomachine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robomachine/default.nix index e0f04758b6..768aaeb89c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robomachine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robomachine/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XrxHaV9U7mZ2TvySHGm6qw1AsoukppzwPq4wufIjL+k="; + hash = "sha256-XrxHaV9U7mZ2TvySHGm6qw1AsoukppzwPq4wufIjL+k="; }; propagatedBuildInputs = [ pyparsing robotframework allpairspy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix index eb8ebbeba1..d5d72ac957 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-c7pPcDgqyqWQtiMbLQbQd0nAgx4TIFUFHrlBVDNdr8M="; + hash = "sha256-c7pPcDgqyqWQtiMbLQbQd0nAgx4TIFUFHrlBVDNdr8M="; }; nativeCheckInputs = [ jsonschema ]; 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 df1201fb8e..6ca7aafc0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "statuschecker"; rev = "refs/tags/v${version}"; - sha256 = "sha256-7xHPqlR7IFZp3Z120mg25ZSg9eI878kE8RF1y3F5O70="; + hash = "sha256-7xHPqlR7IFZp3Z120mg25ZSg9eI878kE8RF1y3F5O70="; }; propagatedBuildInputs = [ robotframework ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix index 9bd1f6f811..4fd25ec806 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-iugVKUPl6HTTO8K1EbSqAk1fl/fsEPoOcsOnnAgcEas="; + hash = "sha256-iugVKUPl6HTTO8K1EbSqAk1fl/fsEPoOcsOnnAgcEas="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rollbar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rollbar/default.nix index 125c3732ef..51b4af38b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rollbar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rollbar/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-AjE9/GBxDsc2qwM9D4yWnYV6i5kc1n4MGpFiDooE7eI="; + hash = "sha256-AjE9/GBxDsc2qwM9D4yWnYV6i5kc1n4MGpFiDooE7eI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/roombapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/roombapy/default.nix index c1ee853a10..7cbe1942e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/roombapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/roombapy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "roombapy"; - version = "1.6.5"; + version = "1.6.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pschmitt"; repo = "roombapy"; rev = version; - sha256 = "sha256-Xjeh29U+FCzI5n/i5s6wC0B88Ktmb8pnNDdOzCiKWi4="; + hash = "sha256-dfeMd/THlj2HQYcLPmeC3AWP3vR/6+8BFU1QtSu5xg4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpcq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpcq/default.nix index d1561046fe..1289f10ed3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpcq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpcq/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-J7jtGXJIF3jp0a0IQZmSR4TWf9D02Luau+Bupmi/d68="; + hash = "sha256-J7jtGXJIF3jp0a0IQZmSR4TWf9D02Luau+Bupmi/d68="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpi-gpio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpi-gpio/default.nix index 56384a12e4..f1ef22515e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpi-gpio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpi-gpio/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "RPi.GPIO"; inherit version; - sha256 = "sha256-zWHEsDw3tiu6SlrP6phidJwzxhjgKV5+kKpHE/s3O3A="; + hash = "sha256-zWHEsDw3tiu6SlrP6phidJwzxhjgKV5+kKpHE/s3O3A="; }; # Tests disable because they do a platform check which requires running on a diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rplcd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rplcd/default.nix index c404317f02..b0b68cb79a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rplcd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rplcd/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "RPLCD"; - sha256 = "sha256-AIEiL+IPU76DF+P08c5qokiJcZdNNDJ/Jjng2Z292LY="; + hash = "sha256-AIEiL+IPU76DF+P08c5qokiJcZdNNDJ/Jjng2Z292LY="; }; # Disable check because it depends on a GPIO library diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix index 206c38cda7..94e5027c5b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix @@ -24,13 +24,13 @@ }: buildPythonPackage rec { - version = "3.5.8"; + version = "3.5.9"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - sha256 = "sha256-ImEfIbxSeYCH+5gwlwXxolz76L/Sf7/u6gHz01L92yk="; + hash = "sha256-iaDX40Bld5VVjg22v52PE5VCi6EYr5AjUV3ako5pRPA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rsskey/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rsskey/default.nix index 7f230fa0c8..095ce2b5c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rsskey/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rsskey/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-QedLuwd0ES2LWhZ72Cjh3+ZZ7HbRyNsyLN9lNFbY5dQ="; + hash = "sha256-QedLuwd0ES2LWhZ72Cjh3+ZZ7HbRyNsyLN9lNFbY5dQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rst2ansi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rst2ansi/default.nix index e161f56d31..7e09d32a0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rst2ansi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rst2ansi/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Gxf7mmKNQPV5M60aOqlSNGREvgaUaVCOc+lQYNoz/m8="; + hash = "sha256-Gxf7mmKNQPV5M60aOqlSNGREvgaUaVCOc+lQYNoz/m8="; }; propagatedBuildInputs = [ docutils ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix index 2a7b91e3db..0d06168191 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "rstcheck"; - version = "6.1.1"; + version = "6.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "rstcheck"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6TpDzk0GjIn9AnWadwHoYRc3SNi9nBAM7GyKm338wH8="; + hash = "sha256-UMByfnnP1va3v1IgyQL0f3kC+W6HoiWScb7U2FAvWkU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rtoml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rtoml/default.nix index f0e4482eaa..d59a988a10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rtoml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rtoml/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { owner = "samuelcolvin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tvX4KcQGw0khBjEXVFmkhsVyAkdr2Bgm6IfD1yGZ37c="; + hash = "sha256-tvX4KcQGw0khBjEXVFmkhsVyAkdr2Bgm6IfD1yGZ37c="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-KcF3Z71S7ZNZicViqwpClfT736nYYbKcKWylOP+S3HI="; + hash = "sha256-KcF3Z71S7ZNZicViqwpClfT736nYYbKcKWylOP+S3HI="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Rtree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rtree/default.nix similarity index 92% rename from third_party/nixpkgs/pkgs/development/python-modules/Rtree/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/rtree/default.nix index 4ee9b26c5d..7d4e141963 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Rtree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rtree/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Rtree"; inherit version; - sha256 = "sha256-IiEhaZwwOmQGXYSb9wOLHsq8N7Zcf6NAvts47w6AVCk="; + hash = "sha256-IiEhaZwwOmQGXYSb9wOLHsq8N7Zcf6NAvts47w6AVCk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rtslib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rtslib/default.nix index ff0b7d1435..4814b863c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rtslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rtslib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { owner = "open-iscsi"; repo = "${pname}-fb"; rev = "refs/tags/v${version}"; - sha256 = "sha256-qBlr4K+LeJIC6Hwy6dN9n/VjHIUYCy8pLlRtPvooWyE="; + hash = "sha256-qBlr4K+LeJIC6Hwy6dN9n/VjHIUYCy8pLlRtPvooWyE="; }; patches = [ # (fetchpatch { url = "https://github.com/zhaofengli/rtslib-fb/commit/1c3c8257940a88e65676f4333363ddf259a06723.patch"; - sha256 = "sha256-nDzL8pUKwKIej+6rOg7Om5AkwkClKk6qKlImbpoufz4="; + hash = "sha256-nDzL8pUKwKIej+6rOg7Om5AkwkClKk6qKlImbpoufz4="; }) ]; 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 31d76d78ac..13885e03ab 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 @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ruamel.yaml"; inherit version; - sha256 = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68="; + hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68="; }; # Tests use relative paths diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rzpipe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rzpipe/default.nix index 8c36507085..5065f2358b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rzpipe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rzpipe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-RSgBwmtpI58caRWov+cDWLKhti+7r70VxJbCxJveEiM="; + hash = "sha256-RSgBwmtpI58caRWov+cDWLKhti+7r70VxJbCxJveEiM="; }; # No native rz_core library diff --git a/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix index 1716dadda1..bb367629b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, pythonRelaxDepsHook , setuptools , click , requests @@ -34,9 +35,14 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ + pythonRelaxDepsHook setuptools ]; + pythonRelaxDeps = [ + "packaging" + ]; + propagatedBuildInputs = [ setuptools click 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 cac3e0fc40..6bee251ff3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.126.0"; + version = "2.135.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wuU53FmrtAY8E08Q+W4OhBoBQ8kks3LjJiR7kxlbfAg="; + hash = "sha256-ypdcqEYLxHbfnq1ycq3hVLThhIIs3pq29Fv33Ly2hbE="; }; nativeBuildInputs = [ pythonRelaxDepsHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/samplerate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/samplerate/default.nix index 99424bbc67..7ac9950a69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/samplerate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/samplerate/default.nix @@ -1,38 +1,56 @@ { lib +, stdenv , buildPythonPackage -, numpy -, pkgs , fetchFromGitHub +, cffi +, numpy +, libsamplerate +, pytestCheckHook }: -buildPythonPackage { - pname = "scikits.samplerate"; - version = "0.3.3"; +buildPythonPackage rec { + pname = "samplerate"; + version = "0.1.0"; + format = "setuptools"; src = fetchFromGitHub { - owner = "cournape"; - repo = "samplerate"; - rev = "a536c97eb2d6195b5f266ea3cc3a35364c4c2210"; - sha256 = "sha256-7x03Q6VXfP9p8HCk15IDZ9HeqTyi5F1AlGX/otdh8VU="; + owner = "tuxu"; + repo = "python-samplerate"; + rev = "refs/tags/${version}"; + hash = "sha256-lHZ9SVnKcsEsnKYXR/QocGbKPEoA7yCZxXvrNPeH1rA="; }; - buildInputs = [ pkgs.libsamplerate ]; - propagatedBuildInputs = [ numpy ]; + postPatch = '' + substituteInPlace setup.py \ + --replace ", 'pytest-runner'" "" - preConfigure = '' - cat > site.cfg << END - [samplerate] - library_dirs=${pkgs.libsamplerate.out}/lib - include_dirs=${pkgs.libsamplerate.dev}/include - END + substituteInPlace samplerate/lowlevel.py --replace \ + "lib_filename = _find_library('samplerate')" \ + 'lib_filename = "${libsamplerate.out}/lib/libsamplerate${stdenv.hostPlatform.extensions.sharedLibrary}"' ''; - doCheck = false; + propagatedBuildInputs = [ + cffi + numpy + ]; + + pythonImportsCheck = [ + "samplerate" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + rm -rf samplerate + ''; meta = with lib; { - homepage = "https://github.com/cournape/samplerate"; - description = "High quality sampling rate convertion from audio data in numpy arrays"; - license = licenses.gpl2; + description = "Python bindings for libsamplerate based on CFFI and NumPy"; + homepage = "https://github.com/tuxu/python-samplerate"; + changelog = "https://github.com/tuxu/python-samplerate/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/saneyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/saneyaml/default.nix index 2290f40a64..9dd89af51f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/saneyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/saneyaml/default.nix @@ -7,11 +7,11 @@ }: buildPythonPackage rec { pname = "saneyaml"; - version = "0.5.2"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "d6074f1959041342ab41d74a6f904720ffbcf63c94467858e0e22e17e3c43d41"; + hash = "sha256-sjCfeDZiPNbbkyV067xD4/ZcdD52NReeZL7ssNFibkQ="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sarge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sarge/default.nix index d02b9da7be..f3dc0f269f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sarge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sarge/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "vsajip"; repo = pname; rev = version; - sha256 = "sha256-bT1DbcQi+SbeRBsL7ILuQbSnAj3BBB4+FNl+Zek5xU4="; + hash = "sha256-bT1DbcQi+SbeRBsL7ILuQbSnAj3BBB4+FNl+Zek5xU4="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix index 773d945f3a..fb2194e963 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -60,13 +60,13 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "31.2.3"; + version = "31.2.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-+5zYYpH8EyHPruX9LDWzeVPny7VoFiARb4+32FXMxUc="; + hash = "sha256-08C3T4CoQm/6s8ERbq/m1t513zYuzVJoexlRkCvv3UY="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scapy/default.nix index a76e8c5384..3714d7bf76 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scapy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "secdev"; repo = "scapy"; rev = "v${version}"; - sha256 = "sha256-xJlovcxUQOQHfOU0Jgin/ayd2T5fOyeN4Jg0DbLHoeU="; + hash = "sha256-xJlovcxUQOQHfOU0Jgin/ayd2T5fOyeN4Jg0DbLHoeU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix index 9ae1fd02b6..323406e152 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "schema-salad"; - version = "8.4.20230127112827"; + version = "8.4.20230213094415"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nptZTNveutV9bGSkDPWLfiBusZblVqd/5m7DN4HwGJY="; + hash = "sha256-x2co8WjL+e4nBZd0pGUwv39nzNkO5G3dYrYJZeqP31o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/schiene/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/schiene/default.nix index b4a3751a83..cc8d496680 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/schiene/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/schiene/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-sCaVrHqQZwAZDXIjh4Rg9ZT/EQSbrOPdSyT8oofCsmA="; + hash = "sha256-sCaVrHqQZwAZDXIjh4Rg9ZT/EQSbrOPdSyT8oofCsmA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/schwifty/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/schwifty/default.nix index 38fffa4ba8..266986be70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/schwifty/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/schwifty/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-YEBBrU+Xcl5zFPEt/EvPD5eFPUYSpGJ3ZoIK6PRVwlc="; + hash = "sha256-YEBBrU+Xcl5zFPEt/EvPD5eFPUYSpGJ3ZoIK6PRVwlc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix index d7781f3fb8..18e49239d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1VqDw+XyyhEydE4UCSM/th2a8MWpXet7KR5uNAcSuGs="; + hash = "sha256-1VqDw+XyyhEydE4UCSM/th2a8MWpXet7KR5uNAcSuGs="; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-build-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-build-core/default.nix index 664bec81ae..7688ff6d3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-build-core/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "scikit-build-core"; - version = "0.1.5"; + version = "0.2.0"; format = "pyproject"; src = fetchPypi { pname = "scikit_build_core"; inherit version; - hash = "sha256-OUS/QOaBd0DDBrDk8c3LzFrPVrVF65EJQPRjGtnUmjU="; + hash = "sha256-0qdtlEekEgONxeJd0lmwPCUnhmGgx8Padmu5ccGprNI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix index dc28674100..f7a2c7e1b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "scikit-build"; - version = "0.16.4"; + version = "0.16.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-KiDEreqzwq7BHXC86WkJlc/w5Tvq/jIae1MACayo5zE="; + hash = "sha256-qbnMdHm3HmyNQ0WW363gJSU6riOtsiqaLYWFD9Uc7P0="; }; # This line in the filterwarnings section of the pytest configuration leads to this error: 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 be166109b6..ba507803fa 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 @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-BgDmxoB1QzZ/DlqIB0m66Km+fbAo5RcpjmX0BZ9985w="; + hash = "sha256-BgDmxoB1QzZ/DlqIB0m66Km+fbAo5RcpjmX0BZ9985w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 1e8b6263b8..0e82762339 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.25"; + version = "0.4.28"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JiQaGyvoECylcJHWR2xm8ob5fA+0FmIEQpTuxxysvlw="; + hash = "sha256-RpjjN26zxX1VSm3G/4GMOSUbnDk3mhOSIcpzexGPuUs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyyaml requests - ] ++ lib.optional (!pythonAtLeast "3.9") [ + ] ++ lib.optionals (!pythonAtLeast "3.9") [ importlib-resources ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix index d899c940b9..22c7387ff0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix @@ -29,7 +29,7 @@ let owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-zvXgZdvYycFbbMsBFSqMDzLanEtF9+JuVSQ3AM8/LQk="; + hash = "sha256-zvXgZdvYycFbbMsBFSqMDzLanEtF9+JuVSQ3AM8/LQk="; }; patches = [ ./add-testing-data.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix index 7499eb6e9d..bd2a9be69b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-+/ilyJPJtLmbzH7Y+z6FAJV6ET9BAYYDhtBmNVIPfPs="; + hash = "sha256-+/ilyJPJtLmbzH7Y+z6FAJV6ET9BAYYDhtBmNVIPfPs="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix index bfe0ab7d5b..ab37bdfd7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-93RqA0eBEGPh7PkSHflINXhQA5U8OLW6hPY/xQjCKRE="; + hash = "sha256-93RqA0eBEGPh7PkSHflINXhQA5U8OLW6hPY/xQjCKRE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix new file mode 100644 index 0000000000..c4a90132d9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix @@ -0,0 +1,113 @@ +{ stdenv +, lib +, pythonOlder +, buildPythonPackage +, fetchFromGitHub +, numpy +, scipy +, pandas +, matplotlib +, tox +, coverage +, flake8 +, nbval +, pyvisa +, networkx +, ipython +, ipykernel +, ipywidgets +, jupyter-client +, sphinx-rtd-theme +, sphinx +, nbsphinx +, openpyxl +, qtpy +, pyqtgraph +, pyqt5 +, setuptools +, pytestCheckHook +, pytest-cov +}: + +buildPythonPackage rec { + pname = "scikit-rf"; + version = "0.25.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "scikit-rf"; + repo = pname; + rev = "v${version}"; + hash = "sha256-drH1N1rKFu/zdLmLsD1jH5xUkzK37V/+nJqGQ38vsTI="; + }; + + buildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + numpy + scipy + pandas + ]; + + passthru.optional-dependencies = { + plot = [ + matplotlib + ]; + xlsx = [ + openpyxl + ]; + netw = [ + networkx + ]; + visa = [ + pyvisa + ]; + docs = [ + ipython + ipykernel + ipywidgets + jupyter-client + sphinx-rtd-theme + sphinx + nbsphinx + openpyxl + ]; + qtapps = [ + qtpy + pyqtgraph + pyqt5 + ]; + }; + + nativeCheckInputs = [ + tox + coverage + flake8 + pytest-cov + nbval + matplotlib + pyvisa + openpyxl + networkx + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "skrf" + ]; + + meta = with lib; { + description = "A Python library for RF/Microwave engineering"; + homepage = "https://scikit-rf.org/"; + changelog = "https://github.com/scikit-rf/scikit-rf/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ lugarun ]; + }; +} 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 c129f4651e..7e2b8bf8bf 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 @@ -18,10 +18,11 @@ buildPythonPackage rec { pname = "scikit-survival"; version = "0.20.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-24+8Sociq6u3KnoGSdV5Od5t/OT1uPkv19i3p5ezLjw="; + hash = "sha256-24+8Sociq6u3KnoGSdV5Od5t/OT1uPkv19i3p5ezLjw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix index 17cbfdfbde..4d56ab6fa9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-px4Z4UhYk3VK6MBQZoIy/MaU8XuDYC51++v3v5+XXh4="; + hash = "sha256-px4Z4UhYk3VK6MBQZoIy/MaU8XuDYC51++v3v5+XXh4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikits-samplerate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikits-samplerate/default.nix new file mode 100644 index 0000000000..5a437c07f4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikits-samplerate/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, numpy +, libsamplerate +, fetchFromGitHub +}: + +buildPythonPackage { + pname = "scikits-samplerate"; + version = "0.3.3"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "cournape"; + repo = "samplerate"; + rev = "a536c97eb2d6195b5f266ea3cc3a35364c4c2210"; + hash = "sha256-7x03Q6VXfP9p8HCk15IDZ9HeqTyi5F1AlGX/otdh8VU="; + }; + + buildInputs = [ + libsamplerate + ]; + + propagatedBuildInputs = [ + numpy + ]; + + preConfigure = '' + cat > site.cfg << END + [samplerate] + library_dirs=${libsamplerate.out}/lib + include_dirs=${lib.getDev libsamplerate}/include + END + ''; + + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/cournape/samplerate"; + description = "High quality sampling rate convertion from audio data in numpy arrays"; + license = licenses.gpl2; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix index 13bc07faed..1090e724a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix @@ -15,24 +15,33 @@ , pytest-xdist , numpy , pybind11 +, pooch , libxcrypt }: buildPythonPackage rec { pname = "scipy"; - version = "1.9.3"; + version = "1.10.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+8XAXIXBoCvnex/1kQh8g7xEV5xtK9n7eYu2TqXhoCc="; + hash = "sha256-LPnfuAp7RYm6TEDOdYiYbW1c68VFfK0sKID2vC1C86U="; }; + patches = [ + # These tests require internet connection, currently impossible to disable + # them otherwise, see: + # https://github.com/scipy/scipy/pull/17965 + ./disable-datasets-tests.patch + ]; + nativeBuildInputs = [ cython gfortran meson-python pythran pkg-config wheel ]; buildInputs = [ numpy.blas pybind11 + pooch ] ++ lib.optionals (pythonOlder "3.9") [ libxcrypt ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scipy/disable-datasets-tests.patch b/third_party/nixpkgs/pkgs/development/python-modules/scipy/disable-datasets-tests.patch new file mode 100644 index 0000000000..a06d0d50dd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/scipy/disable-datasets-tests.patch @@ -0,0 +1,9 @@ +diff --git i/scipy/datasets/meson.build w/scipy/datasets/meson.build +index 101377253..eec2feea4 100644 +--- i/scipy/datasets/meson.build ++++ w/scipy/datasets/meson.build +@@ -11,4 +11,3 @@ py3.install_sources( + subdir: 'scipy/datasets' + ) + +-subdir('tests') diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix index c61bc4a8ce..d8c04f10d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "0.1.13"; + version = "0.1.15"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/KUPePiy3ROZY+orJYZQLiAaQ5kY5eAe4v1hOS5Zmck="; + hash = "sha256-Z/W49P1T8XgCmKWLTO/eI7ArAB9QKWUbJWRTlRnjJ7E="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scp/default.nix index a8a152b0a3..d85d8f1dac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scp"; - version = "0.14.4"; + version = "0.14.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-VGmbkstorjS1koxIqIjquXIqISUCy6iap5W9Vll1Bb0="; + hash = "sha256-ZPABWJmz0hLLgIjn1A668Ghoif8OJD1cEkLv6LUPBT4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scrap-engine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scrap-engine/default.nix index 5fe1c2a464..2726f3675f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scrap-engine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scrap-engine/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-5OlnBRFhjFAcVkuuKM5hpeRxi+uvjpzfdhp1+5Nx1IU="; + hash = "sha256-5OlnBRFhjFAcVkuuKM5hpeRxi+uvjpzfdhp1+5Nx1IU="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix index 290637cb8a..5559586d04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-7PEwJk3AjgxGHIYH7K13dGimStAd7bJinA+BvV/NcpU="; + hash = "sha256-7PEwJk3AjgxGHIYH7K13dGimStAd7bJinA+BvV/NcpU="; }; propagatedBuildInputs = [ scrapy six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/screed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/screed/default.nix index 71e399cb98..604d77c493 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/screed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/screed/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-c0/6eopkUoZJbYlbc2+R1rKYiVbi/UI1gSPZPshRm2o="; + hash = "sha256-c0/6eopkUoZJbYlbc2+R1rKYiVbi/UI1gSPZPshRm2o="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix index 24529b63a5..90d179bffa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.8.0"; + version = "0.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dieselrabbit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VZ2WZpty7PXxU0uqJ/dftUNBW3QEIXrLghKxsW9lsgE="; + hash = "sha256-cnQ3YqVz0AfEVma/RfQuB5kOBxo59qJJBn7PwaEe8Ro="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scs/default.nix index b9ee0aed2d..973e54644b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "bodono"; repo = "scs-python"; rev = version; - sha256 = "sha256-7OgqCo21S0FDev8xv6/8iGFXg8naVi93zd8v1f9iaWw="; + hash = "sha256-7OgqCo21S0FDev8xv6/8iGFXg8naVi93zd8v1f9iaWw="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix index 6b11975cd9..7b40b674b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix @@ -4,6 +4,7 @@ , fetchPypi , flit-core , matplotlib +, pytest-xdist , pytestCheckHook , numpy , pandas @@ -13,14 +14,14 @@ buildPythonPackage rec { pname = "seaborn"; - version = "0.12.1"; + version = "0.12.2"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ux6x1R0wlzaMGHw+8InAKI7B/oqhxp+zJMaKodAt9ME="; + hash = "sha256-N0ZF82UJ0NyriVy6W0fa8Fhvd7/js2yXxgfbfaW+ATk="; }; nativeBuildInputs = [ @@ -35,17 +36,14 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-xdist pytestCheckHook ]; disabledTests = [ - # incompatible with matplotlib 3.5 - "TestKDEPlotBivariate" - "TestBoxPlotter" - "TestCatPlot" - "TestKDEPlotUnivariate" - "test_with_rug" - "test_bivariate_kde_norm" + # incompatible with matplotlib 3.7 + # https://github.com/mwaskom/seaborn/issues/3288 + "test_subplot_kws" # requires internet connection "test_load_dataset_string_error" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seedir/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seedir/default.nix index f9b6c44286..46fca2c568 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seedir/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seedir/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "earnestt1234"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ioez5lBNyiBK3poL2Px3KtCQeM+Gh2d4iD3SoAIHFAk="; + hash = "sha256-ioez5lBNyiBK3poL2Px3KtCQeM+Gh2d4iD3SoAIHFAk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/segno/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/segno/default.nix index e01c248749..12aa23e95d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/segno/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/segno/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "heuer"; repo = "segno"; rev = version; - sha256 = "sha256-+OEXG5OvrZ5Ft7IO/7zodf+SgiRF+frwjltrBENNnHo="; + hash = "sha256-+OEXG5OvrZ5Ft7IO/7zodf+SgiRF+frwjltrBENNnHo="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/segyio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/segyio/default.nix index 7b0ec0bea1..ce7f9a01a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/segyio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/segyio/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # PR https://github.com/equinor/segyio/pull/531 (fetchpatch { url = "https://github.com/equinor/segyio/commit/628bc5e02d0f98b89fe70b072df9b8e677622e9e.patch"; - sha256 = "sha256-j+vqHZNfPIh+yWBgqbGD3W04FBvFiDJKnmcC/oTk3a8="; + hash = "sha256-j+vqHZNfPIh+yWBgqbGD3W04FBvFiDJKnmcC/oTk3a8="; }) ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { owner = "equinor"; repo = pname; rev = version; - sha256 = "sha256-L3u5BHS5tARS2aIiQbumADkuzw1Aw4Yuav8H8tRNYNg="; + hash = "sha256-L3u5BHS5tARS2aIiQbumADkuzw1Aw4Yuav8H8tRNYNg="; }; nativeBuildInputs = [ cmake ninja python scikit-build ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/semantic-version/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/semantic-version/default.nix index 39c4df56ef..d80afabb21 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/semantic-version/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/semantic-version/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "semantic_version"; inherit version; - sha256 = "sha256-vau20zaZjLs3jUuds6S1ah4yNXAdwF6iaQ2amX7VBBw="; + hash = "sha256-vau20zaZjLs3jUuds6S1ah4yNXAdwF6iaQ2amX7VBBw="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/send2trash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/send2trash/default.nix index 6fd63a1c19..890a38e63e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/send2trash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/send2trash/default.nix @@ -17,6 +17,15 @@ buildPythonPackage rec { hash = "sha256-kDUEfyMTk8CXSxTEi7E6kl09ohnWHeaoif+EIaIJh9Q="; }; + postPatch = '' + # Confuses setuptools validation + # setuptools.extern.packaging.requirements.InvalidRequirement: One of the parsed requirements in `extras_require[win32]` looks like a valid environment marker: 'sys_platform == "win32"' + sed -i '/win32 =/d' setup.cfg + + # setuptools.extern.packaging.requirements.InvalidRequirement: One of the parsed requirements in `extras_require[objc]` looks like a valid environment marker: 'sys_platform == "darwin"' + sed -i '/objc =/d' setup.cfg + ''; + nativeBuildInputs = [ setuptools ]; @@ -34,6 +43,8 @@ buildPythonPackage rec { meta = with lib; { description = "Send file to trash natively under macOS, Windows and Linux"; homepage = "https://github.com/hsoft/send2trash"; + changelog = "https://github.com/arsenetar/send2trash/blob/${version}/CHANGES.rst"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } 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 6a359d9889..37e7ea9d98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "sha256-Lx84jmgJz/J5MJtJyqDTVIbN6H63gD2rkJrdNeojd08="; + hash = "sha256-Lx84jmgJz/J5MJtJyqDTVIbN6H63gD2rkJrdNeojd08="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix index 27161cac73..bf668cf4de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.13.0"; + version = "2.14.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-iLHv2rwynpSAKlRn2ezq2VUR7v4oHNJaPg/prlkZo6U="; + hash = "sha256-ICr/IyzzWX1u4qndZYlPpAMlI3Z1A9povzPseMkIZ4U="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentinel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentinel/default.nix index 048b4d3715..33d5f29903 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sentinel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentinel/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-GQko+ZUa9ulKH4Tu/K7XkcKAl90VK4jpiJBr4wBFH9I="; + hash = "sha256-GQko+ZUa9ulKH4Tu/K7XkcKAl90VK4jpiJBr4wBFH9I="; }; meta = with lib; { 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 d81b055036..45834b88b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.15.0"; + version = "1.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-xUDMi2xoRMsDDe7LcQxIxxozo8vV5ZPzZp5zmNld3ew="; + hash = "sha256-hJ6OikRro9YUEX8rqMs/JkTvM9aTabEj4E8iNQ71gEc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix index 7fee814f97..d2a61dcbb7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "blockdiag"; repo = pname; rev = version; - sha256 = "sha256-Dh9JMx50Nexi0q39rYr9MpkKmQRAfT7lzsNOXoTuphg="; + hash = "sha256-Dh9JMx50Nexi0q39rYr9MpkKmQRAfT7lzsNOXoTuphg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/serpent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/serpent/default.nix index 537b986a62..4ee432a9fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/serpent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/serpent/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-BAcDX+PGZEOH1Iz/FGfVqp/v+BTQc3K3hnftDuPtcJU="; + hash = "sha256-BAcDX+PGZEOH1Iz/FGfVqp/v+BTQc3K3hnftDuPtcJU="; }; propagatedBuildInputs = lib.optionals isPy27 [ enum34 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/servefile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/servefile/default.nix index a4a62a5145..13d21b1be6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/servefile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/servefile/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "sebageek"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-hIqXwhmvstCslsCO973oK5FF2c8gZJ0wNUI/z8W+OjU="; + hash = "sha256-hIqXwhmvstCslsCO973oK5FF2c8gZJ0wNUI/z8W+OjU="; }; propagatedBuildInputs = [ pyopenssl ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/service-identity/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/service-identity/default.nix index 9e13bdbe6f..63c0779393 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/service-identity/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/service-identity/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pyca"; repo = pname; rev = version; - sha256 = "sha256-pWc2rU3ULqEukMhd1ySY58lTm3s8f/ayQ7CY4nG24AQ="; + hash = "sha256-pWc2rU3ULqEukMhd1ySY58lTm3s8f/ayQ7CY4nG24AQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix index 85b94cd668..5e4fbecccb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ufuXkHyDDSYPoGWO1Yr9SKhrK4iqxSETXDUv9/00d/0="; + hash = "sha256-ufuXkHyDDSYPoGWO1Yr9SKhrK4iqxSETXDUv9/00d/0="; }; nativeCheckInputs = [ pytestCheckHook ]; 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 d92d81f632..ef031de983 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setupmeta/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setupmeta/default.nix @@ -50,6 +50,9 @@ buildPythonPackage rec { "test_clean" "test_scenario" "test_git_versioning" + # setuptools.installer and fetch_build_eggs are deprecated. + # Requirements should be satisfied by a PEP 517 installer. + "test_brand_new_project" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix index 8442ad6252..fbf05cce22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-V6W5u5rTUMJ46Kpr5M3rvNklubpx1qcSoXimGM+4mPc="; + hash = "sha256-V6W5u5rTUMJ46Kpr5M3rvNklubpx1qcSoXimGM+4mPc="; }; buildInputs = [ setuptools-scm ]; 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 1ad0095e00..5a1a2e2107 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 @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-2NrMsU3A6uG2tus+zveWdb03tAZTafecNTk91cVWUsc="; + hash = "sha256-2NrMsU3A6uG2tus+zveWdb03tAZTafecNTk91cVWUsc="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix index 993850922f..c851cef24b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix @@ -10,7 +10,7 @@ let pname = "setuptools"; - version = "65.6.3"; + version = "67.4.0"; # Create an sdist of setuptools sdist = stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ let owner = "pypa"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-B/1MhH0RDW7/pUam2FHnIcUPN6NpvQYBjRyHIm+E9rI="; + hash = "sha256-QDHycUFA2VRUE9alan8rF0efZTNV3Jt0CskjkCc+in0="; name = "${pname}-${version}-source"; }; @@ -44,7 +44,7 @@ let mv dist/${name} $out ''; }; -in buildPythonPackage rec { +in buildPythonPackage { inherit pname version; # Because of bootstrapping we don't use the setuptoolsBuildHook that comes with format="setuptools" directly. # Instead, we override it to remove setuptools to avoid a circular dependency. @@ -73,8 +73,9 @@ in buildPythonPackage rec { meta = with lib; { description = "Utilities to facilitate the installation of Python packages"; - homepage = "https://pypi.python.org/pypi/setuptools"; - license = with licenses; [ psfl zpl20 ]; + homepage = "https://github.com/pypa/setuptools"; + changelog = "https://setuptools.pypa.io/en/stable/history.html#v${replaceStrings [ "." ] [ "-" ] version}"; + license = with licenses; [ mit ]; platforms = python.meta.platforms; priority = 10; maintainers = teams.python.members; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch b/third_party/nixpkgs/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch index 1dfaf8c6d5..399e168235 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch @@ -1,8 +1,8 @@ diff --git a/setuptools/_distutils/cygwinccompiler.py b/setuptools/_distutils/cygwinccompiler.py -index 2c4da5b5..e2cd8803 100644 +index 47efa377..5cdbbe10 100644 --- a/setuptools/_distutils/cygwinccompiler.py +++ b/setuptools/_distutils/cygwinccompiler.py -@@ -97,14 +97,19 @@ class CygwinCCompiler(UnixCCompiler): +@@ -101,14 +101,19 @@ class CygwinCCompiler(UnixCCompiler): self.cxx = os.environ.get('CXX', 'g++') self.linker_dll = self.cc @@ -22,7 +22,7 @@ index 2c4da5b5..e2cd8803 100644 ) # Include the appropriate MSVC runtime library if Python was built -@@ -136,9 +141,12 @@ class CygwinCCompiler(UnixCCompiler): +@@ -140,9 +145,12 @@ class CygwinCCompiler(UnixCCompiler): raise CompileError(msg) else: # for other files use the C-compiler try: @@ -38,7 +38,7 @@ index 2c4da5b5..e2cd8803 100644 except DistutilsExecError as msg: raise CompileError(msg) -@@ -275,9 +283,12 @@ class Mingw32CCompiler(CygwinCCompiler): +@@ -278,9 +286,12 @@ class Mingw32CCompiler(CygwinCCompiler): self.set_executables( compiler='%s -O -Wall' % self.cc, compiler_so='%s -mdll -O -Wall' % self.cc, @@ -50,12 +50,12 @@ index 2c4da5b5..e2cd8803 100644 + linker_so_cxx='%s %s' % (self.linker_dll_cxx, shared_option) ) - # Maybe we should also append -mthreads, but then the finished + def runtime_library_dir_option(self, dir): diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py -index 3dd8185f..cb374a94 100644 +index a40a7231..e5aad4f4 100644 --- a/setuptools/_distutils/sysconfig.py +++ b/setuptools/_distutils/sysconfig.py -@@ -289,6 +289,7 @@ def customize_compiler(compiler): # noqa: C901 +@@ -297,6 +297,7 @@ def customize_compiler(compiler): # noqa: C901 cflags, ccshared, ldshared, @@ -63,7 +63,7 @@ index 3dd8185f..cb374a94 100644 shlib_suffix, ar, ar_flags, -@@ -298,11 +299,14 @@ def customize_compiler(compiler): # noqa: C901 +@@ -306,11 +307,14 @@ def customize_compiler(compiler): # noqa: C901 'CFLAGS', 'CCSHARED', 'LDSHARED', @@ -78,7 +78,7 @@ index 3dd8185f..cb374a94 100644 if 'CC' in os.environ: newcc = os.environ['CC'] if 'LDSHARED' not in os.environ and ldshared.startswith(cc): -@@ -314,19 +318,27 @@ def customize_compiler(compiler): # noqa: C901 +@@ -322,19 +326,27 @@ def customize_compiler(compiler): # noqa: C901 cxx = os.environ['CXX'] if 'LDSHARED' in os.environ: ldshared = os.environ['LDSHARED'] @@ -107,7 +107,7 @@ index 3dd8185f..cb374a94 100644 if 'AR' in os.environ: ar = os.environ['AR'] if 'ARFLAGS' in os.environ: -@@ -335,13 +347,17 @@ def customize_compiler(compiler): # noqa: C901 +@@ -343,13 +355,17 @@ def customize_compiler(compiler): # noqa: C901 archiver = ar + ' ' + ar_flags cc_cmd = cc + ' ' + cflags @@ -127,10 +127,10 @@ index 3dd8185f..cb374a94 100644 ) diff --git a/setuptools/_distutils/unixccompiler.py b/setuptools/_distutils/unixccompiler.py -index 4ab771a4..17abac83 100644 +index 6ca2332a..5ac64128 100644 --- a/setuptools/_distutils/unixccompiler.py +++ b/setuptools/_distutils/unixccompiler.py -@@ -116,9 +116,12 @@ class UnixCCompiler(CCompiler): +@@ -115,9 +115,12 @@ class UnixCCompiler(CCompiler): 'preprocessor': None, 'compiler': ["cc"], 'compiler_so': ["cc"], @@ -144,7 +144,7 @@ index 4ab771a4..17abac83 100644 'archiver': ["ar", "-cr"], 'ranlib': None, } -@@ -182,8 +185,13 @@ class UnixCCompiler(CCompiler): +@@ -181,8 +184,13 @@ class UnixCCompiler(CCompiler): def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): compiler_so = compiler_fixup(self.compiler_so, cc_args + extra_postargs) @@ -159,7 +159,7 @@ index 4ab771a4..17abac83 100644 except DistutilsExecError as msg: raise CompileError(msg) -@@ -251,7 +259,8 @@ class UnixCCompiler(CCompiler): +@@ -250,7 +258,8 @@ class UnixCCompiler(CCompiler): # building an executable or linker_so (with shared options) # when building a shared library. building_exe = target_desc == CCompiler.EXECUTABLE diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sexpdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sexpdata/default.nix index fd7d99fbb3..4502c6e38a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sexpdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sexpdata/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sexpdata"; - version = "0.0.3"; + version = "0.0.4"; src = fetchPypi { inherit pname version; - sha256 = "1ac827a616c5e87ebb60fd6686fb86f8a166938c645f4089d92de3ffbdd494e0"; + hash = "sha256-5Xb2Lq0y1QQeYw+UV9LBp1RNf+XdlqSbVRWSORFcN3M="; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix index 968dea44b0..6540ca851c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "sfepy"; repo = "sfepy"; rev = "release_${version}"; - sha256 = "sha256-6AhyO6LRG6N62ZAoPCZpRKu4ZBzj9IHkurhKFIPFAJI="; + hash = "sha256-6AhyO6LRG6N62ZAoPCZpRKu4ZBzj9IHkurhKFIPFAJI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sgp4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sgp4/default.nix index 94522c6b78..286d1f8583 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sgp4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sgp4/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-YXm4dQRId+lBYzwgr3ci/SMaiNiomvAb8wvWTzPN7O8="; + hash = "sha256-YXm4dQRId+lBYzwgr3ci/SMaiNiomvAb8wvWTzPN7O8="; }; nativeCheckInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix index bcc07dc14c..069afeca9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix @@ -1,35 +1,52 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, python, coverage, lsof, glibcLocales, coreutils, pytestCheckHook }: +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, python +, lsof +, glibcLocales +, coreutils +, pytestCheckHook + }: buildPythonPackage rec { pname = "sh"; - version = "1.14.3"; + version = "2.0.2"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-5ARbbHMtnOddVxx59awiNO3Zrk9fqdWbCXBQgr3KGMc="; + src = fetchFromGitHub { + owner = "amoffat"; + repo = "sh"; + rev = "refs/tags/${version}"; + hash = "sha256-qMYaGNEvv2z47IHFGqb64TRpN3JHycpEmhYhDjrUi6s="; }; - postPatch = '' - sed -i 's#/usr/bin/env python#${python.interpreter}#' test.py - sed -i 's#/bin/sleep#${coreutils.outPath}/bin/sleep#' test.py - ''; + nativeBuildInputs = [ + poetry-core + ]; - nativeCheckInputs = [ coverage lsof glibcLocales pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests/test.py" + ]; # A test needs the HOME directory to be different from $TMPDIR. preCheck = '' - export LC_ALL="en_US.UTF-8" - HOME=$(mktemp -d) + export HOME=$(mktemp -d) ''; - pytestFlagsArray = [ "test.py" ]; - disabledTests = [ # Disable tests that fail on Hydra "test_no_fd_leak" "test_piped_exception1" "test_piped_exception2" "test_unicode_path" + # fails to import itself after modifying the environment + "test_environment" ] ++ lib.optionals stdenv.isDarwin [ # Disable tests that fail on Darwin sandbox "test_background_exception" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix index cdc4cb4fdf..5fbd75d7e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "trezor"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "sha256-b9tBXN9dBdAeGg3xf5ZBdd6kPpFzseJl6wRTTfNZEwo="; + hash = "sha256-b9tBXN9dBdAeGg3xf5ZBdd6kPpFzseJl6wRTTfNZEwo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix index a7c9b139ac..96c9c1f952 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "slundberg"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-rYVWQ3VRvIObSQPwDRsxhTOGOKNkYkLtiHzVwoB3iJ0="; + hash = "sha256-rYVWQ3VRvIObSQPwDRsxhTOGOKNkYkLtiHzVwoB3iJ0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix index 8225751f90..ec4f6bd6b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "shapely"; - version = "2.0.0"; + version = "2.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EfGxIxpsBCE/sSJsaWjRsbOzaexC0ellUGavh2MYYOo="; + hash = "sha256-Zqaxo+cuzpf8hVNqKBR2+bd5TeLmRsqKRRfi48FEaJM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shellingham/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shellingham/default.nix index d8e9e6274b..08117a58df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shellingham/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shellingham/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "shellingham"; - version = "1.5.0"; + version = "1.5.0.post1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sarugaku"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-CIO5mBFph+5cO7U4NRjMRtQCTbopJDEGlAGBkxjieFw="; + hash = "sha256-nAXI1GxSpmmpJuatPYUeAClA88B9c/buPEWhq7RKvs8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shiv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shiv/default.nix index 8e0ec9de05..0aa5931cbf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shiv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shiv/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-vxRv8/Oryi6xIU6GAY82EkocItk1QO71JAMhys19f1c="; + hash = "sha256-vxRv8/Oryi6xIU6GAY82EkocItk1QO71JAMhys19f1c="; }; propagatedBuildInputs = [ click pip setuptools wheel ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shlib/default.nix index 797e22f14c..1b7c3b9b8f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shlib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "KenKundert"; repo = "shlib"; rev = "v${version}"; - sha256 = "sha256-2fwRxa64QXKJuhYwt9Z4BxhTeq1iwbd/IznfxPUjeSM="; + hash = "sha256-2fwRxa64QXKJuhYwt9Z4BxhTeq1iwbd/IznfxPUjeSM="; }; pythonImportsCheck = [ "shlib" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shodan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shodan/default.nix index 1a17905f3b..b597edf793 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shodan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shodan/default.nix @@ -6,7 +6,7 @@ , requests , setuptools , pythonOlder -, XlsxWriter +, xlsxwriter }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-GL0q6BEUtwg24OMxUicyXhQ5gnUiOZiowjWwmUMvSws="; + hash = "sha256-GL0q6BEUtwg24OMxUicyXhQ5gnUiOZiowjWwmUMvSws="; }; propagatedBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { colorama requests setuptools - XlsxWriter + xlsxwriter ]; # The tests require a shodan api key, so skip them. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sievelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sievelib/default.nix index 694f0f0f34..1bb13e6cc3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sievelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sievelib/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-7cubQWqYWjzFt9f01+wBPjcuv5DmTJ2eAOIDEpmvOP0="; + hash = "sha256-7cubQWqYWjzFt9f01+wBPjcuv5DmTJ2eAOIDEpmvOP0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/signalslot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/signalslot/default.nix index 515267a70b..4dd13c4c08 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/signalslot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/signalslot/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Z26RPNau+4719e82jMhb2LyIR6EvsANI8r3+eKuw494="; + hash = "sha256-Z26RPNau+4719e82jMhb2LyIR6EvsANI8r3+eKuw494="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/signify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/signify/default.nix index 392bcd2eaa..9d6ce6c7db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/signify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/signify/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ralphje"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YJc9RIqkEL7dd1ahE4IbxyyZgsZWBDqbXZAvI/nK24M="; + hash = "sha256-YJc9RIqkEL7dd1ahE4IbxyyZgsZWBDqbXZAvI/nK24M="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simanneal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simanneal/default.nix index a9d61dd652..6145279c32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simanneal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simanneal/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "perrygeo"; repo = "simanneal"; rev = version; - sha256 = "sha256-yKZHkrf6fM0WsHczIEK5Kxusz5dSBgydK3fLu1nDyvk="; + hash = "sha256-yKZHkrf6fM0WsHczIEK5Kxusz5dSBgydK3fLu1nDyvk="; }; nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simple-rest-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simple-rest-client/default.nix index c5d885f328..673028a763 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simple-rest-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simple-rest-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "allisson"; repo = "python-simple-rest-client"; rev = version; - sha256 = "sha256-HdGYLDrqQvd7hvjwhC5dY2amdHUZHTYJvD1QP89lcXU="; + hash = "sha256-HdGYLDrqQvd7hvjwhC5dY2amdHUZHTYJvD1QP89lcXU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simple-rlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simple-rlp/default.nix index 24d5d92412..06837ba1f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simple-rlp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simple-rlp/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-LfHSt2nwoBd9JiMauL4W5l41RrF7sKmkkO/TUXwIKHY="; + hash = "sha256-LfHSt2nwoBd9JiMauL4W5l41RrF7sKmkkO/TUXwIKHY="; }; pythonImportsCheck = [ "rlp" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix index 566c5c7c83..9facb239f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "simple-salesforce"; - version = "1.12.2"; + version = "1.12.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-E1tYKcV+7Raw8R7EOwyzCKh5keGxt232lxEQkoYU0Fw="; + hash = "sha256-lCZdX+gf9ROU1MIRw/ppTNO8jIGUxE1+gbHh6sK5L2s="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simplefix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplefix/default.nix index fc241ce278..9a5ce3ec4c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simplefix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simplefix/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { repo = "simplefix"; owner = "da4089"; rev = "v${version}"; - sha256 = "sha256-GQHMotxNRuRv6zXhrD02T+aFgfYe3RnvUGADsBeSPbA="; + hash = "sha256-GQHMotxNRuRv6zXhrD02T+aFgfYe3RnvUGADsBeSPbA="; }; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix index 381c7688be..f23e988a9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.18.1"; + version = "3.18.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-m5V1wmqkPxZBH25vWajztwa3HF4KtH+HXXs4TCecTm8="; + hash = "sha256-NKDcY/HRAbroT6onHdLP6oolEzWoCC+Jlf+Ec5bFDDc="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/single-version/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/single-version/default.nix index 01671657ee..b1ba4adfa1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/single-version/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/single-version/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "hongquan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-I8ATQzPRH9FVjqPoqrNjYMBU5azpmkLjRmHcz943C10="; + hash = "sha256-I8ATQzPRH9FVjqPoqrNjYMBU5azpmkLjRmHcz943C10="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/siosocks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/siosocks/default.nix index a72b54f56c..7af2a1118c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/siosocks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/siosocks/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-uja79vWhPYOhhTUBIh+XpS4GnrYJy0/XpDXXQjnyHWM="; + hash = "sha256-uja79vWhPYOhhTUBIh+XpS4GnrYJy0/XpDXXQjnyHWM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sip/4.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/sip/4.x.nix index 111cd66ed2..d90d4ff204 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sip/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sip/4.x.nix @@ -21,16 +21,7 @@ buildPythonPackage rec { enableParallelBuilding = true; - installCheckPhase = let - modules = [ - sip-module - "sipconfig" - ]; - imports = lib.concatMapStrings (module: "import ${module};") modules; - in '' - echo "Checking whether modules can be imported..." - PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ${python.interpreter} -c "${imports}" - ''; + pythonImportsCheck = [ sip-module "sipconfig" ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix index 7784b5bee4..9cb4775fa1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "skia-pathops"; inherit version; extension = "zip"; - sha256 = "sha256-Ci/e6Ht62wGMv6bpXvnkKZ7WOwCAvidnejD/77ypE1A="; + hash = "sha256-Ci/e6Ht62wGMv6bpXvnkKZ7WOwCAvidnejD/77ypE1A="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skrl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skrl/default.nix index b40fc789ec..86463a43cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skrl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skrl/default.nix @@ -12,15 +12,15 @@ buildPythonPackage rec { pname = "skrl"; - version = "0.8.0"; + version = "0.10.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Toni-SM"; repo = pname; - rev = version; - hash = "sha256-NfKgQyD7PkPOTnkIua3fOfH7tHNGQEOVZ2HtvIg5HzA="; + rev = "refs/tags/${version}"; + hash = "sha256-/fFKotDibc+wcoGteloh5OEKbQdN/W1NdF+mWf8mSNw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skyfield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skyfield/default.nix index ca45a3de8d..73e6ea9ed0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skyfield/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skyfield/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "skyfielders"; repo = "python-skyfield"; rev = version; - sha256 = "sha256-aoSkuLhZcEy+13EJQOBHV2/rgmN6aZQHqfj4OOirOG0="; + hash = "sha256-aoSkuLhZcEy+13EJQOBHV2/rgmN6aZQHqfj4OOirOG0="; }; propagatedBuildInputs = [ certifi numpy sgp4 jplephem ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix index 2f43d04ba1..226cc5295e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "sha256-Z/jbr9o0WKPjkAsfZzxuwAKKdwYV3rLGkUMlMgyC5s0="; + hash = "sha256-Z/jbr9o0WKPjkAsfZzxuwAKKdwYV3rLGkUMlMgyC5s0="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix index 6066407daf..87319d8127 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "sha256-rC7KA79va8gZpMKJQ7s3xYdbopNqmWdRYDCbaWaxsR0="; + hash = "sha256-rC7KA79va8gZpMKJQ7s3xYdbopNqmWdRYDCbaWaxsR0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-lXPCxRbaqUC5EfyeBPtJDuGADYOA+DWMaOZRwXppP8E="; + hash = "sha256-lXPCxRbaqUC5EfyeBPtJDuGADYOA+DWMaOZRwXppP8E="; }; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix index 8ca4a45b37..b394dd1662 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "sha256-dd0qsSNBwxuSopjz2PLqEFddZpvMgeJIjBXY5P6OAow="; + hash = "sha256-dd0qsSNBwxuSopjz2PLqEFddZpvMgeJIjBXY5P6OAow="; }; buildInputs = [ gobject-introspection gtk3 gtksourceview3 ]; 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 73cf9908ff..6d805c35f0 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 @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.20.1"; + version = "3.20.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-etPNhGjLrXOwkM7m2Q1xGoGraBq/2tq58bWXqncHy+w="; + hash = "sha256-2MPXV+rVXZYMTZe11T8x8GKQmHZwUlkwarCkheVkERo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix index fefc841941..22d1ce93f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "slackclient"; - version = "3.20.0"; + version = "3.20.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-NlUmoOlRV7h7d553uX2tAWi2aWCAqpHflSUrdZxlaws="; + hash = "sha256-etPNhGjLrXOwkM7m2Q1xGoGraBq/2tq58bWXqncHy+w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smart-open/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smart-open/default.nix index 5a306d1810..e0d7757d0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smart-open/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smart-open/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "RaRe-Technologies"; repo = "smart_open"; rev = "refs/tags/v${version}"; - sha256 = "sha256-sVKrCph5M7xsE7gtzsP/eVEbZyFfoucW3p30YYpwVFI="; + hash = "sha256-sVKrCph5M7xsE7gtzsP/eVEbZyFfoucW3p30YYpwVFI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smbus-cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smbus-cffi/default.nix index ec3fbd8e8d..1612a606f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smbus-cffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smbus-cffi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { # https://github.com/bivab/smbus-cffi/pull/24 (fetchpatch { url = "https://github.com/bivab/smbus-cffi/commit/ba79ae174a9d84e767d95f165c43ee212b1bbb92.patch"; - sha256 = "sha256-WtRuK5y6fWDEhm0Xy5XqS5yCkn7vXXYtjlOjS90gla4="; + hash = "sha256-WtRuK5y6fWDEhm0Xy5XqS5yCkn7vXXYtjlOjS90gla4="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smbus2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smbus2/default.nix index 8282d0b109..ba36c02e69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smbus2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smbus2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "kplindegaard"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-6JzFbhUq8XR1nYkadPeYqItcLZDIFAwTe3BriEW2nVI="; + hash = "sha256-6JzFbhUq8XR1nYkadPeYqItcLZDIFAwTe3BriEW2nVI="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smhi-pkg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smhi-pkg/default.nix index b4a5ef4839..e1310a0a38 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smhi-pkg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smhi-pkg/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "joysoftware"; repo = "pypi_smhi"; rev = "refs/tags/${version}"; - sha256 = "sha256-jcIXzAZO9SxC/0apdjAVv1GmBTbdlasfXr1/Tj9adNc="; + hash = "sha256-jcIXzAZO9SxC/0apdjAVv1GmBTbdlasfXr1/Tj9adNc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snitun/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snitun/default.nix index 40dbad84a4..b99cc3cf8e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snitun/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snitun/default.nix @@ -7,17 +7,21 @@ , fetchFromGitHub , pytest-aiohttp , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "snitun"; - version = "0.31.0"; + version = "0.33.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "NabuCasa"; repo = pname; - rev = version; - hash = "sha256-Ehafb35H462Ffn6omGh/MDJKQX5qJJZeiIBO3n0IGlA="; + rev = "refs/tags/${version}"; + hash = "sha256-6aLvNw5/I5UvTRFzUK93YruKarM8S+gHIYd4hyTp/Qs="; }; propagatedBuildInputs = [ @@ -43,6 +47,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "snitun" ]; meta = with lib; { + changelog = "https://github.com/NabuCasa/snitun/releases/tag/${version}"; homepage = "https://github.com/nabucasa/snitun"; description = "SNI proxy with TCP multiplexer"; license = licenses.gpl3Only; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snowballstemmer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowballstemmer/default.nix index a1813fac54..60ba22e903 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snowballstemmer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snowballstemmer/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, PyStemmer, fetchPypi }: +{ lib, buildPythonPackage, pystemmer, fetchPypi }: buildPythonPackage rec { pname = "snowballstemmer"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # No tests included doCheck = false; - propagatedBuildInputs = [ PyStemmer ]; + propagatedBuildInputs = [ pystemmer ]; meta = with lib; { description = "16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/social-auth-app-django/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/social-auth-app-django/default.nix index eb928ec2e7..960e01cfa2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/social-auth-app-django/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/social-auth-app-django/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "python-social-auth"; repo = "social-app-django"; rev = version; - sha256 = "sha256-ONhdXxclHRpVtijpKEZlmGDhjid/jnTaPq6LQtjxCC4="; + hash = "sha256-ONhdXxclHRpVtijpKEZlmGDhjid/jnTaPq6LQtjxCC4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/socialscan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/socialscan/default.nix index 5e25e3c16b..db9cd3c1f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/socialscan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/socialscan/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "iojw"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-jiyTcpJ00DvfweChawj1ugdCVHHAdwDbHEp9jivH7gs="; + hash = "sha256-jiyTcpJ00DvfweChawj1ugdCVHHAdwDbHEp9jivH7gs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/socketio-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/socketio-client/default.nix index 2842e37517..43587824e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/socketio-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/socketio-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "invisibleroads"; repo = "socketio-client"; rev = version; - sha256 = "sha256-71sjiGJDDYElPGUNCH1HaVdvgMt8KeD/kXVDpF615ho="; + hash = "sha256-71sjiGJDDYElPGUNCH1HaVdvgMt8KeD/kXVDpF615ho="; }; propagatedBuildInputs = [ 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 25bc231b81..032b5827d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "softlayer"; - version = "6.1.3"; + version = "6.1.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "softlayer-python"; rev = "refs/tags/v${version}"; - hash = "sha256-msNW0PeDbs5iq77FBPKKWH0js/PAQz6xfbM0ycMVg5U="; + hash = "sha256-Ofl8MmGn70CJPuPZi0W0GJiMiceMNMACSNVKaOPdQN8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix index 4a471bedf1..020c48aaa5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-lqzFY2Rfmc/9KUuFfq07DZkIIS2cJ1JqZ/8gP3+pu5U="; + hash = "sha256-lqzFY2Rfmc/9KUuFfq07DZkIIS2cJ1JqZ/8gP3+pu5U="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/solc-select/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/solc-select/default.nix index b20c60c4ab..9b8c611b92 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/solc-select/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/solc-select/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-850IA1NVvQ4KiH5KEIjqEKFd1k5ECMx/zXLZE7Rvx5k="; + hash = "sha256-850IA1NVvQ4KiH5KEIjqEKFd1k5ECMx/zXLZE7Rvx5k="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/solo-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/solo-python/default.nix index 78fcc22c9f..b0166c303d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/solo-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/solo-python/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "solokeys"; repo = pname; rev = version; - sha256 = "sha256-XVPYr7JwxeZfZ68+vQ7a7MNiAfJ2bvMbM3R1ryVJ+OU="; + hash = "sha256-XVPYr7JwxeZfZ68+vQ7a7MNiAfJ2bvMbM3R1ryVJ+OU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix index e34a6babb0..543f075b28 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "tsproisl"; repo = "SoMaJo"; rev = "refs/tags/v${version}"; - sha256 = "sha256-EnYw8TSZLXgB4pZaZBgxaO13PpTDx4lGsdGJ+51A6wE="; + hash = "sha256-EnYw8TSZLXgB4pZaZBgxaO13PpTDx4lGsdGJ+51A6wE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix index bc9c6fcba3..dedd7864f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-DLwvUhUufyJm48LLSuXYOv0ulv1eHELlZnNiuqo9LbM="; + hash = "sha256-DLwvUhUufyJm48LLSuXYOv0ulv1eHELlZnNiuqo9LbM="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sortedcollections/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sortedcollections/default.nix index 30e7486c6d..73bc2757c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sortedcollections/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sortedcollections/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "grantjenks"; repo = "python-sortedcollections"; rev = "v${version}"; - sha256 = "sha256-GkZO8afUAgDpDjIa3dhO6nxykqrljeKldunKMODSXfg="; + hash = "sha256-GkZO8afUAgDpDjIa3dhO6nxykqrljeKldunKMODSXfg="; }; propagatedBuildInputs = [ sortedcontainers ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix index bbf22ed9b7..7158c6deca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix @@ -13,7 +13,7 @@ let owner = "grantjenks"; repo = "python-sortedcontainers"; rev = "v${version}"; - sha256 = "sha256-YRbSM2isWi7AzfquFvuZBlpEMNUnBJTBLBn0/XYVHKQ="; + hash = "sha256-YRbSM2isWi7AzfquFvuZBlpEMNUnBJTBLBn0/XYVHKQ="; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix index cfeb015a22..46e16e58a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Mja3jxXwQVvfAGpiDO8HPQwFIoUdZvSpYe1tjrFIL+k="; + hash = "sha256-Mja3jxXwQVvfAGpiDO8HPQwFIoUdZvSpYe1tjrFIL+k="; }; propagatedBuildInputs = [ cffi numpy portaudio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix index 632894e869..cd5a0cd194 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "soupsieve"; - version = "2.3.2.post1"; + version = "2.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/FOJOz2iwz3ilWZ6DhnweMFL+GVErzBzVN5fzxKj8w0="; + hash = "sha256-4o26nKbHwAFz405LpXRI8GiLtoG3xei/SXHar8CT1po="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soxr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soxr/default.nix new file mode 100644 index 0000000000..e84dd51d70 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/soxr/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-sytem +, cython_3 +, numpy +, setuptools +, setuptools-scm +, gnutar + +# native +, libsoxr + +# tests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "soxr"; + version = "0.3.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "dofuuz"; + repo = "python-soxr"; + rev = "refs/tags/v${version}"; + fetchSubmodules = true; + hash = "sha256-g8YS5YgK1uK1kKtR/wn8x5DAUVY/hYmuMIgjgJAC8pM="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + cython_3 + gnutar + numpy + setuptools + setuptools-scm + ]; + + pythonImportsCheck = [ + "soxr" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "High quality, one-dimensional sample-rate conversion library"; + homepage = "https://github.com/dofuuz/python-soxr/tree/main"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix index 95ba3c9463..d6081b4863 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1HApl/RZ0w5Tf2OPu1QBUa36uIqilp+dDbPjujn0e9s="; + hash = "sha256-1HApl/RZ0w5Tf2OPu1QBUa36uIqilp+dDbPjujn0e9s="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-oFSruBnoodv6/0/OrmJ/2SVoWm3u3FGtzVJ9xgp0+Cg="; + hash = "sha256-oFSruBnoodv6/0/OrmJ/2SVoWm3u3FGtzVJ9xgp0+Cg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy-loggers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-loggers/default.nix index cc3aebff1b..ebc5df787b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy-loggers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy-loggers/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-5vmDv3EjAJHVu3sRv2S9VEFeyoORCNX4PZFV0LqTvyg="; + hash = "sha256-5vmDv3EjAJHVu3sRv2S9VEFeyoORCNX4PZFV0LqTvyg="; }; 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 43e9ab052d..9cf03ce4f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.5.0"; + version = "3.5.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-/iAScBKZJ3iATZP3XOk3DViFcwcmOcODLOw49Uv35KU="; + hash = "sha256-gRrhRoxYuX/JqjEYfWtVMXeEJY8KR+v2nYHKtjnj+hU="; }; propagatedBuildInputs = [ @@ -107,6 +107,7 @@ buildPythonPackage rec { meta = with lib; { description = "Industrial-strength Natural Language Processing (NLP)"; homepage = "https://github.com/explosion/spaCy"; + changelog = "https://github.com/explosion/spaCy/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/legacy.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/legacy.nix index a68ea0456f..f94855e66a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/legacy.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/legacy.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-s31uDJtuHXyhz1vHFSq2SkxGcfWcha2vej/LhwNXp3Q="; + hash = "sha256-s31uDJtuHXyhz1vHFSq2SkxGcfWcha2vej/LhwNXp3Q="; }; # nativeCheckInputs = [ pytestCheckHook spacy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sparqlwrapper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sparqlwrapper/default.nix index 0660b8a403..41248d73b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sparqlwrapper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sparqlwrapper/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "SPARQLWrapper"; inherit version; - sha256 = "sha256-P+0+vMd2F6SnTSZEuG/Yjg8y5/cAOseyszTAJiAXMfE="; + hash = "sha256-P+0+vMd2F6SnTSZEuG/Yjg8y5/cAOseyszTAJiAXMfE="; }; # break circular dependency loop diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix index 04742fbf02..6bbff9e28f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-HQgewi2kq0/DGY6URd2tbewiYcQ5J4MRUdk+OUImEKo="; + hash = "sha256-HQgewi2kq0/DGY6URd2tbewiYcQ5J4MRUdk+OUImEKo="; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-argparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-argparse/default.nix index 9a5164b3e0..d2720bd124 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-argparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-argparse/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinx_argparse"; inherit version; - sha256 = "sha256-4PNBhOtW8S+s53T7yHuICr25AXoJmNHsVZsmfpaX5Ek="; + hash = "sha256-4PNBhOtW8S+s53T7yHuICr25AXoJmNHsVZsmfpaX5Ek="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autoapi/default.nix similarity index 55% rename from third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/sphinx-autoapi/default.nix index 1f4eb94fea..d8d98a803b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autoapi/default.nix @@ -9,19 +9,20 @@ , pyyaml , sphinx , stdenv +, typing-extensions , unidecode }: buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-l9zxtbVM0Njv74Z1lOSk8+LTosDsHlqJHgphvHcEYAY="; + hash = "sha256-zfR5aMIIUvT+sMzv0J5BS7ggr4r4+C+rFaJLCaPRuro="; }; propagatedBuildInputs = [ @@ -30,6 +31,8 @@ buildPythonPackage rec { pyyaml sphinx unidecode + ] ++ lib.optionals (pythonOlder "3.11") [ + typing-extensions ]; nativeCheckInputs = [ @@ -37,14 +40,25 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # failing typing assertions + "test_integration" + "test_annotations" + ]; + pythonImportsCheck = [ "autoapi" ]; meta = with lib; { homepage = "https://github.com/readthedocs/sphinx-autoapi"; + changelog = "https://github.com/readthedocs/sphinx-autoapi/blob/v${version}/CHANGELOG.rst"; description = "Provides 'autodoc' style documentation"; - longDescription = "Sphinx AutoAPI provides 'autodoc' style documentation for multiple programming languages without needing to load, run, or import the project being documented."; + longDescription = '' + Sphinx AutoAPI provides 'autodoc' style documentation for + multiple programming languages without needing to load, run, or + import the project being documented. + ''; license = licenses.mit; maintainers = with maintainers; [ karolchmist ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index 3908ef631a..06a638737f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -10,7 +10,7 @@ let pname = "sphinx-autodoc-typehints"; - version = "1.19.5"; + version = "1.23.4"; in buildPythonPackage { @@ -22,7 +22,7 @@ buildPythonPackage { src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-OKInN44rwVyE4pr4yx11gRgtoRBxEf0ciLGbXrcHYgU="; + hash = "sha256-tHw6aQ0QGiWdmqkgzFfH6nn7cF15bA1Xyxfpm9HYCjQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-basic-ng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-basic-ng/default.nix index e7f17aac92..f92c9e237f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-basic-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-basic-ng/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "pradyunsg"; repo = "sphinx-basic-ng"; rev = version; - sha256 = "sha256-Zh9KvKs4js+AVSfIk0pAj6Kzq/O2m/MGTF+HCwYJTXk="; + hash = "sha256-Zh9KvKs4js+AVSfIk0pAj6Kzq/O2m/MGTF+HCwYJTXk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-book-theme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-book-theme/default.nix index cb7c3a593b..14898d0b40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-book-theme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-book-theme/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "sphinx_book_theme"; - sha256 = "sha256-9rq6eIjVpjMoohDplgp6bpUeljLXTttvzkjJ1djCh2g="; + hash = "sha256-9rq6eIjVpjMoohDplgp6bpUeljLXTttvzkjJ1djCh2g="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-codeautolink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-codeautolink/default.nix index c9dcec606f..e7defb682d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-codeautolink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-codeautolink/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonImportsCheckHook +, setuptools # documentation build dependencies , sphinxHook , sphinx-rtd-theme @@ -16,18 +16,20 @@ buildPythonPackage rec { pname = "sphinx-codeautolink"; - version = "0.12.1"; + version = "0.15.0"; + format = "pyproject"; + outputs = [ "out" "doc" ]; src = fetchFromGitHub { owner = "felix-hilden"; repo = "sphinx-codeautolink"; - rev = "v${version}"; - hash = "sha256-x81jhYknJ6lsLxR5ZyuYNNz/zt0kto6bNyaeZmPKDIE="; + rev = "refs/tags/v${version}"; + hash = "sha256-iXUdOwyTRViDTDRPCcteiJ2Rcdbpiol7JPEzqbUwIPc="; }; nativeBuildInputs = [ - pythonImportsCheckHook + setuptools sphinxHook sphinx-rtd-theme matplotlib 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 ba0da6319e..f269e2d965 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 @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = "sphinx-copybutton"; rev = "v${version}"; - sha256 = "sha256-ptQNeklF9f0XeDbBq64ZFV15O8b4lQQLHRfblOQ3nRQ="; + hash = "sha256-ptQNeklF9f0XeDbBq64ZFV15O8b4lQQLHRfblOQ3nRQ="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-design/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-design/default.nix index bbba0cadc8..dc0dc30761 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-design/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-design/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sphinx_design"; - sha256 = "sha256-cYP6H65Vs37wG9pRJaIe6EH1u8v1mjU4K+WYGAxM77o="; + hash = "sha256-cYP6H65Vs37wG9pRJaIe6EH1u8v1mjU4K+WYGAxM77o="; }; nativeBuildInputs = [ flit-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-fortran/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-fortran/default.nix index 6b52078f0b..cd47d3c474 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-fortran/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-fortran/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "VACUMM"; repo = pname; rev = "394ae990b43ed43fcff8beb048632f5e99794264"; - sha256 = "sha256-IVKu5u9gqs7/9EZrf4ZYd12K6J31u+/B8kk4+8yfohM="; + hash = "sha256-IVKu5u9gqs7/9EZrf4ZYd12K6J31u+/B8kk4+8yfohM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-hoverxref/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-hoverxref/default.nix index c606297e1a..f11db7fc97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-hoverxref/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-hoverxref/default.nix @@ -10,12 +10,12 @@ , sphinx-rtd-theme , sphinx-tabs , sphinx-version-warning -, sphinxcontrib-autoapi +, sphinx-autoapi , sphinxcontrib-bibtex , sphinxemoji # runtime dependencies , sphinx -, sphinx-jquery +, sphinxcontrib-jquery }: buildPythonPackage rec { @@ -41,12 +41,12 @@ buildPythonPackage rec { sphinx-rtd-theme sphinx-tabs sphinx-version-warning - sphinxcontrib-autoapi + sphinx-autoapi sphinxcontrib-bibtex sphinxemoji ]; - propagatedBuildInputs = [ sphinx sphinx-jquery ]; + propagatedBuildInputs = [ sphinx sphinxcontrib-jquery ]; pythonImportsCheck = [ "hoverxref" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-inline-tabs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-inline-tabs/default.nix index 0dd855fee2..3fa6e6d737 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-inline-tabs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-inline-tabs/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "pradyunsg"; repo = "sphinx-inline-tabs"; rev = version; - sha256 = "sha256-k2nOidUk87EZbFsqQ7zr/4eHk+T7wUOYimjbllfneUM="; + hash = "sha256-k2nOidUk87EZbFsqQ7zr/4eHk+T7wUOYimjbllfneUM="; }; propagatedBuildInputs = [ 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 76823af542..68590ed24e 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 @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-xiMrWaiUE5dwvh3G0LAKN55CiM54FXkE4fhHPeo+Bxg="; + hash = "sha256-xiMrWaiUE5dwvh3G0LAKN55CiM54FXkE4fhHPeo+Bxg="; }; propagatedBuildInputs = [ sphinx ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jquery/default.nix deleted file mode 100644 index 6bbf8687f5..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jquery/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, flit-core -, pythonImportsCheckHook -, sphinx -}: - -buildPythonPackage rec { - pname = "sphinx-jquery"; - version = "3.0.0"; - format = "flit"; - - src = fetchFromGitHub { - owner = "sphinx-contrib"; - repo = "jquery"; - rev = "v${version}"; - hash = "sha256-argG+jMUqLiWo4lKWAmHmUxotHl+ddJuJZ/zcUl9u5Q="; - }; - - nativeBuildInputs = [ - pythonImportsCheckHook - flit-core - ]; - - propagatedBuildInputs = [ sphinx ]; - - pythonImportsCheck = [ "sphinxcontrib.jquery" ]; - - meta = with lib; { - description = "A sphinx extension that ensures that jQuery is installed for use in Sphinx themes or extensions"; - homepage = "https://github.com/sphinx-contrib/jquery"; - license = licenses.bsd0; - maintainers = with maintainers; [ kaction ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix index a27d4019d8..5dff846924 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sphinx_jupyterbook_latex"; - sha256 = "sha256-2h060Cj1XdvxC5Ewu58k/GDK+2ccvTnf2VU3qvyQly4="; + hash = "sha256-2h060Cj1XdvxC5Ewu58k/GDK+2ccvTnf2VU3qvyQly4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-markdown-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-markdown-parser/default.nix index cd5b1927d1..626e8dba58 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-markdown-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-markdown-parser/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , sphinx , markdown -, CommonMark +, commonmark , recommonmark , pydash , pyyaml @@ -27,7 +27,7 @@ buildPythonPackage rec { sha256 = "0i0hhapmdmh83yx61lxi2h4bsmhnzddamz95844g2ghm132kw5mv"; }; - propagatedBuildInputs = [ sphinx markdown CommonMark pydash pyyaml unify yapf recommonmark ]; + propagatedBuildInputs = [ sphinx markdown commonmark pydash pyyaml unify yapf recommonmark ]; # Avoids running broken tests in test_markdown.py checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-notfound-page/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-notfound-page/default.nix index dd2efe81fd..c6255bbc53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-notfound-page/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-notfound-page/default.nix @@ -8,7 +8,7 @@ , sphinx-prompt , sphinx-rtd-theme , sphinx-tabs -, sphinxcontrib-autoapi +, sphinx-autoapi , sphinxemoji # runtime dependencies , sphinx @@ -34,7 +34,7 @@ buildPythonPackage rec { sphinx-prompt sphinx-rtd-theme sphinx-tabs - sphinxcontrib-autoapi + sphinx-autoapi sphinxemoji ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-pytest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-pytest/default.nix index 019a5d177b..6d05a38d63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-pytest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-pytest/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "chrisjsewell"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vRHPq6BAuhn5QvHG2BGen9v6ezA3RgFVtustsNxU+n8="; + hash = "sha256-vRHPq6BAuhn5QvHG2BGen9v6ezA3RgFVtustsNxU+n8="; }; format = "flit"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-theme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-theme/default.nix index 8d2ff5a8a0..3ec142f140 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-theme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-theme/default.nix @@ -4,7 +4,7 @@ , docutils , sphinx , readthedocs-sphinx-ext -, sphinx-jquery +, sphinxcontrib-jquery , pytestCheckHook , pythonRelaxDepsHook }: @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinx_rtd_theme"; inherit version; - sha256 = "sha256-oNi9Gi7VLgszjL4ZxLLu88XnoEh2l1PaxqnwWce2Qbg="; + hash = "sha256-oNi9Gi7VLgszjL4ZxLLu88XnoEh2l1PaxqnwWce2Qbg="; }; preBuild = '' @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ docutils sphinx - sphinx-jquery + sphinxcontrib-jquery ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-togglebutton/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-togglebutton/default.nix index f1056261fb..391fb9205c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-togglebutton/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-togglebutton/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qwyLNmQnsB5MiYAtXQeEcsQn+m6dEtUhw0+gRCVZ3Ho="; + hash = "sha256-qwyLNmQnsB5MiYAtXQeEcsQn+m6dEtUhw0+gRCVZ3Ho="; }; propagatedBuildInputs = [ wheel sphinx docutils ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-version-warning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-version-warning/default.nix index bf57d4f2fd..52a6a26124 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-version-warning/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-version-warning/default.nix @@ -5,7 +5,7 @@ , pythonImportsCheckHook , sphinx , sphinxHook -, sphinxcontrib-autoapi +, sphinx-autoapi , sphinx-rtd-theme , sphinx-tabs , sphinx-prompt @@ -39,7 +39,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pythonImportsCheckHook sphinxHook - sphinxcontrib-autoapi + sphinx-autoapi sphinx-rtd-theme sphinx-tabs sphinx-prompt 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 74abbe90c9..1e14bc7a61 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix @@ -106,6 +106,21 @@ buildPythonPackage rec { # requires imagemagick (increases build closure size), doesn't # test anything substantial "test_ext_imgconverter" + + # fails with pygments 2.14 + # TODO remove for sphinx 6 + "test_viewcode" + "test_additional_targets_should_be_translated" + "test_additional_targets_should_not_be_translated" + + # sphinx.errors.VersionRequirementError: The alabaster extension + # used by this project needs at least Sphinx v1.6; it therefore + # cannot be built with this version. + "test_needs_sphinx" + + # Likely due to pygments 2.14 update + # AssertionError: assert '5:11:17\u202fAM' == '5:11:17 AM' + "test_format_date" ] ++ lib.optionals stdenv.isDarwin [ # Due to lack of network sandboxing can't guarantee port 7777 isn't bound "test_inspect_main_url" 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 index c7bdb26b00..5308034786 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-cpv1ks97fdV8TAV5T3MtwCYScnXXhcKlSUUh/d53P7k="; + hash = "sha256-cpv1ks97fdV8TAV5T3MtwCYScnXXhcKlSUUh/d53P7k="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix index 799a4ba1b5..06e00fbe1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-+M+K8WzQqxQUGgAgGPK+isf3gKK7HOrdI6nNW/V8Wv0="; + hash = "sha256-+M+K8WzQqxQUGgAgGPK+isf3gKK7HOrdI6nNW/V8Wv0="; }; propagatedBuildInputs = [ sphinx sphinxcontrib-tikz ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index d8bb9db6e8..5830ff0caf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-confluencebuilder"; - version = "1.9.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - hash = "sha256-aj+8/ZOWpT1zBdCTit6Zo/XhnzFisLk/rrg5l6sPmkw="; + hash = "sha256-RyShQt/t8tnE5ZHM0WDQ+jrvXem3y24tCpj3s6Thq+g="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix new file mode 100644 index 0000000000..1905659b25 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pytestCheckHook +, sphinx +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-jquery"; + version = "3.0.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "sphinx-contrib"; + repo = "jquery"; + rev = "refs/tags/v${version}"; + hash = "sha256-argG+jMUqLiWo4lKWAmHmUxotHl+ddJuJZ/zcUl9u5Q="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + pythonImportsCheck = [ + "sphinxcontrib.jquery" + ]; + + nativeCheckInputs = [ + pytestCheckHook + sphinx + ]; + + meta = with lib; { + description = "Extension to include jQuery on newer Sphinx releases"; + longDescription = '' + A sphinx extension that ensures that jQuery is installed for use + in Sphinx themes or extensions + ''; + homepage = "https://github.com/sphinx-contrib/jquery"; + changelog = "https://github.com/sphinx-contrib/jquery/blob/v${version}/CHANGES.rst"; + license = licenses.bsd0; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix index 676f72c3f1..8421e1669a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-MA7puMrug1XSXMdLTRx+/RLmCNKtFl4xQdMeb7wVK38="; + hash = "sha256-MA7puMrug1XSXMdLTRx+/RLmCNKtFl4xQdMeb7wVK38="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index 8c4900d35b..987442304b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "sphinxcontrib-spelling"; - version = "7.7.0"; + version = "8.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VlYcP2oVWwlGkU5N6YhymFkxVyncGBteTcimj+eN41o="; + hash = "sha256-GZ0KFpAq2Aw4fClm3J6xD1ZbH7FczOFyEEAtt8JEPlw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index 95926b569a..7a7ed5868f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-8f9FNx6WMopcqihUzNlQoPBGYoW2YkFi6W1iaFLD4qU="; + hash = "sha256-8f9FNx6WMopcqihUzNlQoPBGYoW2YkFi6W1iaFLD4qU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix index 659d8867bf..ae4a571f0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-bC3+bKKC119m3zM4absM5zMcAbR122gJ/50Qe3zf4Es="; + hash = "sha256-bC3+bKKC119m3zM4absM5zMcAbR122gJ/50Qe3zf4Es="; }; propagatedBuildInputs = [ sphinx ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxemoji/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxemoji/default.nix index 342dd3f64e..726ba8132b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxemoji/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxemoji/default.nix @@ -1,4 +1,9 @@ -{ lib, buildPythonPackage, fetchFromGitHub, sphinx }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, sphinx +, sphinxHook +}: buildPythonPackage rec { pname = "sphinxemoji"; @@ -8,25 +13,22 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sphinx-contrib"; - repo = "emojicodes"; # does not match pypi name - rev = "v${version}"; - sha256 = "sha256-TLhjpJpUIoDAe3RZ/7sjTgdW+5s7OpMEd1/w0NyCQ3A="; + repo = "emojicodes"; + rev = "refs/tags/v${version}"; + hash = "sha256-TLhjpJpUIoDAe3RZ/7sjTgdW+5s7OpMEd1/w0NyCQ3A="; }; - propagatedBuildInputs = [ sphinx ]; + propagatedBuildInputs = [ + sphinx + ]; - nativeBuildInputs = [ sphinx ]; + nativeBuildInputs = [ + sphinxHook + ]; - postBuild = '' - PYTHONPATH=$PWD:$PYTHONPATH make -C docs html - ''; - - postInstall = '' - mkdir -p $out/share/doc/python/$pname - cp -r ./docs/build/html $out/share/doc/python/$pname - ''; - - pythonImportsCheck = [ "sphinxemoji" ]; + pythonImportsCheck = [ + "sphinxemoji" + ]; meta = with lib; { description = "Extension to use emoji codes in your Sphinx documentation"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spiderpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spiderpy/default.nix index 82007997cc..1747e86099 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spiderpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spiderpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "peternijssen"; repo = "spiderpy"; rev = version; - sha256 = "sha256-Yujy8HSMbK2DQ/913r2c74hKPYDfcHFKq04ysqxG+go="; + hash = "sha256-Yujy8HSMbK2DQ/913r2c74hKPYDfcHFKq04ysqxG+go="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spidev/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spidev/default.nix index 2676563430..fd3a12d7da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spidev/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spidev/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-FNvDdZSkqu+FQDq2F5hdPD70ZNYrybdp71UttTcBEVs="; + hash = "sha256-FNvDdZSkqu+FQDq2F5hdPD70ZNYrybdp71UttTcBEVs="; }; # package does not include tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/splinter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/splinter/default.nix index e051388daf..a65cf3a3f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/splinter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/splinter/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPy27 , fetchFromGitHub +, urllib3 , selenium , cssselect , django @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "splinter"; - version = "0.18.1"; + version = "0.19.0"; disabled = isPy27; @@ -23,25 +24,28 @@ buildPythonPackage rec { owner = "cobrateam"; repo = "splinter"; rev = "refs/tags/${version}"; - hash = "sha256-5d39e9omc223ugBfVMIsMZh8+NPVxc6q7p2gwZ0fF0o="; + hash = "sha256-K10zrQOM/khVcf+OT4s5UCY8zE2+nWtaAkRLy9/feU0="; }; propagatedBuildInputs = [ - selenium + urllib3 ]; + passthru.optional-dependencies = { + "zope.testbrowser" = [ zope-testbrowser lxml cssselect ]; + django = [ django lxml cssselect ]; + flask = [ flask lxml cssselect ]; + selenium = [ selenium ]; + }; + nativeCheckInputs = [ - cssselect - django - flask - lxml pytestCheckHook - zope-testbrowser - ]; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); disabledTests = [ # driver is present and fails with a different error during loading "test_browser_local_driver_not_present" + "test_browser_log_missing_drivers" "test_local_driver_not_present" ]; @@ -49,6 +53,7 @@ buildPythonPackage rec { "samples" # We run neither Chromium nor Firefox nor ... "tests/test_async_finder.py" + "tests/test_element_is_visible.py" "tests/test_html_snapshot.py" "tests/test_iframes.py" "tests/test_mouse_interaction.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spsdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spsdk/default.nix index db23fee15c..944987f2cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spsdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spsdk/default.nix @@ -33,13 +33,13 @@ buildPythonPackage rec { pname = "spsdk"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "NXPmicro"; repo = pname; - rev = version; - hash = "sha256-yCmkOrUe5XqbuHeo7F84j1gmdzpdpCRWdD9V74U64c4="; + rev = "refs/tags/${version}"; + hash = "sha256-UBiylZB6/0n1FQMMg0coXkYh9S6gLz2LaoKk2HoWu7c="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spur/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spur/default.nix index 24bdc5839a..4b4fe91181 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spur/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spur/default.nix @@ -7,16 +7,16 @@ buildPythonPackage rec { pname = "spur"; - version = "0.3.22"; + version = "0.3.23"; format = "setuptools"; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mwilliamson"; repo = "spur.py"; - rev = version; - sha256 = "sha256-YlwezAE7V4ykFsp+bJ2nYRp6HG4I9Bk7Lhq6f1Inn0s="; + rev = "refs/tags/${version}"; + hash = "sha256-LTkZ1p2P9fsD+gZEQZaCS68Q6nGc4qFGMNtH75gQmXQ="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to run commands and manipulate files locally or over SSH"; homepage = "https://github.com/mwilliamson/spur.py"; + changelog = "https://github.com/mwilliamson/spur.py/blob/0.3.23/CHANGES"; license = with licenses; [ bsd2 ]; maintainers = with maintainers; [ fab ]; }; 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 837cf0c0a5..3480652007 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 @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.4.1"; + version = "2.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eD2N+9cVzZdyjpE5FnebN8+OllZjVevaz+NBHSvrR5Y="; + hash = "sha256-l1huq9ofcUwmA1tbAe18Lj9Tmw3na9R5r1AD9fGbPrc="; }; 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 80435a738d..c1de80fc51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix @@ -35,7 +35,7 @@ , qtconsole , qtpy , rope -, Rtree +, rtree , scipy , spyder-kernels , textdistance @@ -45,14 +45,14 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.4.1"; + version = "5.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kQBOYRXhjz+OQk7Vlxb/UKiDi92mA8ialsFQ+QzqhlE="; + hash = "sha256-L8zgT7M7N+P5/9FQgf6ab7afUQXC1afzwUjAp6yKxC8="; }; patches = [ @@ -93,7 +93,7 @@ buildPythonPackage rec { qtconsole qtpy rope - Rtree + rtree scipy spyder-kernels textdistance diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spyse-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spyse-python/default.nix index bd73edc61e..0064454a1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spyse-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spyse-python/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { (fetchpatch { name = "support-later-limiter.patch"; url = "https://github.com/spyse-com/spyse-python/commit/ff68164c514dfb28ab77d8690b3a5153962dbe8c.patch"; - sha256 = "sha256-PoWPJCK/Scsh4P7lr97u4JpVHXNlY0C9rJgY4TDYmv0="; + hash = "sha256-PoWPJCK/Scsh4P7lr97u4JpVHXNlY0C9rJgY4TDYmv0="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix index 03732a154c..b58fcffd94 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "penguinolog"; repo = "sqlalchemy_jsonfield"; rev = "refs/tags/${version}"; - sha256 = "sha256-dSvqUXZzr+s/v8QEtqrv6slI7p1akXwAxi68D9ctyuU="; + hash = "sha256-dSvqUXZzr+s/v8QEtqrv6slI7p1akXwAxi68D9ctyuU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index c00aad2d40..ae9d8bd953 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -20,6 +20,10 @@ buildPythonPackage rec { pname = "sqlalchemy-migrate"; version = "0.13.0"; + # using deprecated inspect.getargspec function + # https://bugs.launchpad.net/sqlalchemy-migrate/+bug/2003619 + disabled = pythonAtLeast "3.11"; + src = fetchPypi { inherit pname version; sha256 = "1y0lcqii7b4vp7yh9dyxrl4i77hi8jkkw7d06mgdw2h458ljxh0b"; @@ -64,8 +68,6 @@ buildPythonPackage rec { description = "Schema migration tools for SQLAlchemy"; license = licenses.asl20; maintainers = teams.openstack.members ++ (with maintainers; [ makefu ]); - # using deprecated inspect.getargspec function - # https://bugs.launchpad.net/sqlalchemy-migrate/+bug/2003619 - broken = pythonAtLeast "3.11"; + broken = lib.versionAtLeast sqlalchemy.version "2.0.0"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix index 6986ab2343..91e5a64194 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "absent1706"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-GmMxya6aJ7MMqQ3KSqO3f/cbwgWvQYhEVXtGi6fhP1M="; + hash = "sha256-GmMxya6aJ7MMqQ3KSqO3f/cbwgWvQYhEVXtGi6fhP1M="; }; propagatedBuildInputs = [ 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 633457c4b1..d3ad0bf970 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 @@ -37,13 +37,13 @@ buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.39.0"; + version = "0.40.0"; format = "setuptools"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - hash = "sha256-s3JAkX2BwU/htuUJakArrORysXkSE4TkfBDYVNv1r5I="; + hash = "sha256-r4AwiaeSmAP662FzuQ8p0aZ60C8dHnMvQLBUqOs8c3A="; }; patches = [ 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 f378437b47..47ce2d42d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix @@ -7,10 +7,10 @@ # build , cython +, setuptools # propagates , greenlet -, importlib-metadata , typing-extensions # optionals @@ -22,7 +22,7 @@ , mypy , mysql-connector , mysqlclient -# TODO: oracledb +, oracledb , pg8000 , psycopg , psycopg2 @@ -34,28 +34,31 @@ # tests , mock +, pytest-xdist , pytestCheckHook }: buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.46"; + version = "2.0.4"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; + hash = "sha256-laGOGmryEU29nuTxaK0zBw1jF+Ebr6KNmDzHtYX+kAs="; }; - nativeBuildInputs = lib.optionals (!isPyPy) [ + nativeBuildInputs =[ + setuptools + ] ++ lib.optionals (!isPyPy) [ cython ]; propagatedBuildInputs = [ greenlet typing-extensions - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata ]; passthru.optional-dependencies = rec { @@ -63,7 +66,7 @@ buildPythonPackage rec { greenlet ]; mypy = [ - #mypy + mypy ]; mssql = [ pyodbc @@ -87,7 +90,7 @@ buildPythonPackage rec { cx_oracle ]; oracle_oracledb = [ - # TODO: oracledb + oracledb ]; postgresql = [ psycopg2 @@ -126,14 +129,16 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + pytest-xdist pytestCheckHook mock ]; - # disable mem-usage tests on mac, has trouble serializing pickle files - disabledTests = lib.optionals stdenv.isDarwin [ - "MemUsageWBackendTest" - "MemUsageTest" + disabledTestPaths = [ + # typing correctness, not interesting + "test/ext/mypy" + # slow and high memory usage, not interesting + "test/aaa_profiling" ]; meta = with lib; { 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 38847309ce..f506430619 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlitedict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlitedict/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "RaRe-Technologies"; repo = "sqlitedict"; rev = "refs/tags/v${version}"; - sha256 = "sha256-GfvvkQ6a75UBPn70IFOvjvL1MedSc4siiIjA3IsQnic="; + hash = "sha256-GfvvkQ6a75UBPn70IFOvjvL1MedSc4siiIjA3IsQnic="; }; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix index 80e82d353e..a3792cc910 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.7.2"; + version = "1.7.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XTLDdfNZXzqTreRan2kb0tGygdhdAW4JG3rZPKvkDfM="; + hash = "sha256-Madz55RkI+SEtkBep1rcQt2iIwd/LqfzCCKP+4jRHUE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix index 4b30f56a9f..21c48ad86e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, FormEncode +, formencode , pastedeploy , paste , pydispatcher @@ -23,7 +23,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - FormEncode + formencode paste pastedeploy pydispatcher diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix index 479dcc91d7..4e668bed71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-acqASEa7EU0uw4DkNgqKNA24PwzPOvzusUBN8Cj1cmg="; + hash = "sha256-acqASEa7EU0uw4DkNgqKNA24PwzPOvzusUBN8Cj1cmg="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqltrie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqltrie/default.nix index da465eb0cc..8a9c25c535 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqltrie/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqltrie/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sqltrie"; - version = "0.0.28"; + version = "0.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-i1IFkibQ7VHrkD8KzeInBE4ZbjxAw8nQIeE6O4iYmbw="; + hash = "sha256-98x9kIkOIe5QIIlQ4nA2ewFpCczXB7IZBsSLQgGbdzc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/squarify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/squarify/default.nix new file mode 100644 index 0000000000..e0fe054156 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/squarify/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, pytestCheckHook +, matplotlib +}: + +buildPythonPackage rec { + pname = "squarify"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "laserson"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-zSv+6xT9H4WyShRnwjjcNMjY19AFlQ6bw9Mh9p2rL08="; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + + propagatedBuildInputs = [ matplotlib ]; + + pythonImportsCheck = [ "squarify" ]; + + meta = with lib; { + homepage = "https://github.com/laserson/squarify"; + description = "Pure Python implementation of the squarify treemap layout algorithm"; + license = licenses.asl20; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/srvlookup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/srvlookup/default.nix index 15c0eedd0f..a81c1d25da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/srvlookup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/srvlookup/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "gmr"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-iXbi25HsoNX0hnhwZoFik5ddlJ7i+xml3HGaezj3jgY="; + hash = "sha256-iXbi25HsoNX0hnhwZoFik5ddlJ7i+xml3HGaezj3jgY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ssdp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ssdp/default.nix index 2ae8dbf68d..d2db80dbd3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ssdp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ssdp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "codingjoe"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-D2mww3sEc2SvufWNmT450a2CW+ogROn3RHypljkebuY="; + hash = "sha256-D2mww3sEc2SvufWNmT450a2CW+ogROn3RHypljkebuY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ssh-mitm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ssh-mitm/default.nix index ae703fb48e..d5c890b2dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ssh-mitm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ssh-mitm/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "ssh-mitm"; - version = "3.0.1"; + version = "3.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-bFxpgzomtcFGf0LfLUR05y3+/8DNhND6EKAmCZcYb5E="; + hash = "sha256-koV7g6ZmrrXk60rrDP8BwrDZk3shiyJigQgNcb4BASE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sshfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sshfs/default.nix new file mode 100644 index 0000000000..763541221d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sshfs/default.nix @@ -0,0 +1,53 @@ +{ lib +, asyncssh +, bcrypt +, buildPythonPackage +, fetchFromGitHub +, fsspec +, mock-ssh-server +, pytest-asyncio +, pytestCheckHook +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "sshfs"; + version = "2023.1.0"; + + src = fetchFromGitHub { + owner = "fsspec"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-TETxjBI4T8dgmtCtx/lq2LIIwyFsAMWY6xdm7+Qsjb0="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + asyncssh + bcrypt + fsspec + ]; + + nativeCheckInputs = [ + mock-ssh-server + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sshfs" + ]; + + meta = with lib; { + description = "SSH/SFTP implementation for fsspec"; + homepage = "https://github.com/fsspec/sshfs/"; + changelog = "https://github.com/fsspec/sshfs/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ melling ]; + }; +} 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 f68647ce7d..2e585c2bbc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-58sOp3Tbgb+RhE2yLecqQKro97D5u5ug9mbUdO9r+fw="; + hash = "sha256-58sOp3Tbgb+RhE2yLecqQKro97D5u5ug9mbUdO9r+fw="; }; propagatedBuildInputs = [ paramiko ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stack-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stack-data/default.nix index 300dccb944..e1649db165 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stack-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stack-data/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "alexmojaki"; repo = "stack_data"; rev = "v${version}"; - sha256 = "sha256-brXFrk1UU5hxCVeRvGK7wzRA0Hoj9fgqoxTIwInPrEc="; + hash = "sha256-brXFrk1UU5hxCVeRvGK7wzRA0Hoj9fgqoxTIwInPrEc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stanza/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stanza/default.nix index c26f68eae2..495dc22608 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stanza/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stanza/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "stanza"; - version = "1.4.2"; + version = "1.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "stanfordnlp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-v4/wYfXqOwSXxx864LNxviRtsqu5DXqs9diswA1oZXc="; + hash = "sha256-sFGAVavY16UQNJmW467+Ekojws59UMcAoCc1t9wWHM4="; }; propagatedBuildInputs = [ @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Official Stanford NLP Python Library for Many Human Languages"; homepage = "https://github.com/stanfordnlp/stanza/"; + changelog = "https://github.com/stanfordnlp/stanza/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ riotbib ]; }; 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 54fe677dab..134b6d37e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.23.1"; + version = "0.25.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LcFrdaRgFBqcdylCzNlewj/papsg/sZ1FMVxBDLvQWI="; + hash = "sha256-s0ADo/+lcH8Y31hf1iSLbfTsV3fZtlCuZf7BS0uQc9Y="; }; nativeBuildInputs = [ 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 9d24dd739f..db22d41f57 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-w6ge5MQXNRHCM43jKnagTlbquJJys7mprgBOS2uuwHQ="; + hash = "sha256-w6ge5MQXNRHCM43jKnagTlbquJJys7mprgBOS2uuwHQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stem/default.nix index 90bfaf8a62..97e5dfa4e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stem/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-gdQ6fGaLqde8EQOy56kR6dFIKUs3PSelmujaee96Pi8="; + hash = "sha256-gdQ6fGaLqde8EQOy56kR6dFIKUs3PSelmujaee96Pi8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stestr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stestr/default.nix index 29fa7497f6..afce80b83c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stestr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stestr/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-wsHHO/x8/KORJxWeP7x0GTrr8s0C2KBCfy5YZI42zyY="; + hash = "sha256-wsHHO/x8/KORJxWeP7x0GTrr8s0C2KBCfy5YZI42zyY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix index 24c9411540..9dba2290a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "stevedore"; - version = "4.1.1"; + version = "5.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-f4rrbj+Q+WgywwG/8hp+te776JTIjFBkg9NVVl2IzBo="; + hash = "sha256-LEKNIziXYnno6yGW96lJEJYNn3ui9B85iFEelcpEcCE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stickytape/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stickytape/default.nix index 71d64e1e7b..c3c9d4423f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stickytape/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stickytape/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mwilliamson"; repo = pname; rev = version; - sha256 = "sha256-KOZN9oxPb91l8QVU07I49UMNXqox8j+oekA1fMtj6l8="; + hash = "sha256-KOZN9oxPb91l8QVU07I49UMNXqox8j+oekA1fMtj6l8="; }; # Tests have additional requirements diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stim/default.nix index 4ad0891e37..381676047c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stim/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "quantumlib"; repo = "Stim"; rev = "refs/tags/v${version}"; - sha256 = "sha256-zXWdJjFkf74FCWxyVMF8dx0P8GmUkuHFxUo5wYNU2o0="; + hash = "sha256-zXWdJjFkf74FCWxyVMF8dx0P8GmUkuHFxUo5wYNU2o0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stopit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stopit/default.nix index 4d504da674..66f7aadf23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stopit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stopit/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "glenfant"; repo = pname; rev = version; - sha256 = "sha256-uXJUA70JOGWT2NmS6S7fPrTWAJZ0mZ/hICahIUzjfbw="; + hash = "sha256-uXJUA70JOGWT2NmS6S7fPrTWAJZ0mZ/hICahIUzjfbw="; }; pythonImportsCheck = [ "stopit" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix index c65563d6e6..23a4f01ddc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-P00oxUz0oVQB969c/N2wpKLe09wtvQWPH4DH4EZUaxc="; + hash = "sha256-P00oxUz0oVQB969c/N2wpKLe09wtvQWPH4DH4EZUaxc="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix index cd01471d36..9d25284b9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.151.2"; + version = "0.159.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - sha256 = "sha256-sHrdZ33irwTkm3OHQ2yxxcCWZDcaNbKy7amfRTtPVZ8="; + hash = "sha256-3fyls1W2Vx0nDtp7mta/8QeKM6RRsAbw3dWOnH1/jk0="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/streamdeck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/streamdeck/default.nix index d3119ba838..19c8e9498c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/streamdeck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/streamdeck/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-9bNWsNEW5Di2EZ3z+p8y4Q7GTfIG66b05pTiQcff7HE="; + hash = "sha256-9bNWsNEW5Di2EZ3z+p8y4Q7GTfIG66b05pTiQcff7HE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/streamlabswater/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/streamlabswater/default.nix index 0e864960ca..68f6011edc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/streamlabswater/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/streamlabswater/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-kXG0Wg3PVryMBQ9RMMtEzudMiwVQq7Ikw2OK7JcBojA="; + hash = "sha256-kXG0Wg3PVryMBQ9RMMtEzudMiwVQq7Ikw2OK7JcBojA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix index 5660a03287..8a7fa7dc7c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-cM1VmA/ikp3AOJJMoI9o+WFIIjqHd4EPphbjR46+cco="; + hash = "sha256-cM1VmA/ikp3AOJJMoI9o+WFIIjqHd4EPphbjR46+cco="; }; postPatch = '' 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 8ec20e3b1d..db53686c2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "hynek"; repo = "structlog"; rev = "refs/tags/${version}"; - sha256 = "sha256-+r+M+uTXdNBWQf0TGQuZgsCXg2CBKwH8ZE2+uAe0Dzg="; + hash = "sha256-+r+M+uTXdNBWQf0TGQuZgsCXg2CBKwH8ZE2+uAe0Dzg="; }; nativeBuildInputs = [ 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 99ba13d45e..3a822611d1 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.7.1"; + version = "0.7.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-igfC/Hi/cbNnHmrzgWQnhJ9cdWHPI0fIqPIYeIZuxgU="; + hash = "sha256-lvL/bRHvQvvYqr+qzrWe7dOscYFGVA2OrVt/RPGdmzA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/subprocess-tee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/subprocess-tee/default.nix index 467d0a20e2..462a0cd60b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/subprocess-tee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/subprocess-tee/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-s8EkmT+LiNHrHC/eC8IGl4fqxyC6iHccuhfoyTMkgl0="; + hash = "sha256-s8EkmT+LiNHrHC/eC8IGl4fqxyC6iHccuhfoyTMkgl0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/subunit2sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/subunit2sql/default.nix index 03fa99fcd1..2f29322b9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/subunit2sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/subunit2sql/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-c+Dg6moKiv30M0mmwGQSOEbc94gfH//ZnF7lnBgv8EU="; + hash = "sha256-c+Dg6moKiv30M0mmwGQSOEbc94gfH//ZnF7lnBgv8EU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/subzerod/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/subzerod/default.nix index e4f3e531b0..5a36323365 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/subzerod/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/subzerod/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-/7g8Upj9Hb4m83JXLI3X2lqa9faCt42LVxh+V9WpI68="; + hash = "sha256-/7g8Upj9Hb4m83JXLI3X2lqa9faCt42LVxh+V9WpI68="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix index 0ede9c2de8..1015cc0379 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "SMTG-UCL"; repo = "sumo"; rev = "refs/tags/v${version}"; - sha256 = "sha256-eGQOFTo/tg1aM/P1la3stE7RLxpACUdcJ7g1z3zSasc="; + hash = "sha256-eGQOFTo/tg1aM/P1la3stE7RLxpACUdcJ7g1z3zSasc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sumtypes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sumtypes/default.nix index 4c19828545..1b6f1c38e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sumtypes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sumtypes/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "radix"; repo = pname; rev = version; - sha256 = "sha256-qwQyFKVnGEqHUqFmUSnHVvedsp2peM6rJZcS90paLOo="; + hash = "sha256-qwQyFKVnGEqHUqFmUSnHVvedsp2peM6rJZcS90paLOo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix index d316598946..7bde8db01c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "4.1.0"; + version = "4.1.3"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-DAWc5G5YTydxHIuZkY7Nb3euejPn0aQy7D01xChFDeM="; + hash = "sha256-YNShjuLC7gBRn11oAd5Kp5CfCn92vAo/K4QNIXm/Mtc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/superqt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/superqt/default.nix index 22cec4dc86..f0d65a96dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/superqt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/superqt/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "napari"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-zEMG2zscGDlRxtLn/lUTEjZBPabcwzMcj/kMcy3yOs8="; + hash = "sha256-zEMG2zscGDlRxtLn/lUTEjZBPabcwzMcj/kMcy3yOs8="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix index 3999a4c8b8..b99b5cfd05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-NHYbrhojxYGSKBpRFfsH+/IsmwEzwIFmvv/HD+0+vBI="; + hash = "sha256-NHYbrhojxYGSKBpRFfsH+/IsmwEzwIFmvv/HD+0+vBI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sure/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sure/default.nix index fb2857a1be..3252011450 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sure/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sure/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { # https://github.com/gabrielfalcao/sure/issues/169 (fetchpatch { url = "https://raw.githubusercontent.com/archlinux/svntogit-community/055baa81cd987e566de62a5657513937521a90d4/trunk/python310.diff"; - sha256 = "sha256-BKylV8xpTOuO/X4hzZKpoIcAQcdAK0kXYENRad7AGPc="; + hash = "sha256-BKylV8xpTOuO/X4hzZKpoIcAQcdAK0kXYENRad7AGPc="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/surepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/surepy/default.nix index dcd23aadb1..445f942581 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/surepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/surepy/default.nix @@ -5,7 +5,7 @@ , attrs , brotlipy , buildPythonPackage -, cchardet +, faust-cchardet , click , colorama , fetchFromGitHub @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "benleb"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-/fgNznsucjHPO44lK4tk5tDJHKjCJEbPtOO7YHmDcRQ="; + hash = "sha256-/fgNznsucjHPO44lK4tk5tDJHKjCJEbPtOO7YHmDcRQ="; }; postPatch = '' @@ -47,9 +47,9 @@ buildPythonPackage rec { async-timeout attrs brotlipy - cchardet click colorama + faust-cchardet halo requests rich diff --git a/third_party/nixpkgs/pkgs/development/python-modules/surt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/surt/default.nix index 9ae0b451f9..a13bfb154f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/surt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/surt/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "internetarchive"; repo = "surt"; rev = "6934c321b3e2f66af9c001d882475949f00570c5"; # Has no git tag - sha256 = "sha256-pSMNpFfq2V0ANWNFPcb1DwPHccbfddo9P4xZ+ghwbz4="; + hash = "sha256-pSMNpFfq2V0ANWNFPcb1DwPHccbfddo9P4xZ+ghwbz4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/survey/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/survey/default.nix index e15db14c69..f03ad50701 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/survey/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/survey/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-TK89quY3bpNIEz1n3Ecew4FnTH6QgeSLdDNV86gq7+I="; + hash = "sha256-TK89quY3bpNIEz1n3Ecew4FnTH6QgeSLdDNV86gq7+I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/svgwrite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/svgwrite/default.nix index 10d02fa726..7f03007ee5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/svgwrite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/svgwrite/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "mozman"; repo = "svgwrite"; rev = "v${version}"; - sha256 = "sha256-uOsrDhE9AwWU7GIrCVuL3uXTPqtrh8sofvo2C5t+25I="; + hash = "sha256-uOsrDhE9AwWU7GIrCVuL3uXTPqtrh8sofvo2C5t+25I="; }; # svgwrite requires Python 3.6 or newer diff --git a/third_party/nixpkgs/pkgs/development/python-modules/swagger-spec-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/swagger-spec-validator/default.nix index 80fb6bb6a5..124b691352 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/swagger-spec-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/swagger-spec-validator/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "Yelp"; repo = "swagger_spec_validator"; rev = "v${version}"; - sha256 = "sha256-7+kFmtzeze0QlGf6z/M4J4F7z771a5NWewB1S3+bxn4="; + hash = "sha256-7+kFmtzeze0QlGf6z/M4J4F7z771a5NWewB1S3+bxn4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/swift/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/swift/default.nix index 1eed43519e..4e7b496b7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/swift/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/swift/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "swift"; - version = "2.31.0"; + version = "2.31.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gU6XQKiLv6E1OtSjwDunjhNIMK36//arcSsQRwuRtTY="; + hash = "sha256-6CRSIv2m2pqZdzRAEJ/6Qo90PZ7LRNg1zQg50Ecq2RQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix index fc57fec57d..d850d28bb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "symengine"; repo = "symengine.py"; rev = "v${version}"; - sha256 = "sha256-ZHplYEG97foy/unOdSokFFkDl4LK5TI4kypHSLpcCM4="; + hash = "sha256-ZHplYEG97foy/unOdSokFFkDl4LK5TI4kypHSLpcCM4="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sympy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sympy/default.nix index f7fb4b735e..a135f31578 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sympy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sympy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-4yOA3OY8t8AQjtUlVwCS/UUWi9ri+qF+UoIh73Lohlg="; + hash = "sha256-4yOA3OY8t8AQjtUlVwCS/UUWi9ri+qF+UoIh73Lohlg="; }; nativeCheckInputs = [ glibcLocales ]; 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 beca0ef814..5cac083229 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "timmo001"; repo = "system-bridge-connector-py"; rev = "v${version}"; - sha256 = "sha256-Ts8zPRK6S5iLnl19Y/Uz0YAh6hDeVRNBY6HsvLwdUFw="; + hash = "sha256-Ts8zPRK6S5iLnl19Y/Uz0YAh6hDeVRNBY6HsvLwdUFw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/systemd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/systemd/default.nix index 864bb2532c..0dea848dfc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/systemd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/systemd/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "systemd"; repo = "python-systemd"; rev = "v${version}"; - sha256 = "sha256-8p4m4iM/z4o6PHRQIpuSXb64tPTWGlujEYCDVLiIt2o="; + hash = "sha256-8p4m4iM/z4o6PHRQIpuSXb64tPTWGlujEYCDVLiIt2o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tabledata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tabledata/default.nix index 7b9a8977a9..5e7b00c99e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tabledata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tabledata/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "tabledata"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "thombashi"; repo = pname; - rev = "v${version}"; - hash = "sha256-6Nkdc32cp9wbmw7cnBn5VAJKfqxNunyxExuZ9b+qWNY="; + rev = "refs/tags/v${version}"; + hash = "sha256-oDo+wj5MO5Zopya2lp+sU/LAnFGZy6OIdW4YgcAmw1Q="; }; propagatedBuildInputs = [ dataproperty typepy ]; @@ -24,6 +24,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/thombashi/tabledata"; description = "A library to represent tabular data"; + changelog = "https://github.com/thombashi/tabledata/releases/tag/v${version}"; maintainers = with maintainers; [ genericnerdyusername ]; license = licenses.mit; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tables/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tables/default.nix index 2a50024dc6..c2a2cd5e11 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tables/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tables/default.nix @@ -3,6 +3,7 @@ , fetchpatch , buildPythonPackage , pythonOlder +, blosc2 , bzip2 , c-blosc , cython @@ -11,21 +12,27 @@ , numpy , numexpr , packaging +, sphinx # Test inputs -, pytestCheckHook +, python +, pytest }: buildPythonPackage rec { pname = "tables"; - version = "3.7.0"; + version = "3.8.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6SqIetbyqYPlZKaZAt5KdkXDAGn8AavTU+xdolXF4f4="; + hash = "sha256-NPP6I2bOILGPHfVzp3wdJzBs4fKkHZ+e/2IbUZLqh4g="; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ + blosc2 + cython + sphinx + ]; buildInputs = [ bzip2 @@ -34,6 +41,7 @@ buildPythonPackage rec { lzo ]; propagatedBuildInputs = [ + blosc2 numpy numexpr packaging # uses packaging.version at runtime @@ -46,6 +54,8 @@ buildPythonPackage rec { substituteInPlace tables/tests/test_suite.py \ --replace "return 0" "assert result.wasSuccessful(); return 0" \ --replace "return 1" "assert result.wasSuccessful(); return 1" + substituteInPlace requirements.txt \ + --replace "blosc2~=2.0.0" "blosc2" ''; # Regenerate C code with Cython @@ -60,15 +70,21 @@ buildPythonPackage rec { "--blosc=${lib.getDev c-blosc}" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest + ]; + preCheck = '' cd .. ''; - # Runs the test suite as one single test via unittest. The whole "heavy" test suite supposedly takes ~5 hours to run. - pytestFlagsArray = [ - "--pyargs" - "tables.tests.test_suite" - ]; + + # Runs the light (yet comprehensive) subset of the test suite. + # The whole "heavy" test suite supposedly takes ~4 hours to run. + checkPhase = '' + runHook preCheck + ${python.interpreter} -m tables.tests.test_all + runHook postCheck + ''; pythonImportsCheck = [ "tables" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tago/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tago/default.nix index 220c8f2b0b..86923a219e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tago/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tago/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tago-io"; repo = "tago-sdk-python"; rev = version; - sha256 = "sha256-eu6n83qmo1PQKnR/ellto04xi/3egl+LSKMOG277X1k="; + hash = "sha256-eu6n83qmo1PQKnR/ellto04xi/3egl+LSKMOG277X1k="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tahoma-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tahoma-api/default.nix index 4402182231..14989f9ac7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tahoma-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tahoma-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "philklei"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YwOKSBlN4lNyS+hfdbQDUq1gc14FBof463ofxtUVLC4="; + hash = "sha256-YwOKSBlN4lNyS+hfdbQDUq1gc14FBof463ofxtUVLC4="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/taskw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/taskw/default.nix index 76cfe0faf0..32e40801c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/taskw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/taskw/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-EQm9+b3nqbMqUAejAsh4MD/2UYi2QiWsdKMomkxUi90="; + hash = "sha256-EQm9+b3nqbMqUAejAsh4MD/2UYi2QiWsdKMomkxUi90="; }; patches = [ ./use-template-for-taskwarrior-install-path.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix index 8f0adfc8d1..9351784e90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "neogeny"; repo = "TatSu"; rev = "refs/tags/v${version}"; - sha256 = "sha256-cKEMRbH/xNtYM0lmNVazv3i0Q1tmVrVPrB6F2s02Sro="; + hash = "sha256-cKEMRbH/xNtYM0lmNVazv3i0Q1tmVrVPrB6F2s02Sro="; }; nativeBuildInputs = [ pytest-runner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/taxi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/taxi/default.nix index 47a50d8ad2..9e2d5bfae2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/taxi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/taxi/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sephii"; repo = "taxi"; rev = version; - sha256 = "sha256-iIy3odDX3QzVG80AFp81m8AYKES4JjlDp49GGpuIHLI="; + hash = "sha256-iIy3odDX3QzVG80AFp81m8AYKES4JjlDp49GGpuIHLI="; }; propagatedBuildInputs = [ 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 index bb05dec3f4..bc4f25003b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/teamcity-messages/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/teamcity-messages/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "JetBrains"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9az7kD7nKqMF2b3/eFgF+pOKKIYLvTy2sf4TSJfHRnA="; + hash = "sha256-9az7kD7nKqMF2b3/eFgF+pOKKIYLvTy2sf4TSJfHRnA="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix index ca79b7b771..9f6fd6b7a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-aEtBAE3p+HVw/macwZtKo20mSJctrsIN7idqWe6Dvtc="; + hash = "sha256-aEtBAE3p+HVw/macwZtKo20mSJctrsIN7idqWe6Dvtc="; }; propagatedBuildInputs = [ 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 83f07a52f0..1a63403f6a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "tempora"; - version = "5.1.0"; + version = "5.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PnxKU2mheIyIqZtr46THTAx3KNO2L9dop+gb0L4OiN8="; + hash = "sha256-txdkhsWUinUgHo0LIe8sI8qAhHQGDfRyGMkilb3OUnY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tenacity/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tenacity/default.nix index 15d67383c8..ea3f41f935 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tenacity/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tenacity/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tenacity"; - version = "8.1.0"; + version = "8.2.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5IxDf9+TQPVma5LNeZDpa8X8lV4SmLr0qQfjlyBnpEU="; + hash = "sha256-x7tLhkJbl3cmp7SZcVQtT2e69yCWWX0oPz/9AfM7kt8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorboard-data-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorboard-data-server/default.nix index 74f53d7c67..d6df4fc0b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorboard-data-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorboard-data-server/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { inherit version format; dist = "py3"; python = "py3"; - sha256 = "sha256-gJ/piHaC01wffR9U8PQPmLsfdxsUJltFPKBR4s5Y/Kc="; + hash = "sha256-gJ/piHaC01wffR9U8PQPmLsfdxsUJltFPKBR4s5Y/Kc="; }; pythonImportsCheck = [ "tensorboard_data_server" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-datasets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-datasets/default.nix index 20837e9efd..13777b7e76 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -42,13 +42,13 @@ buildPythonPackage rec { pname = "tensorflow-datasets"; - version = "4.8.0"; + version = "4.8.2"; src = fetchFromGitHub { owner = "tensorflow"; repo = "datasets"; rev = "refs/tags/v${version}"; - sha256 = "sha256-YG0Abb5xdTaq+/0I45KU02wuZHyLKD5oMSINJOy7Nrk="; + hash = "sha256-FYFk53WKNQTSrnGGiA6cn9LffbMJkZtjlGuOF52Og7c="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-metadata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-metadata/default.nix index f5008136f0..d6e2951c15 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "tensorflow"; repo = "metadata"; rev = "refs/tags/v${version}"; - sha256 = "sha256-pgeQ9qMcz/DsdvF3THMZ4uPToLxtIM0No/kgRlBzU8A="; + hash = "sha256-pgeQ9qMcz/DsdvF3THMZ4uPToLxtIM0No/kgRlBzU8A="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix index dcfa8e0e96..c9ed927121 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix @@ -57,7 +57,7 @@ in buildPythonPackage { platform = if stdenv.isDarwin then "mac" else "linux"; unit = if cudaSupport then "gpu" else "cpu"; key = "${platform}_py_${pyVerNoDot}_${unit}"; - in fetchurl packages.${key}; + in fetchurl (packages.${key} or {}); propagatedBuildInputs = [ astunparse diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix index adc7b1c1e0..0b0946f110 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix @@ -140,14 +140,14 @@ let (fetchpatch { name = "tensorflow-rules_cc-libtool-path.patch"; url = "https://github.com/bazelbuild/rules_cc/commit/8c427ab30bf213630dc3bce9d2e9a0e29d1787db.diff"; - sha256 = "sha256-C4v6HY5+jm0ACUZ58gBPVejCYCZfuzYKlHZ0m2qDHCk="; + hash = "sha256-C4v6HY5+jm0ACUZ58gBPVejCYCZfuzYKlHZ0m2qDHCk="; }) # https://github.com/bazelbuild/rules_cc/pull/124 (fetchpatch { name = "tensorflow-rules_cc-install_name_tool-path.patch"; url = "https://github.com/bazelbuild/rules_cc/commit/156497dc89100db8a3f57b23c63724759d431d05.diff"; - sha256 = "sha256-NES1KeQmMiUJQVoV6dS4YGRxxkZEjOpFSCyOq9HZYO0="; + hash = "sha256-NES1KeQmMiUJQVoV6dS4YGRxxkZEjOpFSCyOq9HZYO0="; }) ]; postPatch = "popd"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/termcolor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/termcolor/default.nix index 19a7525d6b..ba5244f66a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/termcolor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/termcolor/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "termcolor"; - version = "2.1.1"; + version = "2.2.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Z87iAJrcZEnGUPa8873u0AyLpTqM2lNiczxT4KOftws="; + hash = "sha256-38isPzUHiPI7KUez5s+lpTtjC2EubNiWWgFad2AguZo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/terminado/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/terminado/default.nix index baa5e9b290..1031ff5b14 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/terminado/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/terminado/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-bMu806T4olpewEmR85oLjbUt/NSH6g5XjZd+Z1I4AzM="; + hash = "sha256-bMu806T4olpewEmR85oLjbUt/NSH6g5XjZd+Z1I4AzM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testbook/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testbook/default.nix index b78e453b3b..4b49755bf8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testbook/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testbook/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "nteract"; repo = pname; rev = version; - sha256 = "sha256-qaDgae/5TRpjmjOf7aom7TC5HLHp0PHM/ds47AKtq8U="; + hash = "sha256-qaDgae/5TRpjmjOf7aom7TC5HLHp0PHM/ds47AKtq8U="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix index 2b94a34989..4a3c410098 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "testcontainers"; repo = "testcontainers-python"; rev = "v${version}"; - sha256 = "sha256-OHuvUi5oa0fVcfo0FW9XwaUp52MEH4NTM6GqK4ic0oM="; + hash = "sha256-OHuvUi5oa0fVcfo0FW9XwaUp52MEH4NTM6GqK4ic0oM="; }; buildInputs = [ 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 bfbb1f697c..af81532975 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "7.0.4"; + version = "7.1.0"; format = "setuptools"; # DO NOT CONTACT upstream. # https://github.com/simplistix/ is only concerned with internal CI process. @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-xSaqiXjBAC8FnxUsSt43WMShJBjfqyspdUrmIwyvPQQ="; + hash = "sha256-RWzk85MWDyfNaEClNw7PSnDxchc39eZ6KveebIF4BKQ="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testing-postgresql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testing-postgresql/default.nix index 5c6eaa7ac2..ad64fa53be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testing-postgresql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testing-postgresql/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "tk0miya"; repo = "testing.postgresql"; rev = "c81ded434d00ec8424de0f9e1f4063c778c6aaa8"; - sha256 = "sha256-A4tahAaa98X66ZYa3QxIQDZkwAwVB6ZDRObEhkbUWKs="; + hash = "sha256-A4tahAaa98X66ZYa3QxIQDZkwAwVB6ZDRObEhkbUWKs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testpath/default.nix index 1f8469ad2f..3ce8342084 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testpath/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-LxuX5kQsAmgevgG9hPUxAop8rqGvOCUAD1I0XDAoXg8="; + hash = "sha256-LxuX5kQsAmgevgG9hPUxAop8rqGvOCUAD1I0XDAoXg8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testrail-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testrail-api/default.nix new file mode 100644 index 0000000000..6da3e20267 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/testrail-api/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, pytestCheckHook +, responses +}: + +buildPythonPackage rec { + pname = "testrail-api"; + version = "1.12.0"; + + src = fetchFromGitHub { + owner = "tolstislon"; + repo = "testrail-api"; + rev = version; + sha256 = "sha256-VuAW5Dl3pkA6mtn/mbzxTFoavO5jPoqFSFVlrxc7KRk="; + }; + + nativeCheckInputs = [ + pytestCheckHook + responses + ]; + + propagatedBuildInputs = [ + requests + ]; + + meta = with lib; { + description = "A Python wrapper of the TestRail API"; + homepage = "https://github.com/tolstislon/testrail-api"; + changelog = "https://github.com/tolstislon/ytestrail-api/releases/tag/${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ aanderse ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textdistance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textdistance/default.nix index 9b50727e73..5b50bd0a3a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textdistance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textdistance/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Nk1D9PZjV0JmLj5s9TcqhoWUFshKPJsu+dZtRPWkOFw="; + hash = "sha256-Nk1D9PZjV0JmLj5s9TcqhoWUFshKPJsu+dZtRPWkOFw="; }; # There aren't tests 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 409cffd338..14d7c34cf4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textfsm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textfsm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IHgKG8v0X+LSK6purWBdwDnI/BCs5XA12ZJixuqqXWg="; + hash = "sha256-IHgKG8v0X+LSK6purWBdwDnI/BCs5XA12ZJixuqqXWg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/texttable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/texttable/default.nix index 9b492747bf..5afe66941c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/texttable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/texttable/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-KQNI+2f3dGkxvN/VWsdYTs1OWwhGqxZDM/B5SxIXYPI="; + hash = "sha256-KQNI+2f3dGkxvN/VWsdYTs1OWwhGqxZDM/B5SxIXYPI="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textual/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textual/default.nix index 2b9a035c60..e983b4e56d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textual/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textual/default.nix @@ -2,8 +2,11 @@ , buildPythonPackage , fetchFromGitHub , poetry-core +, mkdocs-exclude +, markdown-it-py +, mdit-py-plugins +, linkify-it-py , importlib-metadata -, nanoid , rich , typing-extensions , aiohttp @@ -19,7 +22,7 @@ buildPythonPackage rec { pname = "textual"; - version = "0.10.1"; + version = "0.12.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +31,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-DPE8brf8y6DJDPfDNUBk09ngthSWN59UYw6yPfI4+Qw="; + hash = "sha256-7QyUARXvPgGzXvIdkh9/WO07I8wfMQF23xdrxPjO8e8="; }; nativeBuildInputs = [ @@ -41,18 +44,21 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - importlib-metadata - nanoid rich - ] ++ lib.optionals (pythonOlder "3.10") [ + markdown-it-py + mdit-py-plugins + linkify-it-py + importlib-metadata + aiohttp + click + msgpack + mkdocs-exclude + ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; nativeCheckInputs = [ - aiohttp - click jinja2 - msgpack pytest-aiohttp pytestCheckHook syrupy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textx/default.nix index 0a8ee22365..f9541cf23c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textx/default.nix @@ -27,7 +27,7 @@ let owner = pname; repo = pname; rev = version; - sha256 = "sha256-uZlO82dKtWQQR5+Q7dWk3+ZoUzAjDJ8qzC4UMLCtnBk="; + hash = "sha256-uZlO82dKtWQQR5+Q7dWk3+ZoUzAjDJ8qzC4UMLCtnBk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tgcrypto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tgcrypto/default.nix index a9c9dd96c6..6d5ebba2ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tgcrypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tgcrypto/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pyrogram"; repo = "tgcrypto"; rev = "refs/tags/v${version}"; - sha256 = "sha256-u+mXzkmM79NBi4oHnb32RbN9WPnba/cm1q2Ko0uNEZg="; + hash = "sha256-u+mXzkmM79NBi4oHnb32RbN9WPnba/cm1q2Ko0uNEZg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Theano/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/theano/default.nix similarity index 99% rename from third_party/nixpkgs/pkgs/development/python-modules/Theano/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/theano/default.nix index e931875605..627941e6bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Theano/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/theano/default.nix @@ -48,7 +48,7 @@ let libgpuarray_ = libgpuarray.override { inherit cudaSupport cudaPackages; }; in buildPythonPackage rec { - pname = "Theano"; + pname = "theano"; version = "1.0.5"; disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thespian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thespian/default.nix index eeea8f5bd4..b1f994fde7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thespian/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thespian/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-HcHvZtMpBtNXq9Yp2ayeHTuIf7gpBUb6xZqjaECbfgo="; + hash = "sha256-HcHvZtMpBtNXq9Yp2ayeHTuIf7gpBUb6xZqjaECbfgo="; }; # Do not run the test suite: it takes a long time and uses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/threadpoolctl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/threadpoolctl/default.nix index b2d85107e7..bfe4042912 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/threadpoolctl/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "joblib"; repo = pname; rev = version; - sha256 = "sha256-/qt7cgFbvpc1BLZC7a4S0RToqSggKXAqF1Xr6xOqzw8="; + hash = "sha256-/qt7cgFbvpc1BLZC7a4S0RToqSggKXAqF1Xr6xOqzw8="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thrift/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thrift/default.nix index dcb6f43441..4ff39c59c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thrift/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thrift/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-K1tkiPze0h+dMSqiPJ/2oBldD2ribdvVrZ4+Jd/BRAg="; + hash = "sha256-K1tkiPze0h+dMSqiPJ/2oBldD2ribdvVrZ4+Jd/BRAg="; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix index 29dcb22b90..343d1b5b01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2022.10.10"; + version = "2023.2.3"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ULYbqUO4ZtGRKVvDigAZHJ/asj7OBjVEx/GiZOP2qo4="; + hash = "sha256-RY31rZpSF/Zo7dY23Bn7xzYGK/eKrII6uEzbrp3o6qY="; }; propagatedBuildInputs = [ @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Read and write image data from and to TIFF files"; homepage = "https://github.com/cgohlke/tifffile/"; + changelog = "https://github.com/cgohlke/tifffile/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; maintainers = with maintainers; [ lebastr ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tika/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tika/default.nix index f71772749c..551813db15 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tika/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tika/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-VmcOuBKUTrJe1z8bOwdapB56E1t0skCCLyi4GeWzc9o="; + hash = "sha256-VmcOuBKUTrJe1z8bOwdapB56E1t0skCCLyi4GeWzc9o="; }; propagatedBuildInputs = [ pyyaml requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tikzplotlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tikzplotlib/default.nix index 8a38bb9a7d..564d8e58b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tikzplotlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tikzplotlib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "nschloe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PLExHhEnxkEiXsE0rqvpNWwVZ+YoaDa2BTx8LktdHl0="; + hash = "sha256-PLExHhEnxkEiXsE0rqvpNWwVZ+YoaDa2BTx8LktdHl0="; }; propagatedBuildInputs = [ 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 7e05668b23..34597923f3 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.19.0"; + version = "0.20.0"; format = "setuptools"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB-Py"; rev = "refs/tags/${version}"; - sha256 = "sha256-eha0I/SJmBGFdvJrNUBg/sx54UXdbjhEbyvI40Vngm4="; + hash = "sha256-Be83b9JVxGxPYoOfqTfVm7qAjZD7cfH5BG6tbSHXhIQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tiler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tiler/default.nix index 7f26871b29..6158c77067 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tiler/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-2HWO/iJ9RCWNVmw2slu9F/+Mchk3evB5/F8EfbuMI/Y="; + hash = "sha256-2HWO/iJ9RCWNVmw2slu9F/+Mchk3evB5/F8EfbuMI/Y="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/time-machine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/time-machine/default.nix index 1c410042ac..d228205dc6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/time-machine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/time-machine/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "adamchainz"; repo = pname; rev = version; - sha256 = "sha256-EFlvO9QlOP351kZAFQ+hwghL+7m+Cin/OyLV3NX+y8E="; + hash = "sha256-EFlvO9QlOP351kZAFQ+hwghL+7m+Cin/OyLV3NX+y8E="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timeago/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timeago/default.nix index fa89cff6eb..6a84d909f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/timeago/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/timeago/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "timeago"; - version = "1.0.15"; + version = "1.0.16"; src = fetchFromGitHub { owner = "hustcc"; repo = pname; rev = version; - sha256 = "03vm7c02l4g2d1x33w382i1psk8i3an7xchk69yinha33fjj1cag"; + sha256 = "sha256-PqORJKAVrjezU/yP2ky3gb1XsM8obDI3GQzi+mok/OM="; }; nativeCheckInputs = [ 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 e85786b378..5b59d288bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/timetagger/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/timetagger/default.nix @@ -1,33 +1,40 @@ -{ stdenv -, lib -, buildPythonPackage -, fetchFromGitHub +{ lib +, stdenv , asgineer , bcrypt +, buildPythonPackage +, fetchFromGitHub +, iptools , itemdb , jinja2 , markdown +, nodejs , pscript , pyjwt -, uvicorn , pytestCheckHook +, pythonOlder , requests +, uvicorn }: buildPythonPackage rec { pname = "timetagger"; - version = "22.12.1"; + version = "23.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-yoDILEE/mUWkGPWp2xTKlkpmw1gZctaQmBsed8U7bHc="; + hash = "sha256-QICn7Ugnac2nu7I4xDWyujvloCiz70XnqA7SJbopR5s="; }; propagatedBuildInputs = [ asgineer bcrypt + iptools itemdb jinja2 markdown @@ -41,15 +48,17 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ + nodejs pytestCheckHook requests ]; meta = with lib; { - broken = stdenv.isDarwin; - homepage = "https://timetagger.app"; + description = "Library to interact with TimeTagger"; + homepage = "https://github.com/almarklein/timetagger"; + changelog = "https://github.com/almarklein/timetagger/releases/tag/v${version}"; license = licenses.gpl3Only; - description = "Tag your time, get the insight"; maintainers = with maintainers; [ matthiasbeyer ]; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix index 937c475053..4c21305ac0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { rev = "v${version}"; # for tests fetchSubmodules = true; - sha256 = "sha256-RUF/3cjNgDFofoxl9iKY3u5ZAVVQmXu2Qbb5U4brdcQ="; + hash = "sha256-RUF/3cjNgDFofoxl9iKY3u5ZAVVQmXu2Qbb5U4brdcQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tinydb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tinydb/default.nix index 87d3502f6e..1352ee20f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tinydb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tinydb/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "msiemens"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-nKsTMakCOBVHDDp8AX/xDkvHpCMBoIb0pa24F4VX/14="; + hash = "sha256-nKsTMakCOBVHDDp8AX/xDkvHpCMBoIb0pa24F4VX/14="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tls-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tls-parser/default.nix index 1c0669b72b..c9b317c3c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tls-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tls-parser/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "tls-parser"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "nabla-c0d3"; repo = "tls_parser"; rev = version; - hash = "sha256-A1lYRe1sHDoOFdF20DP+xRMcPBWzokIXFphIpaBmwBc="; + hash = "sha256-2XHhUDiJ1EctnYdxYFbNSVLF8dmHP9cZXjziOE9+Dew="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tlsh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tlsh/default.nix index dfa7a95e39..c6809a06a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tlsh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tlsh/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "trendmicro"; repo = "tlsh"; rev = version; - sha256 = "sha256-9Vkj7a5xU/coFyM/8i8JB0DdnbgDAEMOjmmMF8ckKuE="; + hash = "sha256-9Vkj7a5xU/coFyM/8i8JB0DdnbgDAEMOjmmMF8ckKuE="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/todoist-api-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/todoist-api-python/default.nix index fca8d0acad..ed7ae3ab0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/todoist-api-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/todoist-api-python/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { (fetchpatch { name = "switch-to-poetry-core.patch"; url = "https://github.com/Doist/todoist-api-python/commit/42288e066d2f0c69611ab50cb57ca98b8c6bd1ca.patch"; - sha256 = "sha256-yq+VVvjPYywvUn+ydyWVQPkiYPYWe9U6w38G54L2lkE="; + hash = "sha256-yq+VVvjPYywvUn+ydyWVQPkiYPYWe9U6w38G54L2lkE="; }) ]; 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 a72e329bc9..403019c07b 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 @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "togglCli"; inherit version; - sha256 = "sha256-ncMwiMwYivaFu5jrAsm1oCuXP/PZ2ALT+M+CmV6dtFo="; + hash = "sha256-ncMwiMwYivaFu5jrAsm1oCuXP/PZ2ALT+M+CmV6dtFo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tokenize-rt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tokenize-rt/default.nix index 6f5d1f08ad..107c3ae75c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tokenize-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tokenize-rt/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YNt4YwkuA3DVq4EjJaIES9V3A6ENa3k6/qVKisjA5Pc="; + hash = "sha256-YNt4YwkuA3DVq4EjJaIES9V3A6ENa3k6/qVKisjA5Pc="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix index a3c02f70ed..720897ad62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src sourceRoot; name = "${pname}-${version}"; - sha256 = "sha256-Euvf0LNMa2Od+6gY1Ldge/7VPrH5mJoZduRRsb+lM/E="; + hash = "sha256-Euvf0LNMa2Od+6gY1Ldge/7VPrH5mJoZduRRsb+lM/E="; }; sourceRoot = "source/bindings/python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/toml-adapt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/toml-adapt/default.nix index 63d05203d6..5c4aa1576b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/toml-adapt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/toml-adapt/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = pname; rev = version; - sha256 = "sha256-7gQZCjsCtzvmV5NPZNAW4d34TkKemH9FgeN0Iwydwgc="; + hash = "sha256-7gQZCjsCtzvmV5NPZNAW4d34TkKemH9FgeN0Iwydwgc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tomli-w/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tomli-w/default.nix index bbd928ac16..920063fd10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tomli-w/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tomli-w/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "hukkin"; repo = pname; rev = version; - sha256 = "sha256-wZSC5uOi1JUeKXIli1I8/Vo0wGsv9Q1I84dAMQQP95w="; + hash = "sha256-wZSC5uOi1JUeKXIli1I8/Vo0wGsv9Q1I84dAMQQP95w="; }; nativeBuildInputs = [ flit-core ]; 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 c196d1e487..8f96a82ad6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tomli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tomli/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "hukkin"; repo = pname; rev = version; - sha256 = "sha256-v0ZMrHIIaGeORwD4JiBeLthmnKZODK5odZVL0SY4etA="; + hash = "sha256-v0ZMrHIIaGeORwD4JiBeLthmnKZODK5odZVL0SY4etA="; }; nativeBuildInputs = [ flit-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/toolz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/toolz/default.nix index d1961b970d..c6c9ecf31d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/toolz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/toolz/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-iMVwhhxEDuPy9gN8RlRhMij/QMk6bCXg66cNFygsYZQ="; + hash = "sha256-iMVwhhxEDuPy9gN8RlRhMij/QMk6bCXg66cNFygsYZQ="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/toposort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/toposort/default.nix index bc0185482f..5270da85f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/toposort/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/toposort/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-v7tHnFPQppbqdAJgH05pPJewNng3yImLxkca38o3pr0="; + hash = "sha256-v7tHnFPQppbqdAJgH05pPJewNng3yImLxkca38o3pr0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix index b00146b573..d889dfc602 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python, cudaSupport ? false, cudaPackages, magma, - mklDnnSupport ? true, useSystemNccl ? true, + useSystemNccl ? true, MPISupport ? false, mpi, buildDocs ? false, @@ -9,7 +9,7 @@ # Build inputs numactl, - CoreServices, libobjc, + Accelerate, CoreServices, libobjc, # Propagated build inputs numpy, pyyaml, cffi, click, typing-extensions, @@ -17,6 +17,10 @@ # Unit tests hypothesis, psutil, + # Disable MKLDNN on aarch64-darwin, it negatively impacts performance, + # this is also what official pytorch build does + mklDnnSupport ? !(stdenv.isDarwin && stdenv.isAarch64), + # virtual pkg that consistently instantiates blas across nixpkgs # See https://github.com/NixOS/nixpkgs/pull/83888 blas, @@ -275,7 +279,7 @@ in buildPythonPackage rec { ++ lib.optionals rocmSupport [ openmp ] ++ lib.optionals (cudaSupport || rocmSupport) [ magma ] ++ lib.optionals stdenv.isLinux [ numactl ] - ++ lib.optionals stdenv.isDarwin [ CoreServices libobjc ]; + ++ lib.optionals stdenv.isDarwin [ Accelerate CoreServices libobjc ]; propagatedBuildInputs = [ cffi 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 d36beb6575..8201d9c72b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix @@ -1,30 +1,50 @@ -{ lib -, symlinkJoin -, buildPythonPackage +{ buildPythonPackage +, cudaSupport ? torch.cudaSupport or false # by default uses the value from torch , fetchFromGitHub -, ninja -, which +, lib , libjpeg_turbo , libpng +, ninja , numpy -, scipy , pillow -, torch , pytest -, cudaSupport ? torch.cudaSupport or false # by default uses the value from torch +, scipy +, symlinkJoin +, torch +, which }: let - inherit (torch) gpuTargetString; - inherit (torch.cudaPackages) cudatoolkit cudnn; + inherit (torch) cudaPackages gpuTargetString; + inherit (cudaPackages) cudatoolkit cudaFlags cudaVersion; - cudatoolkit_joined = symlinkJoin { - name = "${cudatoolkit.name}-unsplit"; - paths = [ cudatoolkit.out cudatoolkit.lib ]; + # NOTE: torchvision doesn't use cudnn; torch does! + # For this reason it is not included. + cuda-common-redist = with cudaPackages; [ + cuda_cccl # + libcublas # cublas_v2.h + libcusolver # cusolverDn.h + libcusparse # cusparse.h + ]; + + cuda-native-redist = symlinkJoin { + name = "cuda-native-redist-${cudaVersion}"; + paths = with cudaPackages; [ + cuda_cudart # cuda_runtime.h + cuda_nvcc + ] ++ cuda-common-redist; }; -in buildPythonPackage rec { + + cuda-redist = symlinkJoin { + name = "cuda-redist-${cudaVersion}"; + paths = cuda-common-redist; + }; + pname = "torchvision"; version = "0.14.1"; +in +buildPythonPackage { + inherit pname version; src = fetchFromGitHub { owner = "pytorch"; @@ -33,18 +53,21 @@ in buildPythonPackage rec { hash = "sha256-lKkEJolJQaLr1TVm44CizbJQedGa1wyy0cFWg2LTJN0="; }; - nativeBuildInputs = [ libpng ninja which ] - ++ lib.optionals cudaSupport [ cudatoolkit_joined ]; + nativeBuildInputs = [ libpng ninja which ] ++ lib.optionals cudaSupport [ cuda-native-redist ]; - TORCHVISION_INCLUDE = "${libjpeg_turbo.dev}/include/"; - TORCHVISION_LIBRARY = "${libjpeg_turbo}/lib/"; - - buildInputs = [ libjpeg_turbo libpng ] - ++ lib.optionals cudaSupport [ cudnn ]; + buildInputs = [ libjpeg_turbo libpng ] ++ lib.optionals cudaSupport [ cuda-redist ]; propagatedBuildInputs = [ numpy pillow torch scipy ]; - preBuild = lib.optionalString cudaSupport '' + preConfigure = '' + export TORCHVISION_INCLUDE="${libjpeg_turbo.dev}/include/" + export TORCHVISION_LIBRARY="${libjpeg_turbo}/lib/" + '' + # NOTE: We essentially override the compilers provided by stdenv because we don't have a hook + # for cudaPackages to swap in compilers supported by NVCC. + + lib.optionalString cudaSupport '' + export CC=${cudatoolkit.cc}/bin/cc + export CXX=${cudatoolkit.cc}/bin/c++ export TORCH_CUDA_ARCH_LIST="${gpuTargetString}" export FORCE_CUDA=1 ''; @@ -52,6 +75,7 @@ in buildPythonPackage rec { # tries to download many datasets for tests doCheck = false; + pythonImportsCheck = [ "torchvision" ]; checkPhase = '' HOME=$TMPDIR py.test test --ignore=test/test_datasets_download.py ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix index 7c8a374a8d..478b0c936f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix @@ -1,25 +1,37 @@ { lib , python , buildPythonPackage -, fetchPypi -, pycares -, pycurl -, twisted +, fetchFromGitHub +, pytestCheckHook }: buildPythonPackage rec { pname = "tornado"; - version = "6.2"; + version = "6.2.0"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-m2MEGb3oTsZmv9fqCkyyqKZRwtXMzb3RlyoMhZ38PBM="; + src = fetchFromGitHub { + owner = "tornadoweb"; + repo = "tornado"; + rev = "v${version}"; + hash = "sha256-IV0QN3GqoclFo9kWJVc21arypmBkvUClo86Zmt/Gv6E="; }; nativeCheckInputs = [ - pycares - pycurl - twisted + pytestCheckHook + ]; + + disabledTestPaths = [ + # additional tests that have extra dependencies, run slowly, or produce more output than a simple pass/fail + # https://github.com/tornadoweb/tornado/blob/v6.2.0/maint/test/README + "maint/test" + + # AttributeError: 'TestIOStreamWebMixin' object has no attribute 'io_loop' + "tornado/test/iostream_test.py" + ]; + + disabledTests = [ + # Exception: did not get expected log message + "test_unix_socket_bad_request" ]; pythonImportsCheck = [ "tornado" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torpy/default.nix index 635b975f28..ea9c96d33e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "torpyorg"; repo = "torpy"; rev = "v${version}"; - sha256 = "sha256-Ni7GcpkxzAMtP4wBOFsi4KnxK+nC0XCZR/2Z/eS/C+w="; + hash = "sha256-Ni7GcpkxzAMtP4wBOFsi4KnxK+nC0XCZR/2Z/eS/C+w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torrequest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torrequest/default.nix index 4c994f8102..99ea0e4e53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torrequest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torrequest/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-N0XU6j/9qY16A0Njx4ets3qrd72rQAlKTZNzks1NroI="; + hash = "sha256-N0XU6j/9qY16A0Njx4ets3qrd72rQAlKTZNzks1NroI="; }; propagatedBuildInputs = [ 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 b0cf95cd3a..de97071166 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "tox"; - version = "4.1.0"; + version = "4.4.6"; format = "pyproject"; src = fetchFromGitHub { owner = "tox-dev"; repo = "tox"; rev = "refs/tags/${version}"; - hash = "sha256-ApJa7v1HJDca2jvZFKqOgKho4fI2tXFrjaFzLcS9Vfk="; + hash = "sha256-kWvYN2PA4al2X813Mu4R/n2ZLsZ+MaYCCWNfmYD3nBo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tplink-omada-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tplink-omada-client/default.nix index 570849a744..9622e67b41 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.1.1"; + version = "1.1.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-Fg1rhTS9aP7C1URDfoC3w1w1IduToxYUtwTLDM3916U="; + hash = "sha256-Ppo/vv15fcwN7qTiLO8umF6ig3C8k0Z974znviWcY8c="; }; nativeBuildInputs = [ 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 edb182d8b3..891771ebc6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-X09oKgBJUcG0ULx1PHEOkoDFdGzm/+3uJT3by/VM8eQ="; + hash = "sha256-X09oKgBJUcG0ULx1PHEOkoDFdGzm/+3uJT3by/VM8eQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix index bab98930c1..c29d309627 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "trackpy"; - version = "0.5.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "soft-matter"; repo = pname; - rev = "v${version}"; - sha256 = "0if069f4sjyjl7wvzyzk8k9q9qjixswcc6aszrrgfb4a4mix3h1g"; + rev = "refs/tags/v${version}"; + hash = "sha256-NG1TOppqRbIZHLxJjlaXD4icYlAUkSxtmmC/fsS/pXo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trainer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trainer/default.nix index 4145fdf1a4..d27e80494c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trainer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trainer/default.nix @@ -18,7 +18,7 @@ let pname = "trainer"; - version = "0.0.20"; + version = "0.0.22"; in buildPythonPackage { inherit pname version; @@ -28,7 +28,7 @@ buildPythonPackage { owner = "coqui-ai"; repo = "Trainer"; rev = "refs/tags/v${version}"; - hash = "sha256-se2Q2wJyynPc/3TkfEn4nEh+emqBJBwPGDSnOV+sH4I="; + hash = "sha256-iujRx/9HNHIUOuoTHvQM5EByKydLjoVwfsBn7XdM3ks="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix index a42fc6f95e..e3f6f5e7bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "traitlets"; - version = "5.8.0"; + version = "5.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bMV9bcKMhdU2WWFyb/0ZtThzk0d0nhPr404DMjoOj4Q="; + hash = "sha256-9s3iGpxoz3Vq8CA19y1acjv2B+hi574z7OUFq/Sjutk="; }; nativeBuildInputs = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/traits/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/traits/default.nix index ebe3c85854..36aa310869 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/traits/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/traits/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-eLssyv1gr/YGUVqsRt5kZooKgctcVMZQuYd6hBqp6BI="; + hash = "sha256-eLssyv1gr/YGUVqsRt5kZooKgctcVMZQuYd6hBqp6BI="; }; # Circular dependency diff --git a/third_party/nixpkgs/pkgs/development/python-modules/traittypes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/traittypes/default.nix index a26ab6b46f..f129aad915 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/traittypes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/traittypes/default.nix @@ -35,6 +35,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ traitlets ]; nativeCheckInputs = [ numpy pandas xarray nose pytestCheckHook ]; + + disabledTestPaths = lib.optional (lib.versionAtLeast numpy.version "1.17") [ + # https://github.com/jupyter-widgets/traittypes/blob/master/setup.py#L86-L87 + "traittypes/tests/test_traittypes.py" + ]; + pythonImportsCheck = [ "traittypes" ]; meta = with lib; { 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 15eee616ae..839fe0177c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.25.1"; + version = "4.26.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-b0xEHM72HcaTRgGisB6fnPrMaXZ8EcJfowwK92W4aYg="; + hash = "sha256-JRW3uSPgWgvtH4WFQLHD1ma8L1qq05MSemJbcdYMC6E="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix index 77eec05114..9b054c8233 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-L1TRG9siV3nX5ykBHpOp+3F2aM49xl+NT1pde6L0jhA="; + hash = "sha256-L1TRG9siV3nX5ykBHpOp+3F2aM49xl+NT1pde6L0jhA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/translatepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/translatepy/default.nix index 90ccce1c9f..08e7dfab61 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/translatepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/translatepy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Animenosekai"; repo = "translate"; rev = "refs/tags/v${version}"; - sha256 = "sha256-cx5OeBrB8il8KrcyOmQbQ7VCXoaA5RP++oTTxCs/PcM="; + hash = "sha256-cx5OeBrB8il8KrcyOmQbQ7VCXoaA5RP++oTTxCs/PcM="; }; propagatedBuildInputs = [ 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 da95234c1f..05d5c28dbf 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 @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "transmission-rpc"; - version = "3.4.0"; + version = "4.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Trim21"; repo = "transmission-rpc"; rev = "refs/tags/v${version}"; - hash = "sha256-O+VimSIVsO4P7v+8HHdYujaKpPx4FV8bF/Nn4EHP2vo="; + hash = "sha256-LHxB3VkpUlDupqOybvnhW8ER1gvu4vex6dT3m9y0r4o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trectools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trectools/default.nix index 1c3b2a542b..3948d0441d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trectools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trectools/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { repo = pname; # https://github.com/joaopalotti/trectools/issues/41 rev = "5c1d56e9cf955f45b5a1780ee6a82744d31e7a79"; - sha256 = "sha256-Lh6sK2rxEdCsOUKHn1jgm+rsn8FK1f2po0UuZfZajBA="; + hash = "sha256-Lh6sK2rxEdCsOUKHn1jgm+rsn8FK1f2po0UuZfZajBA="; }; postPatch = '' 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 5f71842066..d72d46e9d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-33V+PxQfx4Lt4HamBFIRlP/LQPomRc9I5aNwYDB/Uuw="; + hash = "sha256-33V+PxQfx4Lt4HamBFIRlP/LQPomRc9I5aNwYDB/Uuw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix index c56e3663c0..a106db6d56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-jhUBca/+rDge/bFHgpKQhNZBTsd8zNyHHW8NZE/1e9g="; + hash = "sha256-jhUBca/+rDge/bFHgpKQhNZBTsd8zNyHHW8NZE/1e9g="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix index e5db9c72a5..d6ff9bb36d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-4IylpUvXZYAXFkyFGNbN9iPTsHff3M/RL2Eq9f7wWFU="; + hash = "sha256-4IylpUvXZYAXFkyFGNbN9iPTsHff3M/RL2Eq9f7wWFU="; }; propagatedBuildInputs = [ setuptools trezor libagent ecdsa ed25519 mnemonic keepkey semver wheel pinentry ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trfl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trfl/default.nix index 356eb98500..b81481e384 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trfl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trfl/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "deepmind"; repo = pname; rev = "ed6eff5b79ed56923bcb102e152c01ea52451d4c"; - sha256 = "sha256-UsDUKJCHSJ4gP+P95Pm7RsPpqTJqJhrsW47C7fTZ77I="; + hash = "sha256-UsDUKJCHSJ4gP+P95Pm7RsPpqTJqJhrsW47C7fTZ77I="; }; buildInputs = [ 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 a0d41a3e83..1f2c0fc398 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.20.0"; + version = "3.20.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JZl3I1X0bdQ2alz2zozPo6AyIvCLHDlklNRb9clYGNE="; + hash = "sha256-UUkzHQoRCC7SmQgA4uz09J/KRxizr5LhwCYobINY1gc="; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix index 4549a056b0..c499812dd0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "HyperionGray"; repo = "trio-websocket"; rev = version; - sha256 = "sha256-8VrpI/pk5IhEvqzo036cnIbJ1Hu3UfQ6GHTNkNJUYvo="; + hash = "sha256-8VrpI/pk5IhEvqzo036cnIbJ1Hu3UfQ6GHTNkNJUYvo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/troposphere/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/troposphere/default.nix index a7a27bd86c..3c659055f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/troposphere/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/troposphere/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "troposphere"; - version = "4.2.0"; + version = "4.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cloudtools"; repo = pname; - rev = version; - hash = "sha256-4flnV4WxK21NNd9FXizkw6FoGffSL27Tq/Jc87vYJbc="; + rev = "refs/tags/${version}"; + hash = "sha256-YciNwiLb/1fUYmlWtDRaJgtkgJi1mMt2FgeJKQi9yRg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix index a662d1a1a5..c8a33e9a54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "trove-classifiers"; - version = "2023.2.20"; + version = "2023.3.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hgsMDYyeDTJinKXvE36h5jdYC2NLdLpA4VOf00RkwPU="; + hash = "sha256-7kLy+MHUvP4190bkcvB2M1cNSF+rRUB+/8A3knCjuwM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trustme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trustme/default.nix index 786b6f5bc8..4deb72308f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trustme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trustme/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XgeyPXDO7WTzuzauS5q8UjVMFsmNRasDe+4rX7/+WGw="; + hash = "sha256-XgeyPXDO7WTzuzauS5q8UjVMFsmNRasDe+4rX7/+WGw="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix index 8f7dd450c2..fdb29c7f81 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "6.6.1"; + version = "6.6.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fE1JBlvKIvDFjMat/lgOM22rIpMlqnxoo9p8VJF6szs="; + hash = "sha256-BZZhaXHk0QEgtN7B15bGepJi7Dk4LgMpmQmsjU5E1Vw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tubes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tubes/default.nix index a605952b2b..4c787af378 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tubes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tubes/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Tubes"; inherit version; - sha256 = "sha256-WbkZfy+m9/xrwygd5VeXrccpu3XJxhO09tbEFZnw14s="; + hash = "sha256-WbkZfy+m9/xrwygd5VeXrccpu3XJxhO09tbEFZnw14s="; }; propagatedBuildInputs = [ characteristic six twisted ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/turnt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/turnt/default.nix index b6c0549c04..58109ce4a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/turnt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/turnt/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-X0uJmY2MVnvM50LDBXDn9hK4NuHAil4Kf39V/8b8OIQ="; + hash = "sha256-X0uJmY2MVnvM50LDBXDn9hK4NuHAil4Kf39V/8b8OIQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix index 89db0e84f9..d1b9d482da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tuya"; repo = "tuya-iot-python-sdk"; rev = "v${version}"; - sha256 = "sha256-KmSVa71CM/kNhzE4GznaxISGmIaV+UcTSn3v+fmxmrQ="; + hash = "sha256-KmSVa71CM/kNhzE4GznaxISGmIaV+UcTSn3v+fmxmrQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tuyaha/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tuyaha/default.nix index 749ac4e198..53d6c83d48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tuyaha/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tuyaha/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "PaulAnnekov"; repo = pname; rev = version; - sha256 = "sha256-PTIw/2NRHHiqV6E5oj2pMeGq1uApevKfT2n5zV8AQmM="; + hash = "sha256-PTIw/2NRHHiqV6E5oj2pMeGq1uApevKfT2n5zV8AQmM="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix index 7889a8ab03..0e05aa041d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "dbr"; repo = "tvdb_api"; rev = "ce0382181a9e08a5113bfee0fed2c78f8b1e613f"; - sha256 = "sha256-poUuwySr6+8U9PIHhqFaR7nXzh8kSaW7mZkuKTUJKj8="; + hash = "sha256-poUuwySr6+8U9PIHhqFaR7nXzh8kSaW7mZkuKTUJKj8="; }; propagatedBuildInputs = [ requests-cache ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix index a768e3559d..af5a65a080 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "boschmitt"; repo = "tweedledum"; rev = "v${version}"; - sha256 = "sha256-wgrY5ajaMYxznyNvlD0ul1PFr3W8oV9I/OVsStlZEBM="; + hash = "sha256-wgrY5ajaMYxznyNvlD0ul1PFr3W8oV9I/OVsStlZEBM="; }; nativeBuildInputs = [ cmake ninja scikit-build ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tweepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tweepy/default.nix index e313818daf..ba4c7f8f9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tweepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tweepy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "tweepy"; - version = "4.12.1"; + version = "4.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jyH2qJoVFuNwZCOtl2CvuuMCpJXCvlxcaHJd7fT1XzA="; + hash = "sha256-47TXKZLS2j+YdCYt2cJbdzsVOHeRzGYqUNyOOKIgXkc="; }; 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 c54f897a51..17f14b8e8f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-twentemilieu"; rev = "v${version}"; - sha256 = "sha256-k2jdw2H/bNejNUjIEQlEA1KkHHpkyFlSDC1HKUoMIqQ="; + hash = "sha256-k2jdw2H/bNejNUjIEQlEA1KkHHpkyFlSDC1HKUoMIqQ="; }; postPatch = '' 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 e3a8b36ec4..7459a39814 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.16.4"; + version = "7.16.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-OB7jW+I5oAE2TGPWmuIcXcABY1v1FMjo8UT83Xn4DB8="; + hash = "sha256-Z/A+NcB/LpzF3JtdDA7+h0scjGWOiYx5fwAZTuyfdug="; }; 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 5e51082ed6..9bd98fd5ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twine/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-nhAu9f3VogZh64j61GM4gGw70yzx23KWA/42l7G8g8g="; + hash = "sha256-nhAu9f3VogZh64j61GM4gGw70yzx23KWA/42l7G8g8g="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twinkly-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twinkly-client/default.nix index 77eb17b9fc..d9931c044b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twinkly-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twinkly-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-F/N6yMOvLHIfXvPyR7z3P/Rlh79OvCbvEiNwClLSLl8="; + hash = "sha256-F/N6yMOvLHIfXvPyR7z3P/Rlh79OvCbvEiNwClLSLl8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twitch-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twitch-python/default.nix index 7bb1d04f54..e2f9c8caf3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twitch-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twitch-python/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-bgnXIQuOCrtoknZ9ciB56zWxTCnncM2032TVaey6oXw="; + hash = "sha256-bgnXIQuOCrtoknZ9ciB56zWxTCnncM2032TVaey6oXw="; }; disabled = !isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/txi2p-tahoe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/txi2p-tahoe/default.nix new file mode 100644 index 0000000000..3d891c6eee --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/txi2p-tahoe/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, setuptools-scm +, parsley +, twisted +, python +}: + +buildPythonPackage rec { + pname = "txi2p-tahoe"; + version = "0.3.7"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tahoe-lafs"; + repo = "txi2p"; + rev = "refs/tags/${version}"; + hash = "sha256-u/IOhxK9jWC/tTKKLsc4PexbCuki+yEtMNw7LuQKmuk="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + propagatedBuildInputs = [ + parsley + twisted + ]; + + pythonImportsCheck = [ "txi2p" ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m twisted.trial txi2p + runHook postCheck + ''; + + meta = { + description = "I2P bindings for Twisted"; + homepage = "https://github.com/tahoe-lafs/txi2p"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix index e412b9a870..6a4a098856 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix @@ -4,7 +4,7 @@ , buildPythonPackage , cryptography , fetchPypi -, GeoIP +, geoip , idna , incremental , lsof @@ -42,7 +42,7 @@ buildPythonPackage rec { pytestCheckHook mock lsof - GeoIP + geoip ]; doCheck = !(stdenv.isDarwin && stdenv.isAarch64); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/txzmq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/txzmq/default.nix index f47c33924c..4f6a4067d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/txzmq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/txzmq/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "txZMQ"; - sha256 = "sha256-jWB9C/CcqUYAuOQvByHb5D7lOgRwGCNErHrOfljcYXc="; + hash = "sha256-jWB9C/CcqUYAuOQvByHb5D7lOgRwGCNErHrOfljcYXc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typecode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typecode/default.nix index 929f53785a..3c5ccce3a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typecode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typecode/default.nix @@ -25,6 +25,12 @@ buildPythonPackage rec { hash = "sha256-pRGLU/xzQQqDZMIsrq1Fy7VgGIpFjnHtpmO+yL7t4g8="; }; + postPatch = '' + # PEP440 support was removed in newer setuptools, https://github.com/nexB/typecode/pull/31 + substituteInPlace setup.cfg \ + --replace ">=3.6.*" ">=3.6" + ''; + dontConfigure = true; nativeBuildInputs = [ @@ -59,6 +65,7 @@ buildPythonPackage rec { meta = with lib; { description = "Comprehensive filetype and mimetype detection using libmagic and Pygments"; homepage = "https://github.com/nexB/typecode"; + changelog = "https://github.com/nexB/typecode/releases/tag/v${version}"; license = licenses.asl20; maintainers = teams.determinatesystems.members; }; 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 fb046be652..6061645453 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 @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Mt04D8iNDnofJ6hLoc5uKboK1CyqobiOe10n5h9uSWI="; + hash = "sha256-Mt04D8iNDnofJ6hLoc5uKboK1CyqobiOe10n5h9uSWI="; }; # Modules doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-pillow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-pillow/default.nix index 6418c370d6..f0f79a8782 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-pillow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-pillow/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pillow"; - version = "9.4.0.13"; + version = "9.4.0.17"; format = "setuptools"; src = fetchPypi { inherit version; pname = "types-Pillow"; - sha256 = "sha256-RRCqmKKJR79j8rKe3rvRG3z/hkfZC4Z87Js2dMCowyE="; + hash = "sha256-fw6HHS1G+7a8feyj4C3FUs+cHotJ3rlZVQlVG+OVTkk="; }; # Modules doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix index 4455ab8ffc..dd075bd370 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 @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-bsrdzHrtLGNnRaF8FBGTLN73oDUwTVD/1BQCl7a4gug="; + hash = "sha256-bsrdzHrtLGNnRaF8FBGTLN73oDUwTVD/1BQCl7a4gug="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-psutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-psutil/default.nix index a988099f68..cb169ef0e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-psutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-psutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-psutil"; - version = "5.9.5.7"; + version = "5.9.5.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-s443a6DVO5oI0Ot3w8z2Ifng4PkPm9+y7MRz1ixoKKM="; + hash = "sha256-xsfmtBtvfruHr9VlDfNgdR0Ois8NJ2t6xk0A9Bm+uSI="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix index a3a67259be..9727a3bb76 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SH0+jp9Ace7ICBdG1T+pgrvAWBLnGdy/Lr89VaGkzSg="; + hash = "sha256-SH0+jp9Ace7ICBdG1T+pgrvAWBLnGdy/Lr89VaGkzSg="; }; # Modules doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix index 47ef2a0c49..9c85c50dc0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types-PyYAML"; inherit version; - sha256 = "sha256-GTBIaaidSa8AvmgeeyZ0FN8hP064ljTESV+mLo+UK58="; + hash = "sha256-GTBIaaidSa8AvmgeeyZ0FN8hP064ljTESV+mLo+UK58="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-redis/default.nix index 3a970d42d0..bd4ce4a150 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-redis/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.4.0.0"; + version = "4.5.1.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fYJtRY6abb19TyH99tfDm6Li80dMijSAACQZZYYKDt8="; + hash = "sha256-dmAXh1TWCkz6z1sz7gY6oGJTEXkcYgdc2TYTZiej978="; }; # Module doesn't have tests 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 e341ea2fd4..6b9853a7d9 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 @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-/I6qCcwBRpnGtjxgwuOt0MiwmkEMgYtaxuZfkqJt3gk="; + hash = "sha256-/I6qCcwBRpnGtjxgwuOt0MiwmkEMgYtaxuZfkqJt3gk="; }; 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 661d3ce8c7..efa9b6cf24 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 = "65.6.0.2"; + version = "67.4.0.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rWDM8B1ibel2IiREjzbBPgZg6GOv1twR2Xmzc5psfSQ="; + hash = "sha256-GelY39vxxaYo5UwqfuhJNQUa+3J40MHNsIrBlHV+47E="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-toml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-toml/default.nix index c3c5a13e90..3e475b17cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-toml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-toml/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-toml"; - version = "0.10.8.2"; + version = "0.10.8.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UdQoZmsw6cwEd5H0QNDxGoIgXnicQN67uG863XRyzz4="; + hash = "sha256-v4D859LXS+kRSPR7iNmuWt6xAkq+8iqi/bq8A21rizw="; }; # 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 fe16137f19..7b72ea6019 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.8.3"; + version = "1.5.8.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-OmK8JRaPi0TOdOERT5+8Luh9bpbjiAy+85qtlSJVW04="; + hash = "sha256-KFU4ZFKJdRtKfFnh2WZI2o84O4o8nUcYeyib781XjLg="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-ujson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-ujson/default.nix new file mode 100644 index 0000000000..5dda912997 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-ujson/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-ujson"; + version = "5.7.0.1"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-VDUaYuwbZVDvsXr2PvfwwA0O+pwJnefaXGJ+HvooBVM="; + }; + + doCheck = false; + + pythonImportsCheck = [ + "ujson-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for ujson"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ centromere ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typical/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typical/default.nix index 4914e011e9..8554b3ba84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typical/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typical/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { (fetchpatch { name = "switch-to-poetry-core.patch"; url = "https://github.com/seandstewart/typical/commit/66b3c34f8969b7fb1f684f0603e514405bab0dd7.patch"; - sha256 = "sha256-c7qJOtHmJRnVEGl+OADB3HpjvMK8aYDD9+0gplOn9pQ="; + hash = "sha256-c7qJOtHmJRnVEGl+OADB3HpjvMK8aYDD9+0gplOn9pQ="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix index 01ef53e479..de6512b3e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "typing-extensions"; - version = "4.4.0"; + version = "4.5.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "typing_extensions"; inherit version; - hash = "sha256-FRFDS7kr+N0ZjBKxzIEugA1Bgc/LhnZ04PgnnMkwh6o="; + hash = "sha256-XLX0p5E51plgez72IqHe2vqE4RWrACTg2cBEqUecp8s="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typing-inspect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typing-inspect/default.nix index b0418176bf..a5d27c1f71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typing-inspect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typing-inspect/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "typing_inspect"; - sha256 = "sha256-ix/wxACUO2FF34EZxBwkTKggfx8QycBXru0VYOSAbj0="; + hash = "sha256-ix/wxACUO2FF34EZxBwkTKggfx8QycBXru0VYOSAbj0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix index 18215f96bb..730bb26bea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-6G96xqoO9MbEnwBLT9Q1vOmcI+LdXXMAPz+YFgJMK9g="; + hash = "sha256-6G96xqoO9MbEnwBLT9Q1vOmcI+LdXXMAPz+YFgJMK9g="; }; LC_ALL="en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix index 985a0af28f..e60d550947 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.6.3"; + version = "1.6.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fOA+tGANKKHeq0uGbzd9Tq5/yc3Gfj6I94jV8daD3IY="; + hash = "sha256-IYMzJDXveIL60ick4/L2PT/VpRx/DGNdY0h5SLAuN0k="; }; patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/udatetime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/udatetime/default.nix index 2188cf25a5..49b56c5f1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/udatetime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/udatetime/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-sQvFVwaZpDinLitaZOdr2MKO4779FvIJOHpVB/oLgwE="; + hash = "sha256-sQvFVwaZpDinLitaZOdr2MKO4779FvIJOHpVB/oLgwE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uharfbuzz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uharfbuzz/default.nix index ce9d4da479..2573bdc51e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uharfbuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uharfbuzz/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "harfbuzz"; repo = "uharfbuzz"; rev = "v${version}"; - sha256 = "sha256-DyFXbwB28JH2lvmWDezRh49tjCvleviUNSE5LHG3kUg="; + hash = "sha256-DyFXbwB28JH2lvmWDezRh49tjCvleviUNSE5LHG3kUg="; fetchSubmodules = true; }; 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 6755a274d1..8893d00434 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-54jl1dyuj2EYrJtF0LiRoNVfesSA7dy38HJj8rzzeyM="; + hash = "sha256-54jl1dyuj2EYrJtF0LiRoNVfesSA7dy38HJj8rzzeyM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix index d53281f5f0..171b1dc499 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ulid-transform"; - version = "0.4.0"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JuTIE8FAVZkfn+byJ1z9/ep9Oih1uXpz/QTB2OfM0WU="; + hash = "sha256-eRLmA/8fKfG0qEl0QbX6FziEviU34uU7SP0iyZmbku8="; }; 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 f2fdbd748c..bf08374ece 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-gBEeCDnyOcWyM8tHcgF7SDoLehVzpYG5Krd0ajXm+qs="; + hash = "sha256-gBEeCDnyOcWyM8tHcgF7SDoLehVzpYG5Krd0ajXm+qs="; }; propagatedBuildInputs = [ future ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix index 4f9a2a9526..16be16d443 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-HmqQLeYOpcP30q9+J0UAa05Lm97eiIoH+EQcmTjy7n0="; + hash = "sha256-HmqQLeYOpcP30q9+J0UAa05Lm97eiIoH+EQcmTjy7n0="; }; nativeCheckInputs = [ nose pytest hypothesis six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unearth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unearth/default.nix index 0501a1695c..79b205c4b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unearth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unearth/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.7.0"; + version = "0.7.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-z1RBGze3qUHzzf3ymu7ivxgWSor8o1xGe5f+q2JuZx4="; + hash = "sha256-4jQbp7meQxlVoQzT2gwVqw1CpfnLPx4/Rg30K8M5bc8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unidiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unidiff/default.nix index c34e70eb9d..85ec596a89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unidiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unidiff/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "unidiff"; - version = "0.7.4"; + version = "0.7.5"; src = fetchPypi { inherit pname version; - sha256 = "2bbcbc986e1fb97f04b1d7b864aa6002ab02f4d8a996bf03aa6e5a81447d1fc5"; + sha256 = "2e5f0162052248946b9f0970a40e9e124236bf86c82b70821143a6fc1dea2574"; }; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix index d84f5c36d8..fb4a3b543c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "xmlrunner"; repo = "unittest-xml-reporting"; rev = version; - sha256 = "sha256-lOJ/+8CVJUXdIaZLLF5PpPkG0DzlNgo46kRZ1Xy7Ju0="; + hash = "sha256-lOJ/+8CVJUXdIaZLLF5PpPkG0DzlNgo46kRZ1Xy7Ju0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/univers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/univers/default.nix index f40fc7d99e..3669009d53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/univers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/univers/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-yM0SDBpkiZEbaZ0ugjiMwwUFKqZGbmh1JNlv5qvPAYo="; + hash = "sha256-yM0SDBpkiZEbaZ0ugjiMwwUFKqZGbmh1JNlv5qvPAYo="; }; patches = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { # Upstream PR (already merged): https://github.com/nexB/univers/pull/77 (fetchpatch { url = "https://github.com/nexB/univers/commit/b74229cc1c8790287633cd7220d6b2e97c508302.patch"; - sha256 = "sha256-i6zWv9rAlwCMghd9g5FP6WIQLLDLYvp+6qJ1E7nfTSY="; + hash = "sha256-i6zWv9rAlwCMghd9g5FP6WIQLLDLYvp+6qJ1E7nfTSY="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unrardll/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unrardll/default.nix index f0a0cbbf17..e6d7461651 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unrardll/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unrardll/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "unrardll"; - version = "0.1.5"; + version = "0.1.7"; src = fetchPypi { inherit pname version; - sha256 = "8bebb480b96cd49d4290d814914f39cff75cf0fa0514c4790bb32b1757227c78"; + sha256 = "sha256-4QZ/4nu03iBO+PNpLyPZPF07QpL3iyksb8fcT3V0n3Y="; }; buildInputs = [ unrar ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/untangle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/untangle/default.nix index 0948e91c72..6456bdd3cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/untangle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/untangle/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { repo = "untangle"; # 1.1.1 is not tagged on GitHub rev = "refs/tags/${version}"; - sha256 = "sha256-cJkN8vT5hW5hRuLxr/6udwMO4GVH1pJhAc6qmPO2EEI="; + hash = "sha256-cJkN8vT5hW5hRuLxr/6udwMO4GVH1pJhAc6qmPO2EEI="; }; 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 b4d0f71a5a..42934f4174 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "uproot"; - version = "5.0.2"; + version = "5.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-cklLbTO/EooQpq8vavKgloncSlyIX7DW+T9Cauyn6ng="; + hash = "sha256-5XR92e3rQJbKojfQX+MjaF4SCKvV1xBu7hezaFrtJwc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix index e9af904e9c..03a5dccee9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "uptime-kuma-api"; - version = "0.9.0"; + version = "0.10.0"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "uptime_kuma_api"; inherit version; - hash = "sha256-nbRBsG4Mietd6kcrvpbTbWUP0SMRXbW4mWme1G5n3ks="; + hash = "sha256-qBSXQyruLVGJ0QeihnEUXOqYpvVftdFM5ED3usHT0OQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uranium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uranium/default.nix index 58b96b5cd7..8af65b0cc6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uranium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uranium/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "sha256-SE9xqrloPXIRTJiiqUdRKFmb4c0OjmJK5CMn6VXMFmk="; + hash = "sha256-SE9xqrloPXIRTJiiqUdRKFmb4c0OjmJK5CMn6VXMFmk="; }; disabled = pythonOlder "3.5.0"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uri-template/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uri-template/default.nix index b09b2e1b76..db7dc602ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uri-template/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uri-template/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "plinss"; repo = "uri_template"; rev = "v${version}"; - sha256 = "sha256-IAq6GpEwimq45FU0QugLZLSOhwAmC1KbpZKD0zyxsUs="; + hash = "sha256-IAq6GpEwimq45FU0QugLZLSOhwAmC1KbpZKD0zyxsUs="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uritemplate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uritemplate/default.nix index ccd1126439..363313163d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uritemplate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uritemplate/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Q0bt/Fw7efaUvM1tYJmjIrvrYo2/LNhu6lWkVs5RJPA="; + hash = "sha256-Q0bt/Fw7efaUvM1tYJmjIrvrYo2/LNhu6lWkVs5RJPA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/url-normalize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/url-normalize/default.nix index a3cca49393..b851eccbe2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/url-normalize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/url-normalize/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { (fetchpatch { name = "switch-to-poetry-core.patch"; url = "https://github.com/niksite/url-normalize/commit/b8557b10c977b191cc9d37e6337afe874a24ad08.patch"; - sha256 = "sha256-SVCQATV9V6HbLmjOHs7V7eBagO0PuqZLubIJghBYfQQ="; + hash = "sha256-SVCQATV9V6HbLmjOHs7V7eBagO0PuqZLubIJghBYfQQ="; }) ]; 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 37390c12ba..cd7496d636 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.26.13"; + version = "1.26.14"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-wIPdDc5o2/vhEp1SccuQ+UR96n1SCXxuASYSDFId3qg="; + hash = "sha256-B2kHv4/TVc3ndyhHExZiWk0vfnE8El9RlTu1s+7PT3I="; }; # FIXME: remove backwards compatbility hack diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urwid-readline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urwid-readline/default.nix index 3ea35c2a90..7d24067fd1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/urwid-readline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/urwid-readline/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-AYAgy8hku17Ye+F9wmsGnq4nVcsp86nFaarDve0e+vQ="; + hash = "sha256-AYAgy8hku17Ye+F9wmsGnq4nVcsp86nFaarDve0e+vQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix index 372d6830f8..e9b3556043 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "pazz"; repo = "urwidtrees"; rev = version; - sha256 = "sha256-yGSjwagCd5TiwEFtF6ZhDuVqj4PTa5pVXhs8ebr2O/g="; + hash = "sha256-yGSjwagCd5TiwEFtF6ZhDuVqj4PTa5pVXhs8ebr2O/g="; }; propagatedBuildInputs = [ urwid ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { patches = [ (fetchpatch { url = "https://github.com/pazz/urwidtrees/commit/ed39dbc4fc67b0e0249bf108116a88cd18543aa9.patch"; - sha256 = "sha256-fA+30d2uVaoNCg4rtoWLNPvrZtq41Co4vcmM80hkURs="; + hash = "sha256-fA+30d2uVaoNCg4rtoWLNPvrZtq41Co4vcmM80hkURs="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/usbtmc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/usbtmc/default.nix index 6c8b3ede80..57f2819ecc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/usbtmc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/usbtmc/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "python-ivi"; repo = "python-usbtmc"; rev = "v${version}"; - sha256 = "sha256-69kqBTqnVqdWC2mqlXylzb9VkdhwTGZI0Ykf6lqbypI="; + hash = "sha256-69kqBTqnVqdWC2mqlXylzb9VkdhwTGZI0Ykf6lqbypI="; }; propagatedBuildInputs = [ pyusb ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ush/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ush/default.nix index 7ce8ec1f28..a2b83bff3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ush/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ush/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "tarruda"; repo = "python-ush"; rev = version; - sha256 = "sha256-eL3vG3yS02enbLYorKvvYKbju9HInffUhrZgkodwhvo="; + hash = "sha256-eL3vG3yS02enbLYorKvvYKbju9HInffUhrZgkodwhvo="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix index ac3da7eb78..fc5023b5fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix @@ -12,6 +12,7 @@ , aiohttp , psutil , pyopenssl +, pytest-forked , pytestCheckHook }: @@ -39,6 +40,7 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; nativeCheckInputs = [ + pytest-forked pytestCheckHook psutil ] ++ lib.optionals (pythonOlder "3.11") [ @@ -64,14 +66,17 @@ buildPythonPackage rec { # Tries to run "env", but fails to find it "--deselect=tests/test_process.py::Test_UV_Process::test_process_env_2" "--deselect=tests/test_process.py::Test_AIO_Process::test_process_env_2" + # AssertionError: b'' != b'out\n' + "--deselect=tests/test_process.py::Test_UV_Process::test_process_streams_redirect" + "--deselect=tests/test_process.py::Test_AIO_Process::test_process_streams_redirect" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + # Segmentation fault + "--deselect=tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename" ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - # Flaky test: https://github.com/MagicStack/uvloop/issues/412 - "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_shutdown_timeout_handler_not_set" # Broken: https://github.com/NixOS/nixpkgs/issues/160904 "--deselect=tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost" - # Flaky test: https://github.com/MagicStack/uvloop/issues/513 - "--deselect=tests/test_tcp.py::Test_UV_TCP::test_create_server_5" - "--deselect=tests/test_tcp.py::Test_UV_TCP::test_create_server_6" + # Segmentation fault + "--deselect=tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename" ]; disabledTestPaths = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix index 85809e0a5f..1a7b850342 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-JBSM5OZBAKLV4mcjPiPnr+tVMWtH0w+q5+tucpK8Imo="; + hash = "sha256-JBSM5OZBAKLV4mcjPiPnr+tVMWtH0w+q5+tucpK8Imo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix index 418850444c..034998fc90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix @@ -24,21 +24,18 @@ buildPythonPackage rec { pname = "vdirsyncer"; - version = "0.19.0"; - format = "setuptools"; + version = "0.19.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256:0995bavlv8s9j0127ncq3yzy5p72lam9qgpswyjfanc6l01q87lf"; + hash = "sha256-qnbHclqlpxH2N0vFzYO+eKrmjHSCljWp7Qc81MCfA64="; }; postPatch = '' - substituteInPlace setup.py \ - --replace "click-log>=0.3.0, <0.4.0" "click-log>=0.3.0, <0.5.0" - - sed -i -e '/--cov/d' -e '/--no-cov/d' setup.cfg + sed -i -e '/--cov/d' -e '/--no-cov/d' pyproject.toml ''; propagatedBuildInputs = [ @@ -53,10 +50,6 @@ buildPythonPackage rec { aiohttp-oauthlib ]; - nativeBuildInputs = [ - setuptools-scm - ]; - nativeCheckInputs = [ hypothesis pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vector/default.nix index a1b153deef..03f38e12a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vector/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "vector"; - version = "0.11.0"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/e0wZDWIIm9vi37NEkIEitQj0p1M132AAO6id0eaA5Y="; + hash = "sha256-T62k/dqlwb1ppbopb/2UjMy1da16vlPRSWD1b+Mt1ME="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vega/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vega/default.nix index 989a26c11d..57f9e18486 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vega/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vega/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-cO+7Ynbv/+uoNUOPQvDNZji04llHUBlm95Cyfy+Ny80="; + hash = "sha256-cO+7Ynbv/+uoNUOPQvDNZji04llHUBlm95Cyfy+Ny80="; }; propagatedBuildInputs = [ jupyter jupyter-core pandas ipywidgets ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vehicle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vehicle/default.nix index 24ee92f492..301675878f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vehicle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vehicle/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-vehicle"; rev = "v${version}"; - sha256 = "sha256-dvSdYrONUEe+bdZ+9nALrOQ6gJwq9e1dLvuq08xP5tQ="; + hash = "sha256-dvSdYrONUEe+bdZ+9nALrOQ6gJwq9e1dLvuq08xP5tQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/venstarcolortouch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/venstarcolortouch/default.nix index 2eb878e8d9..9945c09ea9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/venstarcolortouch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/venstarcolortouch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-QjcoF46GrBH7ExGQno8xDgtOSGNxhAP+NycJb22hL+E="; + hash = "sha256-QjcoF46GrBH7ExGQno8xDgtOSGNxhAP+NycJb22hL+E="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vilfo-api-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vilfo-api-client/default.nix index d628a12fff..6f023b184f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vilfo-api-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vilfo-api-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ManneW"; repo = "vilfo-api-client-python"; rev = version; - sha256 = "sha256-j06Bbv0hWSmrlCv8RfgvfGTyOF+vSX+zZnX3AvG5Hys="; + hash = "sha256-j06Bbv0hWSmrlCv8RfgvfGTyOF+vSX+zZnX3AvG5Hys="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix index 3723daec55..da312bc207 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "edwardgeorge"; repo = pname; rev = version; - sha256 = "sha256-qrN74IwLRqiVPxU8gVhdiM34yBmiS/5ot07uroYPDVw="; + hash = "sha256-qrN74IwLRqiVPxU8gVhdiM34yBmiS/5ot07uroYPDVw="; }; postPatch = '' 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 c57a1e0e04..30e3fc43d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix @@ -8,6 +8,8 @@ , fetchPypi , filelock , flaky +, hatch-vcs +, hatchling , importlib-metadata , importlib-resources , pathlib2 @@ -16,23 +18,23 @@ , pytest-mock , pytest-timeout , pytestCheckHook -, setuptools-scm }: buildPythonPackage rec { pname = "virtualenv"; - version = "20.17.1"; - format = "setuptools"; + version = "20.19.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-+LknaE78bxzCBsnbKXpXCrmtDlHBb6nkVIfTbRkFwFg="; + hash = "sha256-N6ZAuoLtQLImWZxSLUEeS+XtszmgwN4DDA3HtkbWFZA="; }; nativeBuildInputs = [ - setuptools-scm + hatch-vcs + hatchling ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/viv-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/viv-utils/default.nix index 62b528e71d..f80d32e963 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/viv-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/viv-utils/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "williballenthin"; repo = "viv-utils"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ih6CtnsGfHRLDjoaF7BkoUENu+0pU3NB6TG0A70f3nE="; + hash = "sha256-ih6CtnsGfHRLDjoaF7BkoUENu+0pU3NB6TG0A70f3nE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix index f35ab607a0..c5e0093f44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy3k +, pythonOlder , pytestCheckHook , voluptuous }: @@ -11,7 +11,7 @@ buildPythonPackage rec { version = "2.6.0"; format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "home-assistant-libs"; @@ -24,19 +24,19 @@ buildPythonPackage rec { voluptuous ]; - nativeCheckInputs = [ - pytestCheckHook - voluptuous - ]; - pythonImportsCheck = [ "voluptuous_serialize" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + meta = with lib; { - homepage = "https://github.com/home-assistant-libs/voluptuous-serialize"; - license = licenses.asl20; description = "Convert Voluptuous schemas to dictionaries so they can be serialized"; - maintainers = with maintainers; [ ]; + homepage = "https://github.com/home-assistant-libs/voluptuous-serialize"; + changelog = "https://github.com/home-assistant-libs/voluptuous-serialize/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; }; } 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 e50a91c060..7184a90172 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi{ inherit pname version; - sha256 = "sha256-O3WnG3JQ7CEHMPYTmE9pgnS8YZs717P6wBKBnXIvvFI="; + hash = "sha256-O3WnG3JQ7CEHMPYTmE9pgnS8YZs717P6wBKBnXIvvFI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vqgan-jax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vqgan-jax/default.nix index 7310bf393c..e917230b62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vqgan-jax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vqgan-jax/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "patil-suraj"; repo = "vqgan-jax"; rev = "1be20eee476e5d35c30e4ec3ed12222018af8ce4"; - sha256 = "sha256-OZihAXpE0UsgauQ38XDmAF+lrIgz05uK0ro8SCdVsPc="; + hash = "sha256-OZihAXpE0UsgauQ38XDmAF+lrIgz05uK0ro8SCdVsPc="; }; format = "setuptools"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vsure/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vsure/default.nix index 1551ab3118..b51622ed07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vsure/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vsure/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "vsure"; - version = "2.6.0"; + version = "2.6.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-KMLW1270Xs9s2a4ROWTvwRpfr4n4RO9rIYlskNjGzFQ="; + hash = "sha256-D6Q76L1BVx5hpFSShP1rUOmgTogEO+6Jj5x8GaepC+c="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix index 501b08969d..b568350324 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "vulture"; - version = "2.6"; + version = "2.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-JRX6hIGBAB3Ipzq6agGhoXQG9dNy8k7H9xkYZvn0mX4="; + hash = "sha256-Z/uAoBTtn9tZndRLuWy1QxEDKhBBBvwucG73ptrYgDI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix index 934f55f2aa..801b108e50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "remcohaszing"; repo = "pywakeonlan"; rev = "refs/tags/${version}"; - sha256 = "sha256-7BDE7TmTT8rSaG0rEn5QwH+izGWA2PeQzxpGiv7+3fo="; + hash = "sha256-7BDE7TmTT8rSaG0rEn5QwH+izGWA2PeQzxpGiv7+3fo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wallbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wallbox/default.nix index 07474de168..da2b93e9d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wallbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wallbox/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-/RM1tqtGBCUa1fcqh5yvVQMNzaEqpAUPonciEIE6lC4="; + hash = "sha256-/RM1tqtGBCUa1fcqh5yvVQMNzaEqpAUPonciEIE6lC4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wand/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wand/default.nix index f150984918..3f55ec7f47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wand/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wand/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Wand"; inherit version; - sha256 = "sha256-tmFwDan48ekx5Scm5PxkOlZblRT1iD1Bt3Pjw3yfqZU="; + hash = "sha256-tmFwDan48ekx5Scm5PxkOlZblRT1iD1Bt3Pjw3yfqZU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/warcio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/warcio/default.nix index 6b9fd5d171..935a538222 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/warcio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/warcio/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { owner = "webrecorder"; repo = "warcio"; rev = "aa702cb321621b233c6e5d2a4780151282a778be"; # Repo has no git tags, see https://github.com/webrecorder/warcio/issues/126 - sha256 = "sha256-wn2rd73wRfOqHu9H0GIn76tmEsERBBCQatnk4b/JToU="; + hash = "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="; + hash = "sha256-3izm9LvAeOFixiIUUqmd5flZIxH92+NxL7jeu35aObQ="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix index 103f71a70a..3c1611a15d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-9e58YJAngRvRbmIPL9enMZRmAFhI5BsFGmIFOrj9cNY="; + hash = "sha256-9e58YJAngRvRbmIPL9enMZRmAFhI5BsFGmIFOrj9cNY="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix index 043b1e8aff..97dcc6c717 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix @@ -2,10 +2,10 @@ , stdenv , buildPythonPackage , CoreServices +, eventlet , fetchpatch , fetchPypi , flaky -, pathtools , pytest-timeout , pytestCheckHook , pythonOlder @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "watchdog"; - version = "2.2.1"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zcwjyVKGAaiik+tDacvRT2tPNPB66HaUISUunCJxi28="; + hash = "sha256-nTnv/mkJvomLo+coap6bF6ap9zT7Hvnd4+m7aHFfyjk="; }; patches = lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [ @@ -32,16 +32,16 @@ buildPythonPackage rec { CoreServices ]; - propagatedBuildInputs = [ - pathtools + passthru.optional-dependencies.watchmedo = [ pyyaml ]; nativeCheckInputs = [ + eventlet flaky pytest-timeout pytestCheckHook - ]; + ] ++ passthru.optional-dependencies.watchmedo; postPatch = '' substituteInPlace setup.cfg \ @@ -49,17 +49,47 @@ buildPythonPackage rec { --replace "--cov-report=term-missing" "" ''; - disabledTests = [ - # probably failing because of an encoding related issue - "test_create_wrong_encoding" - ] ++ lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [ - "test_delete" - "test_separate_consecutive_moves" + pytestFlagsArray = [ + "--deselect=tests/test_emitter.py::test_create_wrong_encoding" + "--deselect=tests/test_emitter.py::test_close" + ] ++ lib.optionals (stdenv.isDarwin) [ + # fails to stop process in teardown + "--deselect=tests/test_0_watchmedo.py::test_auto_restart_subprocess_termination" + # assert cap.out.splitlines(keepends=False).count('+++++ 0') == 2 != 3 + "--deselect=tests/test_0_watchmedo.py::test_auto_restart_on_file_change_debounce" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + # FileCreationEvent != FileDeletionEvent + "--deselect=tests/test_emitter.py::test_separate_consecutive_moves" + # segfaults + "--deselect=tests/test_delayed_queue.py::test_delayed_get" + "--deselect=tests/test_emitter.py::test_delete" + # AttributeError: '_thread.RLock' object has no attribute 'key'" + "--deselect=tests/test_skip_repeats_queue.py::test_eventlet_monkey_patching" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # segfaults + "--deselect=tests/test_delayed_queue.py::test_delayed_get" + "--deselect=tests/test_0_watchmedo.py::test_tricks_from_file" + "--deselect=tests/test_fsevents.py::test_watcher_deletion_while_receiving_events_1" + "--deselect=tests/test_fsevents.py::test_watcher_deletion_while_receiving_events_2" + "--deselect=tests/test_skip_repeats_queue.py::test_eventlet_monkey_patching" + "--deselect=tests/test_fsevents.py::test_recursive_check_accepts_relative_paths" + # fsevents:fsevents.py:318 Unhandled exception in FSEventsEmitter + "--deselect=tests/test_fsevents.py::test_watchdog_recursive" + # SystemError: Cannot start fsevents stream. Use a kqueue or polling observer... + "--deselect=tests/test_fsevents.py::test_add_watch_twice" + # fsevents:fsevents.py:318 Unhandled exception in FSEventsEmitter + "--deselect=ests/test_fsevents.py::test_recursive_check_accepts_relative_paths" + # gets stuck + "--deselect=tests/test_fsevents.py::test_converting_cfstring_to_pyunicode" ]; disabledTestPaths = [ - # Tests are flaky + # tests timeout easily "tests/test_inotify_buffer.py" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # segfaults the testsuite + "tests/test_emitter.py" + "tests/test_fsevents.py" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watchgod/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watchgod/default.nix index 80d95b3175..ce61747baa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/watchgod/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/watchgod/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-yxH/ZmV777qU2CjjtiLV+3byL72hN281Xz5uUel9lFA="; + hash = "sha256-yxH/ZmV777qU2CjjtiLV+3byL72hN281Xz5uUel9lFA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wavinsentio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wavinsentio/default.nix index 34531b5f7e..8e994f8e99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wavinsentio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wavinsentio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-c3MpFoJrT2FBQrNce+zP/bfIZFqu8gSAA9oIa1jKYCo="; + hash = "sha256-c3MpFoJrT2FBQrNce+zP/bfIZFqu8gSAA9oIa1jKYCo="; }; propagatedBuildInputs = [ 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 dd561d1c05..34c2430632 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wazeroutecalculator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wazeroutecalculator/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "WazeRouteCalculator"; inherit version; - sha256 = "sha256-DB5oWthWNwamFG3kNxA/kmUBOVogoSg5LI2KrI39s4M="; + hash = "sha256-DB5oWthWNwamFG3kNxA/kmUBOVogoSg5LI2KrI39s4M="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wcag-contrast-ratio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wcag-contrast-ratio/default.nix index e6025b7690..b3ed1b0b1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wcag-contrast-ratio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wcag-contrast-ratio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-aRkrjlwKfQ3F/xGH7rPjmBQWM6S95RxpyH9Y/oftNhw="; + hash = "sha256-aRkrjlwKfQ3F/xGH7rPjmBQWM6S95RxpyH9Y/oftNhw="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix index 6105838ec5..dc8aae05f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-sfBCqJnqTEWLcyHaG14zMePg7HgVg0NN4TAZRs6tuUM="; + hash = "sha256-sfBCqJnqTEWLcyHaG14zMePg7HgVg0NN4TAZRs6tuUM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wcwidth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wcwidth/default.nix index 7b58fb111f..21f3a7b440 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wcwidth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wcwidth/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "wcwidth"; - version = "0.2.5"; + version = "0.2.6"; src = fetchPypi { inherit pname version; - sha256 = "c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"; + hash = "sha256-pSIHgKQE2+M1N4mHCXjkcs/kd3YfBu5VB3JW5QmxVtA="; }; nativeCheckInputs = [ pytestCheckHook ]; 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 e98156a13f..b69ff310a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webargs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webargs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-mdaJQMRS4HcmSFoV/vQ/EviubAxbORvLp2Bl1FJ/uF0="; + hash = "sha256-mdaJQMRS4HcmSFoV/vQ/EviubAxbORvLp2Bl1FJ/uF0="; }; 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 8b0287c9aa..a2873a26f0 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,14 +8,14 @@ buildPythonPackage rec { pname = "websocket-client"; - version = "1.4.2"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1uj5DKji3U6AJ8RWGt65RWtUBEMS26ZV58rmUs65rlk="; + hash = "sha256-Pwnm2CMIklRxMhd/V1pOPnPP3wZSbiDMAqocO0cYTUA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/websockify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/websockify/default.nix index e1f311ba02..8b0401b72f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/websockify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/websockify/default.nix @@ -1,29 +1,50 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, jwcrypto , numpy +, pytestCheckHook +, pythonOlder +, redis +, requests +, simplejson }: buildPythonPackage rec { - version = "0.10.0"; pname = "websockify"; + version = "0.11.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "6c4cc1bc132abb4a99834bcb1b4bd72f51d35a08d08093a817646ecc226ac44e"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "novnc"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-82Fk9qbiiCD5Rts1d14sK/njeN7DcjKMKPqE7S/1WHs="; }; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + jwcrypto + numpy + redis + requests + simplejson + ]; - # Ran 0 tests in 0.000s - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "websockify" ]; + pythonImportsCheck = [ + "websockify" + ]; meta = with lib; { description = "WebSockets support for any application/server"; homepage = "https://github.com/kanaka/websockify"; - license = licenses.lgpl3; + changelog = "https://github.com/novnc/websockify/releases/tag/v${version}"; + license = licenses.lgpl3Only; maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webtest-aiohttp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webtest-aiohttp/default.nix index 34c61524f1..f8666689ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webtest-aiohttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webtest-aiohttp/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "sloria"; repo = pname; rev = version; - sha256 = "sha256-UuAz/k/Tnumupv3ybFR7PkYHwG3kH7M5oobZykEP+ao="; + hash = "sha256-UuAz/k/Tnumupv3ybFR7PkYHwG3kH7M5oobZykEP+ao="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix index 204e4a848a..fdce818b4d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "werkzeug"; - version = "2.2.2"; + version = "2.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Werkzeug"; inherit version; - sha256 = "sha256-fqLUgyLMfA+LOiFe1z6r17XXXQtQ4xqwBihsz/ngC48="; + hash = "sha256-LhzMlBfU2jWLnebxdOOsCUOR6h1PvvLWZ4ZdgZ39Cv4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wfuzz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wfuzz/default.nix index f7a197bcc1..1304b6c1dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wfuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wfuzz/default.nix @@ -28,6 +28,11 @@ buildPythonPackage rec { hash = "sha256-RM6QM/iR00ymg0FBUtaWAtxPHIX4u9U/t5N/UT/T6sc="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "pyparsing>=2.4*" "pyparsing>=2.4" + ''; + propagatedBuildInputs = [ chardet pycurl diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whatthepatch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whatthepatch/default.nix index 0d7aa81230..64c53ea8e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whatthepatch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whatthepatch/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "whatthepatch"; - version = "1.0.3"; + version = "1.0.4"; format = "pyproject"; src = fetchFromGitHub { owner = "cscorley"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-P4SYSMdDjwXOmre3hXKS4gQ0OS9pz0SWqBeD/WQMQFw="; + hash = "sha256-pejph0WyhryS2injlFElFozIDl6zJeiENh6fqh6982s="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whisper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whisper/default.nix index 114c32356d..300465b654 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whisper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whisper/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "graphite-project"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-CnCbRmI2jc67mTtfupoE1uHtobrAiWoUXbfX8YeEV6A="; + hash = "sha256-CnCbRmI2jc67mTtfupoE1uHtobrAiWoUXbfX8YeEV6A="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/widlparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/widlparser/default.nix index 024852ca40..2501d4821f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/widlparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/widlparser/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "plinss"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T17fDWYd1naza/ao7kXWGcRIl2fzL1/Z9SaJiutZzqk="; + hash = "sha256-T17fDWYd1naza/ao7kXWGcRIl2fzL1/Z9SaJiutZzqk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wifi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wifi/default.nix index c02ab8781b..45594c226e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wifi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wifi/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "rockymeza"; repo = pname; rev = "v${version}"; - sha256 = "sha256-scg/DvApvyQZtzDgkHFJzf9gCRfJgBvZ64CG/c2Cx8E="; + hash = "sha256-scg/DvApvyQZtzDgkHFJzf9gCRfJgBvZ64CG/c2Cx8E="; }; disabled = pythonOlder "2.6"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/willow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/willow/default.nix index 4f6955c2db..d4d297d68d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/willow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/willow/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Willow"; inherit version; - sha256 = "sha256-Dfj/UoUx4AtI1Av3Ltgb6sHcgvLULlu+1K/wIYvvjA0="; + hash = "sha256-Dfj/UoUx4AtI1Av3Ltgb6sHcgvLULlu+1K/wIYvvjA0="; }; propagatedBuildInputs = [ six pillow ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/withings-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/withings-api/default.nix index df5af3299d..5be701fa29 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/withings-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/withings-api/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "vangorra"; repo = "python_withings_api"; rev = "refs/tags/${version}"; - sha256 = "sha256-8cOLHYnodPGk1b1n6xbVyW2iju3cG6MgnzYTKDsP/nw="; + hash = "sha256-8cOLHYnodPGk1b1n6xbVyW2iju3cG6MgnzYTKDsP/nw="; }; postPatch = '' 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 8c2967c5ae..d887287e91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-wled"; rev = "refs/tags/v${version}"; - sha256 = "sha256-GmentEsCJQ9N9kXfy5pbkGXi5CvZfbepdCWab+/fLJc="; + hash = "sha256-GmentEsCJQ9N9kXfy5pbkGXi5CvZfbepdCWab+/fLJc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix index a0313bc23f..6adc8b1538 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "LuminosoInsight"; repo = "wordfreq"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ANOBbQWLB35Vz6oil6QZDpsNpKHeKUJnDKA5Q9JRVdE="; + hash = "sha256-ANOBbQWLB35Vz6oil6QZDpsNpKHeKUJnDKA5Q9JRVdE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wrapio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wrapio/default.nix index e9364a618d..f18bf597be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wrapio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wrapio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-CUocIbdZ/tJQCxAHzhFpB267ynlXf8Mu+thcRRc0yeg="; + hash = "sha256-CUocIbdZ/tJQCxAHzhFpB267ynlXf8Mu+thcRRc0yeg="; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wsgiprox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wsgiprox/default.nix index af35c23e45..ecaef390fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wsgiprox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wsgiprox/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { repo = "wsgiprox"; # https://github.com/webrecorder/wsgiprox/issues/8 rev = "004870a87959e68ff28ff4362e4f0df28ec22030"; - sha256 = "sha256-EquddaNrVceyJHuQMCajKHGZX2Q7ebR0Zhvi2pl2WEw="; + hash = "sha256-EquddaNrVceyJHuQMCajKHGZX2Q7ebR0Zhvi2pl2WEw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/WSME/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wsme/default.nix similarity index 94% rename from third_party/nixpkgs/pkgs/development/python-modules/WSME/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/wsme/default.nix index a88b843a61..a818b3baf4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/WSME/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wsme/default.nix @@ -21,13 +21,14 @@ }: buildPythonPackage rec { - pname = "WSME"; + pname = "wsme"; version = "0.11.0"; disabled = pythonAtLeast "3.9"; src = fetchPypi { - inherit pname version; + pname = "WSME"; + inherit version; sha256 = "bd2dfc715bedcc8f4649611bc0c8a238f483dc01cff7102bc1efa6bea207b64b"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wsproto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wsproto/default.nix index 583b8111ab..fc78d23fea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wsproto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wsproto/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-rVZfJuy5JYij5DvD2WFk3oTNmQJIKxMNDduqlmSoUGU="; + hash = "sha256-rVZfJuy5JYij5DvD2WFk3oTNmQJIKxMNDduqlmSoUGU="; }; propagatedBuildInputs = [ h11 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix index 3448ad879b..2171db6e94 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "xarray"; - version = "2022.12.0"; + version = "2023.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CD0I5VKnZHx+zhNt+jpLahN5JWvrVbvti43fBfHhTsc="; + hash = "sha256-qnYFAKLY+L6O/Y87J6lLKvOwqMLANzR9WV6vb/Cdinc="; }; SETUPTOOLS_SCM_PRETEND_VERSION="${version}"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xcffib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xcffib/default.nix index 4de24783ea..b4def14ff4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xcffib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xcffib/default.nix @@ -1,27 +1,35 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , xorg , cffi -, six , pytestCheckHook }: buildPythonPackage rec { - version = "1.1.2"; + version = "1.2.0"; pname = "xcffib"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Wqc6wlUUUpfMeJmhEFmEf41TDz2zhLPeOqwT+GDgS6w="; + hash = "sha256-8yMCFEf55zB40hu5KMSPTavq6z87N+gDxta5hzXoFIM="; }; - patchPhase = '' + patches = [ + (fetchpatch { + name = "remove-leftover-six-import.patch"; + url = "https://github.com/tych0/xcffib/commit/8a488867d30464913706376ca3a9f4c98ca6c5cf.patch"; + hash = "sha256-wEms0gC7tVqtmKMjjpH/34kdQ6HUV0h67bUGbgijlqw="; + }) + ]; + + postPatch = '' # Hardcode cairo library path sed -e 's,ffi\.dlopen(,&"${xorg.libxcb.out}/lib/" + ,' -i xcffib/__init__.py ''; - propagatedBuildInputs = [ cffi six ]; + propagatedBuildInputs = [ cffi ]; propagatedNativeBuildInputs = [ cffi ]; @@ -31,6 +39,11 @@ buildPythonPackage rec { xorg.xorgserver ]; + preCheck = '' + # import from $out + rm -r xcffib + ''; + pythonImportsCheck = [ "xcffib" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xdg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xdg/default.nix index a84d2656cd..d5583200be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xdg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xdg/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "srstevenson"; repo = pname; rev = version; - sha256 = "sha256-z/Zvo2WGw9qA+M3Pt9r35DuxtuhL7/I75LlFEdDOJcc="; + hash = "sha256-z/Zvo2WGw9qA+M3Pt9r35DuxtuhL7/I75LlFEdDOJcc="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix index ad1e3b731f..c7f768ab2a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -5,7 +5,7 @@ , html5lib , pillow , pyhanko -, pypdf3 +, pypdf , pytestCheckHook , python-bidi , pythonOlder @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "xhtml2pdf"; - version = "0.2.8"; + version = "0.2.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,8 +25,8 @@ buildPythonPackage rec { owner = pname; repo = pname; # Currently it is not possible to fetch from version as there is a branch with the same name - rev = "refs/tags/v${version}"; - sha256 = "sha256-zWzg/r18wjzxWyD5QJ7l4pY+4bJTvHjrD11FRuuy8H8="; + rev = "refs/tags/${version}"; + hash = "sha256-MrzAsa0AZX3+0LN/Can3QBoPBRxb0a/F2jLBd8rD5H4="; }; propagatedBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { html5lib pillow pyhanko - pypdf3 + pypdf python-bidi reportlab svglib diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xkbcommon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xkbcommon/default.nix index 8bf77c24e3..0b8f8d4ceb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xkbcommon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xkbcommon/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-W+WXO/W3UlaHpN9shHibQhWQ1/fPkq5W8qqxd7eV1RY="; + hash = "sha256-W+WXO/W3UlaHpN9shHibQhWQ1/fPkq5W8qqxd7eV1RY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix index 7cf71eabdb..57d1549ee8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-fs1tK8JCby5DL0/awSIR4ZdtPLtl+QM+Htpl7dogReM="; + hash = "sha256-fs1tK8JCby5DL0/awSIR4ZdtPLtl+QM+Htpl7dogReM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/XlsxWriter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xlsxwriter/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/XlsxWriter/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/xlsxwriter/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xml-marshaller/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xml-marshaller/default.nix index 30300c6104..6e1c6d8c2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xml-marshaller/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xml-marshaller/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "xml_marshaller"; inherit version; - sha256 = "sha256-QvBALLDD8o5nZQ5Z4bembhadK6jcydWKQpJaSmGqqJM="; + hash = "sha256-QvBALLDD8o5nZQ5Z4bembhadK6jcydWKQpJaSmGqqJM="; }; propagatedBuildInputs = [ lxml six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmldiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmldiff/default.nix index 9f3bde9f34..cae17b6088 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xmldiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xmldiff/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-bF8wvGXOboHZpwo8sCafe6YYUv1sqnoPv8Dt8zs8txc="; + hash = "sha256-bF8wvGXOboHZpwo8sCafe6YYUv1sqnoPv8Dt8zs8txc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmlsec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmlsec/default.nix index 0817764cc8..94af405e8f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xmlsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xmlsec/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-kW9deOgEH2zZORq7plnajJSk/vcZbRJtQK8f9Bfyz4Y="; + hash = "sha256-kW9deOgEH2zZORq7plnajJSk/vcZbRJtQK8f9Bfyz4Y="; }; nativeBuildInputs = [ pkg-config pkgconfig setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix index c0dbe6dc3c..38185102a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-NBWVpIjj4BqFqdiRHYkS/ZIu3l/sxNzkN+tLbI0DflY="; + hash = "sha256-NBWVpIjj4BqFqdiRHYkS/ZIu3l/sxNzkN+tLbI0DflY="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xxhash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xxhash/default.nix index 00cc42ee56..9062026f74 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xxhash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xxhash/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Gv1Hr4lVxdtzD2MK1TrnmM9/rgrLZM67PPlNNcR90Ig="; + hash = "sha256-Gv1Hr4lVxdtzD2MK1TrnmM9/rgrLZM67PPlNNcR90Ig="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xyzservices/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xyzservices/default.nix index 56a2ad45ab..aca00b20fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xyzservices/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xyzservices/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "xyzservices"; - version = "2022.9.0"; + version = "2023.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-VWUZYXCLmhSEmXizOd92AIyIbfeoMmMIpVSbrlUWJgw="; + hash = "sha256-M0K7pBDXlBKQ7tDlii5arbD3uXhj7EKDsoPEBu5yOig="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/y-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/y-py/default.nix new file mode 100644 index 0000000000..12111407e5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/y-py/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, rustPlatform +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "y-py"; + version = "0.6.0"; + format = "pyproject"; + + src = fetchPypi { + pname = "y_py"; + inherit version; + hash = "sha256-RoNhaffcKVffhRPP5LwgCRdbOkc+Ywr0IajnXuHEj5g="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-tpUDGBIHqXsKPsK+1h2sNuiV2I0pGVBokKh+hdFazRQ="; + }; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + rust.cargo + rust.rustc + ]; + + pythonImportsCheck = [ "y_py" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Python bindings for Y-CRDT"; + homepage = "https://github.com/y-crdt/ypy"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yacs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yacs/default.nix index 7abf151a08..a105a18b2f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yacs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yacs/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "rbgirshick"; repo = "yacs"; rev = "v${version}"; - sha256 = "sha256-nO8FL4tTkfTthXYXxXORLieFwvn780DDxfrxC9EUUJ0="; + hash = "sha256-nO8FL4tTkfTthXYXxXORLieFwvn780DDxfrxC9EUUJ0="; }; propagatedBuildInputs = [ pyyaml ]; 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 d2c1691cb3..c621fa1138 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yalesmartalarmclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yalesmartalarmclient/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "domwillcode"; repo = "yale-smart-alarm-client"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Zpj1lLaxiTaYpcj1R/ktuVldl/r19r7fzNKvnSIDq80="; + hash = "sha256-Zpj1lLaxiTaYpcj1R/ktuVldl/r19r7fzNKvnSIDq80="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix index 7e0d693abc..f4e90d649a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "23andMe"; repo = pname; rev = version; - sha256 = "sha256-1GFvgfy3MDsJGKSEm0yaQoLM7VqIS2wphw16trNTUOc="; + hash = "sha256-1GFvgfy3MDsJGKSEm0yaQoLM7VqIS2wphw16trNTUOc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix index 84fb0dd9a4..97fa5fd9d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix @@ -10,12 +10,14 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.28.0"; - disabled = pythonOlder "3.5"; + version = "1.29.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nj2N3RbQWDIUxf3/6AbJNECGch8QdDX2i62ZDlqIgms="; + hash = "sha256-ZqdV1fvLuIMfGpVoZ2MptbrILDeZW8ya/QSLZFn5+kg="; }; propagatedBuildInputs = [ @@ -42,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "A linter for YAML files"; homepage = "https://github.com/adrienverge/yamllint"; + changelog = "https://github.com/adrienverge/yamllint/blob/v${version}/CHANGELOG.rst"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jonringer mikefaille ]; }; 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 c8e8809bcd..482c474945 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.15"; + version = "1.4.16"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yw/LwWjHW4vgHp06E/DgqauTvdfLxerHw1avge91XLU="; + hash = "sha256-P447JnQ8zhalcg9k8prW1QQE3h5PqY155hFtvLvBVSI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yapsy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yapsy/default.nix index 2787120195..a58c14150a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yapsy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yapsy/default.nix @@ -5,11 +5,12 @@ }: buildPythonPackage rec { - pname = "Yapsy"; + pname = "yapsy"; version = "1.12.2"; src = fetchPypi { - inherit pname version; + pname = "Yapsy"; + inherit version; sha256 = "12rznbnswfw0w7qfbvmmffr9r317gl1rqg36nijwzsklkjgks4fq"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yark/default.nix index c2ac28e64d..8c171d9d74 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yark/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "yark"; - version = "1.2.4"; + version = "1.2.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "fdd50d0e832b4522cbe24433f42ed571a1f199f571c1d0c98472b94a501db9cf"; + hash = "sha256-8O4EpHb1fP/O/t6hS1K1ylSXNKBuiipo7wvEnUJODSw="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yaspin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yaspin/default.nix index bf68acafba..afb475e018 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yaspin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yaspin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "yaspin"; - version = "2.2.0"; + version = "2.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pavdmyt"; repo = pname; - rev = "v${version}"; - hash = "sha256-Z+L0SaRe/uN20KS25Di40AjHww9QUjkFaw0Jgbe9yPg="; + rev = "refs/tags/v${version}"; + hash = "sha256-TURfjhEqkg8TT7dsoIOn2iAeD7+lX8+s9hItritf1GU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix index 2a67d6a9b6..e31a9e4581 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "stavros"; repo = "python-yeelight"; rev = "v${version}"; - sha256 = "sha256-vUsL1CvhYRtv75gkmiPe/UkAtBDZPy1iK2BPUupMXz8="; + hash = "sha256-vUsL1CvhYRtv75gkmiPe/UkAtBDZPy1iK2BPUupMXz8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yoyo-migrations/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yoyo-migrations/default.nix index 14aec06320..eb79d8ac0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yoyo-migrations/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yoyo-migrations/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ggYGoD4mLPHNT1niVsKPpEZCUiTVuCo9EnX9eBeFI+Q="; + hash = "sha256-ggYGoD4mLPHNT1niVsKPpEZCUiTVuCo9EnX9eBeFI+Q="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix new file mode 100644 index 0000000000..ca5d5c6956 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, hatchling +, aiofiles +, aiosqlite +, y-py +, pytest-asyncio +, pytestCheckHook +, websockets +}: + +buildPythonPackage rec { + pname = "ypy-websocket"; + version = "0.8.4"; + + disabled = pythonOlder "3.7"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "y-crdt"; + repo = "ypy-websocket"; + rev = "refs/tags/v${version}"; + hash = "sha256-jl2ciIA3enJRfPgcu96MZN+BmNL+bBet54AFDBy3seY="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + aiofiles + aiosqlite + y-py + ]; + + pythonImportsCheck = [ "ypy_websocket" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + websockets + ]; + + disabledTestPaths = [ + # requires installing yjs Node.js module + "tests/test_ypy_yjs.py" + ]; + + meta = { + changelog = "https://github.com/y-crdt/ypy-websocket/blob/${src.rev}/CHANGELOG.md"; + description = "WebSocket Connector for Ypy"; + homepage = "https://github.com/y-crdt/ypy-websocket"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix index 599cb56c4d..787c74d5c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "yq"; - version = "3.1.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MKhKoiSGx0m6JpJWvVhsC803C34qcedsOSTq1IZ+dPI="; + hash = "sha256-hT80KxVi3e6XkDjsjs7lQFzdm2p8uB7WzbgBjJ6AJjM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yq/jq-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/yq/jq-path.patch index ed98ec86aa..bd2967b6ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yq/jq-path.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/yq/jq-path.patch @@ -1,26 +1,26 @@ diff --git a/test/test.py b/test/test.py -index f25dced..cd308c8 100755 +index db674a4..b6c797e 100755 --- a/test/test.py +++ b/test/test.py -@@ -105,7 +105,7 @@ class TestYq(unittest.TestCase): +@@ -130,7 +130,7 @@ class TestYq(unittest.TestCase): tf2.seek(0) - self.assertEqual(self.run_yq("", ["-y", arg, tf.name, self.fd_path(tf2)]), '1\n...\n') - + self.assertEqual(self.run_yq("", ["-y", arg, tf.name, self.fd_path(tf2)]), "1\n...\n") + - @unittest.skipIf(subprocess.check_output(["jq", "--version"]) < b"jq-1.6", "Test options introduced in jq 1.6") + @unittest.skipIf(subprocess.check_output(["@jq@", "--version"]) < b"jq-1.6", "Test options introduced in jq 1.6") def test_jq16_arg_passthrough(self): - self.assertEqual(self.run_yq("{}", ["--indentless", "-y", ".a=$ARGS.positional", "--args", "a", "b"]), - "a:\n- a\n- b\n") + self.assertEqual( + self.run_yq("{}", ["--indentless", "-y", ".a=$ARGS.positional", "--args", "a", "b"]), "a:\n- a\n- b\n" diff --git a/yq/__init__.py b/yq/__init__.py -index 91212d0..ee5a799 100755 +index 0ccb8e8..8342ff0 100644 --- a/yq/__init__.py +++ b/yq/__init__.py -@@ -146,7 +146,7 @@ def yq(input_streams=None, output_stream=None, input_format="yaml", output_forma - try: +@@ -206,7 +206,7 @@ def yq( # Notes: universal_newlines is just a way to induce subprocess to make stdin a text buffer and encode it for us; # close_fds must be false for command substitution to work (yq . t.yml --slurpfile t <(yq . t.yml)) -- jq = subprocess.Popen(["jq"] + list(jq_args), -+ jq = subprocess.Popen(["@jq@"] + list(jq_args), - stdin=subprocess.PIPE, - stdout=subprocess.PIPE if converting_output else None, - close_fds=False, + jq = subprocess.Popen( +- ["jq"] + list(jq_args), ++ ["@jq@"] + list(jq_args), + stdin=subprocess.PIPE, + stdout=subprocess.PIPE if converting_output else None, + close_fds=False, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yte/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yte/default.nix index cb5e036b6b..3280cc7680 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yte/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yte/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "koesterlab"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-7erT5UpejPMIoyqhpYNEON3YWE2l5SdP2olOVpkbNkY="; + hash = "sha256-7erT5UpejPMIoyqhpYNEON3YWE2l5SdP2olOVpkbNkY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix index 53609f6b34..43ccf906ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix @@ -1,23 +1,25 @@ { lib -, buildPythonPackage -, isPy27 -, fetchPypi -, setuptools-scm , asciitree -, numpy +, buildPythonPackage , fasteners +, fetchPypi , numcodecs -, pytest +, numpy +, pytestCheckHook +, pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "zarr"; - version = "2.13.3"; - disabled = isPy27; + version = "2.14.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2ySwkGFsY49l4zprxdlW1kIiEYKWFRXMvCixf7DQtIw="; + hash = "sha256-aOxZuOvfxP7l4yvWwM4nP3L31O0BdFS0UyfGc8YJB7w="; }; nativeBuildInputs = [ @@ -32,17 +34,18 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest + pytestCheckHook ]; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ + "zarr" + ]; meta = with lib; { description = "An implementation of chunked, compressed, N-dimensional arrays for Python"; homepage = "https://github.com/zarr-developers/zarr"; + changelog = "https://github.com/zarr-developers/zarr-python/releases/tag/v${version}"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zbaemon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zbaemon/default.nix index 738fbb0756..00f1c57abb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zbaemon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zbaemon/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SCHjvbRzh88eklWwREusQ3z3KqC1nRQHuTLjH9QyPvw="; + hash = "sha256-SCHjvbRzh88eklWwREusQ3z3KqC1nRQHuTLjH9QyPvw="; }; propagatedBuildInputs = [ zconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zc_lockfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zc_lockfile/default.nix index 97289ec363..70e2406ffa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zc_lockfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zc_lockfile/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "zc.lockfile"; - version = "2.0"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "307ad78227e48be260e64896ec8886edc7eae22d8ec53e4d528ab5537a83203b"; + hash = "sha256-5Y/9ndYsbUMuhoK/oZbJDKw+XB4/JNrjuJ1ggihV14g="; }; buildInputs = [ mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zconfig/default.nix index 2f965d1e63..d02848c6b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zconfig/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-RCLH1mOvdizXeVd1NmvGpnq0QKGreW6w90JbDpA08HY="; + hash = "sha256-RCLH1mOvdizXeVd1NmvGpnq0QKGreW6w90JbDpA08HY="; }; patches = lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeep/default.nix index 8f0aff1db6..dc37c5315a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeep/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeep/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "mvantellingen"; repo = "python-zeep"; rev = "refs/tags/${version}"; - sha256 = "sha256-8f6kS231gbaZ8qyE8BKMcbnZsm8o2+iBoTlQrs5X+jY="; + hash = "sha256-8f6kS231gbaZ8qyE8BKMcbnZsm8o2+iBoTlQrs5X+jY="; }; propagatedBuildInputs = [ 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 4fd287f3be..0852ce740e 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 @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version pname; - sha256 = "sha256-ZDiiyNT871XMDHNPOhKHm4NzgXHcJ0fN/iO4sEz8pRE="; + hash = "sha256-ZDiiyNT871XMDHNPOhKHm4NzgXHcJ0fN/iO4sEz8pRE="; }; buildInputs = [ openssl bzip2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zfec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zfec/default.nix index 2101c36adb..e58e29a974 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zfec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zfec/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-TuUZvg3MfaLohIK8/Av5d6Ql4dfoJ4z1u7uNAPiir7Y="; + hash = "sha256-TuUZvg3MfaLohIK8/Av5d6Ql4dfoJ4z1u7uNAPiir7Y="; }; propagatedBuildInputs = [ pyutil ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix index d3353df4de..98b51b21f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.93"; + version = "0.0.94"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-ilPwzQV4vucLV3QAR/otsVIDIxRw8iWPGXM8CvgtFxg="; + hash = "sha256-WYMl/KN3JUmBV+O29WVxZXFpfJ5of7Jo2hFgrbn2NYc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zict/default.nix index fa4122a7e8..d1e7891eee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zict/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1zZsLiKTMUES3PJDIQhCime5J7AABWGf7vwxDRLYM/M="; + hash = "sha256-1zZsLiKTMUES3PJDIQhCime5J7AABWGf7vwxDRLYM/M="; }; disabled = pythonOlder "3.6"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix index e09c22f56f..86fa26af68 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-xbee"; rev = "refs/tags/${version}"; - sha256 = "sha256-EzdKY/VisMUc/5yHN+7JUz1fDM4mCpk5TyApC24z4CU="; + hash = "sha256-EzdKY/VisMUc/5yHN+7JUz1fDM4mCpk5TyApC24z4CU="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix index e4d6ddad8d..4ebe9caa99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-UTL7g9tIXtMVeBRq5Fdw5VqUB9H/LaobASwHlFPoO2s="; + hash = "sha256-UTL7g9tIXtMVeBRq5Fdw5VqUB9H/LaobASwHlFPoO2s="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix index 040a181e4a..4b55e598e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix @@ -48,6 +48,13 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # # Our two manual scans succeeded and the periodic one was attempted + # assert len(mock_scan.mock_calls) == 3 + # AssertionError: assert 4 == 3 + "test_periodic_scan_priority" + ]; + pythonImportsCheck = [ "zigpy.application" "zigpy.config" 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 267f376620..e2a9add8af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix @@ -9,14 +9,14 @@ let zipp = buildPythonPackage rec { pname = "zipp"; - version = "3.11.0"; + version = "3.15.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-p6IuBZKSkKZ0AUQLOWkK5lYyebztXzFGCdnQN5j1Z2Y="; + hash = "sha256-ESkprWSdqUHCPeUPNWorVXDJVLZRUGQrzN1mvxlNIks="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zodb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zodb/default.nix index d44642d751..4e1ed3ce99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zodb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zodb/default.nix @@ -10,7 +10,7 @@ , zconfig , persistent , zc_lockfile -, BTrees +, btrees , manuel }: @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-KNugDvYm3hBYnt7auFrQ8O33KSXnXTahXJnGOsBf52Q="; + hash = "sha256-KNugDvYm3hBYnt7auFrQ8O33KSXnXTahXJnGOsBf52Q="; }; # remove broken test @@ -36,7 +36,7 @@ buildPythonPackage rec { zconfig persistent zc_lockfile - BTrees + btrees ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope-cachedescriptors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope-cachedescriptors/default.nix index 56c6875cee..2c73f58005 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope-cachedescriptors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope-cachedescriptors/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "zope.cachedescriptors"; inherit version; - sha256 = "sha256-1FxIdIb334HymS8aAJEmJL93JZ2DxdmKp2tnhxbj0Ro="; + hash = "sha256-1FxIdIb334HymS8aAJEmJL93JZ2DxdmKp2tnhxbj0Ro="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope-hookable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope-hookable/default.nix index ff5fe9bb20..64db918321 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope-hookable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope-hookable/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "zope.hookable"; inherit version; - sha256 = "sha256-+2AfAKyH5apYKoExXtlnaM41EygHKdP1H3kxLiuLlKw="; + hash = "sha256-+2AfAKyH5apYKoExXtlnaM41EygHKdP1H3kxLiuLlKw="; }; nativeCheckInputs = [ zope_testing ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_component/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_component/default.nix index a5cbcffe43..c59aa01b58 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_component/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_component/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "zope.component"; - version = "5.0.1"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "32cbe426ba8fa7b62ce5b211f80f0718a0c749cc7ff09e3f4b43a57f7ccdf5e5"; + hash = "sha256-pQj5/vG29ShkYtM0DNif+rXHiZ3KBAEzcjnLa6fGuwo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix index 7e1ed3d5dd..6b96708e22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-giPqSvU5hmznqccwrH6xjlHRfrUVk6p3c7NZPI1tdgg="; + hash = "sha256-giPqSvU5hmznqccwrH6xjlHRfrUVk6p3c7NZPI1tdgg="; }; nativeCheckInputs = [ zope_testrunner manuel ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix index 1e5ac40d1c..6d90dcce72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-NnVoeLxSWzY2TQ1b2ZovCw/TuaUND+m73Eqxs4rCOAA="; + hash = "sha256-NnVoeLxSWzY2TQ1b2ZovCw/TuaUND+m73Eqxs4rCOAA="; }; nativeCheckInputs = [ zope_testrunner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_copy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_copy/default.nix index 88d26cee5a..4be3b5600e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_copy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_copy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-epg2yjqX9m1WGzYPeGUBKGif4JNAddzg75ECe9xPOlc="; + hash = "sha256-epg2yjqX9m1WGzYPeGUBKGif4JNAddzg75ECe9xPOlc="; }; propagatedBuildInputs = [ zope_interface ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix index aca291669c..bb9f527555 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-mfWDqAKFhqtMIXlGE+QR0BDNCZF/RdqXa9/udI87++w="; + hash = "sha256-mfWDqAKFhqtMIXlGE+QR0BDNCZF/RdqXa9/udI87++w="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_event/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_event/default.nix index fddf45ef06..93cfc749c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_event/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_event/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-gdmIEwRvyGzEE242mP7mKKMoL5wyDbGGWMIXSSNfzoA="; + hash = "sha256-gdmIEwRvyGzEE242mP7mKKMoL5wyDbGGWMIXSSNfzoA="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_exceptions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_exceptions/default.nix index 16da25903e..14c81f7924 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_exceptions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_exceptions/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-YZ0kpMZb7Zez3QUV5zLoK2nxVdQsyUlV0b6MKCiGg80="; + hash = "sha256-YZ0kpMZb7Zez3QUV5zLoK2nxVdQsyUlV0b6MKCiGg80="; }; propagatedBuildInputs = [ zope_interface ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_filerepresentation/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_filerepresentation/default.nix index 6539143a00..b119099f9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_filerepresentation/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_filerepresentation/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-yza3iGspJ2+C8WhfPykfQjXmac2HhdFHQtRl0Trvaqs="; + hash = "sha256-yza3iGspJ2+C8WhfPykfQjXmac2HhdFHQtRl0Trvaqs="; }; propagatedBuildInputs = [ zope_interface zope_schema ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix index 856b51d067..42aa31415e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-R7djR7gOCytmxIbuZvP4bFdJOiB1uFqfuAJpD6cwvZI="; + hash = "sha256-R7djR7gOCytmxIbuZvP4bFdJOiB1uFqfuAJpD6cwvZI="; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix index eea485ab2a..2a8bd1d785 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-v+4fP/YhQ4GUmeNI9bin86oCWfmspeDdrnOR0Fnc5nE="; + hash = "sha256-v+4fP/YhQ4GUmeNI9bin86oCWfmspeDdrnOR0Fnc5nE="; }; propagatedBuildInputs = [ zope_event ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix index 7b3852239e..1d230c732b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-9ahU6J/5fe6ke/vqN4u77yeJ0uDMkKHB2lfZChzmfLU="; + hash = "sha256-9ahU6J/5fe6ke/vqN4u77yeJ0uDMkKHB2lfZChzmfLU="; }; propagatedBuildInputs = [ zope_event zope_component ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_location/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_location/default.nix index f4fe420951..aaf85eaadb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_location/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_location/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Fx7tyKIOw6isJxOaqQzyd/93dy6gMrVLaicBp5J7OsU="; + hash = "sha256-Fx7tyKIOw6isJxOaqQzyd/93dy6gMrVLaicBp5J7OsU="; }; propagatedBuildInputs = [ zope_proxy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix index 24210e8c73..199a4b97d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.proxy"; - version = "4.6.1"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+xUTt6jtc3oxI/1XHCRPB+7iRdYIGlY3CyBhHUAPCXQ="; + hash = "sha256-b6RMl6QStNxR4vX9Tcc8W9SZ01KA+IzSvNJviuHkV3s="; }; propagatedBuildInputs = [ zope_interface ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix index 4dd97d94e4..b3694fe09d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "zope.schema"; - version = "6.2.1"; + version = "7.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-47M8i8i6nYWlZxOrjwo8JhXVSoCF8eQVzgyN+15UC+Y="; + hash = "sha256-6tTbywM1TU5BDJo7kERR60TZAlR1Gxy97fSmGu3p+7k="; }; propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_size/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_size/default.nix index bf7a44f8a0..6480e91b73 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_size/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_size/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-bhv3QJdZtNpyAuL6/aZXWD1Acx8661VweWaItJPpkHk="; + hash = "sha256-bhv3QJdZtNpyAuL6/aZXWD1Acx8661VweWaItJPpkHk="; }; propagatedBuildInputs = [ zope_i18nmessageid zope_interface ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_testing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_testing/default.nix index 773209adcd..bc5d9ed94b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_testing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_testing/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-6HzQ2NZmVzza8TOBare5vuyAGmSoZZXBnLX+mS7z1kk="; + hash = "sha256-6HzQ2NZmVzza8TOBare5vuyAGmSoZZXBnLX+mS7z1kk="; }; doCheck = !isPyPy; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix index a1f85a9d0f..d687e24082 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1r1y9E6jLKpBW5bP4UFSsnhjF67xzW9IqCe2Le8Fj9Q="; + hash = "sha256-1r1y9E6jLKpBW5bP4UFSsnhjF67xzW9IqCe2Le8Fj9Q="; }; propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix index 580ab130d8..2da5ae524b 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "zstandard"; - version = "0.19.0"; + version = "0.20.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MdEvzZQt2Nv1LKX2sbvih/ROXVUaCBqYP/PqIIKGeGM="; + hash = "sha256-YT2q3XLHGxSIdCyvssOzgcOdDJu4xswVeqLV6kXMLvw="; }; propagatedNativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zstd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zstd/default.nix index eb98ae6f78..d528f42397 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zstd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zstd/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "zstd"; - version = "1.5.2.6"; + version = "1.5.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9ECFjRmIkOX/UX3/MtFejDG7c1BqiW+br20BTv5i9/w="; + hash = "sha256-oNEd9wqXhSk0G1duaaTwsqI+dGaG4k+bkCYKM85JBC0="; }; postPatch = '' 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 ca8b65b341..d4c1ebea51 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 @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for zwave-js-server"; homepage = "https://github.com/home-assistant-libs/zwave-js-server-python"; + changelog = "https://github.com/home-assistant-libs/zwave-js-server-python/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/r-modules/wrapper-radian.nix b/third_party/nixpkgs/pkgs/development/r-modules/wrapper-radian.nix new file mode 100644 index 0000000000..a0a23222b5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/r-modules/wrapper-radian.nix @@ -0,0 +1,37 @@ +{ lib +, runCommand +, R +, radian +, makeWrapper +, recommendedPackages +, packages +, wrapR ? false +}: + +runCommand (radian.name + "-wrapper") { + preferLocalBuild = true; + allowSubstitutes = false; + + buildInputs = [ radian ] ++ recommendedPackages ++ packages + ++ lib.optional wrapR R; + + nativeBuildInputs = [ makeWrapper ]; + + passthru = { inherit recommendedPackages; }; + + meta = radian.meta // { + # To prevent builds on hydra + hydraPlatforms = [ ]; + # prefer wrapper over the package + priority = (radian.meta.priority or 0) - 1; + }; +} ('' + makeWrapper "${radian}/bin/radian" "$out/bin/radian" \ + --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" +'' + lib.optionalString wrapR '' + cd ${R}/bin + for exe in *; do + makeWrapper "${R}/bin/$exe" "$out/bin/$exe" \ + --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" + done +'') diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/with-packages/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/with-packages/default.nix index 5be820b60e..31573bce49 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/with-packages/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/with-packages/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildEnv, buildRubyGem, ruby, gemConfig, makeWrapper }: +{ stdenv, lib, buildEnv, buildRubyGem, ruby, gemConfig, makeBinaryWrapper }: /* Example usage: @@ -43,7 +43,7 @@ let wrappedRuby = stdenv.mkDerivation { name = "wrapped-${ruby.name}"; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; buildCommand = '' mkdir -p $out/bin for i in ${ruby}/bin/*; do @@ -54,7 +54,7 @@ let in stdenv.mkDerivation { name = "${ruby.name}-with-packages"; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; buildInputs = [ selected ruby ]; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/with-packages/test.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/with-packages/test.nix index ca2934b6f6..be652747c4 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/with-packages/test.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/with-packages/test.nix @@ -15,6 +15,22 @@ let pkgs.ruby.gems) // (import ./require_exceptions.nix); + testWrapper = ruby: stdenv.mkDerivation { + name = "test-wrappedRuby-${ruby.name}"; + buildInputs = [ ((ruby.withPackages (ps: [ ])).wrappedRuby) ]; + buildCommand = '' + cat <<'EOF' > test-ruby + #!/usr/bin/env ruby + puts RUBY_VERSION + EOF + + chmod +x test-ruby + patchShebangs test-ruby + [[ $(./test-ruby) = $(${ruby}/bin/ruby test-ruby) ]] + touch $out + ''; + }; + tests = ruby: lib.mapAttrs (name: gem: let @@ -39,7 +55,7 @@ let in stdenv.mkDerivation { name = "test-all-ruby-gems"; - buildInputs = builtins.foldl' (sum: ruby: sum ++ ( builtins.attrValues (tests ruby) )) [] rubyVersions; + buildInputs = builtins.foldl' (sum: ruby: sum ++ [ (testWrapper ruby) ] ++ ( builtins.attrValues (tests ruby) )) [] rubyVersions; buildCommand = '' touch $out ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix b/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix index 312afa557d..0ff47dae38 100644 --- a/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "5.0.14"; + version = "5.0.17"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-gd7aSBNhTO1ira76lL+1apLlXYXRfGWAbGAsJEUtEqw="; + sha256 = "sha256-UX7WqQt5inVldrXG3bIVmR8ucCvbHdyVLgQ/srhpCak="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/brakeman/Gemfile.lock b/third_party/nixpkgs/pkgs/development/tools/analysis/brakeman/Gemfile.lock index a2f6e818f0..cd37f43213 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/brakeman/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/brakeman/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - brakeman (5.4.0) + brakeman (5.4.1) PLATFORMS ruby @@ -10,4 +10,4 @@ DEPENDENCIES brakeman BUNDLED WITH - 2.3.25 + 2.4.6 diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/brakeman/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/brakeman/gemset.nix index 5798e37538..d3d827e507 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/brakeman/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/brakeman/gemset.nix @@ -4,9 +4,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lcxxlrzgpi9z2mr2v19xda6fdysmn5psa9bsp2rksa915v91fds"; + sha256 = "0wzvxpabnjwwjgr9s13965dbdgl3qfvwjbmhimh83p81bm5lsrnw"; type = "gem"; }; - version = "5.4.0"; + version = "5.4.1"; }; } 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 e9ce87dc08..39e49d979d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , python3 }: + let py = python3.override { packageOverrides = self: super: { @@ -10,21 +11,11 @@ let version = "1.5.0"; src = oldAttrs.src.override { inherit version; - sha256 = "06rn91n2izw7czncgql71w7acsa8wwni51njw0c6s8w4xas1arj9"; + hash = "sha256-SWYVtOqEI20Y4NKGEi3nSGmmDg+H4sfsZ4f/KGxINhs="; }; doCheck = false; }); - jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { - version = "3.2.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "sha256-yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo="; - }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - doCheck = false; - }); - }; }; in @@ -32,20 +23,26 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.1.20"; + version = "2.3.92"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; - rev = version; - hash = "sha256-dXpgm9S++jtBhuzX9db8Pm5LF6Qb4isXx5uyOGdWGUc="; + rev = "refs/tags/${version}"; + hash = "sha256-7Mr9mWnUuxfGJZVx845JHtIbWZeWStY/xbWUVjOcksM="; }; patches = [ ./flake8-compat-5.x.patch ]; + pythonRelaxDeps = [ + "bc-python-hcl2" + "pycep-parser" + "networkx" + ]; + nativeBuildInputs = with py.pkgs; [ pythonRelaxDepsHook setuptools-scm @@ -56,6 +53,8 @@ buildPythonApplication rec { aiohttp aiomultiprocess argcomplete + bc-detect-secrets + bc-jsonpath-ng bc-python-hcl2 boto3 cachetools @@ -65,14 +64,13 @@ buildPythonApplication rec { configargparse cyclonedx-python-lib deep_merge - detect-secrets docker dockerfile-parse dpath flake8 gitpython + igraph jmespath - jsonpath-ng jsonschema junit-xml networkx @@ -99,11 +97,6 @@ buildPythonApplication rec { responses ]; - pythonRelaxDeps = [ - "bc-python-hcl2" - "pycep-parser" - ]; - preCheck = '' export HOME=$(mktemp -d); ''; @@ -113,28 +106,39 @@ buildPythonApplication rec { "api_key" # Requires network access "TestSarifReport" - # Will probably be fixed in one of the next releases - "test_valid_cyclonedx_bom" - "test_record_relative_path_with" - "test_record_relative_path_with_relative_dir" - # Requires prettytable release which is only available in staging - "test_skipped_check_exists" - # AssertionError: 0 not greater than 0 "test_skip_mapping_default" - # Test is failing - "test_SQLServerAuditingEnabled" + # Flake8 test + "test_file_with_class" + "test_dataclass_skip" + "test_typing_class_skip" + # Tests are comparing console output + "cli" + "console" + # Starting to fail after 2.3.92 + "test_runner_verify_secrets_skip" ]; disabledTestPaths = [ # Tests are pulling from external sources # https://github.com/bridgecrewio/checkov/blob/f03a4204d291cf47e3753a02a9b8c8d805bbd1be/.github/workflows/build.yml "integration_tests/" + "tests/ansible/" + "tests/arm/" + "tests/bicep/" + "tests/cloudformation/" + "tests/common/" + "tests/dockerfile/" + "tests/generic_json/" + "tests/generic_yaml/" + "tests/github_actions/" + "tests/github/" + "tests/kubernetes/" + "tests/sca_package_2" "tests/terraform/" # Performance tests have no value for us "performance_tests/test_checkov_performance.py" - # Requires prettytable release which is only available in staging - "tests/sca_package/" - "tests/test_runner_filter.py" + # No Helm + "dogfood_tests/test_checkov_dogfood.py" ]; pythonImportsCheck = [ @@ -148,6 +152,7 @@ buildPythonApplication rec { meta = with lib; { description = "Static code analysis tool for infrastructure-as-code"; homepage = "https://github.com/bridgecrewio/checkov"; + changelog = "https://github.com/bridgecrewio/checkov/releases/tag/${version}"; longDescription = '' Prevent cloud misconfigurations during build-time for Terraform, Cloudformation, Kubernetes, Serverless framework and other infrastructure-as-code-languages. diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix index fb6372e491..60824f2601 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "10.8.0"; + version = "10.8.1"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-gWcenFKcqTDg1Ld3D40+dbw+cD4QO2JG/3Bcol2Aj6c="; + sha256 = "sha256-xVtouHBS5zR62WsPSn2mPlxce4Hn6JZLDwg2saCOrL0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix index 6c526cd1dc..b1d7813a3d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "2.10.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "danmar"; repo = "cppcheck"; rev = version; - hash = "sha256-tN7MYMRBakdL++ZeY2u9s2B2wyAU7iaOB/hsv2GXI6s="; + hash = "sha256-wr2O9EqDvHaMQwnjFLLtP1XxfUwFa/P6gGqYNNPVyaA="; }; buildInputs = [ pcre (python3.withPackages (ps: [ps.pygments])) ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix index 5c0a96e5d8..bbf91ec28f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix @@ -62,6 +62,10 @@ mkDerivation rec { mkdir -p 3rdparty/{perfparser,PrefixTickLabels}/.git ''; + qtWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ rustc-demangle ]}" + ]; + meta = with lib; { description = "A GUI for Linux perf"; longDescription = '' 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 14474f9955..cbd6a56439 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "radare2"; - version = "5.8.2"; + version = "5.8.4"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; - rev = version; - hash = "sha256-jwr3QPgJ6vKSk8yGxndQ69AickP8PorNDuGyJzHMpV4="; + rev = "refs/tags/${version}"; + hash = "sha256-Fbluq3Q/BgPwTVNKW28FJL+Ok46hDiBjwFt6KwN4anc="; }; preBuild = '' @@ -110,6 +110,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "UNIX-like reverse engineering framework and command-line tools"; homepage = "https://radare.org"; + changelog = "https://github.com/radareorg/radare2/releases/tag/${version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ azahi raskin makefu mic92 arkivm ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/tools/argc/default.nix b/third_party/nixpkgs/pkgs/development/tools/argc/default.nix index 5007428ab4..a6920dfe84 100644 --- a/third_party/nixpkgs/pkgs/development/tools/argc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/argc/default.nix @@ -2,26 +2,27 @@ rustPlatform.buildRustPackage rec { pname = "argc"; - version = "0.12.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "sigoden"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y6qXxnjep9AF3aAW6EZNx4dghMH3BSw8ExpNhTVH1QI="; + sha256 = "sha256-vvGeC+5dsO26ALfHoZ9+zVlpl+63Nj/VqtSBQo1Gl/c="; }; - cargoSha256 = "sha256-Wr+sUtxxdmY6l+sMAcQGR3Zmqvj8qybC74o9ipkwTMk="; + cargoSha256 = "sha256-A45txIc5AcJtWx6Jl4w7Ys2H3UgTjRsEiMySuUv9+Ds="; nativeBuildInputs = [ installShellFiles ]; postInstall = '' - installShellCompletion completions/argc.{bash,zsh} + installShellCompletion completions/argc.{bash,fish,zsh} ''; meta = with lib; { description = "A tool to handle sh/bash cli parameters"; homepage = "https://github.com/sigoden/argc"; + changelog = "https://github.com/sigoden/argc/releases/tag/v${version}"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/bacon/default.nix b/third_party/nixpkgs/pkgs/development/tools/bacon/default.nix index c336375d2d..8dc1825f71 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bacon/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/bacon/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-aCdVu9R1RGju05lAeXtm47ZroNOcqTSr/vYH6capcjs="; + hash = "sha256-EmkPH0TjLa9ouRjgv0IEyhqx5VaHR2TUQdqznKIKZdY="; }; - cargoHash = "sha256-uiKKyIy2IHDtHWJmG3G9UVHaASL9uEg5Zu+2Wj8mw0k="; + cargoHash = "sha256-vEged6GfcdcibCm4JX4/GIo1qbVtT+jX721+iLKOQsc="; - buildInputs = lib.optional stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/buf/default.nix b/third_party/nixpkgs/pkgs/development/tools/buf/default.nix index c5561b9b66..fdf763efb2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buf/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - hash = "sha256-63JWRyB586klWSQskBY/fDRTdXrQa15IygdZfmHpEqM="; + hash = "sha256-XiB8ZlbtzU66abM9zJotaMCrbYScqWmDv4ulEeQS6+g="; }; - vendorHash = "sha256-XRv8AnktIPR1emRdRMmDwOh7r3kNByy0REwZbg3NYPc="; + vendorHash = "sha256-bQKpy5xjUItgQ79r8TrMUOjo0Ze9E25glvOv312W1k0="; patches = [ # Skip a test that requires networking to be available to work. 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 2aff749ebc..a8d47b1a11 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 @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { + lib.optionalString isBootstrap "-boot" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.25.1"; + version = "3.25.2"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; - sha256 = "sha256-HFEdCVFq9JNpTtm68TxVlHo2OJZ01lei1eDM7caykdg="; + sha256 = "0g6k9sa23smh9z5dz8v6dqy89887gxc7s24gchpm7p9ip4ng49n0"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix index bb9be13ef0..c5253edb53 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix @@ -25,6 +25,9 @@ rustPlatform.buildRustPackage rec { substituteInPlace src/git.rs \ --replace 'std::process::Command::new("git")' \ 'std::process::Command::new("${git}/bin/git")' + substituteInPlace tests/lib.rs \ + --replace 'std::process::Command::new("git")' \ + 'std::process::Command::new("${git}/bin/git")' ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.4/0001-No-impure-bin-sh.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.4/0001-No-impure-bin-sh.patch new file mode 100644 index 0000000000..58ee2d6fe0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.4/0001-No-impure-bin-sh.patch @@ -0,0 +1,35 @@ +From e00a5257a6ca5fedbf68b09eee7df3502971a057 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Sat, 24 Apr 2021 10:11:40 +0200 +Subject: [PATCH 1/2] No impure bin sh + +default_shell is used to populuate default shell used to execute jobs. +Unless SHELL is set to a different value this would be /bin/sh. +Our stdenv provides sh in form of bash anyway. Having this value not +hard-coded has some advantages: + +- It would ensure that on all systems it uses sh from its PATH rather + than /bin/sh, which helps as different systems might have different + shells there (bash vs. dash) +- In the past I had issues with LD_PRELOAD with BEAR, where /bin/sh + used a different glibc than BEAR which came from my development shell. +--- + src/job.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/job.c b/src/job.c +index ae1f18b..6b4ddb3 100644 +--- a/src/job.c ++++ b/src/job.c +@@ -77,7 +77,7 @@ char * vms_strsignal (int status); + + #else + +-const char *default_shell = "/bin/sh"; ++const char *default_shell = "sh"; + int batch_mode_shell = 0; + + #endif +-- +2.31.1 + diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.4/0002-remove-impure-dirs.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.4/0002-remove-impure-dirs.patch new file mode 100644 index 0000000000..e62aee7d99 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.4/0002-remove-impure-dirs.patch @@ -0,0 +1,40 @@ +From 795d63d3c8b5c0dbb7e544954f75507b371b7228 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Sat, 24 Apr 2021 10:20:16 +0200 +Subject: [PATCH 2/2] remove impure dirs + +--- + src/read.c | 3 --- + src/remake.c | 2 -- + 2 files changed, 5 deletions(-) + +diff --git a/src/read.c b/src/read.c +index fa197fb..defacfb 100644 +--- a/src/read.c ++++ b/src/read.c +@@ -109,9 +109,6 @@ static const char *default_include_directories[] = + #endif + INCLUDEDIR, + #ifndef _AMIGA +- "/usr/gnu/include", +- "/usr/local/include", +- "/usr/include", + #endif + 0 + }; +diff --git a/src/remake.c b/src/remake.c +index fb237c5..94bff7d 100644 +--- a/src/remake.c ++++ b/src/remake.c +@@ -1601,8 +1601,6 @@ library_search (const char *lib, FILE_TIMESTAMP *mtime_ptr) + static const char *dirs[] = + { + #ifndef _AMIGA +- "/lib", +- "/usr/lib", + #endif + #if defined(WINDOWS32) && !defined(LIBDIR) + /* +-- +2.31.1 + diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.4/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.4/default.nix new file mode 100644 index 0000000000..3057a0a4d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.4/default.nix @@ -0,0 +1,75 @@ +{ lib +, stdenv +, fetchurl +, guileSupport ? false, guile +# avoid guile depend on bootstrap to prevent dependency cycles +, inBootstrap ? false +, pkg-config +, gnumake +}: + +let + guileEnabled = guileSupport && !inBootstrap; +in + +stdenv.mkDerivation rec { + pname = "gnumake"; + version = "4.4"; + + src = fetchurl { + url = "mirror://gnu/make/make-${version}.tar.gz"; + hash = "sha256-WB9NToctp0s5Qch0IViYp9NYAvA3Mr3M7h1KeXkQXRg="; + }; + + # to update apply these patches with `git am *.patch` to https://git.savannah.gnu.org/git/make.git + patches = [ + # Replaces /bin/sh with sh, see patch file for reasoning + ./0001-No-impure-bin-sh.patch + # Purity: don't look for library dependencies (of the form `-lfoo') in /lib + # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for + # included Makefiles, don't look in /usr/include and friends. + ./0002-remove-impure-dirs.patch + ]; + + nativeBuildInputs = lib.optionals guileEnabled [ pkg-config ]; + buildInputs = lib.optionals guileEnabled [ guile ]; + + configureFlags = lib.optional guileEnabled "--with-guile" + + # Make uses this test to decide whether it should keep track of + # subseconds. Apple made this possible with APFS and macOS 10.13. + # However, we still support macOS 10.11 and 10.12. Binaries built + # in Nixpkgs will be unable to use futimens to set mtime less than + # a second. So, tell Make to ignore nanoseconds in mtime here by + # overriding the autoconf test for the struct. + # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion. + ++ lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; + + outputs = [ "out" "man" "info" ]; + separateDebugInfo = true; + + passthru.tests = { + # make sure that the override doesn't break bootstrapping + gnumakeWithGuile = gnumake.override { guileSupport = true; }; + }; + + meta = with lib; { + description = "A tool to control the generation of non-source files from sources"; + longDescription = '' + Make is a tool which controls the generation of executables and + other non-source files of a program from the program's source files. + + Make gets its knowledge of how to build your program from a file + called the makefile, which lists each of the non-source files and + how to compute it from other files. When you write a program, you + should write a makefile for it, so that it is possible to use Make + to build and install the program. + ''; + homepage = "https://www.gnu.org/software/make/"; + + license = licenses.gpl3Plus; + maintainers = [ maintainers.vrthra ]; + mainProgram = "make"; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix index add4fd0d35..774ea50f86 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix @@ -14,11 +14,11 @@ in stdenv.mkDerivation rec { pname = "gnumake"; - version = "4.4"; + version = "4.4.1"; src = fetchurl { url = "mirror://gnu/make/make-${version}.tar.gz"; - sha256 = "sha256-WB9NToctp0s5Qch0IViYp9NYAvA3Mr3M7h1KeXkQXRg="; + sha256 = "sha256-3Rb7HWe/q3mnL16DkHNcSePo5wtJRaFasfgd23hlj7M="; }; # to update apply these patches with `git am *.patch` to https://git.savannah.gnu.org/git/make.git diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix index 5f92214d40..9af80afd11 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix @@ -127,9 +127,9 @@ rec { # https://docs.gradle.org/current/userguide/compatibility.html gradle_7 = gen { - version = "7.6"; + version = "7.6.1"; nativeVersion = "0.22-milestone-24"; - sha256 = "0jwycvzv8a5v2bhg5d8zccr2csr3sf9y5mrr9d2ap44p09a8r9kv"; + sha256 = "11qz1xjfihnlvsblqqnd49kmvjq86pzqcylj6k1zdvxl4dd60iv1"; defaultJava = jdk17; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix index 11c0d85ee4..1455dc38e6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.11.2"; + version = "0.11.4"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-P1hu60vjJJASWxgc9LOwdy7psqgIHi8Z/D5c++TProY="; + hash = "sha256-/9gP8ciHeFKjO0VAKXDor19Wm6wULLVlFYbHUYWFpWY="; }; vendorHash = null; @@ -23,7 +23,7 @@ buildGoModule rec { description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit"; homepage = "https://github.com/moby/buildkit"; license = licenses.asl20; - maintainers = with maintainers; [ vdemeester marsam ]; + maintainers = with maintainers; [ vdemeester marsam developer-guy ]; mainProgram = "buildctl"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/cambalache/default.nix b/third_party/nixpkgs/pkgs/development/tools/cambalache/default.nix index e2e7157425..43a5778ff9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cambalache/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cambalache/default.nix @@ -57,15 +57,16 @@ python3.pkgs.buildPythonApplication rec { libhandy ]; - # Not compatible with gobject-introspection setup hooks. - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - # Prevent double wrapping. dontWrapGApps = true; postPatch = '' patchShebangs postinstall.py + # those programs are used at runtime not build time + # https://gitlab.gnome.org/jpu/cambalache/-/blob/main/meson.build#L79-80 + substituteInPlace ./meson.build \ + --replace "find_program('broadwayd', required: true)" "" \ + --replace "find_program('gtk4-broadwayd', required: true)" "" ''; preFixup = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix b/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix index 45246f7dfe..029f0abf9f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.21.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DcR5pofMcV2Y5qVA2h3I5h/1qS25+deVAUQWIMLu/KI="; + hash = "sha256-q1/BPJkoLjNbk6OTd+VDmRX7zjDXr8vKWme7csG9xN8="; }; - vendorSha256 = "sha256-GRHyoKv05JRZiY0g3Xd11liDYPcA6rfE8vorZRCV1wI="; + vendorHash = "sha256-MQjUajAE9ST8mwbmfwTMBOkhyqPe7pS0yQimFaBn50U="; ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/coder/default.nix b/third_party/nixpkgs/pkgs/development/tools/coder/default.nix index e5f017de1e..a96cf652df 100644 --- a/third_party/nixpkgs/pkgs/development/tools/coder/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/coder/default.nix @@ -1,8 +1,18 @@ -{ buildGoModule +{ lib , fetchFromGitHub , installShellFiles -, lib +, makeWrapper +, buildGoModule +, fetchYarnDeps +, fixup_yarn_lock +, pkg-config +, nodejs +, yarn +, nodePackages +, python3 +, terraform }: + buildGoModule rec { pname = "coder"; version = "0.17.1"; @@ -14,18 +24,59 @@ buildGoModule rec { hash = "sha256-FHBaefwSGZXwn1jdU7zK8WhwjarknvyeUJTlhmk/hPM="; }; - # integration tests require network access - doCheck = false; + offlineCache = fetchYarnDeps { + yarnLock = src + "/site/yarn.lock"; + hash = "sha256-nRmEXR9fjDxvpbnT+qpGeM0Cc/qW/kN53sKOXwZiBXY="; + }; + + subPackages = [ "cmd/..." ]; vendorHash = "sha256-+AvmJkZCFovE2+5Lg98tUvA7f2kBHUMzhl5IyrEGuy8="; - nativeBuildInputs = [ installShellFiles ]; + # integration tests require network access + doCheck = false; + + ldflags = [ + "-s" + "-w" + "-X github.com/coder/coder/buildinfo.tag=${version}" + ]; + + preBuild = '' + export HOME=$TEMPDIR + + pushd site + yarn config --offline set yarn-offline-mirror ${offlineCache} + fixup_yarn_lock yarn.lock + + # node-gyp tries to download always the headers and fails: https://github.com/NixOS/nixpkgs/issues/195404 + yarn remove --offline jest-canvas-mock canvas + + NODE_ENV=production node node_modules/.bin/vite build + + popd + ''; + + tags = [ "embed" ]; + + nativeBuildInputs = [ + fixup_yarn_lock + installShellFiles + makeWrapper + nodePackages.node-pre-gyp + nodejs + pkg-config + python3 + yarn + ]; postInstall = '' installShellCompletion --cmd coder \ --bash <($out/bin/coder completion bash) \ --fish <($out/bin/coder completion fish) \ --zsh <($out/bin/coder completion zsh) + + wrapProgram $out/bin/coder --prefix PATH : ${lib.makeBinPath [ terraform ]} ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/codespell/default.nix b/third_party/nixpkgs/pkgs/development/tools/codespell/default.nix index 8315aa20aa..b049701581 100644 --- a/third_party/nixpkgs/pkgs/development/tools/codespell/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/codespell/default.nix @@ -6,18 +6,18 @@ python3.pkgs.buildPythonApplication rec { pname = "codespell"; - version = "2.2.2"; + version = "2.2.4"; format = "pyproject"; src = fetchFromGitHub { owner = "codespell-project"; repo = "codespell"; rev = "v${version}"; - sha256 = "sha256-zXHqaZzGIS7BOFc/kPzA4sgpoEmXuaKHdOcKpMWWeOI="; + sha256 = "sha256-hyTy6zAH5WrW5Jn/g0irH9xGZErnXJMSUYZaNxMvq2Y="; }; postPatch = '' - substituteInPlace setup.cfg \ + substituteInPlace pyproject.toml \ --replace "--cov=codespell_lib" "" \ --replace "--cov-report=" "" ''; 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 e6b22a99bd..36931247d1 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 @@ -15,13 +15,13 @@ }: buildDotnetModule rec { pname = "github-runner"; - version = "2.302.1"; + version = "2.303.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-hPZzqTJGwcBxajLjU0TuIQ2KLnDl9E66seuutm9JWDo="; + hash = "sha256-gGIYlYM4Rf7Ils2rThsQHWIkLDt5Htg4NDuJhxvl1rU="; # Required to obtain HEAD's Git commit hash leaveDotGit = true; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 9a101323fb..6dad681809 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "15.9.0"; + version = "15.9.1"; in buildGoModule rec { inherit version; @@ -23,7 +23,7 @@ buildGoModule rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-wdeH1/1FNG1vwmSmXo7KjhxfQTmQk9lNAxVNoUKlLi4="; + sha256 = "sha256-J8wcTU2bilhEKwOAVgaJk743b66TLndYOxc1k+S/cBg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix index bbfe942d85..b09bbe7e5d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { simple API and more. ''; license = licenses.mit; - maintainers = with maintainers; [ ken-matsui ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; }) 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 baa7ebf562..385be71d82 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.16.2"; + version = "2.0.1"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "sha256-5hjAP2+0hbYcA9G7YJyRqqp1ZC8LzFDomjeFjl4z4FY="; + sha256 = "sha256-zARaxjzVTi90BkwPOyfGYk3mBHRoAGMOe2LPlJB4Mvo="; }; - vendorHash = "sha256-7fC1jJMY/XK+GX5t2/o/k+EjFxAlRAmiemMcWaZhL9o="; + vendorHash = "sha256-NZ2HVFViU8Vzwyo33cueNJwdCT4exZlB7g4WgoWKZBE="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pgsync/Gemfile.lock b/third_party/nixpkgs/pkgs/development/tools/database/pgsync/Gemfile.lock index 9c69271360..e27726b69d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/pgsync/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/tools/database/pgsync/Gemfile.lock @@ -2,13 +2,13 @@ GEM remote: https://rubygems.org/ specs: parallel (1.22.1) - pg (1.4.5) - pgsync (0.7.3) + pg (1.4.6) + pgsync (0.7.4) parallel pg (>= 0.18.2) - slop (>= 4.8.2) + slop (>= 4.10.1) tty-spinner - slop (4.10.0) + slop (4.10.1) tty-cursor (0.7.1) tty-spinner (0.9.3) tty-cursor (~> 0.7) @@ -20,4 +20,4 @@ DEPENDENCIES pgsync BUNDLED WITH - 2.3.7 + 2.4.6 diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pgsync/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/database/pgsync/gemset.nix index 3224efedfc..a18ec0613f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/pgsync/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/pgsync/gemset.nix @@ -14,10 +14,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1"; + sha256 = "07m6lxljabw9kyww5k5lgsxsznsm1v5l14r1la09gqka9b5kv3yr"; type = "gem"; }; - version = "1.4.5"; + version = "1.4.6"; }; pgsync = { dependencies = ["parallel" "pg" "slop" "tty-spinner"]; @@ -25,20 +25,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18misp6iwjr3cd4jzhbnf2q058gnkxx27jx1b87z6p64bwkgr3x2"; + sha256 = "1f2lzsa7l88skp18f8w1ch9w8a42pymc48rdaqjrrdgg0126kvj3"; type = "gem"; }; - version = "0.7.3"; + version = "0.7.4"; }; slop = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "052mhd76f4dshc36f2bd5pp807lgnaj5i6ai8jg075384wcfhcpb"; + sha256 = "1iyrjskgxyn8i1679qwkzns85p909aq77cgx2m4fs5ygzysj4hw4"; type = "gem"; }; - version = "4.10.0"; + version = "4.10.1"; }; tty-cursor = { groups = ["default"]; 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 256178e7a9..1bbeee4f55 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "1.4.5"; + version = "2.0.0"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Kc0doBR2iOy54arxOYXH5eHlcM7pXFVUqedopsZH8rE="; + hash = "sha256-2WKRB4mMiML7POCAd9G0IROTKujcsJT591h1bmSX63E="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/development/tools/datree/default.nix b/third_party/nixpkgs/pkgs/development/tools/datree/default.nix index 83e9d2d987..ec8dcf94a6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/datree/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/datree/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "datree"; - version = "1.8.33"; + version = "1.8.39"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = "refs/tags/${version}"; - hash = "sha256-pyu8umkR8ncDVkSLJbxqnLFRlZQR29GnkCSxDNHQUGg="; + hash = "sha256-kTN1c16AIXnnSi1lN378u/kmuC1axZT2LAOH+LGLVbA="; }; vendorHash = "sha256-mkVguYzjNGgFUdATjGfenCx3h97LS3SEOkYo3CuP9fA="; diff --git a/third_party/nixpkgs/pkgs/development/tools/dump_syms/default.nix b/third_party/nixpkgs/pkgs/development/tools/dump_syms/default.nix index 7dea51ef56..6929150c8e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dump_syms/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dump_syms/default.nix @@ -16,7 +16,7 @@ let pname = "dump_syms"; - version = "2.2.0"; + version = "2.2.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -25,10 +25,10 @@ rustPlatform.buildRustPackage { owner = "mozilla"; repo = pname; rev = "v${version}"; - hash = "sha256-rbpZXLtBPD77jZ+P6ljtrSfKYfhMUdsP/Eoi0cYxsqo="; + hash = "sha256-YzGFzmAGHev3gM6+l0sC+nCdyEYZI2G30U1JBrZ2uSU="; }; - cargoSha256 = "sha256-UUyoiyA9ykUnFavsAqo7gNMSYpQ9Lu29t4fn1oLj6gs="; + cargoSha256 = "sha256-gWLd1MUpCeVRUgzqkA5USmlYDq8BmmB/EQfiFl9JsjA="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/development/tools/fq/default.nix b/third_party/nixpkgs/pkgs/development/tools/fq/default.nix index 3a66004bc3..3506c66810 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fq/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "fq"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${version}"; - sha256 = "sha256-tMlHhfPocm+n2aHG/XXbhElwPau8IHxEm6IrYaszcNQ="; + hash = "sha256-2Sif6LUv99u/R4SrvsJoJ08aS5G/o34IC+4qAoRvX/g="; }; - vendorSha256 = "sha256-kfJfEvMHaPyDK9qkZVP07NByALxVwPcAKs9Kab6v4NE="; + vendorHash = "sha256-8YJ52stnRHyTfiEHVvUgzLMd14WHI5ZeNAPk77oXSlA="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/gemstash/default.nix b/third_party/nixpkgs/pkgs/development/tools/gemstash/default.nix index 13ab213c15..ce8fde604a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gemstash/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gemstash/default.nix @@ -1,11 +1,14 @@ -{ lib, bundlerApp, bundlerUpdateScript }: +{ lib, bundlerApp, bundlerUpdateScript, nixosTests }: bundlerApp rec { pname = "gemstash"; gemdir = ./.; exes = [ pname ]; - passthru.updateScript = bundlerUpdateScript pname; + passthru = { + updateScript = bundlerUpdateScript pname; + tests = { inherit (nixosTests) gemstash; }; + }; meta = with lib; { description = "A cache for RubyGems.org and a private gem server"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix b/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix index 8bfce4a9af..69c04dc5e6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-91Mi8BU2xMHckzEGahIOd/FWPwzhkSPFOQdEA66mKYw="; + sha256 = "sha256-ew0O+xuRsIrjxJxmdYegbYjcXeEmpL00fJS43jyGIEg="; }; - vendorHash = "sha256-GuqIYbgPt/noFBsa+P7oE1U+M+H/OiV0Gz7wJXHcEQ4="; + vendorHash = "sha256-nz32DPm0Sg13ScAeXUYagXvxhpRm+L+rvvY0gE1L584="; # integration tests expect more file changes # types tests are missing CodeLocation diff --git a/third_party/nixpkgs/pkgs/development/tools/github/cligh/default.nix b/third_party/nixpkgs/pkgs/development/tools/github/cligh/default.nix index ce340239ac..426a9735a9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/github/cligh/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/github/cligh/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }: +{ lib, fetchFromGitHub, buildPythonApplication, pyxdg, pygithub }: buildPythonApplication rec { pname = "cligh"; @@ -13,7 +13,7 @@ buildPythonApplication rec { sha256 = "0d1fd78rzl2n75xpmy1gnxh1shvcs4qm0j4qqszqvfriwkg2flxn"; }; - propagatedBuildInputs = [ pyxdg PyGithub ]; + propagatedBuildInputs = [ pyxdg pygithub ]; meta = with lib; { homepage = "http://the-brannons.com/software/cligh.html"; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix index a802490269..118c8f52f7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, go-mockery, runCommand, go }: buildGoModule rec { pname = "go-mockery"; @@ -24,6 +24,37 @@ buildGoModule rec { vendorHash = "sha256-3lx3wHnPQ/slRXnlVAnI1ZqSykDXNivjwg1WUITGj64="; + passthru.tests = { + generateMock = runCommand "${pname}-test" { + nativeBuildInputs = [ go-mockery ]; + buildInputs = [ go ]; + } '' + if [[ $(mockery --version) != *"${version}"* ]]; then + echo "Error: program version does not match package version" + exit 1 + fi + + export HOME=$TMPDIR + + cat < foo.go + package main + + type Foo interface { + Bark() string + } + EOF + + mockery --name Foo --dir . + + if [[ ! -f "mocks/Foo.go" ]]; then + echo "Error: mocks/Foo.go was not generated by ${pname}" + exit 1 + fi + + touch $out + ''; + }; + meta = with lib; { homepage = "https://github.com/vektra/mockery"; description = "A mock code autogenerator for Golang"; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-protobuf/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-protobuf/default.nix index 00e62c87cb..42b4fbe1d3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-protobuf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-protobuf"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "golang"; repo = "protobuf"; rev = "v${version}"; - sha256 = "sha256-E/6Qh8hWilaGeSojOCz8PzP9qnVqNG2DQLYJUqN3BdY="; + sha256 = "sha256-cRB4oicBfYvhqtzafWWmf82AuvSnB0NhHwpp0pjgwQ0="; }; - vendorSha256 = "sha256-CcJjFMslSUiZMM0LLMM3BR53YMxyWk8m7hxjMI9tduE="; + vendorHash = "sha256-CcJjFMslSUiZMM0LLMM3BR53YMxyWk8m7hxjMI9tduE="; meta = with lib; { homepage = "https://github.com/golang/protobuf"; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix index e52c36cf39..719743c076 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.21.0"; + version = "3.22.0"; src = fetchFromGitHub { owner = pname; repo = "task"; - rev = "v${version}"; - sha256 = "sha256-w46fCcUKMtmiFVSMSzgsegWBZUcTaMgOkhu9HnfYHf4="; + rev = "refs/tags/v${version}"; + hash = "sha256-SmO59VXuQZISDNJy2d6qhQv1QCxm0WodqPx2qHhCs80="; }; - vendorHash = "sha256-YC2C0/ayl0Rp8brzLLcdLB98BmhH7sP7EzLVdOIGAvQ="; + vendorHash = "sha256-TsFPpN/X5pO4KALbqsHCa6YxYtaXMVqB5ENaIEfTWRo="; doCheck = false; @@ -32,6 +32,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://taskfile.dev/"; description = "A task runner / simpler Make alternative written in Go"; + changelog = "https://github.com/go-task/task/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ parasrah ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/hatch/default.nix b/third_party/nixpkgs/pkgs/development/tools/hatch/default.nix index f7604220f3..026aa6f2fc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hatch/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hatch/default.nix @@ -63,6 +63,8 @@ python3.pkgs.buildPythonApplication rec { "test_editable_pth" # AssertionError: assert len(extract_installed_requirements(output.splitlines())) > 0 "test_creation_allow_system_packages" + # Formatting changes with pygments 2.14.0 + "test_create_necessary_directories" ] ++ lib.optionals stdenv.isDarwin [ # https://github.com/NixOS/nixpkgs/issues/209358 "test_scripts_no_environment" diff --git a/third_party/nixpkgs/pkgs/development/tools/hclfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/hclfmt/default.nix index 002d9b9548..63042f8c38 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hclfmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hclfmt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hclfmt"; - version = "2.16.1"; + version = "2.16.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcl"; rev = "v${version}"; - hash = "sha256-EsqOpVCsn0bD0BAOoFifH1hfEF8Wu8bUpM0/BSXAewY="; + hash = "sha256-7RHRUIZhF6UOZDi85HAzQhzD7c8Y4aPjt4Ly3KUM26k="; }; vendorHash = "sha256-QZzDFVAmmjkm7n/KpMxDMAjShKiVVGZbZB1W3/TeVjs="; diff --git a/third_party/nixpkgs/pkgs/development/tools/jaq/default.nix b/third_party/nixpkgs/pkgs/development/tools/jaq/default.nix index 794affe443..1ba8a37a3b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jaq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jaq/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jaq"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "01mf02"; repo = "jaq"; rev = "v${version}"; - sha256 = "sha256-Y1QLNiAeHKYsSbFW235mdTiHyQFBQQsO+FtuFxDX9Hs="; + sha256 = "sha256-v3dC5Qi0Op+oFCcbkbK1ZUQxWTEYVvXsc+ye9Kk9y7c="; }; - cargoSha256 = "sha256-+9uy5R/dO2T/6dRhtYlPCKfosaYua0JvbECvMacc3XA="; + cargoHash = "sha256-N3zlaoBPVK4xI+t3F+NXz0DhqIOoE3lh3FftToACeZM="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/jql/default.nix b/third_party/nixpkgs/pkgs/development/tools/jql/default.nix index 6db7a1696a..eea6701b6b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jql/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jql/default.nix @@ -1,21 +1,25 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib +, fetchFromGitHub +, rustPlatform +}: rustPlatform.buildRustPackage rec { pname = "jql"; - version = "5.1.7"; + version = "5.2.0"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-V7JLoXYhCCh2XfNE7ry/us4b/NsoieFls88ewuyrN08="; + rev = "refs/tags/v${version}"; + hash = "sha256-gFPN3aSukh0QMfGLn65icf5ZyYb8Y+r+GMdG2gm2InY="; }; - cargoHash = "sha256-+H9KlzrVZSAfzmdw3chJYHg2fbctIs9xCIqHk4ZJzOM="; + cargoHash = "sha256-XJW0TDRJdLwgWDm5ZBSCUj5VS5ZowGCr6tHV0MpZuvI="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; homepage = "https://github.com/yamafaktory/jql"; + changelog = "https://github.com/yamafaktory/jql/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ akshgpt7 ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/kafkactl/default.nix b/third_party/nixpkgs/pkgs/development/tools/kafkactl/default.nix index 750e93f665..e52eda11bb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kafkactl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kafkactl/default.nix @@ -1,21 +1,26 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "kafkactl"; - version = "3.0.3"; + version = "3.1.0"; src = fetchFromGitHub { owner = "deviceinsight"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-rz3cAA5iqhrCZhLc+RKZhudiMlfu3m6wWYNHAnUP/kg="; + rev = "refs/tags/v${version}"; + hash = "sha256-H6oSkPQx5bk9VBBoeGVg0Ri5LTCv96tR4Vq4guymAbQ="; }; vendorHash = "sha256-Y3BPt3PsedrlCoKiKUObf6UQd+MuNiCGLpJUg94XSgA="; + doCheck = false; meta = with lib; { - inherit (src.meta) homepage; + homepage = "https://github.com/deviceinsight/kafkactl"; + changelog = "https://github.com/deviceinsight/kafkactl/blob/v${version}/CHANGELOG.md"; description = "Command Line Tool for managing Apache Kafka"; longDescription = '' A command-line interface for interaction with Apache Kafka. diff --git a/third_party/nixpkgs/pkgs/development/tools/ko/default.nix b/third_party/nixpkgs/pkgs/development/tools/ko/default.nix index 447b7ba698..eb916e3318 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ko/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ko/default.nix @@ -7,14 +7,15 @@ buildGoModule rec { pname = "ko"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "ko-build"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hhPV40e5wB2/VcdigqgjffDW4X1ZDddXTZiCUBijtHQ="; + sha256 = "sha256-KVJqqvp46BAUscG5Xj/g4ThUXKFsuJdzEB++uBskFiw="; }; + vendorSha256 = null; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/konstraint/default.nix b/third_party/nixpkgs/pkgs/development/tools/konstraint/default.nix index a613e421a6..bd679d79a9 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.25.1"; + version = "0.26.0"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KOl1K6XSublOxaCE89QXIRESyBrfgrJnVkaaC76ld1E="; + sha256 = "sha256-xxNDzg+cnN6Sl8xNVgyLMPTy98r8SFjc5gQ3OT3FGwM="; }; - vendorHash = "sha256-t306WYXPVXHqp6Ixd02QTVSLJ8VI57FA1KwMDW/JSeg="; + vendorHash = "sha256-EHYsaE18C6UUX/d694hfczY054vP1xB/2Qc5PHxbra0="; # Exclude go within .github folder excludedPackages = ".github"; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix index 23946af16f..969fda1d15 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lua-language-server"; - version = "3.6.13"; + version = "3.6.17"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-9TFTmTjj6FfPTfcgnQaHFYUtoM1VUMSpD7Yxk/Oeul0="; + sha256 = "sha256-/AvyiE9r7aEPRDc486CER4B5/9NWh7BhI3y3ieDMxQU="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/nil/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/nil/default.nix index 866293aba8..7a25b50aae 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/nil/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/nil/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nil"; - version = "2023-03-01"; + version = "2023-03-11"; src = fetchFromGitHub { owner = "oxalica"; repo = pname; rev = version; - hash = "sha256-HGd/TV8ZHVAVBx+ndrxAfS/Nz+VHOQjNWjtKkkgYkqA="; + hash = "sha256-5WEdrN+ABrNOdfQc2k2mf+fj+ZvZR1Dp/PtypEdlFWA="; }; - cargoHash = "sha256-A6Go1OYAaoDvQtAcK5BL5Tz00iLPOft0VLH6usWtb9g="; + cargoHash = "sha256-ISkw0lhUKJG8nWUHcR93sLUFt5dDEyK7EORcOXEmVbE="; CFG_RELEASE = version; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/vala-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/vala-language-server/default.nix index 6c7ebabe63..71fa107afc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/vala-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/vala-language-server/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { ninja pkg-config scdoc + ] ++ lib.optionals stdenv.isLinux [ # GNOME Builder Plugin gnome-builder ]; @@ -61,6 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/vala-lang/vala-language-server"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ andreasfelix ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/marksman/default.nix b/third_party/nixpkgs/pkgs/development/tools/marksman/default.nix index d31268f9ce..3007e648bf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/marksman/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/marksman/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "marksman"; - version = "2023-01-29"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "artempyanykh"; repo = "marksman"; rev = version; - sha256 = "sha256-UPPO4ueu7gMR7a573M2/xT3N0QgRSNBshJAqoyXEZpc="; + sha256 = "sha256-jBZC2z1wtDMIssgRrKkZpl9NQ3XkRCcxo5eylwB2OBQ="; }; projectFile = "Marksman/Marksman.fsproj"; diff --git a/third_party/nixpkgs/pkgs/development/tools/mdk/default.nix b/third_party/nixpkgs/pkgs/development/tools/mdk/default.nix index 30ae23e85a..7345540b51 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mdk/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "gnu-mdk"; version = "1.3.0"; src = fetchurl { - url = "mirror://gnu/gnu/mdk/v${version}/mdk-${version}.tar.gz"; + url = "mirror://gnu/mdk/v${version}/mdk-${version}.tar.gz"; sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb"; }; nativeBuildInputs = [ pkg-config intltool ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/metal-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/metal-cli/default.nix index f6d5103745..002caa296f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/metal-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/metal-cli/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "metal-cli"; - version = "0.13.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - hash = "sha256-v+8zfNV93nrRSwfn1u7SNYv7WYY74R8nPJFmreDb7i4="; + hash = "sha256-CibqkT4YHxQ7geUKROp7SMvamN0ba/FqTXFHO1TUP/k="; }; - vendorHash = "sha256-drsNZXLNUWICLI8D+IvJE4X8GmWrP9U3dmpf9HnKCWw="; + vendorHash = "sha256-4hjrKlpd+gr/yLRuSq8XrOVl76uYVIMfYjTAgqkbOSw="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix b/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix index 563a2e7fd3..6c0d5eb8e6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "3.8.6"; + version = "3.8.7"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-hnECB/tqyEN0g3WIIEHg2uAzEmspB+TQUTECyOtUNy4="; + sha256 = "sha256-k0elIvsaKnVkerBUmRSEwbP+tl4sEKfzeoWkc4uYWvg="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/acr/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/acr/default.nix index afa2b950bf..14884f22af 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/acr/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/acr/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation (self: { pname = "acr"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "radareorg"; repo = "acr"; rev = self.version; - hash = "sha256-ma4KhwGFlLCfRQvQ11OdyovgGbKQUBo6qVRrE7V2pNo="; + hash = "sha256-JReYgIqQISQuLPd4pUbqbKtBOXT0/YJCn9czz2VTVBs="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix index 6bd622a6e7..8d5a5efb20 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.13.2"; + version = "2.14.0"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "1/O1n0nO+adY7KNVnz6xkESyODiLw61x68xE84EKW+I="; + sha256 = "PrKJlxJhMX9ZgUGPIQFmAi7PMdcZKTuIuCUEunlYq+I="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "fy3i++HpGuKH9ijPY61O66PhFyORIpjkZV++75H5738="; + sha256 = "F1ners+2TVfhiIlmUSMRX7/nLVg5fEw5z6mW3kyHDnE="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "zO3KWbrudhCGpbdCUBRWQkK/snvDdUOxKF9ukZC+vno="; + sha256 = "ux/Yc03XCZkEfnsBuY9SqhnDIESbVzuyo0OF0Mbhc44="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "Sqn5tFpvlF9LbUyC1i38BsyM9B+MOmykt+5COMhuO1A="; + sha256 = "JXQpLnRFZNxfwE+kpzYGTiB1/gsS/lzDEIwMT88oj5U="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "9vrrBiz744s1W5FV7QO8QKL7pfK6OGPinnSOJSvMIOk="; + sha256 = "TdYMAy2lkwA+IYKriw9d+qXSv7+Pbi9ap/M5/3DnhPw="; }; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix index cad25a942d..df12d6c2c7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix @@ -13,15 +13,15 @@ , nix-update-script }: -let ccache = stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ccache"; - version = "4.7.4"; + version = "4.8"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-mt5udwSdzGaspfpAdUavQ55dBeJdhbZjcQpd9xNOQms="; + owner = "ccache"; + repo = "ccache"; + rev = "refs/tags/v${finalAttrs.version}"; + sha256 = "sha256-X7Pv+yEQaKPdWTiKq67kSAyimyKvLSCYr4EjLlw+J0U="; }; outputs = [ "out" "man" ]; @@ -53,25 +53,27 @@ let ccache = stdenv.mkDerivation rec { bashInteractive ] ++ lib.optional stdenv.isDarwin xcodebuild; - checkPhase = let - badTests = [ - "test.trim_dir" # flaky on hydra (possibly filesystem-specific?) - ] ++ lib.optionals stdenv.isDarwin [ - "test.basedir" - "test.multi_arch" - "test.nocpp2" - ]; - in '' - runHook preCheck - export HOME=$(mktemp -d) - ctest --output-on-failure -E '^(${lib.concatStringsSep "|" badTests})$' - runHook postCheck - ''; + checkPhase = + let + badTests = [ + "test.trim_dir" # flaky on hydra (possibly filesystem-specific?) + ] ++ lib.optionals stdenv.isDarwin [ + "test.basedir" + "test.multi_arch" + "test.nocpp2" + ]; + in + '' + runHook preCheck + export HOME=$(mktemp -d) + ctest --output-on-failure -E '^(${lib.concatStringsSep "|" badTests})$' + runHook postCheck + ''; passthru = { # A derivation that provides gcc and g++ commands, but that # will end up calling ccache for the given cacheDir - links = {unwrappedCC, extraConfig}: stdenv.mkDerivation { + links = { unwrappedCC, extraConfig }: stdenv.mkDerivation { name = "ccache-links"; passthru = { isClang = unwrappedCC.isClang or false; @@ -85,7 +87,7 @@ let ccache = stdenv.mkDerivation rec { wrap() { local cname="$1" if [ -x "${unwrappedCC}/bin/$cname" ]; then - makeWrapper ${ccache}/bin/ccache $out/bin/$cname \ + makeWrapper ${finalAttrs.finalPackage}/bin/ccache $out/bin/$cname \ --run ${lib.escapeShellArg extraConfig} \ --add-flags ${unwrappedCC}/bin/$cname fi @@ -108,17 +110,19 @@ let ccache = stdenv.mkDerivation rec { done ''; }; - }; - passthru.updateScript = nix-update-script { }; + updateScript = nix-update-script { }; + }; meta = with lib; { description = "Compiler cache for fast recompilation of C/C++ code"; homepage = "https://ccache.dev"; downloadPage = "https://ccache.dev/download.html"; + changelog = "https://ccache.dev/releasenotes.html#_ccache_${ + builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version + }"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau r-burns ]; platforms = platforms.unix; }; -}; -in ccache +}) diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch index 4b4d79867f..04c431aafb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch @@ -1,3 +1,5 @@ +diff --git a/test/run b/test/run +index 43a57312..398be8d8 100755 --- a/test/run +++ b/test/run @@ -148,21 +148,17 @@ file_size() { @@ -19,9 +21,9 @@ objdump_grep_cmd() { - if $HOST_OS_APPLE; then -- fgrep -q "\"$1\"" +- grep -Fq "\"$1\"" - elif $HOST_OS_WINDOWS || $HOST_OS_CYGWIN; then + if $HOST_OS_WINDOWS || $HOST_OS_CYGWIN; then - fgrep -q "$1" + grep -Fq "$1" else - fgrep -q ": $1" + grep -Fq ": $1" 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 6a79e1ab87..0b44b662a7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.23816"; + version = "0.1.23845"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ab22+fEHQry8dRIElFydxQXVWOXLo4Ch8Q26F8qPUDw="; + sha256 = "sha256-oLjr3aWJ8+X+T7oD1NdDfNDBuufwA180AOT3K8WR/q0="; }; vendorHash = "sha256-8HAiZ0zEJ+nnCsSUrNv0qQlvROCyNXO49fLWnKi6anE="; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/default.nix index e245128aa2..9c2641487d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/default.nix @@ -11,17 +11,17 @@ buildPythonApplication rec { pname = "cmake-language-server"; - version = "unstable-2023-01-08"; + version = "0.1.7"; format = "pyproject"; src = fetchFromGitHub { owner = "regen100"; - repo = pname; - rev = "60c376a5fda29835060687569cb212350a292116"; - hash = "sha256-vNG43sZy2wMetY5mbgxIoei5jCCj1f8vWiovWtwzbPc="; + repo = "cmake-language-server"; + rev = "refs/tags/v${version}"; + hash = "sha256-ExEAi47hxxEJeoT3FCwpRwJrf3URnI47/5FDL7fS5sY="; }; - PDM_PEP517_SCM_VERSION = "2023.1"; + PDM_PEP517_SCM_VERSION = version; patches = [ # Test timeouts occasionally cause the build to fail diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/disable-test-timeouts.patch b/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/disable-test-timeouts.patch index 6b66681056..237558bb66 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/disable-test-timeouts.patch +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/disable-test-timeouts.patch @@ -1,10 +1,10 @@ diff --git a/tests/test_server.py b/tests/test_server.py -index 2d09bb2..59a122a 100644 +index f349329..d130a2e 100644 --- a/tests/test_server.py +++ b/tests/test_server.py -@@ -26,7 +26,7 @@ from pygls.lsp.types import ( - ) - from pygls.server import LanguageServer +@@ -27,7 +27,7 @@ from pygls.server import LanguageServer + + from cmake_language_server.server import CMakeLanguageServer -CALL_TIMEOUT = 2 +CALL_TIMEOUT = None diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix index d105dd6166..c59ed440b7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix @@ -63,10 +63,6 @@ python3.pkgs.buildPythonApplication rec { "-Dtests=false" # needs dbus ]; - # Temporary fix - # See https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix index fb8767edc8..09d9b81249 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "devspace"; - version = "6.3.0"; + version = "6.3.1"; src = fetchFromGitHub { owner = "loft-sh"; repo = "devspace"; rev = "v${version}"; - sha256 = "sha256-ISyimfjTWU4niGeL8cSRRsUMNq3OQOvKJw7MCbY0K7o="; + sha256 = "sha256-N7u9qZBoaaxqcH+9lU0JoemEPYAuztkDyqVo/GWtS8c="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix index 2b71fa7116..1f4a40b446 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix @@ -8,11 +8,11 @@ # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { pname = "elfutils"; - version = "0.188"; + version = "0.189"; src = fetchurl { url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-+4sOjQgCAFuaMJxgwdjeMt0pUbVvDDo8tW0hzgFZXf8="; + sha256 = "sha256-Ob2PGjOOK3zUq8P/EaDt3G5pD2lXildHjYF5tBSHCMg="; }; patches = [ @@ -37,18 +37,6 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0="; }) - (fetchpatch { - name = "use-curlopt_protocols_str-for-new-libcurl.patch"; - url = "https://sourceware.org/git/?p=elfutils.git;a=patch;h=6560fb26a62ef135a804357ef4f15a47de3e49b3;hp=a5b07cdf9c491fb7a4a16598c482c68b718f59b9"; - excludes = [ "debuginfod/ChangeLog" ]; # Doesn't apply - sha256 = "sha256-yjeliqojRGvfwbXynmxFGyKqAY7AEr0mbSGQEliYhZ4="; - }) - (fetchpatch { - name = "fix-usage-of-deprecated-curlinfo.patch"; - url = "https://sourceware.org/git/?p=elfutils.git;a=patch;h=d2bf497b12fbd49b4996ccf0744303ffd67735b1;hp=6ecd16410ce1fe5cb0ac5b7c3342c5cc330e3a04"; - excludes = [ "debuginfod/ChangeLog" ]; # Doesn't apply - sha256 = "sha256-zMx/TazM7vXJre2XagIWvwRS8cd8pbzMTmAbpbqZmx0="; - }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix index bd7adcd1a7..29bc6e601e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix @@ -4,7 +4,7 @@ , fetchurl, fetchpatch, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages # Run time -, ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu, sourceHighlight +, ncurses, readline, gmp, mpfr, expat, libipt, zlib, zstd, dejagnu, sourceHighlight , pythonSupport ? stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isCygwin, python3 ? null , enableDebuginfod ? false, elfutils @@ -28,11 +28,11 @@ assert pythonSupport -> python3 != null; stdenv.mkDerivation rec { pname = targetPrefix + basename; - version = "12.1"; + version = "13.1"; src = fetchurl { url = "mirror://gnu/gdb/${basename}-${version}.tar.xz"; - hash = "sha256-DheTv48rVNU/Rt6oTM/URvSPgbKXsoxPf8AXuBjWn+0="; + hash = "sha256-EVrVwY1ppr4qsViC02XdoqIhHBT0gLNQLG66V24ulaA="; }; postPatch = lib.optionalString stdenv.isDarwin '' @@ -47,23 +47,13 @@ stdenv.mkDerivation rec { patches = [ ./debug-info-from-env.patch - # backport readline=8.2 support - (fetchpatch { - name = "readline-8.2.patch"; - url = "https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=1add37b567a7dee39d99f37b37802034c3fce9c4"; - hash = "sha256-KmQXylPAWNGXF8wtXCCArhUzHi+GUY8ii2Xpx8R08jE="; - }) ] ++ lib.optionals stdenv.isDarwin [ ./darwin-target-match.patch - # Does not nave to be conditional. We apply it conditionally - # to speed up inclusion to nearby nixos release. - ] ++ lib.optionals stdenv.is32bit [ - ./32-bit-BFD_VMA-format.patch ]; nativeBuildInputs = [ pkg-config texinfo perl setupDebugInfoDirs ]; - buildInputs = [ ncurses readline gmp mpfr expat libipt zlib guile sourceHighlight ] + buildInputs = [ ncurses readline gmp mpfr expat libipt zlib zstd guile sourceHighlight ] ++ lib.optional pythonSupport python3 ++ lib.optional doCheck dejagnu ++ lib.optional enableDebuginfod (elfutils.override { enableDebuginfod = true; }); @@ -81,8 +71,15 @@ stdenv.mkDerivation rec { configurePlatforms = [ "build" "host" "target" ]; - # GDB have to be built out of tree. preConfigure = '' + # remove precompiled docs, required for man gdbinit to mention /etc/gdb/gdbinit + rm gdb/doc/*.info* + rm gdb/doc/*.5 + rm gdb/doc/*.1 + # fix doc build https://sourceware.org/bugzilla/show_bug.cgi?id=27808 + rm gdb/doc/GDBvn.texi + + # GDB have to be built out of tree. mkdir _build cd _build ''; @@ -103,6 +100,9 @@ stdenv.mkDerivation rec { "--with-system-zlib" "--with-system-readline" + "--with-system-gdbinit=/etc/gdb/gdbinit" + "--with-system-gdbinit-dir=/etc/gdb/gdbinit.d" + "--with-gmp=${gmp.dev}" "--with-mpfr=${mpfr.dev}" "--with-expat" "--with-libexpat-prefix=${expat.dev}" diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/go-licenses/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/go-licenses/default.nix new file mode 100644 index 0000000000..c9bc25973a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/go-licenses/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "go-licenses"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "go-licenses"; + rev = "refs/tags/v${version}"; + hash = "sha256-GAlwTVoVA+n9+EfhybmpKm16FoY9kFzrxy1ZQxS6A8E="; + }; + + vendorHash = "sha256-ToRn2wj7Yi+UDJwvAhV0ACEhqlcQjt4bRpz7abNRt9A="; + + patches = [ + # Without this, we get error messages like: + # vendor/golang.org/x/sys/unix/syscall.go:83:16: unsafe.Slice requires go1.17 or later (-lang was set to go1.16; check go.mod) + # The patch was generated by changing "go 1.16" to "go 1.17" and executing `go mod tidy`. + ./fix-go-version-error.patch + ]; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = '' + installShellCompletion --cmd go-licenses \ + --bash <("$out/bin/go-licenses" completion bash) \ + --fish <("$out/bin/go-licenses" completion fish) \ + --zsh <("$out/bin/go-licenses" completion zsh) + ''; + + # Tests require internet connection + doCheck = false; + + meta = with lib; { + changelog = "https://github.com/google/go-licenses/releases/tag/v${version}"; + description = "Reports on the licenses used by a Go package and its dependencies"; + homepage = "https://github.com/google/go-licenses"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/go-licenses/fix-go-version-error.patch b/third_party/nixpkgs/pkgs/development/tools/misc/go-licenses/fix-go-version-error.patch new file mode 100644 index 0000000000..1e102636dd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/go-licenses/fix-go-version-error.patch @@ -0,0 +1,65 @@ +diff --git a/go.mod b/go.mod +index 7e3d596..d90b393 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,27 +1,50 @@ + module github.com/google/go-licenses + +-go 1.16 ++go 1.17 + + require ( +- cloud.google.com/go/iam v0.4.0 // indirect +- github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/google/go-cmp v0.5.8 + github.com/google/go-replayers/httpreplay v1.1.1 + github.com/google/licenseclassifier v0.0.0-20210722185704-3043a050f148 +- github.com/kr/text v0.2.0 // indirect +- github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect + github.com/otiai10/copy v1.6.0 +- github.com/pkg/errors v0.9.1 // indirect +- github.com/sergi/go-diff v1.2.0 // indirect + github.com/spf13/cobra v1.6.0 +- github.com/stretchr/testify v1.8.0 // indirect + go.opencensus.io v0.23.0 +- golang.org/x/crypto v0.1.0 // indirect + golang.org/x/mod v0.7.0 + golang.org/x/net v0.5.0 + golang.org/x/text v0.6.0 + golang.org/x/tools v0.5.0 +- gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect + gopkg.in/src-d/go-git.v4 v4.13.1 + k8s.io/klog/v2 v2.80.1 + ) ++ ++require ( ++ cloud.google.com/go v0.102.1 // indirect ++ cloud.google.com/go/iam v0.4.0 // indirect ++ cloud.google.com/go/storage v1.22.1 // indirect ++ github.com/emirpasic/gods v1.12.0 // indirect ++ github.com/go-logr/logr v1.2.0 // indirect ++ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect ++ github.com/google/martian/v3 v3.3.2 // indirect ++ github.com/inconshreveable/mousetrap v1.0.1 // indirect ++ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect ++ github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect ++ github.com/kr/text v0.2.0 // indirect ++ github.com/mitchellh/go-homedir v1.1.0 // indirect ++ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect ++ github.com/pkg/errors v0.9.1 // indirect ++ github.com/sergi/go-diff v1.2.0 // indirect ++ github.com/spf13/pflag v1.0.5 // indirect ++ github.com/src-d/gcfg v1.4.0 // indirect ++ github.com/stretchr/testify v1.8.0 // indirect ++ github.com/xanzy/ssh-agent v0.2.1 // indirect ++ golang.org/x/crypto v0.1.0 // indirect ++ golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 // indirect ++ golang.org/x/sys v0.4.0 // indirect ++ google.golang.org/api v0.93.0 // indirect ++ google.golang.org/genproto v0.0.0-20220815135757-37a418bb8959 // indirect ++ google.golang.org/grpc v1.48.0 // indirect ++ google.golang.org/protobuf v1.28.1 // indirect ++ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect ++ gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect ++ gopkg.in/warnings.v0 v0.1.2 // indirect ++) diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/highlight-assertions/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/highlight-assertions/default.nix index c16bf86334..9e4ed0e61d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/highlight-assertions/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/highlight-assertions/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "highlight-assertions"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "thehamsta"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OVf8s7zuGj5//zWJIVBfHBoA6zD+l8lqVQGn2vHsvSQ="; + sha256 = "sha256-7r8tBJ6JFGUGUsTivzlO23hHiXISajjn2WF12mmbmMg="; }; - cargoSha256 = "sha256-cS4IbFuxZCKDIAcgiKzBF/qQ6mXZb9omvMeGcU+yWpk="; + cargoSha256 = "sha256-E2TNwCry7JOWy50+iLM9d+Tx4lIO6hkBtaHVLV8bDuo="; # requires nightly features RUSTC_BOOTSTRAP = 1; 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 39b6baabc8..4bbd7b7e9c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/pahole/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/pahole/default.nix @@ -1,15 +1,12 @@ -{ lib, stdenv, fetchgit, pkg-config, libbpf, cmake, elfutils, zlib, argp-standalone, musl-obstack }: +{ lib, stdenv, fetchzip, pkg-config, libbpf, cmake, elfutils, zlib, argp-standalone, musl-obstack }: stdenv.mkDerivation rec { pname = "pahole"; - # Need a revision that supports DW_TAG_unspecified_type(0x3b). - # Was added after 1.24 release in a series of changes. - # Can switch back to release tags once 1.25 is cut. - version = "1.24-unstable-2022-11-24"; - src = fetchgit { - url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git"; - rev = "02d67c51765dfbd5893087da63744c864c7cc9e0"; - hash = "sha256-hKc8UKxPtEM2zlYmolSt1pXJKNRt4wC/Uf+dP/Sb7+s="; + # Can switch back to release tags if they can build linux_testing. + version = "1.24-unstable-2023-03-02"; + src = fetchzip { + url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-a9498899109d3be14f17abbc322a8f55a1067bee.tar.gz"; + sha256 = "xEKA6Fz6NaxNqSggvgswCU+7LlezGSNrK7cmt2JYv1Y="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/phpunit/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/phpunit/default.nix index 0b95f2f170..90bc80caca 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/phpunit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/phpunit/default.nix @@ -2,14 +2,14 @@ let pname = "phpunit"; - version = "10.0.11"; + version = "10.0.14"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://phar.phpunit.de/phpunit-${version}.phar"; - hash = "sha256-zAAFDiZ2wjncGMI4c74+tzWR++rKMjv1h5gk2GobhbI="; + hash = "sha256-tANk4A9tZ0gp+pX8qKxnMsR7RP55+5E/y9EXr7ZkLVM="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/seer/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/seer/default.nix index e44d8a9ce1..ccb71310c5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/seer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/seer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "seer"; - version = "1.14"; + version = "1.15"; src = fetchFromGitHub { owner = "epasveer"; repo = "seer"; rev = "v${version}"; - sha256 = "sha256-IxFG+OhRhPRPSyGFJh559Tz2E7aMOtpphm9GbYS0dRA="; + sha256 = "sha256-TktCUO281Cok47qT60DMAO5uUIg1iDH1RKx+fBPezLs="; }; preConfigure = '' 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 6734b4fd85..26f3b86326 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terracognita"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OzqIUnvWVxaUAWRIKDWaxtmTeFGqvVYAgdbG4jrph7w="; + hash = "sha256-ipPJMh88R9Ddo1QzN+No9H2bBsLSPARUI2HRaYvK6jc="; }; - vendorHash = "sha256-LzkxVxqBJ3pRk3EI+/Lc6XSNyxhPUg61GKwI1Kmadsc="; + vendorHash = "sha256-7fGqChud9dcgA9BXyJysUgvvG7zI+ByA0oFlSMd+rps="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/7.0.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/7.0.nix new file mode 100644 index 0000000000..b92b923ddc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/7.0.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "7.0.2"; + sha256 = "sha256-8hHsMmE4PhqJ5FVak7nQF/6Ae5w5kvst/0hx2ubaVK0="; +} 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 38a44e8c9c..af0d26fe1f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation { patches = patches ++ optional crossBuildTools ./cross-tools-flags.patch; + postPatch = '' + patchShebangs tp/maintain + ''; + # ncurses is required to build `makedoc' # this feature is introduced by the ./cross-tools-flags.patch NATIVE_TOOLS_CFLAGS = if crossBuildTools then "-I${getDev buildPackages.ncurses}/include" else null; @@ -58,7 +62,7 @@ stdenv.mkDerivation { && !stdenv.isDarwin && !stdenv.isSunOS; # flaky - checkFlags = lib.optionals (!stdenv.hostPlatform.isMusl) [ + checkFlags = lib.optionals (!stdenv.hostPlatform.isMusl && lib.versionOlder version "7") [ # Test is known to fail on various locales on texinfo-6.8: # https://lists.gnu.org/r/bug-texinfo/2021-07/msg00012.html "XFAIL_TESTS=test_scripts/layout_formatting_fr_icons.sh" @@ -72,8 +76,9 @@ stdenv.mkDerivation { ''; meta = { - homepage = "https://www.gnu.org/software/texinfo/"; description = "The GNU documentation system"; + homepage = "https://www.gnu.org/software/texinfo/"; + changelog = "https://git.savannah.gnu.org/cgit/texinfo.git/plain/NEWS"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ vrthra oxij ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix index 229438377d..7d2e36e0e1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - sha256 = "sha256-DOzXsxqOLlETCAVpKpUXAxO+T0pE+2LwnOS99vU2o48="; + sha256 = "sha256-2P+aidfYkO8l9VjqTstXbksyGTQ3porJhrBYod9oCYQ="; }; - cargoSha256 = "sha256-t/4nfsED29F8v3DkLYCh2A8AJvQvZvU8z6C0PLhTFuM="; + cargoSha256 = "sha256-Yr4i35Yf9kWYD1xQi+RKx6RQtyQUlZS8cXWkGGNuwXI="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { # generate the man page postInstall = lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v5.3.0/.github/workflows/publish.yml#L127-L131 + # https://github.com/latex-lsp/texlab/blob/v5.4.0/.github/workflows/publish.yml#L127-L131 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/topiary/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/topiary/default.nix index 06f75284b5..8a38ec4663 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/topiary/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/topiary/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topiary"; - version = "unstable-2023-01-10"; + version = "0.1.0"; src = fetchFromGitHub { owner = "tweag"; repo = pname; - rev = "c36d4a2253f337e1a28d497826a84754b8d833f6"; - sha256 = "sha256-0uqDuEpL9JCXzD7sQ3PDv4N1KtCSkoMoD5i402uIfas="; + rev = "v${version}"; + sha256 = "sha256-Gm6AzzVLUXZi2jzJ1b/c4yjIvRRA2e5mC2CMVyly2X8="; }; - cargoSha256 = "sha256-PvMjLC133rlsPrgyESuVHIf2TPCtgGQQULCQvBTIJ20="; + cargoSha256 = "sha256-2Ovwntg3aZyR73rg8ruA/U1wVS1BO+B7r37D6/LPa/g="; postInstall = '' install -Dm444 languages/* -t $out/share/languages diff --git a/third_party/nixpkgs/pkgs/development/tools/mongosh/composition.nix b/third_party/nixpkgs/pkgs/development/tools/mongosh/composition.nix deleted file mode 100644 index dac56f12aa..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/mongosh/composition.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: - -let - nodeEnv = import ../../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 ./packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/mongosh/default.nix b/third_party/nixpkgs/pkgs/development/tools/mongosh/default.nix index c71c7dcb72..0bc4aa24a1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mongosh/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mongosh/default.nix @@ -1,14 +1,37 @@ -{ pkgs, stdenv, lib, testers, mongosh }: +{ lib +, buildNpmPackage +, fetchurl +, testers +, mongosh +}: let - nodePackages = import ./composition.nix { - inherit pkgs; - inherit (stdenv.hostPlatform) system; - }; + source = builtins.fromJSON (builtins.readFile ./source.json); in -nodePackages.mongosh.override { - passthru.tests.version = testers.testVersion { - package = mongosh; +buildNpmPackage { + pname = "mongosh"; + inherit (source) version; + + src = fetchurl { + url = "https://registry.npmjs.org/mongosh/-/${source.filename}"; + hash = source.integrity; + }; + + postPatch = '' + ln -s ${./package-lock.json} package-lock.json + ''; + + npmDepsHash = source.deps; + + makeCacheWritable = true; + dontNpmBuild = true; + npmFlags = [ "--omit=optional" ]; + + passthru = { + tests.version = testers.testVersion { + package = mongosh; + }; + updateScript = ./update.sh; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/mongosh/generate.sh b/third_party/nixpkgs/pkgs/development/tools/mongosh/generate.sh deleted file mode 100755 index ef120ee9e9..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/mongosh/generate.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p node2nix - -cd "$(dirname "$0")" - -node2nix \ - --no-copy-node-env \ - --node-env ../../node-packages/node-env.nix \ - --input packages.json \ - --output packages.nix \ - --composition composition.nix \ - --strip-optional-dependencies \ - --nodejs-16 diff --git a/third_party/nixpkgs/pkgs/development/tools/mongosh/package-lock.json b/third_party/nixpkgs/pkgs/development/tools/mongosh/package-lock.json new file mode 100644 index 0000000000..64aa53e586 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/mongosh/package-lock.json @@ -0,0 +1,3824 @@ +{ + "name": "mongosh", + "version": "1.8.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "mongosh", + "version": "1.8.0", + "license": "Apache-2.0", + "dependencies": { + "@mongosh/cli-repl": "1.8.0" + }, + "bin": { + "mongosh": "bin/mongosh.js" + }, + "engines": { + "node": ">=16.15.0" + } + }, + "node_modules/@ampproject/remapping": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", + "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", + "dependencies": { + "@jridgewell/gen-mapping": "^0.1.0", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@aws-crypto/ie11-detection": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz", + "integrity": "sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==", + "dependencies": { + "tslib": "^1.11.1" + } + }, + "node_modules/@aws-crypto/ie11-detection/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, + "node_modules/@aws-crypto/sha256-browser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz", + "integrity": "sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==", + "dependencies": { + "@aws-crypto/ie11-detection": "^3.0.0", + "@aws-crypto/sha256-js": "^3.0.0", + "@aws-crypto/supports-web-crypto": "^3.0.0", + "@aws-crypto/util": "^3.0.0", + "@aws-sdk/types": "^3.222.0", + "@aws-sdk/util-locate-window": "^3.0.0", + "@aws-sdk/util-utf8-browser": "^3.0.0", + "tslib": "^1.11.1" + } + }, + "node_modules/@aws-crypto/sha256-browser/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, + "node_modules/@aws-crypto/sha256-js": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz", + "integrity": "sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==", + "dependencies": { + "@aws-crypto/util": "^3.0.0", + "@aws-sdk/types": "^3.222.0", + "tslib": "^1.11.1" + } + }, + "node_modules/@aws-crypto/sha256-js/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, + "node_modules/@aws-crypto/supports-web-crypto": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz", + "integrity": "sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==", + "dependencies": { + "tslib": "^1.11.1" + } + }, + "node_modules/@aws-crypto/supports-web-crypto/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, + "node_modules/@aws-crypto/util": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-3.0.0.tgz", + "integrity": "sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==", + "dependencies": { + "@aws-sdk/types": "^3.222.0", + "@aws-sdk/util-utf8-browser": "^3.0.0", + "tslib": "^1.11.1" + } + }, + "node_modules/@aws-crypto/util/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, + "node_modules/@aws-sdk/abort-controller": { + "version": "3.272.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.272.0.tgz", + "integrity": "sha512-s2TV3phapcTwZNr4qLxbfuQuE9ZMP4RoJdkvRRCkKdm6jslsWLJf2Zlcxti/23hOlINUMYv2iXE2pftIgWGdpg==", + "dependencies": { + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/client-cognito-identity": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.282.0.tgz", + "integrity": "sha512-OU9Wy50u31Mog4xmj9o+lLOb/y+yuQBTFwEVYApJtCkPsI2e3DtZFt36IcAy04fcjNUaSD3u6SGgfYo2vDQ2zA==", + "dependencies": { + "@aws-crypto/sha256-browser": "3.0.0", + "@aws-crypto/sha256-js": "3.0.0", + "@aws-sdk/client-sts": "3.282.0", + "@aws-sdk/config-resolver": "3.282.0", + "@aws-sdk/credential-provider-node": "3.282.0", + "@aws-sdk/fetch-http-handler": "3.282.0", + "@aws-sdk/hash-node": "3.272.0", + "@aws-sdk/invalid-dependency": "3.272.0", + "@aws-sdk/middleware-content-length": "3.282.0", + "@aws-sdk/middleware-endpoint": "3.282.0", + "@aws-sdk/middleware-host-header": "3.282.0", + "@aws-sdk/middleware-logger": "3.272.0", + "@aws-sdk/middleware-recursion-detection": "3.282.0", + "@aws-sdk/middleware-retry": "3.282.0", + "@aws-sdk/middleware-serde": "3.272.0", + "@aws-sdk/middleware-signing": "3.282.0", + "@aws-sdk/middleware-stack": "3.272.0", + "@aws-sdk/middleware-user-agent": "3.282.0", + "@aws-sdk/node-config-provider": "3.272.0", + "@aws-sdk/node-http-handler": "3.282.0", + "@aws-sdk/protocol-http": "3.282.0", + "@aws-sdk/smithy-client": "3.279.0", + "@aws-sdk/types": "3.272.0", + "@aws-sdk/url-parser": "3.272.0", + "@aws-sdk/util-base64": "3.208.0", + "@aws-sdk/util-body-length-browser": "3.188.0", + "@aws-sdk/util-body-length-node": "3.208.0", + "@aws-sdk/util-defaults-mode-browser": "3.279.0", + "@aws-sdk/util-defaults-mode-node": "3.282.0", + "@aws-sdk/util-endpoints": "3.272.0", + "@aws-sdk/util-retry": "3.272.0", + "@aws-sdk/util-user-agent-browser": "3.282.0", + "@aws-sdk/util-user-agent-node": "3.282.0", + "@aws-sdk/util-utf8": "3.254.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/client-sso": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.282.0.tgz", + "integrity": "sha512-VzdCCaxlDyU+7wvLDWh+uACQ6RPfaKLQ3yJ2UY0B0SkH4R0E4GLDJ2OJzqS5eyyOsnq1rxfY75S4WYzj8E2cvg==", + "dependencies": { + "@aws-crypto/sha256-browser": "3.0.0", + "@aws-crypto/sha256-js": "3.0.0", + "@aws-sdk/config-resolver": "3.282.0", + "@aws-sdk/fetch-http-handler": "3.282.0", + "@aws-sdk/hash-node": "3.272.0", + "@aws-sdk/invalid-dependency": "3.272.0", + "@aws-sdk/middleware-content-length": "3.282.0", + "@aws-sdk/middleware-endpoint": "3.282.0", + "@aws-sdk/middleware-host-header": "3.282.0", + "@aws-sdk/middleware-logger": "3.272.0", + "@aws-sdk/middleware-recursion-detection": "3.282.0", + "@aws-sdk/middleware-retry": "3.282.0", + "@aws-sdk/middleware-serde": "3.272.0", + "@aws-sdk/middleware-stack": "3.272.0", + "@aws-sdk/middleware-user-agent": "3.282.0", + "@aws-sdk/node-config-provider": "3.272.0", + "@aws-sdk/node-http-handler": "3.282.0", + "@aws-sdk/protocol-http": "3.282.0", + "@aws-sdk/smithy-client": "3.279.0", + "@aws-sdk/types": "3.272.0", + "@aws-sdk/url-parser": "3.272.0", + "@aws-sdk/util-base64": "3.208.0", + "@aws-sdk/util-body-length-browser": "3.188.0", + "@aws-sdk/util-body-length-node": "3.208.0", + "@aws-sdk/util-defaults-mode-browser": "3.279.0", + "@aws-sdk/util-defaults-mode-node": "3.282.0", + "@aws-sdk/util-endpoints": "3.272.0", + "@aws-sdk/util-retry": "3.272.0", + "@aws-sdk/util-user-agent-browser": "3.282.0", + "@aws-sdk/util-user-agent-node": "3.282.0", + "@aws-sdk/util-utf8": "3.254.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/client-sso-oidc": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.282.0.tgz", + "integrity": "sha512-upC4yBZllAXg5OVIuS8Lu9MI1aqfAObl2BBixj9fIYbDanQ02s0b1IwfZqlOqNNkGzMko1AWyiOSyOdVgyJ+xg==", + "dependencies": { + "@aws-crypto/sha256-browser": "3.0.0", + "@aws-crypto/sha256-js": "3.0.0", + "@aws-sdk/config-resolver": "3.282.0", + "@aws-sdk/fetch-http-handler": "3.282.0", + "@aws-sdk/hash-node": "3.272.0", + "@aws-sdk/invalid-dependency": "3.272.0", + "@aws-sdk/middleware-content-length": "3.282.0", + "@aws-sdk/middleware-endpoint": "3.282.0", + "@aws-sdk/middleware-host-header": "3.282.0", + "@aws-sdk/middleware-logger": "3.272.0", + "@aws-sdk/middleware-recursion-detection": "3.282.0", + "@aws-sdk/middleware-retry": "3.282.0", + "@aws-sdk/middleware-serde": "3.272.0", + "@aws-sdk/middleware-stack": "3.272.0", + "@aws-sdk/middleware-user-agent": "3.282.0", + "@aws-sdk/node-config-provider": "3.272.0", + "@aws-sdk/node-http-handler": "3.282.0", + "@aws-sdk/protocol-http": "3.282.0", + "@aws-sdk/smithy-client": "3.279.0", + "@aws-sdk/types": "3.272.0", + "@aws-sdk/url-parser": "3.272.0", + "@aws-sdk/util-base64": "3.208.0", + "@aws-sdk/util-body-length-browser": "3.188.0", + "@aws-sdk/util-body-length-node": "3.208.0", + "@aws-sdk/util-defaults-mode-browser": "3.279.0", + "@aws-sdk/util-defaults-mode-node": "3.282.0", + "@aws-sdk/util-endpoints": "3.272.0", + "@aws-sdk/util-retry": "3.272.0", + "@aws-sdk/util-user-agent-browser": "3.282.0", + "@aws-sdk/util-user-agent-node": "3.282.0", + "@aws-sdk/util-utf8": "3.254.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/client-sts": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.282.0.tgz", + "integrity": "sha512-JZybEaST0rloS9drlX/0yJAnKHuV7DlS1n1WZxgaM2DY704ydlGiviiPQvC/q/dItsX4017gscC0blGJcUjK1g==", + "dependencies": { + "@aws-crypto/sha256-browser": "3.0.0", + "@aws-crypto/sha256-js": "3.0.0", + "@aws-sdk/config-resolver": "3.282.0", + "@aws-sdk/credential-provider-node": "3.282.0", + "@aws-sdk/fetch-http-handler": "3.282.0", + "@aws-sdk/hash-node": "3.272.0", + "@aws-sdk/invalid-dependency": "3.272.0", + "@aws-sdk/middleware-content-length": "3.282.0", + "@aws-sdk/middleware-endpoint": "3.282.0", + "@aws-sdk/middleware-host-header": "3.282.0", + "@aws-sdk/middleware-logger": "3.272.0", + "@aws-sdk/middleware-recursion-detection": "3.282.0", + "@aws-sdk/middleware-retry": "3.282.0", + "@aws-sdk/middleware-sdk-sts": "3.282.0", + "@aws-sdk/middleware-serde": "3.272.0", + "@aws-sdk/middleware-signing": "3.282.0", + "@aws-sdk/middleware-stack": "3.272.0", + "@aws-sdk/middleware-user-agent": "3.282.0", + "@aws-sdk/node-config-provider": "3.272.0", + "@aws-sdk/node-http-handler": "3.282.0", + "@aws-sdk/protocol-http": "3.282.0", + "@aws-sdk/smithy-client": "3.279.0", + "@aws-sdk/types": "3.272.0", + "@aws-sdk/url-parser": "3.272.0", + "@aws-sdk/util-base64": "3.208.0", + "@aws-sdk/util-body-length-browser": "3.188.0", + "@aws-sdk/util-body-length-node": "3.208.0", + "@aws-sdk/util-defaults-mode-browser": "3.279.0", + "@aws-sdk/util-defaults-mode-node": "3.282.0", + "@aws-sdk/util-endpoints": "3.272.0", + "@aws-sdk/util-retry": "3.272.0", + "@aws-sdk/util-user-agent-browser": "3.282.0", + "@aws-sdk/util-user-agent-node": "3.282.0", + "@aws-sdk/util-utf8": "3.254.0", + "fast-xml-parser": "4.1.2", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/config-resolver": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.282.0.tgz", + "integrity": "sha512-30qFLh2N4NXQ2EAook7NIFeu1K/nlrRLrdVb2BtGFi/F3cZnz+sy9o0XmL6x+sO9TznWjdNxD1RKQdqoAwGnCQ==", + "dependencies": { + "@aws-sdk/signature-v4": "3.282.0", + "@aws-sdk/types": "3.272.0", + "@aws-sdk/util-config-provider": "3.208.0", + "@aws-sdk/util-middleware": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-cognito-identity": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.282.0.tgz", + "integrity": "sha512-GsLOt6GzckLQbMzgXOblKcRtXyMu3NcP0vFkYpy4r9oEzoxqPhy1yUpRNLeDv7r2qoa8naN81F5FwPwd17PrKg==", + "dependencies": { + "@aws-sdk/client-cognito-identity": "3.282.0", + "@aws-sdk/property-provider": "3.272.0", + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-env": { + "version": "3.272.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.272.0.tgz", + "integrity": "sha512-QI65NbLnKLYHyTYhXaaUrq6eVsCCrMUb05WDA7+TJkWkjXesovpjc8vUKgFiLSxmgKmb2uOhHNcDyObKMrYQFw==", + "dependencies": { + "@aws-sdk/property-provider": "3.272.0", + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-imds": { + "version": "3.272.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.272.0.tgz", + "integrity": "sha512-wwAfVY1jTFQEfxVfdYD5r5ieYGl+0g4nhekVxNMqE8E1JeRDd18OqiwAflzpgBIqxfqvCUkf+vl5JYyacMkNAQ==", + "dependencies": { + "@aws-sdk/node-config-provider": "3.272.0", + "@aws-sdk/property-provider": "3.272.0", + "@aws-sdk/types": "3.272.0", + "@aws-sdk/url-parser": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-ini": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.282.0.tgz", + "integrity": "sha512-2GKduXORcUgOigF1jZF7A1Wh4W/aJt3ynh7xb1vfx020nHx6YDljrEGpzgH6pOVzl7ZhgthpojicCuy2UumkMA==", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.272.0", + "@aws-sdk/credential-provider-imds": "3.272.0", + "@aws-sdk/credential-provider-process": "3.272.0", + "@aws-sdk/credential-provider-sso": "3.282.0", + "@aws-sdk/credential-provider-web-identity": "3.272.0", + "@aws-sdk/property-provider": "3.272.0", + "@aws-sdk/shared-ini-file-loader": "3.272.0", + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-node": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.282.0.tgz", + "integrity": "sha512-qyHipZW0ep8STY+SO+Me8ObQ1Ee/aaZTmAK0Os/gB+EsiZhIE+mi6zRcScwdnpgJPLRYMEe4p/Cr6DOrA0G0GQ==", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.272.0", + "@aws-sdk/credential-provider-imds": "3.272.0", + "@aws-sdk/credential-provider-ini": "3.282.0", + "@aws-sdk/credential-provider-process": "3.272.0", + "@aws-sdk/credential-provider-sso": "3.282.0", + "@aws-sdk/credential-provider-web-identity": "3.272.0", + "@aws-sdk/property-provider": "3.272.0", + "@aws-sdk/shared-ini-file-loader": "3.272.0", + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-process": { + "version": "3.272.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.272.0.tgz", + "integrity": "sha512-hiCAjWWm2PeBFp5cjkxqyam/XADjiS+e7GzwC34TbZn3LisS0uoweLojj9tD11NnnUhyhbLteUvu5+rotOLwrg==", + "dependencies": { + "@aws-sdk/property-provider": "3.272.0", + "@aws-sdk/shared-ini-file-loader": "3.272.0", + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-sso": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.282.0.tgz", + "integrity": "sha512-c4nibry7u0hkYRMi7+cWzdwYXfDDG+j3VYFxk2oOvU1VIJRyE6oeJqVaz3jgYLX9brHyrLJjuFCIJCUV/WXgIA==", + "dependencies": { + "@aws-sdk/client-sso": "3.282.0", + "@aws-sdk/property-provider": "3.272.0", + "@aws-sdk/shared-ini-file-loader": "3.272.0", + "@aws-sdk/token-providers": "3.282.0", + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-web-identity": { + "version": "3.272.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.272.0.tgz", + "integrity": "sha512-ImrHMkcgneGa/HadHAQXPwOrX26sAKuB8qlMxZF/ZCM2B55u8deY+ZVkVuraeKb7YsahMGehPFOfRAF6mvFI5Q==", + "dependencies": { + "@aws-sdk/property-provider": "3.272.0", + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/credential-providers": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.282.0.tgz", + "integrity": "sha512-/Pau2Ht15j26ibTSTaJHbx6wA3suNT0Qgu+++6ZUoVCeHL5ZN/otcoebsR/lOZTw8Fji7K5kl8TW41UNAE8s2w==", + "dependencies": { + "@aws-sdk/client-cognito-identity": "3.282.0", + "@aws-sdk/client-sso": "3.282.0", + "@aws-sdk/client-sts": "3.282.0", + "@aws-sdk/credential-provider-cognito-identity": "3.282.0", + "@aws-sdk/credential-provider-env": "3.272.0", + "@aws-sdk/credential-provider-imds": "3.272.0", + "@aws-sdk/credential-provider-ini": "3.282.0", + "@aws-sdk/credential-provider-node": "3.282.0", + "@aws-sdk/credential-provider-process": "3.272.0", + "@aws-sdk/credential-provider-sso": "3.282.0", + "@aws-sdk/credential-provider-web-identity": "3.272.0", + "@aws-sdk/property-provider": "3.272.0", + "@aws-sdk/shared-ini-file-loader": "3.272.0", + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/fetch-http-handler": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.282.0.tgz", + "integrity": "sha512-RTd53UzKtUucIEdVLGGgtlbVwp0QkOt3ZfHuA/A1lOH7meChSh1kz7B5z3p4HQDpXO+MQ1Y6Ble9Vg2fh1zwJQ==", + "dependencies": { + "@aws-sdk/protocol-http": "3.282.0", + "@aws-sdk/querystring-builder": "3.272.0", + "@aws-sdk/types": "3.272.0", + "@aws-sdk/util-base64": "3.208.0", + "tslib": "^2.3.1" + } + }, + "node_modules/@aws-sdk/hash-node": { + "version": "3.272.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.272.0.tgz", + "integrity": "sha512-40dwND+iAm3VtPHPZu7/+CIdVJFk2s0cWZt1lOiMPMSXycSYJ45wMk7Lly3uoqRx0uWfFK5iT2OCv+fJi5jTng==", + "dependencies": { + "@aws-sdk/types": "3.272.0", + "@aws-sdk/util-buffer-from": "3.208.0", + "@aws-sdk/util-utf8": "3.254.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/invalid-dependency": { + "version": "3.272.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.272.0.tgz", + "integrity": "sha512-ysW6wbjl1Y78txHUQ/Tldj2Rg1BI7rpMO9B9xAF6yAX3mQ7t6SUPQG/ewOGvH2208NBIl3qP5e/hDf0Q6r/1iw==", + "dependencies": { + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + } + }, + "node_modules/@aws-sdk/is-array-buffer": { + "version": "3.201.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/is-array-buffer/-/is-array-buffer-3.201.0.tgz", + "integrity": "sha512-UPez5qLh3dNgt0DYnPD/q0mVJY84rA17QE26hVNOW3fAji8W2wrwrxdacWOxyXvlxWsVRcKmr+lay1MDqpAMfg==", + "dependencies": { + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/middleware-content-length": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.282.0.tgz", + "integrity": "sha512-SDgMLRRTMr9LlHSNk4bXUXynYnkT4oNMqE+FxhjsdbT8hK36eS4AadM58R7nPwgjR3EuWRW4ZRRawLWatpWspA==", + "dependencies": { + "@aws-sdk/protocol-http": "3.282.0", + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/middleware-endpoint": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.282.0.tgz", + "integrity": "sha512-8U9Mv/Sbdo1KI6/ip7IIUdBl5pgmalFbfkYAyO+AtmkEvawI9ipdWFs5HB0Dwd1BGVup5choY72Ik/7sCAAFTQ==", + "dependencies": { + "@aws-sdk/middleware-serde": "3.272.0", + "@aws-sdk/protocol-http": "3.282.0", + "@aws-sdk/signature-v4": "3.282.0", + "@aws-sdk/types": "3.272.0", + "@aws-sdk/url-parser": "3.272.0", + "@aws-sdk/util-config-provider": "3.208.0", + "@aws-sdk/util-middleware": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/middleware-host-header": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.282.0.tgz", + "integrity": "sha512-90dfYow4zh4tCatTOnqB3nE/dIAucQLZnMqwN/WBPu0fUqjymzpsNkPchqWBPnSWdNE8w3PiKMqqD9rjYwqw4Q==", + "dependencies": { + "@aws-sdk/protocol-http": "3.282.0", + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/middleware-logger": { + "version": "3.272.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.272.0.tgz", + "integrity": "sha512-u2SQ0hWrFwxbxxYMG5uMEgf01pQY5jauK/LYWgGIvuCmFgiyRQQP3oN7kkmsxnS9MWmNmhbyQguX2NY02s5e9w==", + "dependencies": { + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/middleware-recursion-detection": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.282.0.tgz", + "integrity": "sha512-cSLq/daEaTEucbP/TgAXIOcpwLu7Bfw3VGzH1U56ngDjI4KWvUheF16JiB6OqKQXduPBPsdZ9dVmkDVKddmCRw==", + "dependencies": { + "@aws-sdk/protocol-http": "3.282.0", + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/middleware-retry": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.282.0.tgz", + "integrity": "sha512-3+0M1GP9o480IdqHVZbkhTgge63uKhDFlS6cQznpNGj0eIuQPhXRnlEz2/rma0INUqFm6+7qJ5yzHR4WQbfHpw==", + "dependencies": { + "@aws-sdk/protocol-http": "3.282.0", + "@aws-sdk/service-error-classification": "3.272.0", + "@aws-sdk/types": "3.272.0", + "@aws-sdk/util-middleware": "3.272.0", + "@aws-sdk/util-retry": "3.272.0", + "tslib": "^2.3.1", + "uuid": "^8.3.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/middleware-sdk-sts": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.282.0.tgz", + "integrity": "sha512-Qe20mtJcF6lxt7280FhTFD2IpBDn39MEXmbm/zIkXR2/cAmvji8YhcxhNrq1l7XiuMM6SokBDC/f3dlF1oOC6g==", + "dependencies": { + "@aws-sdk/middleware-signing": "3.282.0", + "@aws-sdk/property-provider": "3.272.0", + "@aws-sdk/protocol-http": "3.282.0", + "@aws-sdk/signature-v4": "3.282.0", + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/middleware-serde": { + "version": "3.272.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.272.0.tgz", + "integrity": "sha512-kW1uOxgPSwtXPB5rm3QLdWomu42lkYpQL94tM1BjyFOWmBLO2lQhk5a7Dw6HkTozT9a+vxtscLChRa6KZe61Hw==", + "dependencies": { + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/middleware-signing": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.282.0.tgz", + "integrity": "sha512-eE5qMDcqqxZPdSwybUEph/knrA2j2cHjW+B2ddROw3Ojg0XLjep5hOhithAudgBREQhYF9pdsBr6mUMynUIrKw==", + "dependencies": { + "@aws-sdk/property-provider": "3.272.0", + "@aws-sdk/protocol-http": "3.282.0", + "@aws-sdk/signature-v4": "3.282.0", + "@aws-sdk/types": "3.272.0", + "@aws-sdk/util-middleware": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/middleware-stack": { + "version": "3.272.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.272.0.tgz", + "integrity": "sha512-jhwhknnPBGhfXAGV5GXUWfEhDFoP/DN8MPCO2yC5OAxyp6oVJ8lTPLkZYMTW5VL0c0eG44dXpF4Ib01V+PlDrQ==", + "dependencies": { + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/middleware-user-agent": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.282.0.tgz", + "integrity": "sha512-P1ealsSrUALo0w0Qu5nBKsNQwsmqIfsoNtFWpaznjIcXE5rRMlZL69zb0KnGbQCBfEXsgaMOWjeGT8I3/XbOHQ==", + "dependencies": { + "@aws-sdk/protocol-http": "3.282.0", + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/node-config-provider": { + "version": "3.272.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.272.0.tgz", + "integrity": "sha512-YYCIBh9g1EQo7hm2l22HX5Yr9RoPQ2RCvhzKvF1n1e8t1QH4iObQrYUtqHG4khcm64Cft8C5MwZmgzHbya5Z6Q==", + "dependencies": { + "@aws-sdk/property-provider": "3.272.0", + "@aws-sdk/shared-ini-file-loader": "3.272.0", + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/node-http-handler": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.282.0.tgz", + "integrity": "sha512-LIA4lsSKA/l1kTR5ERkJG2gARveB7Y40MR6yDwtIuhXeVu7Xo9m4BJFanCYIbyc093W0T53x438bwoBR+R+/fw==", + "dependencies": { + "@aws-sdk/abort-controller": "3.272.0", + "@aws-sdk/protocol-http": "3.282.0", + "@aws-sdk/querystring-builder": "3.272.0", + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/property-provider": { + "version": "3.272.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.272.0.tgz", + "integrity": "sha512-V1pZTaH5eqpAt8O8CzbItHhOtzIfFuWymvwZFkAtwKuaHpnl7jjrTouV482zoq8AD/fF+VVSshwBKYA7bhidIw==", + "dependencies": { + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/protocol-http": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.282.0.tgz", + "integrity": "sha512-aOPv5DhsbG06WKfeh2g0H8RGnaeI8pLhaA+Mq1BvzXcghhlDu+FM9K/GjC/f1lWk1UNryfevOR7SdQm95ciHQg==", + "dependencies": { + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/querystring-builder": { + "version": "3.272.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.272.0.tgz", + "integrity": "sha512-ndo++7GkdCj5tBXE6rGcITpSpZS4PfyV38wntGYAlj9liL1omk3bLZRY6uzqqkJpVHqbg2fD7O2qHNItzZgqhw==", + "dependencies": { + "@aws-sdk/types": "3.272.0", + "@aws-sdk/util-uri-escape": "3.201.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/querystring-parser": { + "version": "3.272.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.272.0.tgz", + "integrity": "sha512-5oS4/9n6N1LZW9tI3qq/0GnCuWoOXRgcHVB+AJLRBvDbEe+GI+C/xK1tKLsfpDNgsQJHc4IPQoIt4megyZ/1+A==", + "dependencies": { + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/service-error-classification": { + "version": "3.272.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.272.0.tgz", + "integrity": "sha512-REoltM1LK9byyIufLqx9znhSolPcHQgVHIA2S0zu5sdt5qER4OubkLAXuo4MBbisUTmh8VOOvIyUb5ijZCXq1w==", + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/shared-ini-file-loader": { + "version": "3.272.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.272.0.tgz", + "integrity": "sha512-lzFPohp5sy2XvwFjZIzLVCRpC0i5cwBiaXmFzXYQZJm6FSCszHO4ax+m9yrtlyVFF/2YPWl+/bzNthy4aJtseA==", + "dependencies": { + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/signature-v4": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.282.0.tgz", + "integrity": "sha512-rnSL3UyF/No7+O2EMtN1sTCiqL1a+odbfnfo3wCSl8DH5PEYINt2kZgVEvT1Fgaffk1pUggBBOZoR+arPIIDJA==", + "dependencies": { + "@aws-sdk/is-array-buffer": "3.201.0", + "@aws-sdk/types": "3.272.0", + "@aws-sdk/util-hex-encoding": "3.201.0", + "@aws-sdk/util-middleware": "3.272.0", + "@aws-sdk/util-uri-escape": "3.201.0", + "@aws-sdk/util-utf8": "3.254.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/smithy-client": { + "version": "3.279.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.279.0.tgz", + "integrity": "sha512-ZcYWUQDGAYN6NXRpJuSn46PetrpPCA6TrDVwP9+3pERzTXZ66npXoG2XhHjNrOXy/Ted5A3OxKrM4/zLu9tK3A==", + "dependencies": { + "@aws-sdk/middleware-stack": "3.272.0", + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/token-providers": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.282.0.tgz", + "integrity": "sha512-Qk/D6i+Hpc0fp/2SRHbfJeKPgUIugzsmye3NL0OV1bqd1Y40dW5LT4u67VcZHwqxzYDKe6Eo+7NHJu7qfvwhog==", + "dependencies": { + "@aws-sdk/client-sso-oidc": "3.282.0", + "@aws-sdk/property-provider": "3.272.0", + "@aws-sdk/shared-ini-file-loader": "3.272.0", + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/types": { + "version": "3.272.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.272.0.tgz", + "integrity": "sha512-MmmL6vxMGP5Bsi+4wRx4mxYlU/LX6M0noOXrDh/x5FfG7/4ZOar/nDxqDadhJtNM88cuWVHZWY59P54JzkGWmA==", + "dependencies": { + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/url-parser": { + "version": "3.272.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.272.0.tgz", + "integrity": "sha512-vX/Tx02PlnQ/Kgtf5TnrNDHPNbY+amLZjW0Z1d9vzAvSZhQ4i9Y18yxoRDIaDTCNVRDjdhV8iuctW+05PB5JtQ==", + "dependencies": { + "@aws-sdk/querystring-parser": "3.272.0", + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + } + }, + "node_modules/@aws-sdk/util-base64": { + "version": "3.208.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-base64/-/util-base64-3.208.0.tgz", + "integrity": "sha512-PQniZph5A6N7uuEOQi+1hnMz/FSOK/8kMFyFO+4DgA1dZ5pcKcn5wiFwHkcTb/BsgVqQa3Jx0VHNnvhlS8JyTg==", + "dependencies": { + "@aws-sdk/util-buffer-from": "3.208.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/util-body-length-browser": { + "version": "3.188.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.188.0.tgz", + "integrity": "sha512-8VpnwFWXhnZ/iRSl9mTf+VKOX9wDE8QtN4bj9pBfxwf90H1X7E8T6NkiZD3k+HubYf2J94e7DbeHs7fuCPW5Qg==", + "dependencies": { + "tslib": "^2.3.1" + } + }, + "node_modules/@aws-sdk/util-body-length-node": { + "version": "3.208.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.208.0.tgz", + "integrity": "sha512-3zj50e5g7t/MQf53SsuuSf0hEELzMtD8RX8C76f12OSRo2Bca4FLLYHe0TZbxcfQHom8/hOaeZEyTyMogMglqg==", + "dependencies": { + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/util-buffer-from": { + "version": "3.208.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.208.0.tgz", + "integrity": "sha512-7L0XUixNEFcLUGPeBF35enCvB9Xl+K6SQsmbrPk1P3mlV9mguWSDQqbOBwY1Ir0OVbD6H/ZOQU7hI/9RtRI0Zw==", + "dependencies": { + "@aws-sdk/is-array-buffer": "3.201.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/util-config-provider": { + "version": "3.208.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-config-provider/-/util-config-provider-3.208.0.tgz", + "integrity": "sha512-DSRqwrERUsT34ug+anlMBIFooBEGwM8GejC7q00Y/9IPrQy50KnG5PW2NiTjuLKNi7pdEOlwTSEocJE15eDZIg==", + "dependencies": { + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/util-defaults-mode-browser": { + "version": "3.279.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.279.0.tgz", + "integrity": "sha512-RnchYRrpapTT5Hu23LOfk6e8RMVq0kUzho6xA6TJj1a4uGxkcRMvgzPipCq1P5uHu0mrkQBg9pGPEVNOUs38/Q==", + "dependencies": { + "@aws-sdk/property-provider": "3.272.0", + "@aws-sdk/types": "3.272.0", + "bowser": "^2.11.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@aws-sdk/util-defaults-mode-node": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.282.0.tgz", + "integrity": "sha512-D1BlFoA7ZMeK2diDUWFx1xBFrSaJuBZMRBuWbnbT9AnRYNCsASZ8DRU1KkZ8LuFQIwmZz94P9q683emYnZBhiw==", + "dependencies": { + "@aws-sdk/config-resolver": "3.282.0", + "@aws-sdk/credential-provider-imds": "3.272.0", + "@aws-sdk/node-config-provider": "3.272.0", + "@aws-sdk/property-provider": "3.272.0", + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@aws-sdk/util-endpoints": { + "version": "3.272.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.272.0.tgz", + "integrity": "sha512-c4MPUaJt2G6gGpoiwIOqDfUa98c1J63RpYvf/spQEKOtC/tF5Gfqlxuq8FnAl5lHnrqj1B9ZXLLxFhHtDR0IiQ==", + "dependencies": { + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/util-hex-encoding": { + "version": "3.201.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.201.0.tgz", + "integrity": "sha512-7t1vR1pVxKx0motd3X9rI3m/xNp78p3sHtP5yo4NP4ARpxyJ0fokBomY8ScaH2D/B+U5o9ARxldJUdMqyBlJcA==", + "dependencies": { + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/util-locate-window": { + "version": "3.208.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.208.0.tgz", + "integrity": "sha512-iua1A2+P7JJEDHVgvXrRJSvsnzG7stYSGQnBVphIUlemwl6nN5D+QrgbjECtrbxRz8asYFHSzhdhECqN+tFiBg==", + "dependencies": { + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/util-middleware": { + "version": "3.272.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.272.0.tgz", + "integrity": "sha512-Abw8m30arbwxqmeMMha5J11ESpHUNmCeSqSzE8/C4B8jZQtHY4kq7f+upzcNIQ11lsd+uzBEzNG3+dDRi0XOJQ==", + "dependencies": { + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/util-retry": { + "version": "3.272.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-retry/-/util-retry-3.272.0.tgz", + "integrity": "sha512-Ngha5414LR4gRHURVKC9ZYXsEJhMkm+SJ+44wlzOhavglfdcKKPUsibz5cKY1jpUV7oKECwaxHWpBB8r6h+hOg==", + "dependencies": { + "@aws-sdk/service-error-classification": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">= 14.0.0" + } + }, + "node_modules/@aws-sdk/util-uri-escape": { + "version": "3.201.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-uri-escape/-/util-uri-escape-3.201.0.tgz", + "integrity": "sha512-TeTWbGx4LU2c5rx0obHeDFeO9HvwYwQtMh1yniBz00pQb6Qt6YVOETVQikRZ+XRQwEyCg/dA375UplIpiy54mA==", + "dependencies": { + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/util-user-agent-browser": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.282.0.tgz", + "integrity": "sha512-Z639oyTa5fZfyi4Xr64+eiAwBCxfpe9Op4Vhnr1z/RwonQM/qywydv6Ttpeq1q5uQ0nG4wTkOMpfh39g+VqIgw==", + "dependencies": { + "@aws-sdk/types": "3.272.0", + "bowser": "^2.11.0", + "tslib": "^2.3.1" + } + }, + "node_modules/@aws-sdk/util-user-agent-node": { + "version": "3.282.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.282.0.tgz", + "integrity": "sha512-GSOdWNmzEd554wR9HBrgeYptKBOybveVwUkd6ws+YTdCOz4xD5Gga+I5JomKkcMEUVdBrJnYVUtq7ZsJy2f11w==", + "dependencies": { + "@aws-sdk/node-config-provider": "3.272.0", + "@aws-sdk/types": "3.272.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "aws-crt": ">=1.0.0" + }, + "peerDependenciesMeta": { + "aws-crt": { + "optional": true + } + } + }, + "node_modules/@aws-sdk/util-utf8": { + "version": "3.254.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8/-/util-utf8-3.254.0.tgz", + "integrity": "sha512-14Kso/eIt5/qfIBmhEL9L1IfyUqswjSTqO2mY7KOzUZ9SZbwn3rpxmtkhmATkRjD7XIlLKaxBkI7tU9Zjzj8Kw==", + "dependencies": { + "@aws-sdk/util-buffer-from": "3.208.0", + "tslib": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/util-utf8-browser": { + "version": "3.259.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz", + "integrity": "sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==", + "dependencies": { + "tslib": "^2.3.1" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", + "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", + "dependencies": { + "@babel/highlight": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/compat-data": { + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz", + "integrity": "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core": { + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz", + "integrity": "sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA==", + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.18.6", + "@babel/generator": "^7.21.0", + "@babel/helper-compilation-targets": "^7.20.7", + "@babel/helper-module-transforms": "^7.21.0", + "@babel/helpers": "^7.21.0", + "@babel/parser": "^7.21.0", + "@babel/template": "^7.20.7", + "@babel/traverse": "^7.21.0", + "@babel/types": "^7.21.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.2", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@babel/core/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@babel/generator": { + "version": "7.21.1", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.1.tgz", + "integrity": "sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA==", + "dependencies": { + "@babel/types": "^7.21.0", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", + "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "dependencies": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/helper-compilation-targets": { + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz", + "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==", + "dependencies": { + "@babel/compat-data": "^7.20.5", + "@babel/helper-validator-option": "^7.18.6", + "browserslist": "^4.21.3", + "lru-cache": "^5.1.1", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-compilation-targets/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@babel/helper-environment-visitor": { + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", + "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-function-name": { + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz", + "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==", + "dependencies": { + "@babel/template": "^7.20.7", + "@babel/types": "^7.21.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-hoist-variables": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", + "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", + "dependencies": { + "@babel/types": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-imports": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", + "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", + "dependencies": { + "@babel/types": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-transforms": { + "version": "7.21.2", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz", + "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==", + "dependencies": { + "@babel/helper-environment-visitor": "^7.18.9", + "@babel/helper-module-imports": "^7.18.6", + "@babel/helper-simple-access": "^7.20.2", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/helper-validator-identifier": "^7.19.1", + "@babel/template": "^7.20.7", + "@babel/traverse": "^7.21.2", + "@babel/types": "^7.21.2" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-plugin-utils": { + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", + "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-simple-access": { + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", + "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", + "dependencies": { + "@babel/types": "^7.20.2" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-split-export-declaration": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", + "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", + "dependencies": { + "@babel/types": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", + "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", + "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-option": { + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz", + "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers": { + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz", + "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==", + "dependencies": { + "@babel/template": "^7.20.7", + "@babel/traverse": "^7.21.0", + "@babel/types": "^7.21.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", + "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "dependencies": { + "@babel/helper-validator-identifier": "^7.18.6", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/parser": { + "version": "7.21.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz", + "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==", + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/plugin-transform-destructuring": { + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz", + "integrity": "sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.20.2" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-parameters": { + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz", + "integrity": "sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.20.2" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-shorthand-properties": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz", + "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/template": { + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz", + "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==", + "dependencies": { + "@babel/code-frame": "^7.18.6", + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse": { + "version": "7.21.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.2.tgz", + "integrity": "sha512-ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw==", + "dependencies": { + "@babel/code-frame": "^7.18.6", + "@babel/generator": "^7.21.1", + "@babel/helper-environment-visitor": "^7.18.9", + "@babel/helper-function-name": "^7.21.0", + "@babel/helper-hoist-variables": "^7.18.6", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/parser": "^7.21.2", + "@babel/types": "^7.21.2", + "debug": "^4.1.0", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/types": { + "version": "7.21.2", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.2.tgz", + "integrity": "sha512-3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw==", + "dependencies": { + "@babel/helper-string-parser": "^7.19.4", + "@babel/helper-validator-identifier": "^7.19.1", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@hapi/hoek": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", + "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" + }, + "node_modules/@hapi/topo": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz", + "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", + "dependencies": { + "@hapi/hoek": "^9.0.0" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", + "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", + "dependencies": { + "@jridgewell/set-array": "^1.0.0", + "@jridgewell/sourcemap-codec": "^1.4.10" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", + "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.14", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", + "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.17", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", + "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", + "dependencies": { + "@jridgewell/resolve-uri": "3.1.0", + "@jridgewell/sourcemap-codec": "1.4.14" + } + }, + "node_modules/@mongodb-js/devtools-connect": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-1.4.4.tgz", + "integrity": "sha512-SANGqz+k/3/Nt0YA3RlQ7852XK6zOFJ33VfVZgJFSm7Nlrh2vkCjZGjPNq7bb3lvIU7fcCd1Dbn/tCWBNKEvqg==", + "dependencies": { + "system-ca": "^1.0.2" + }, + "optionalDependencies": { + "os-dns-native": "^1.2.0", + "resolve-mongodb-srv": "^1.1.1" + }, + "peerDependencies": { + "mongodb": "^4.2.2 || ^5.0.0", + "mongodb-log-writer": "^1.1.3" + } + }, + "node_modules/@mongodb-js/mongodb-constants": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@mongodb-js/mongodb-constants/-/mongodb-constants-0.2.2.tgz", + "integrity": "sha512-vm1G+/WRWmXGyE9ZnhDv9toe+LRu1x0F/lGEwqWESfBiUUUuVZhj25fS2o4IL7H4pJ31sFxr7/gu+ER8OkmtzA==" + }, + "node_modules/@mongosh/arg-parser": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-1.8.0.tgz", + "integrity": "sha512-pl8B2Sd1pe7I6ekAFDrDGd/LL4iaxXxt1F5Y/jZxIiW/hNMLVHQ1pQ59ofaWNAe4wTzpp4IgCWcReU4MuQtTFw==", + "dependencies": { + "@mongosh/errors": "1.8.0", + "@mongosh/i18n": "1.8.0", + "mongodb-connection-string-url": "^2.6.0" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "node_modules/@mongosh/async-rewriter2": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-1.8.0.tgz", + "integrity": "sha512-ti1IxIOwP6+2Tbj9Q80unOr28ySkidIsKDp6dl37JvJ9dmd7ql+STsrI4itO18qEnOHaf6nUnOR/JVUfIq6yUg==", + "dependencies": { + "@babel/core": "7.16.x", + "@babel/plugin-transform-destructuring": "^7.16.7", + "@babel/plugin-transform-parameters": "^7.16.7", + "@babel/plugin-transform-shorthand-properties": "^7.16.7", + "@babel/types": "^7.16.8", + "@types/babel__core": "^7.1.18" + }, + "bin": { + "async-rewrite": "bin/async-rewrite.js" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "node_modules/@mongosh/async-rewriter2/node_modules/@babel/core": { + "version": "7.16.12", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.12.tgz", + "integrity": "sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg==", + "dependencies": { + "@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", + "json5": "^2.1.2", + "semver": "^6.3.0", + "source-map": "^0.5.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@mongosh/async-rewriter2/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@mongosh/autocomplete": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-1.8.0.tgz", + "integrity": "sha512-IGk69vBhWyMtD6irylTTB5dVnfT5II2cezxo+Q0nxgoyelRESpUOMGhNB0SJX1opjJ5R4/nsiRNuGObFjbE8mA==", + "dependencies": { + "@mongodb-js/mongodb-constants": "^0.2.2", + "@mongosh/shell-api": "1.8.0", + "semver": "^7.3.2" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "node_modules/@mongosh/cli-repl": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-1.8.0.tgz", + "integrity": "sha512-TfCHtW37dk8OVZUsmqm5KYDViu9hehOaL40G/A6wyiE9KseKrglXSNNskPYKWz7Cn8y5Muo9kbeJ7eqhho3Igw==", + "dependencies": { + "@mongosh/arg-parser": "1.8.0", + "@mongosh/autocomplete": "1.8.0", + "@mongosh/editor": "1.8.0", + "@mongosh/errors": "1.8.0", + "@mongosh/history": "1.8.0", + "@mongosh/i18n": "1.8.0", + "@mongosh/js-multiline-to-singleline": "1.8.0", + "@mongosh/logging": "1.8.0", + "@mongosh/service-provider-core": "1.8.0", + "@mongosh/service-provider-server": "1.8.0", + "@mongosh/shell-api": "1.8.0", + "@mongosh/shell-evaluator": "1.8.0", + "@mongosh/snippet-manager": "1.8.0", + "@mongosh/types": "1.8.0", + "analytics-node": "^5.1.2", + "ansi-escape-sequences": "^5.1.2", + "askcharacter": "^1.0.0", + "askpassword": "^1.2.4", + "is-recoverable-error": "^1.0.3", + "js-yaml": "^4.1.0", + "mongodb-connection-string-url": "^2.6.0", + "mongodb-log-writer": "^1.1.5", + "numeral": "^2.0.6", + "pretty-repl": "^3.1.1", + "semver": "^7.1.2", + "strip-ansi": "^6.0.0", + "text-table": "^0.2.0", + "yargs-parser": "^20.2.4" + }, + "bin": { + "mongosh": "bin/mongosh.js" + }, + "engines": { + "node": ">=16.15.0" + }, + "optionalDependencies": { + "get-console-process-list": "^1.0.4", + "macos-export-certificate-and-key": "^1.1.1", + "mongodb-crypt-library-version": "^1.0.3", + "win-export-certificate-and-key": "^1.1.1" + } + }, + "node_modules/@mongosh/editor": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@mongosh/editor/-/editor-1.8.0.tgz", + "integrity": "sha512-/QyNSMeEPWdmb3ZXA/IVee0CUm76zJRqP/hUaOjhGXLkc84U2/cUJgfpfbBpCevXCWNs76cX+Y3yct8FmfD2dg==", + "dependencies": { + "@mongosh/js-multiline-to-singleline": "1.8.0", + "@mongosh/service-provider-core": "1.8.0", + "@mongosh/shell-api": "1.8.0", + "@mongosh/shell-evaluator": "1.8.0", + "@mongosh/types": "1.8.0", + "js-beautify": "^1.14.0" + }, + "engines": { + "node": ">=16.15.0" + } + }, + "node_modules/@mongosh/errors": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-1.8.0.tgz", + "integrity": "sha512-5DvB9uQacBUYGlF+8ZpGrpGpQUfySgSYZpFYmvPThgtoDrkB7TmTiO+dt7yA1st1ZiSgspmJ83+mUMBmOwk4+g==", + "engines": { + "node": ">=14.15.1" + } + }, + "node_modules/@mongosh/history": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-1.8.0.tgz", + "integrity": "sha512-P1fiBjPhSFpMtUawt+dR9v+Hkvy2SlvMRgNfmriua7/I/hwPq6e/4o+AuSDqWc8VdAwTUfhv2dvbqnr5wvCNyw==", + "dependencies": { + "mongodb-connection-string-url": "^2.6.0", + "mongodb-redact": "^0.2.2" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "node_modules/@mongosh/i18n": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-1.8.0.tgz", + "integrity": "sha512-O3Clvh5EMC4Kjs5azXu3ZQAlMUsUdfIZZCAYwERmt7ET1xriE+0HX0SeyXx/nS9PfWj3qRWsNzIUPO1pJR5ojw==", + "dependencies": { + "@mongosh/errors": "1.8.0", + "mustache": "^4.0.0" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "node_modules/@mongosh/js-multiline-to-singleline": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-1.8.0.tgz", + "integrity": "sha512-nMafNRoHYshj+Z5upk7JktPvc5LwA7bBHAPcyNyBSBzw66b766DN9DjhKDi1DW2fygPdkaRnwtOtZVDVAiHhYg==", + "dependencies": { + "@babel/core": "^7.16.12" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "node_modules/@mongosh/logging": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-1.8.0.tgz", + "integrity": "sha512-xo1XfwSytpGVb3lL0MTWSmlbcU/de8mbffbiWgjMx7VBPuNUFTrmygkwIzqQ4Dq1PdWK7rN1sXbk07z3Ri5GvA==", + "dependencies": { + "@mongodb-js/devtools-connect": "^1.4.4", + "@mongosh/errors": "1.8.0", + "@mongosh/history": "1.8.0", + "@mongosh/types": "1.8.0", + "mongodb-log-writer": "^1.1.5", + "mongodb-redact": "^0.2.2" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "node_modules/@mongosh/service-provider-core": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-1.8.0.tgz", + "integrity": "sha512-XxzvPQBfQSq8QbmnqRPex7LyfSjlnooECK3jJkEo/tnJvw0Ly0zqp0+XCkqbTEbuaI3TJx4VfJEqADKB3/9tuQ==", + "dependencies": { + "@aws-sdk/credential-providers": "^3.262.0", + "@mongosh/errors": "1.8.0", + "bson": "^5.0.1", + "mongodb": "^5.1.0", + "mongodb-build-info": "^1.5.0" + }, + "engines": { + "node": ">=14.15.1" + }, + "optionalDependencies": { + "mongodb-client-encryption": "^2.6.0" + } + }, + "node_modules/@mongosh/service-provider-server": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-1.8.0.tgz", + "integrity": "sha512-HY0fXi57u2CZ3KsS7+vNmCdzokFX0uMGL5RgbFX5T1RElIhIYh+fUfKHWKtTh5At8VEM36Bro8NqtNryZZHppQ==", + "dependencies": { + "@mongodb-js/devtools-connect": "^1.4.4", + "@mongosh/errors": "1.8.0", + "@mongosh/service-provider-core": "1.8.0", + "@mongosh/types": "1.8.0", + "@types/sinon-chai": "^3.2.3", + "aws4": "^1.11.0", + "mongodb": "^5.1.0", + "mongodb-connection-string-url": "^2.6.0", + "saslprep": "github:mongodb-js/saslprep#v1.0.4" + }, + "engines": { + "node": ">=14.15.1" + }, + "optionalDependencies": { + "kerberos": "^2.0.0", + "mongodb-client-encryption": "^2.6.0" + } + }, + "node_modules/@mongosh/shell-api": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-1.8.0.tgz", + "integrity": "sha512-fXj/BA0zhKrXsPRa6Q97LO58VhI4y7MpCZ0bKOhNDYLpa9jzVzlBGszB3m2I5U9NKXstXRZjwU1PL5bdHQ34Vw==", + "dependencies": { + "@mongosh/arg-parser": "1.8.0", + "@mongosh/errors": "1.8.0", + "@mongosh/history": "1.8.0", + "@mongosh/i18n": "1.8.0", + "@mongosh/service-provider-core": "1.8.0", + "mongodb-redact": "^0.2.2" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "node_modules/@mongosh/shell-evaluator": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-1.8.0.tgz", + "integrity": "sha512-/t5/RUoDsDj4JkALBK575E+aKRzAKJmq3aJRn51KyC1iWUz9OUWBQUzhp2L/94T+RITnr1C4ZSMYBd6VzvXpdw==", + "dependencies": { + "@mongosh/async-rewriter2": "1.8.0", + "@mongosh/history": "1.8.0", + "@mongosh/shell-api": "1.8.0" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "node_modules/@mongosh/snippet-manager": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-1.8.0.tgz", + "integrity": "sha512-tiX3aBXN5+MjQE3PGDVZa0IqhmdpXP6MY5DQJEHInhnIXOKEeE3pd8zHFi7uQDWEqS1r86mhm4Z2YVapCxO0Ng==", + "dependencies": { + "@mongosh/errors": "1.8.0", + "@mongosh/shell-api": "1.8.0", + "@mongosh/types": "1.8.0", + "bson": "^5.0.1", + "cross-spawn": "^7.0.3", + "escape-string-regexp": "^4.0.0", + "joi": "^17.4.0", + "node-fetch": "^2.6.1", + "tar": "^6.1.0" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "node_modules/@mongosh/types": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-1.8.0.tgz", + "integrity": "sha512-D9y3XMj6V1it+dVTPIT9LitibqWq4sy0pzQs3/fiZwW4/OcNCXvp8ayKhX2zskTN0rGQdSeL5M76R5Oe1512PQ==", + "dependencies": { + "@mongodb-js/devtools-connect": "^1.4.4" + }, + "engines": { + "node": ">=14.15.1" + } + }, + "node_modules/@segment/loosely-validate-event": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@segment/loosely-validate-event/-/loosely-validate-event-2.0.0.tgz", + "integrity": "sha512-ZMCSfztDBqwotkl848ODgVcAmN4OItEWDCkshcKz0/W6gGSQayuuCtWV/MlodFivAZD793d6UgANd6wCXUfrIw==", + "dependencies": { + "component-type": "^1.2.1", + "join-component": "^1.1.0" + } + }, + "node_modules/@sideway/address": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz", + "integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==", + "dependencies": { + "@hapi/hoek": "^9.0.0" + } + }, + "node_modules/@sideway/formula": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz", + "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==" + }, + "node_modules/@sideway/pinpoint": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz", + "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" + }, + "node_modules/@types/babel__core": { + "version": "7.20.0", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz", + "integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==", + "dependencies": { + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "node_modules/@types/babel__generator": { + "version": "7.6.4", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz", + "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==", + "dependencies": { + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__template": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", + "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", + "dependencies": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__traverse": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz", + "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==", + "dependencies": { + "@babel/types": "^7.3.0" + } + }, + "node_modules/@types/chai": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.4.tgz", + "integrity": "sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw==" + }, + "node_modules/@types/node": { + "version": "18.14.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.6.tgz", + "integrity": "sha512-93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA==" + }, + "node_modules/@types/sinon": { + "version": "10.0.13", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.13.tgz", + "integrity": "sha512-UVjDqJblVNQYvVNUsj0PuYYw0ELRmgt1Nt5Vk0pT5f16ROGfcKJY8o1HVuMOJOpD727RrGB9EGvoaTQE5tgxZQ==", + "dependencies": { + "@types/sinonjs__fake-timers": "*" + } + }, + "node_modules/@types/sinon-chai": { + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/@types/sinon-chai/-/sinon-chai-3.2.9.tgz", + "integrity": "sha512-/19t63pFYU0ikrdbXKBWj9PCdnKyTd0Qkz0X91Ta081cYsq90OxYdcWwK/dwEoDa6dtXgj2HJfmzgq+QZTHdmQ==", + "dependencies": { + "@types/chai": "*", + "@types/sinon": "*" + } + }, + "node_modules/@types/sinonjs__fake-timers": { + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.2.tgz", + "integrity": "sha512-9GcLXF0/v3t80caGs5p2rRfkB+a8VBGLJZVih6CNFkx8IZ994wiKKLSRs9nuFwk1HevWs/1mnUmkApGrSGsShA==" + }, + "node_modules/@types/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-xTE1E+YF4aWPJJeUzaZI5DRntlkY3+BCVJi0axFptnjGmAoWxkyREIh/XMrfxVLejwQxMCfDXdICo0VLxThrog==" + }, + "node_modules/@types/whatwg-url": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.2.tgz", + "integrity": "sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==", + "dependencies": { + "@types/node": "*", + "@types/webidl-conversions": "*" + } + }, + "node_modules/abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + }, + "node_modules/acorn": { + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", + "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-class-fields": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/acorn-class-fields/-/acorn-class-fields-1.0.0.tgz", + "integrity": "sha512-l+1FokF34AeCXGBHkrXFmml9nOIRI+2yBnBpO5MaVAaTIJ96irWLtcCxX+7hAp6USHFCe+iyyBB4ZhxV807wmA==", + "dependencies": { + "acorn-private-class-elements": "^1.0.0" + }, + "engines": { + "node": ">=4.8.2" + }, + "peerDependencies": { + "acorn": "^6 || ^7 || ^8" + } + }, + "node_modules/acorn-numeric-separator": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/acorn-numeric-separator/-/acorn-numeric-separator-0.3.6.tgz", + "integrity": "sha512-jUr5esgChu4k7VzesH/Nww3EysuyGJJcTEEiXqILUFKpO96PNyEXmK21M6nE0TSqGA1PeEg1MzgqJaoFsn9JMw==", + "deprecated": "acorn>=7.4 supports numeric separators", + "engines": { + "node": ">=4.8.2" + }, + "peerDependencies": { + "acorn": "^6 || ^7 || ^8" + } + }, + "node_modules/acorn-private-class-elements": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/acorn-private-class-elements/-/acorn-private-class-elements-1.0.0.tgz", + "integrity": "sha512-zYNcZtxKgVCg1brS39BEou86mIao1EV7eeREG+6WMwKbuYTeivRRs6S2XdWnboRde6G9wKh2w+WBydEyJsJ6mg==", + "engines": { + "node": ">=4.8.2" + }, + "peerDependencies": { + "acorn": "^6.1.0 || ^7 || ^8" + } + }, + "node_modules/acorn-private-methods": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/acorn-private-methods/-/acorn-private-methods-1.0.0.tgz", + "integrity": "sha512-Jou2L3nfwfPpFdmmHObI3yUpVPM1bPohTUAZCyVDw5Efyn9LSS6E36neRLCRfIr8QjskAfdxRdABOrvP4c/gwQ==", + "dependencies": { + "acorn-private-class-elements": "^1.0.0" + }, + "engines": { + "node": ">=4.8.2" + }, + "peerDependencies": { + "acorn": "^6 || ^7 || ^8" + } + }, + "node_modules/acorn-static-class-features": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/acorn-static-class-features/-/acorn-static-class-features-1.0.0.tgz", + "integrity": "sha512-XZJECjbmMOKvMHiNzbiPXuXpLAJfN3dAKtfIYbk1eHiWdsutlek+gS7ND4B8yJ3oqvHo1NxfafnezVmq7NXK0A==", + "dependencies": { + "acorn-private-class-elements": "^1.0.0" + }, + "engines": { + "node": ">=4.8.2" + }, + "peerDependencies": { + "acorn": "^6.1.0 || ^7 || ^8" + } + }, + "node_modules/analytics-node": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/analytics-node/-/analytics-node-5.1.2.tgz", + "integrity": "sha512-WZ8gkXtLuqD2Q2xEOr/2/LJiR0AnhWHfXZhfPnMZpB7vEwCsh3HapYAUmA1cPj1abrhAqBX7POWuWo/1wUu/Fw==", + "dependencies": { + "@segment/loosely-validate-event": "^2.0.0", + "axios": "^0.21.4", + "axios-retry": "3.2.0", + "lodash.isstring": "^4.0.1", + "md5": "^2.2.1", + "ms": "^2.0.0", + "remove-trailing-slash": "^0.1.0", + "uuid": "^8.3.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/ansi-escape-sequences": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-5.1.2.tgz", + "integrity": "sha512-JcpoVp1W1bl1Qn4cVuiXEhD6+dyXKSOgCn2zlzE8inYgCJCBy1aPnUhlz6I4DFum8D4ovb9Qi/iAjUcGvG2lqw==", + "dependencies": { + "array-back": "^4.0.0" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + }, + "node_modules/array-back": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz", + "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/askcharacter": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/askcharacter/-/askcharacter-1.0.0.tgz", + "integrity": "sha512-WsJcKyOh7iOWQSWcwPVE//yDUSXn3WvL+bgT9JYdEuiY/xeg1Vgwl5re72ZzufhXOwoiCrWWxW4CscRrxb3kZg==", + "dependencies": { + "hijack-stream": "^1.0.0" + } + }, + "node_modules/askpassword": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/askpassword/-/askpassword-1.2.4.tgz", + "integrity": "sha512-HR27ScUv/j6vHSKU0AN+y3pGA3iqXzD09qqJl6JjVqSJRk7QiKPJt+W4tFhozMbiTsOh/QrIkeRi+Okd97VkRA==", + "dependencies": { + "handle-backspaces": "^1.0.0", + "hijack-stream": "^1.0.0" + } + }, + "node_modules/aws4": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz", + "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==" + }, + "node_modules/axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "dependencies": { + "follow-redirects": "^1.14.0" + } + }, + "node_modules/axios-retry": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/axios-retry/-/axios-retry-3.2.0.tgz", + "integrity": "sha512-RK2cLMgIsAQBDhlIsJR5dOhODPigvel18XUv1dDXW+4k1FzebyfRk+C+orot6WPZOYFKSfhLwHPwVmTVOODQ5w==", + "dependencies": { + "is-retry-allowed": "^1.1.0" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "optional": true + }, + "node_modules/bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "optional": true, + "dependencies": { + "file-uri-to-path": "1.0.0" + } + }, + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "optional": true, + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/bowser": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz", + "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==" + }, + "node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/browserslist": { + "version": "4.21.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz", + "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + } + ], + "dependencies": { + "caniuse-lite": "^1.0.30001449", + "electron-to-chromium": "^1.4.284", + "node-releases": "^2.0.8", + "update-browserslist-db": "^1.0.10" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/bson": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/bson/-/bson-5.0.1.tgz", + "integrity": "sha512-y09gBGusgHtinMon/GVbv1J6FrXhnr/+6hqLlSmEFzkz6PodqF6TxjyvfvY3AfO+oG1mgUtbC86xSbOlwvM62Q==", + "engines": { + "node": ">=14.20.1" + } + }, + "node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "optional": true, + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001460", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001460.tgz", + "integrity": "sha512-Bud7abqjvEjipUkpLs4D7gR0l8hBYBHoa+tGtKJHvT2AYzLp1z7EmVkUT4ERpVUfca8S2HGIVs883D8pUH1ZzQ==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + } + ] + }, + "node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/chalk/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/charenc": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", + "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==", + "engines": { + "node": "*" + } + }, + "node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "engines": { + "node": ">=10" + } + }, + "node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" + }, + "node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + }, + "node_modules/component-type": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-type/-/component-type-1.2.1.tgz", + "integrity": "sha512-Kgy+2+Uwr75vAi6ChWXgHuLvd+QLD7ssgpaRq2zCvt80ptvAfMc/hijcJxXkBa2wMlEZcJvC2H8Ubo+A9ATHIg==" + }, + "node_modules/config-chain": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", + "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", + "dependencies": { + "ini": "^1.3.4", + "proto-list": "~1.2.1" + } + }, + "node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/crypt": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", + "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==", + "engines": { + "node": "*" + } + }, + "node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/debug/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "node_modules/decompress-response": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "optional": true, + "dependencies": { + "mimic-response": "^3.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "optional": true, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/detect-libc": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz", + "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==", + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/editorconfig": { + "version": "0.15.3", + "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz", + "integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==", + "dependencies": { + "commander": "^2.19.0", + "lru-cache": "^4.1.5", + "semver": "^5.6.0", + "sigmund": "^1.0.1" + }, + "bin": { + "editorconfig": "bin/editorconfig" + } + }, + "node_modules/editorconfig/node_modules/lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "dependencies": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "node_modules/editorconfig/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/editorconfig/node_modules/yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==" + }, + "node_modules/electron-to-chromium": { + "version": "1.4.320", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.320.tgz", + "integrity": "sha512-h70iRscrNluMZPVICXYl5SSB+rBKo22XfuIS1ER0OQxQZpKTnFpuS6coj7wY9M/3trv7OR88rRMOlKmRvDty7Q==" + }, + "node_modules/emphasize": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emphasize/-/emphasize-3.0.0.tgz", + "integrity": "sha512-xhtAWvxdkxsQbcCLGVjlfB7cQ4bWSPYXeaGDwK5Bl7n2y/9R+MVK5UNBTmZ9N8m/YShsiyGgQBgFGcjOWCWXHQ==", + "dependencies": { + "chalk": "^3.0.0", + "highlight.js": "~9.12.0", + "lowlight": "~1.9.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/emphasize/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/emphasize/node_modules/chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/emphasize/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/emphasize/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/emphasize/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/emphasize/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "optional": true, + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/expand-template": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", + "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", + "optional": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/fast-xml-parser": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.1.2.tgz", + "integrity": "sha512-CDYeykkle1LiA/uqQyNwYpFbyF6Axec6YapmpUP+/RHWIoR1zKjocdvNaTsxCxZzQ6v9MLXaSYm9Qq0thv0DHg==", + "dependencies": { + "strnum": "^1.0.5" + }, + "bin": { + "fxparser": "src/cli/cli.js" + }, + "funding": { + "type": "paypal", + "url": "https://paypal.me/naturalintelligence" + } + }, + "node_modules/fault": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz", + "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==", + "dependencies": { + "format": "^0.2.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "optional": true + }, + "node_modules/follow-redirects": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/format": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz", + "integrity": "sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==", + "engines": { + "node": ">=0.4.x" + } + }, + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "optional": true + }, + "node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/fs-minipass/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/fs-minipass/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" + }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-console-process-list": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/get-console-process-list/-/get-console-process-list-1.0.4.tgz", + "integrity": "sha512-vn5MA+CCTMgRuF9fxvJYLC2fMCuBPKQ7RwhA9H2TvMvy33oDivjIqA4mh2NJlUDoZXPcu/1moN3VfyukxxKwpA==", + "hasInstallScript": true, + "optional": true, + "os": [ + "win32" + ], + "dependencies": { + "bindings": "^1.5.0", + "node-addon-api": "^4.3.0" + } + }, + "node_modules/github-from-package": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", + "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", + "optional": true + }, + "node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "engines": { + "node": ">=4" + } + }, + "node_modules/handle-backspaces": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/handle-backspaces/-/handle-backspaces-1.0.0.tgz", + "integrity": "sha512-w11NXUn51gVN50nTW5MOuhKuko9xZonnHDe5LlapaOZvuyxDXVDn9b1ZtG0IJTABGbL/UGeSitqHgo9Bb7nDhQ==" + }, + "node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "engines": { + "node": ">=4" + } + }, + "node_modules/highlight.js": { + "version": "9.12.0", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz", + "integrity": "sha512-qNnYpBDO/FQwYVur1+sQBQw7v0cxso1nOYLklqWh6af8ROwwTVoII5+kf/BVa8354WL4ad6rURHYGUXCbD9mMg==", + "deprecated": "Version no longer supported. Upgrade to @latest", + "engines": { + "node": "*" + } + }, + "node_modules/hijack-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/hijack-stream/-/hijack-stream-1.0.0.tgz", + "integrity": "sha512-9riBbIorIgSvsLQHL/rKEK6vJBexhgSRZC/tkieuei7a1U+CHgrXJVqW+RPswgEyuPbxcGCpx0QXO3iJuKRrrw==" + }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "optional": true + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" + }, + "node_modules/ip": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", + "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==" + }, + "node_modules/ipv6-normalize": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ipv6-normalize/-/ipv6-normalize-1.0.1.tgz", + "integrity": "sha512-Bm6H79i01DjgGTCWjUuCjJ6QDo1HB96PT/xCYuyJUP9WFbVDrLSbG4EZCvOCun2rNswZb0c3e4Jt/ws795esHA==", + "optional": true + }, + "node_modules/is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + }, + "node_modules/is-recoverable-error": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-recoverable-error/-/is-recoverable-error-1.0.3.tgz", + "integrity": "sha512-T06goBQXH5WCzWtzuU+kYhT3Ui0d3wgk8n4GR/3n9UjgO6cuphhel+W02ps/Z2PYZB8C+l//XAJk9tR5Txo6/w==", + "dependencies": { + "acorn": "^8.8.1", + "acorn-class-fields": "^1.0.0", + "acorn-numeric-separator": "^0.3.6", + "acorn-private-methods": "^1.0.0", + "acorn-static-class-features": "^1.0.0" + } + }, + "node_modules/is-retry-allowed": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", + "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + }, + "node_modules/joi": { + "version": "17.8.3", + "resolved": "https://registry.npmjs.org/joi/-/joi-17.8.3.tgz", + "integrity": "sha512-q5Fn6Tj/jR8PfrLrx4fpGH4v9qM6o+vDUfD4/3vxxyg34OmKcNqYZ1qn2mpLza96S8tL0p0rIw2gOZX+/cTg9w==", + "dependencies": { + "@hapi/hoek": "^9.0.0", + "@hapi/topo": "^5.0.0", + "@sideway/address": "^4.1.3", + "@sideway/formula": "^3.0.1", + "@sideway/pinpoint": "^2.0.0" + } + }, + "node_modules/join-component": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/join-component/-/join-component-1.1.0.tgz", + "integrity": "sha512-bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ==" + }, + "node_modules/js-beautify": { + "version": "1.14.7", + "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.7.tgz", + "integrity": "sha512-5SOX1KXPFKx+5f6ZrPsIPEY7NwKeQz47n3jm2i+XeHx9MoRsfQenlOP13FQhWvg8JRS0+XLO6XYUQ2GX+q+T9A==", + "dependencies": { + "config-chain": "^1.1.13", + "editorconfig": "^0.15.3", + "glob": "^8.0.3", + "nopt": "^6.0.0" + }, + "bin": { + "css-beautify": "js/bin/css-beautify.js", + "html-beautify": "js/bin/html-beautify.js", + "js-beautify": "js/bin/js-beautify.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/kerberos": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-2.0.1.tgz", + "integrity": "sha512-O/jIgbdGK566eUhFwIcgalbqirYU/r76MW7/UFw06Fd9x5bSwgyZWL/Vm26aAmezQww/G9KYkmmJBkEkPk5HLw==", + "hasInstallScript": true, + "optional": true, + "dependencies": { + "bindings": "^1.5.0", + "node-addon-api": "^4.3.0", + "prebuild-install": "7.1.1" + }, + "engines": { + "node": ">=12.9.0" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==" + }, + "node_modules/lowlight": { + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.9.2.tgz", + "integrity": "sha512-Ek18ElVCf/wF/jEm1b92gTnigh94CtBNWiZ2ad+vTgW7cTmQxUY3I98BjHK68gZAJEWmybGBZgx9qv3QxLQB/Q==", + "dependencies": { + "fault": "^1.0.2", + "highlight.js": "~9.12.0" + } + }, + "node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dependencies": { + "yallist": "^3.0.2" + } + }, + "node_modules/macos-export-certificate-and-key": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/macos-export-certificate-and-key/-/macos-export-certificate-and-key-1.1.1.tgz", + "integrity": "sha512-J2g0dJRLG3DghmdCkbJnif/zPmSylj6ql//xBYff5allzNlHPnWxRoyho9XznBYLbPJw4jZlKjMO69jtV8VC7Q==", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "dependencies": { + "bindings": "^1.5.0", + "node-addon-api": "^4.3.0" + } + }, + "node_modules/md5": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz", + "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==", + "dependencies": { + "charenc": "0.0.2", + "crypt": "0.0.2", + "is-buffer": "~1.1.6" + } + }, + "node_modules/memory-pager": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", + "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==" + }, + "node_modules/mimic-response": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", + "optional": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "optional": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/minipass": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.4.tgz", + "integrity": "sha512-lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mkdirp-classic": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", + "optional": true + }, + "node_modules/mongodb": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.1.0.tgz", + "integrity": "sha512-qgKb7y+EI90y4weY3z5+lIgm8wmexbonz0GalHkSElQXVKtRuwqXuhXKccyvIjXCJVy9qPV82zsinY0W1FBnJw==", + "dependencies": { + "bson": "^5.0.1", + "mongodb-connection-string-url": "^2.6.0", + "socks": "^2.7.1" + }, + "engines": { + "node": ">=14.20.1" + }, + "optionalDependencies": { + "saslprep": "^1.0.3" + }, + "peerDependencies": { + "@aws-sdk/credential-providers": "^3.201.0", + "mongodb-client-encryption": "^2.3.0", + "snappy": "^7.2.2" + }, + "peerDependenciesMeta": { + "@aws-sdk/credential-providers": { + "optional": true + }, + "mongodb-client-encryption": { + "optional": true + }, + "snappy": { + "optional": true + } + } + }, + "node_modules/mongodb-build-info": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/mongodb-build-info/-/mongodb-build-info-1.5.0.tgz", + "integrity": "sha512-D+cXTPet0X7fcMuXBR+Trzqjl9DX7lX7L36v527+5T8mp/wTUP9r/rA/PrmHrQLa9jGknxEbAZOHpC+g/lJ/UQ==", + "dependencies": { + "mongodb-connection-string-url": "^2.2.0" + } + }, + "node_modules/mongodb-client-encryption": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-2.6.0.tgz", + "integrity": "sha512-2fJFZLX+VK7zOyMkOy/LAH2TO1TpBLzPW0YzIujhsng//KRcdvro/JmQ3R/iwptjZJSrPOOZcVUq9yi5KY5akg==", + "hasInstallScript": true, + "optional": true, + "dependencies": { + "bindings": "^1.5.0", + "node-addon-api": "^4.3.0", + "prebuild-install": "^7.1.1", + "socks": "^2.6.1" + }, + "engines": { + "node": ">=12.9.0" + }, + "peerDependencies": { + "@aws-sdk/credential-providers": "^3.186.0", + "gcp-metadata": "^5.2.0", + "mongodb": ">=3.4.0" + }, + "peerDependenciesMeta": { + "@aws-sdk/credential-providers": { + "optional": true + }, + "gcp-metadata": { + "optional": true + } + } + }, + "node_modules/mongodb-connection-string-url": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz", + "integrity": "sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ==", + "dependencies": { + "@types/whatwg-url": "^8.2.1", + "whatwg-url": "^11.0.0" + } + }, + "node_modules/mongodb-crypt-library-version": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/mongodb-crypt-library-version/-/mongodb-crypt-library-version-1.0.3.tgz", + "integrity": "sha512-w+T89kF9fC7npcf7m/+OUeXasf5TSL0GlugOCxzdXQFykV5MdU2yvcuuDZz4MD1pJickvGxBcw41jGg2s4lJ0g==", + "hasInstallScript": true, + "optional": true, + "dependencies": { + "bindings": "^1.5.0", + "node-addon-api": "^4.3.0" + }, + "bin": { + "mongodb-crypt-library-version": "bin/mongodb-crypt-library-version.js" + } + }, + "node_modules/mongodb-log-writer": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-1.1.5.tgz", + "integrity": "sha512-vwylkiNJciRHHupPiitDsTd4yzZZg3XnVaa6WXvYIApBEGFtCXBVdJBBF5K8c49evRp2mSds9O1uSVKWwC5yRg==", + "dependencies": { + "bson": "^4.5.1 || ^5.0.0" + } + }, + "node_modules/mongodb-redact": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/mongodb-redact/-/mongodb-redact-0.2.2.tgz", + "integrity": "sha512-tmgDpSBymFtKggsLzpa0vDYaqh2wEXOswBZtJkXvbPKP0ThfPwoFYXtOukactU6WZsC4RYmpSPM4P6582FR/Xw==", + "dependencies": { + "lodash": "^4.17.15" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "node_modules/mustache": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz", + "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==", + "bin": { + "mustache": "bin/mustache" + } + }, + "node_modules/napi-build-utils": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz", + "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==", + "optional": true + }, + "node_modules/node-abi": { + "version": "3.33.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.33.0.tgz", + "integrity": "sha512-7GGVawqyHF4pfd0YFybhv/eM9JwTtPqx0mAanQ146O3FlSh3pA24zf9IRQTOsfTSqXTNzPSP5iagAJ94jjuVog==", + "optional": true, + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/node-addon-api": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz", + "integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==", + "optional": true + }, + "node_modules/node-fetch": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz", + "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, + "node_modules/node-fetch/node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, + "node_modules/node-fetch/node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, + "node_modules/node-fetch/node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, + "node_modules/node-forge": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", + "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==", + "optional": true, + "engines": { + "node": ">= 6.13.0" + } + }, + "node_modules/node-releases": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz", + "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==" + }, + "node_modules/nopt": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", + "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", + "dependencies": { + "abbrev": "^1.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/numeral": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/numeral/-/numeral-2.0.6.tgz", + "integrity": "sha512-qaKRmtYPZ5qdw4jWJD6bxEf1FJEqllJrwxCLIm0sQU/A7v2/czigzOb+C2uSiFsa9lBUzeH7M1oK+Q+OLxL3kA==", + "engines": { + "node": "*" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/os-dns-native": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/os-dns-native/-/os-dns-native-1.2.0.tgz", + "integrity": "sha512-pnq7NYCsuZixeIOFjerXIXXFNpqJyDqiIHTu9TzefKtu+8ReUROA9OB2VQE+qk3uYhkXtxe1tf8b4dqPINtStw==", + "hasInstallScript": true, + "optional": true, + "dependencies": { + "bindings": "^1.5.0", + "debug": "^4.3.3", + "ipv6-normalize": "^1.0.1", + "node-addon-api": "^4.3.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "engines": { + "node": ">=8" + } + }, + "node_modules/picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + }, + "node_modules/prebuild-install": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz", + "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==", + "optional": true, + "dependencies": { + "detect-libc": "^2.0.0", + "expand-template": "^2.0.3", + "github-from-package": "0.0.0", + "minimist": "^1.2.3", + "mkdirp-classic": "^0.5.3", + "napi-build-utils": "^1.0.1", + "node-abi": "^3.3.0", + "pump": "^3.0.0", + "rc": "^1.2.7", + "simple-get": "^4.0.0", + "tar-fs": "^2.0.0", + "tunnel-agent": "^0.6.0" + }, + "bin": { + "prebuild-install": "bin.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/pretty-repl": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/pretty-repl/-/pretty-repl-3.1.1.tgz", + "integrity": "sha512-JHhsuel0+/j4nKIdRnCcdE5qx4FVpeJEXTCpmGdhv5ivKlXWoQw0x9AqocsGQ+HABJ63lJ6pYF1OCoWAF0rEhA==", + "dependencies": { + "ansi-regex": "^5.0.0", + "chalk": "^4.1.1", + "emphasize": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=11" + } + }, + "node_modules/pretty-repl/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/pretty-repl/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/pretty-repl/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/pretty-repl/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/pretty-repl/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/pretty-repl/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/proto-list": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", + "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==" + }, + "node_modules/pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==" + }, + "node_modules/pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "optional": true, + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "node_modules/punycode": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", + "engines": { + "node": ">=6" + } + }, + "node_modules/rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "optional": true, + "dependencies": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "bin": { + "rc": "cli.js" + } + }, + "node_modules/readable-stream": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz", + "integrity": "sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==", + "optional": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/remove-trailing-slash": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/remove-trailing-slash/-/remove-trailing-slash-0.1.1.tgz", + "integrity": "sha512-o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA==" + }, + "node_modules/resolve-mongodb-srv": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/resolve-mongodb-srv/-/resolve-mongodb-srv-1.1.2.tgz", + "integrity": "sha512-jCuT9KvycstfAQnS/0KnfL48RVLYHuq4S3NZznQzuPMNyH7dBoMqSRSwWYIHp/UCcAnpXbNLrILEzEoxE8wWKA==", + "optional": true, + "dependencies": { + "whatwg-url": "^11.0.0" + }, + "bin": { + "resolve-mongodb-srv": "bin/resolve-mongodb-srv.js" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "optional": true + }, + "node_modules/saslprep": { + "version": "1.0.4", + "resolved": "git+ssh://git@github.com/mongodb-js/saslprep.git#9813a626d0685f54e4f2fac6160470d6e01d8c96", + "license": "MIT", + "dependencies": { + "sparse-bitfield": "^3.0.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "engines": { + "node": ">=8" + } + }, + "node_modules/sigmund": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", + "integrity": "sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==" + }, + "node_modules/simple-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", + "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "optional": true + }, + "node_modules/simple-get": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", + "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "optional": true, + "dependencies": { + "decompress-response": "^6.0.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" + } + }, + "node_modules/smart-buffer": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz", + "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==", + "dependencies": { + "ip": "^2.0.0", + "smart-buffer": "^4.2.0" + }, + "engines": { + "node": ">= 10.13.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/sparse-bitfield": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", + "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==", + "dependencies": { + "memory-pager": "^1.0.2" + } + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "optional": true, + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/strnum": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz", + "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==" + }, + "node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/system-ca": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/system-ca/-/system-ca-1.0.2.tgz", + "integrity": "sha512-/6CCJOKB5Fpi0x7/DCbV7uiFPgwGCeJsAaSondXS2DjLBv7ER2worVGvQWJqPM0kgOKO6auaCcSWpJKnrDmXjw==", + "optionalDependencies": { + "macos-export-certificate-and-key": "^1.1.1", + "win-export-certificate-and-key": "^1.1.1" + } + }, + "node_modules/tar": { + "version": "6.1.13", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz", + "integrity": "sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==", + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^4.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/tar-fs": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", + "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "optional": true, + "dependencies": { + "chownr": "^1.1.1", + "mkdirp-classic": "^0.5.2", + "pump": "^3.0.0", + "tar-stream": "^2.1.4" + } + }, + "node_modules/tar-fs/node_modules/chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "optional": true + }, + "node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "optional": true, + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tar/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" + }, + "node_modules/to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "engines": { + "node": ">=4" + } + }, + "node_modules/tr46": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", + "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/tslib": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", + "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" + }, + "node_modules/tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", + "optional": true, + "dependencies": { + "safe-buffer": "^5.0.1" + }, + "engines": { + "node": "*" + } + }, + "node_modules/update-browserslist-db": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", + "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + } + ], + "dependencies": { + "escalade": "^3.1.1", + "picocolors": "^1.0.0" + }, + "bin": { + "browserslist-lint": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "optional": true + }, + "node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "engines": { + "node": ">=12" + } + }, + "node_modules/whatwg-url": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", + "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", + "dependencies": { + "tr46": "^3.0.0", + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/win-export-certificate-and-key": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/win-export-certificate-and-key/-/win-export-certificate-and-key-1.1.1.tgz", + "integrity": "sha512-wvF1DKlbt/PLOSdnKzIqv0Ipj+87n2VYOJFbkqBoN7l3l244reT7Lf6+Dnu86bYVWoVpq3ZZG417OLNHFnkP6A==", + "hasInstallScript": true, + "optional": true, + "os": [ + "win32" + ], + "dependencies": { + "bindings": "^1.5.0", + "node-addon-api": "^4.3.0", + "node-forge": "^1.2.1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + }, + "node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + }, + "node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "engines": { + "node": ">=10" + } + } + } +} diff --git a/third_party/nixpkgs/pkgs/development/tools/mongosh/packages.json b/third_party/nixpkgs/pkgs/development/tools/mongosh/packages.json deleted file mode 100644 index fedc258fef..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/mongosh/packages.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - "mongosh" -] diff --git a/third_party/nixpkgs/pkgs/development/tools/mongosh/packages.nix b/third_party/nixpkgs/pkgs/development/tools/mongosh/packages.nix deleted file mode 100644 index 4bc8ab90a9..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/mongosh/packages.nix +++ /dev/null @@ -1,2205 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: - -let - sources = { - "@ampproject/remapping-2.2.0" = { - name = "_at_ampproject_slash_remapping"; - packageName = "@ampproject/remapping"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz"; - sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="; - }; - }; - "@babel/code-frame-7.18.6" = { - name = "_at_babel_slash_code-frame"; - packageName = "@babel/code-frame"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"; - sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; - }; - }; - "@babel/compat-data-7.20.10" = { - name = "_at_babel_slash_compat-data"; - packageName = "@babel/compat-data"; - version = "7.20.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.10.tgz"; - sha512 = "sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg=="; - }; - }; - "@babel/core-7.16.12" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; - version = "7.16.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.16.12.tgz"; - sha512 = "dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg=="; - }; - }; - "@babel/core-7.20.12" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; - version = "7.20.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz"; - sha512 = "XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg=="; - }; - }; - "@babel/generator-7.20.7" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.20.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz"; - sha512 = "7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw=="; - }; - }; - "@babel/helper-compilation-targets-7.20.7" = { - name = "_at_babel_slash_helper-compilation-targets"; - packageName = "@babel/helper-compilation-targets"; - version = "7.20.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz"; - sha512 = "4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ=="; - }; - }; - "@babel/helper-environment-visitor-7.18.9" = { - name = "_at_babel_slash_helper-environment-visitor"; - packageName = "@babel/helper-environment-visitor"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz"; - sha512 = "3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="; - }; - }; - "@babel/helper-function-name-7.19.0" = { - name = "_at_babel_slash_helper-function-name"; - packageName = "@babel/helper-function-name"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz"; - sha512 = "WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w=="; - }; - }; - "@babel/helper-hoist-variables-7.18.6" = { - name = "_at_babel_slash_helper-hoist-variables"; - packageName = "@babel/helper-hoist-variables"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"; - sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; - }; - }; - "@babel/helper-module-imports-7.18.6" = { - name = "_at_babel_slash_helper-module-imports"; - packageName = "@babel/helper-module-imports"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz"; - sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; - }; - }; - "@babel/helper-module-transforms-7.20.11" = { - name = "_at_babel_slash_helper-module-transforms"; - packageName = "@babel/helper-module-transforms"; - version = "7.20.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz"; - sha512 = "uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg=="; - }; - }; - "@babel/helper-plugin-utils-7.20.2" = { - name = "_at_babel_slash_helper-plugin-utils"; - packageName = "@babel/helper-plugin-utils"; - version = "7.20.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz"; - sha512 = "8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ=="; - }; - }; - "@babel/helper-simple-access-7.20.2" = { - name = "_at_babel_slash_helper-simple-access"; - packageName = "@babel/helper-simple-access"; - version = "7.20.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz"; - sha512 = "+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA=="; - }; - }; - "@babel/helper-split-export-declaration-7.18.6" = { - name = "_at_babel_slash_helper-split-export-declaration"; - packageName = "@babel/helper-split-export-declaration"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz"; - sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; - }; - }; - "@babel/helper-string-parser-7.19.4" = { - name = "_at_babel_slash_helper-string-parser"; - packageName = "@babel/helper-string-parser"; - version = "7.19.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz"; - sha512 = "nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="; - }; - }; - "@babel/helper-validator-identifier-7.19.1" = { - name = "_at_babel_slash_helper-validator-identifier"; - packageName = "@babel/helper-validator-identifier"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"; - sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="; - }; - }; - "@babel/helper-validator-option-7.18.6" = { - name = "_at_babel_slash_helper-validator-option"; - packageName = "@babel/helper-validator-option"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"; - sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; - }; - }; - "@babel/helpers-7.20.7" = { - name = "_at_babel_slash_helpers"; - packageName = "@babel/helpers"; - version = "7.20.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz"; - sha512 = "PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA=="; - }; - }; - "@babel/highlight-7.18.6" = { - name = "_at_babel_slash_highlight"; - packageName = "@babel/highlight"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz"; - sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; - }; - }; - "@babel/parser-7.20.7" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.20.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz"; - sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg=="; - }; - }; - "@babel/plugin-transform-destructuring-7.20.7" = { - name = "_at_babel_slash_plugin-transform-destructuring"; - packageName = "@babel/plugin-transform-destructuring"; - version = "7.20.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz"; - sha512 = "Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA=="; - }; - }; - "@babel/plugin-transform-parameters-7.20.7" = { - name = "_at_babel_slash_plugin-transform-parameters"; - packageName = "@babel/plugin-transform-parameters"; - version = "7.20.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz"; - sha512 = "WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA=="; - }; - }; - "@babel/plugin-transform-shorthand-properties-7.18.6" = { - name = "_at_babel_slash_plugin-transform-shorthand-properties"; - packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz"; - sha512 = "eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw=="; - }; - }; - "@babel/template-7.20.7" = { - name = "_at_babel_slash_template"; - packageName = "@babel/template"; - version = "7.20.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz"; - sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; - }; - }; - "@babel/traverse-7.20.12" = { - name = "_at_babel_slash_traverse"; - packageName = "@babel/traverse"; - version = "7.20.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.12.tgz"; - sha512 = "MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ=="; - }; - }; - "@babel/types-7.20.7" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.20.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz"; - sha512 = "69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg=="; - }; - }; - "@hapi/hoek-9.3.0" = { - name = "_at_hapi_slash_hoek"; - packageName = "@hapi/hoek"; - version = "9.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz"; - sha512 = "/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="; - }; - }; - "@hapi/topo-5.1.0" = { - name = "_at_hapi_slash_topo"; - packageName = "@hapi/topo"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz"; - sha512 = "foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg=="; - }; - }; - "@jridgewell/gen-mapping-0.1.1" = { - name = "_at_jridgewell_slash_gen-mapping"; - packageName = "@jridgewell/gen-mapping"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"; - sha512 = "sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w=="; - }; - }; - "@jridgewell/gen-mapping-0.3.2" = { - name = "_at_jridgewell_slash_gen-mapping"; - packageName = "@jridgewell/gen-mapping"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"; - sha512 = "mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A=="; - }; - }; - "@jridgewell/resolve-uri-3.1.0" = { - name = "_at_jridgewell_slash_resolve-uri"; - packageName = "@jridgewell/resolve-uri"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"; - sha512 = "F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="; - }; - }; - "@jridgewell/set-array-1.1.2" = { - name = "_at_jridgewell_slash_set-array"; - packageName = "@jridgewell/set-array"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"; - sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; - }; - }; - "@jridgewell/sourcemap-codec-1.4.14" = { - name = "_at_jridgewell_slash_sourcemap-codec"; - packageName = "@jridgewell/sourcemap-codec"; - version = "1.4.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"; - sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; - }; - }; - "@jridgewell/trace-mapping-0.3.17" = { - name = "_at_jridgewell_slash_trace-mapping"; - packageName = "@jridgewell/trace-mapping"; - version = "0.3.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz"; - sha512 = "MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g=="; - }; - }; - "@mongodb-js/devtools-connect-1.4.3" = { - name = "_at_mongodb-js_slash_devtools-connect"; - packageName = "@mongodb-js/devtools-connect"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-1.4.3.tgz"; - sha512 = "Y7j5XZo+bmphN/IERA9p++91ZYEXPagONUVP7seQ04ha2jHwB6lr6WudPWcRw7NkzPj/PuEjA50lJXtt2ilA3Q=="; - }; - }; - "@mongodb-js/mongodb-constants-0.1.5" = { - name = "_at_mongodb-js_slash_mongodb-constants"; - packageName = "@mongodb-js/mongodb-constants"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@mongodb-js/mongodb-constants/-/mongodb-constants-0.1.5.tgz"; - sha512 = "YMc7Hymiyo/H/jXPb576u5DmJFoWCnFc89mi30UqYE2YLZR7yg3zEFJxv6XAlemtznenmoqVEZ4YYAxcojw0KA=="; - }; - }; - "@mongosh/arg-parser-1.6.2" = { - name = "_at_mongosh_slash_arg-parser"; - packageName = "@mongosh/arg-parser"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-1.6.2.tgz"; - sha512 = "RDY2IxARZ80TpPjKRQEvrhvJLpLZyeOm/zfPifGIRMlVXtwm/8AB1AyReGdsmbmpVAQt6PXkF6eiap1EmPBfNg=="; - }; - }; - "@mongosh/async-rewriter2-1.6.2" = { - name = "_at_mongosh_slash_async-rewriter2"; - packageName = "@mongosh/async-rewriter2"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-1.6.2.tgz"; - sha512 = "Jb4PUz7lFz0dOFLmlNwCiQX5X83A2ntnxk33GFikdmiW8L6S99AyuD63y3qyAkiSXgHErwBXDXYB8k3DJoTizw=="; - }; - }; - "@mongosh/autocomplete-1.6.2" = { - name = "_at_mongosh_slash_autocomplete"; - packageName = "@mongosh/autocomplete"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-1.6.2.tgz"; - sha512 = "EHk4DGN2DyrVOj5vEZ7xoYWr2V/bQMSDFnk2c6809wRhN+mHlKVwvaqTk/xRAJXHGwW+shWx2lZ3BJVQqoVbvA=="; - }; - }; - "@mongosh/cli-repl-1.6.2" = { - name = "_at_mongosh_slash_cli-repl"; - packageName = "@mongosh/cli-repl"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-1.6.2.tgz"; - sha512 = "I3WU32+gNRQ7AWYt1SsS87N8rSzLYww4VOCklJ15jers3x9sv4DvoZMbCh7Z47dG5tNB+XS8/C/obmMD0T8zyA=="; - }; - }; - "@mongosh/editor-1.6.2" = { - name = "_at_mongosh_slash_editor"; - packageName = "@mongosh/editor"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/editor/-/editor-1.6.2.tgz"; - sha512 = "bTC73BBe4Qo0WhyRYqWtuSWAbicsxAfqUavKYKZ0ogcPCASJXYUyQQu9Af4qW4MbOB8yq7dymHc/z6Yw1rYvJA=="; - }; - }; - "@mongosh/errors-1.6.2" = { - name = "_at_mongosh_slash_errors"; - packageName = "@mongosh/errors"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/errors/-/errors-1.6.2.tgz"; - sha512 = "BpLk4d67Meb0JtEWWs+4JR3iUpsHnJ3qLHFsvnEn5xQraYmWcbbw+gsSdJh26crMTmPjAdKJENCWGL+vPenZXg=="; - }; - }; - "@mongosh/history-1.6.2" = { - name = "_at_mongosh_slash_history"; - packageName = "@mongosh/history"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/history/-/history-1.6.2.tgz"; - sha512 = "cNhus7wIKz4/Rxds96+/3IpM5jymppoHGU5KRE73xFECcPYqsKaOnILrFOG+QiRCUV5mfESM/gfrmhDGmZyu+Q=="; - }; - }; - "@mongosh/i18n-1.6.2" = { - name = "_at_mongosh_slash_i18n"; - packageName = "@mongosh/i18n"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/i18n/-/i18n-1.6.2.tgz"; - sha512 = "N5hRG/Y4ipQC6z6SnqoHCPlvQ/8qwRg8SiaHXfaJl+ruME+BCInmpg9c+0fRa+gIFiB98w7A4QUjfiMkZ9Bmsw=="; - }; - }; - "@mongosh/js-multiline-to-singleline-1.6.2" = { - name = "_at_mongosh_slash_js-multiline-to-singleline"; - packageName = "@mongosh/js-multiline-to-singleline"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-1.6.2.tgz"; - sha512 = "bsO3u+JJeNGve9V+Dj6jqCOG5lg74B3bh8s/0tCO9pkC7osI2e/5ufPutQaIBe3m8s9M4AJFgYJk6kOc3dL2eQ=="; - }; - }; - "@mongosh/logging-1.6.2" = { - name = "_at_mongosh_slash_logging"; - packageName = "@mongosh/logging"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/logging/-/logging-1.6.2.tgz"; - sha512 = "TBIUBH5yxlssqXLTQh5AkuPcQEHwuys4DIOUCI73obCm/4xHH26+qAm+hjoI9OXW41cmoihxmOmv6jQnlE7tFA=="; - }; - }; - "@mongosh/service-provider-core-1.6.2" = { - name = "_at_mongosh_slash_service-provider-core"; - packageName = "@mongosh/service-provider-core"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-1.6.2.tgz"; - sha512 = "BSnfvSDI3MxSIQZKFk/ifVj7vkwG3LIy21m/4w8EhomWoCjKrwH1sFjfbv6iCIaBl6SxJNoq11J2m+d9mPbwNQ=="; - }; - }; - "@mongosh/service-provider-server-1.6.2" = { - name = "_at_mongosh_slash_service-provider-server"; - packageName = "@mongosh/service-provider-server"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-1.6.2.tgz"; - sha512 = "onvooY8RiW/r4FOnY4PcAq/Z/yWx5IlFtnGCq2AS1DB4boEvlsoBEqpcpwKtJWZW7+jW9tYVWgAiXWefl/Ss8w=="; - }; - }; - "@mongosh/shell-api-1.6.2" = { - name = "_at_mongosh_slash_shell-api"; - packageName = "@mongosh/shell-api"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-1.6.2.tgz"; - sha512 = "lWcTf8qZXQPQI2swZYig3wP9/49A8JNIuRRY/ZC1CAF4XUsDYCijqVkPc0HKGux2K8r1uuIqxh/Ke0HzuN4awQ=="; - }; - }; - "@mongosh/shell-evaluator-1.6.2" = { - name = "_at_mongosh_slash_shell-evaluator"; - packageName = "@mongosh/shell-evaluator"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-1.6.2.tgz"; - sha512 = "AfWrXwi2KlZhwkkS817XIiW4aAJuQmiN+vnHyMRgztRfwxp7jEdXrNyactEOSLYmPrgVAMuToXowelkrRy5KHQ=="; - }; - }; - "@mongosh/snippet-manager-1.6.2" = { - name = "_at_mongosh_slash_snippet-manager"; - packageName = "@mongosh/snippet-manager"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-1.6.2.tgz"; - sha512 = "DjQopKCmUBnLin+SDOAzUJxsgstZfVlic26GgwwSKp8+6LyqtUa/K+/kha6Rlq2i9fpwsSdb3YBXjks6MzSDjw=="; - }; - }; - "@mongosh/types-1.6.2" = { - name = "_at_mongosh_slash_types"; - packageName = "@mongosh/types"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/types/-/types-1.6.2.tgz"; - sha512 = "REWGm6AlBqxklUIB8LbZ1+lPVSqdVfkr6mwPjj0PZHo4yrYNPMV4KJ9rQzaKd3alx+oRDyakOKek2b7RbhRzOw=="; - }; - }; - "@segment/loosely-validate-event-2.0.0" = { - name = "_at_segment_slash_loosely-validate-event"; - packageName = "@segment/loosely-validate-event"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@segment/loosely-validate-event/-/loosely-validate-event-2.0.0.tgz"; - sha512 = "ZMCSfztDBqwotkl848ODgVcAmN4OItEWDCkshcKz0/W6gGSQayuuCtWV/MlodFivAZD793d6UgANd6wCXUfrIw=="; - }; - }; - "@sideway/address-4.1.4" = { - name = "_at_sideway_slash_address"; - packageName = "@sideway/address"; - version = "4.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz"; - sha512 = "7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw=="; - }; - }; - "@sideway/formula-3.0.1" = { - name = "_at_sideway_slash_formula"; - packageName = "@sideway/formula"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz"; - sha512 = "/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg=="; - }; - }; - "@sideway/pinpoint-2.0.0" = { - name = "_at_sideway_slash_pinpoint"; - packageName = "@sideway/pinpoint"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz"; - sha512 = "RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="; - }; - }; - "@types/babel__core-7.1.20" = { - name = "_at_types_slash_babel__core"; - packageName = "@types/babel__core"; - version = "7.1.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.20.tgz"; - sha512 = "PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ=="; - }; - }; - "@types/babel__generator-7.6.4" = { - name = "_at_types_slash_babel__generator"; - packageName = "@types/babel__generator"; - version = "7.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz"; - sha512 = "tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg=="; - }; - }; - "@types/babel__template-7.4.1" = { - name = "_at_types_slash_babel__template"; - packageName = "@types/babel__template"; - version = "7.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz"; - sha512 = "azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g=="; - }; - }; - "@types/babel__traverse-7.18.3" = { - name = "_at_types_slash_babel__traverse"; - packageName = "@types/babel__traverse"; - version = "7.18.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz"; - sha512 = "1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w=="; - }; - }; - "@types/chai-4.3.4" = { - name = "_at_types_slash_chai"; - packageName = "@types/chai"; - version = "4.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/chai/-/chai-4.3.4.tgz"; - sha512 = "KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw=="; - }; - }; - "@types/node-18.11.18" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "18.11.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz"; - sha512 = "DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA=="; - }; - }; - "@types/sinon-10.0.13" = { - name = "_at_types_slash_sinon"; - packageName = "@types/sinon"; - version = "10.0.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.13.tgz"; - sha512 = "UVjDqJblVNQYvVNUsj0PuYYw0ELRmgt1Nt5Vk0pT5f16ROGfcKJY8o1HVuMOJOpD727RrGB9EGvoaTQE5tgxZQ=="; - }; - }; - "@types/sinon-chai-3.2.9" = { - name = "_at_types_slash_sinon-chai"; - packageName = "@types/sinon-chai"; - version = "3.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/sinon-chai/-/sinon-chai-3.2.9.tgz"; - sha512 = "/19t63pFYU0ikrdbXKBWj9PCdnKyTd0Qkz0X91Ta081cYsq90OxYdcWwK/dwEoDa6dtXgj2HJfmzgq+QZTHdmQ=="; - }; - }; - "@types/sinonjs__fake-timers-8.1.2" = { - name = "_at_types_slash_sinonjs__fake-timers"; - packageName = "@types/sinonjs__fake-timers"; - version = "8.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.2.tgz"; - sha512 = "9GcLXF0/v3t80caGs5p2rRfkB+a8VBGLJZVih6CNFkx8IZ994wiKKLSRs9nuFwk1HevWs/1mnUmkApGrSGsShA=="; - }; - }; - "@types/webidl-conversions-7.0.0" = { - name = "_at_types_slash_webidl-conversions"; - packageName = "@types/webidl-conversions"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.0.tgz"; - sha512 = "xTE1E+YF4aWPJJeUzaZI5DRntlkY3+BCVJi0axFptnjGmAoWxkyREIh/XMrfxVLejwQxMCfDXdICo0VLxThrog=="; - }; - }; - "@types/whatwg-url-8.2.2" = { - name = "_at_types_slash_whatwg-url"; - packageName = "@types/whatwg-url"; - version = "8.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.2.tgz"; - sha512 = "FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA=="; - }; - }; - "abbrev-1.1.1" = { - name = "abbrev"; - packageName = "abbrev"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; - }; - }; - "acorn-8.8.1" = { - name = "acorn"; - packageName = "acorn"; - version = "8.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz"; - sha512 = "7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA=="; - }; - }; - "acorn-class-fields-1.0.0" = { - name = "acorn-class-fields"; - packageName = "acorn-class-fields"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-class-fields/-/acorn-class-fields-1.0.0.tgz"; - sha512 = "l+1FokF34AeCXGBHkrXFmml9nOIRI+2yBnBpO5MaVAaTIJ96irWLtcCxX+7hAp6USHFCe+iyyBB4ZhxV807wmA=="; - }; - }; - "acorn-numeric-separator-0.3.6" = { - name = "acorn-numeric-separator"; - packageName = "acorn-numeric-separator"; - version = "0.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-numeric-separator/-/acorn-numeric-separator-0.3.6.tgz"; - sha512 = "jUr5esgChu4k7VzesH/Nww3EysuyGJJcTEEiXqILUFKpO96PNyEXmK21M6nE0TSqGA1PeEg1MzgqJaoFsn9JMw=="; - }; - }; - "acorn-private-class-elements-1.0.0" = { - name = "acorn-private-class-elements"; - packageName = "acorn-private-class-elements"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-private-class-elements/-/acorn-private-class-elements-1.0.0.tgz"; - sha512 = "zYNcZtxKgVCg1brS39BEou86mIao1EV7eeREG+6WMwKbuYTeivRRs6S2XdWnboRde6G9wKh2w+WBydEyJsJ6mg=="; - }; - }; - "acorn-private-methods-1.0.0" = { - name = "acorn-private-methods"; - packageName = "acorn-private-methods"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-private-methods/-/acorn-private-methods-1.0.0.tgz"; - sha512 = "Jou2L3nfwfPpFdmmHObI3yUpVPM1bPohTUAZCyVDw5Efyn9LSS6E36neRLCRfIr8QjskAfdxRdABOrvP4c/gwQ=="; - }; - }; - "acorn-static-class-features-1.0.0" = { - name = "acorn-static-class-features"; - packageName = "acorn-static-class-features"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-static-class-features/-/acorn-static-class-features-1.0.0.tgz"; - sha512 = "XZJECjbmMOKvMHiNzbiPXuXpLAJfN3dAKtfIYbk1eHiWdsutlek+gS7ND4B8yJ3oqvHo1NxfafnezVmq7NXK0A=="; - }; - }; - "analytics-node-5.2.0" = { - name = "analytics-node"; - packageName = "analytics-node"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/analytics-node/-/analytics-node-5.2.0.tgz"; - sha512 = "JAc0K7J//QKGGX2mfwBE7wyG/Rh4W0BATB6CncwYhVX1qLjiXwHmB7bYr9PgJIer5M6jKMOhZoO5lxiruQk9BQ=="; - }; - }; - "ansi-escape-sequences-5.1.2" = { - name = "ansi-escape-sequences"; - packageName = "ansi-escape-sequences"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-5.1.2.tgz"; - sha512 = "JcpoVp1W1bl1Qn4cVuiXEhD6+dyXKSOgCn2zlzE8inYgCJCBy1aPnUhlz6I4DFum8D4ovb9Qi/iAjUcGvG2lqw=="; - }; - }; - "ansi-regex-5.0.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"; - sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; - }; - }; - "ansi-styles-3.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; - }; - }; - "ansi-styles-4.3.0" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"; - sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; - }; - }; - "argparse-2.0.1" = { - name = "argparse"; - packageName = "argparse"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"; - sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; - }; - }; - "array-back-4.0.2" = { - name = "array-back"; - packageName = "array-back"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz"; - sha512 = "NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg=="; - }; - }; - "askcharacter-1.0.0" = { - name = "askcharacter"; - packageName = "askcharacter"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/askcharacter/-/askcharacter-1.0.0.tgz"; - sha512 = "WsJcKyOh7iOWQSWcwPVE//yDUSXn3WvL+bgT9JYdEuiY/xeg1Vgwl5re72ZzufhXOwoiCrWWxW4CscRrxb3kZg=="; - }; - }; - "askpassword-1.2.4" = { - name = "askpassword"; - packageName = "askpassword"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/askpassword/-/askpassword-1.2.4.tgz"; - sha512 = "HR27ScUv/j6vHSKU0AN+y3pGA3iqXzD09qqJl6JjVqSJRk7QiKPJt+W4tFhozMbiTsOh/QrIkeRi+Okd97VkRA=="; - }; - }; - "aws4-1.12.0" = { - name = "aws4"; - packageName = "aws4"; - version = "1.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz"; - sha512 = "NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="; - }; - }; - "axios-0.21.4" = { - name = "axios"; - packageName = "axios"; - version = "0.21.4"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"; - sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; - }; - }; - "axios-retry-3.2.0" = { - name = "axios-retry"; - packageName = "axios-retry"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.2.0.tgz"; - sha512 = "RK2cLMgIsAQBDhlIsJR5dOhODPigvel18XUv1dDXW+4k1FzebyfRk+C+orot6WPZOYFKSfhLwHPwVmTVOODQ5w=="; - }; - }; - "balanced-match-1.0.2" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; - sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; - }; - }; - "base64-js-1.5.1" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; - sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; - }; - }; - "brace-expansion-2.0.1" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"; - sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="; - }; - }; - "browserslist-4.21.4" = { - name = "browserslist"; - packageName = "browserslist"; - version = "4.21.4"; - src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz"; - sha512 = "CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw=="; - }; - }; - "bson-4.7.1" = { - name = "bson"; - packageName = "bson"; - version = "4.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bson/-/bson-4.7.1.tgz"; - sha512 = "XkuFtlCzi0WSy8D6PMhvrQ/q8VlZHN/2bJ/shJglwuA6TPD2ZP/hHLB7iDxOEWVINHN/UVTxP4pqZqOKMXPIXg=="; - }; - }; - "buffer-5.7.1" = { - name = "buffer"; - packageName = "buffer"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; - sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; - }; - }; - "caniuse-lite-1.0.30001442" = { - name = "caniuse-lite"; - packageName = "caniuse-lite"; - version = "1.0.30001442"; - src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz"; - sha512 = "239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow=="; - }; - }; - "chalk-2.4.2" = { - name = "chalk"; - packageName = "chalk"; - version = "2.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; - sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; - }; - }; - "chalk-3.0.0" = { - name = "chalk"; - packageName = "chalk"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz"; - sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; - }; - }; - "chalk-4.1.2" = { - name = "chalk"; - packageName = "chalk"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"; - sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; - }; - }; - "charenc-0.0.2" = { - name = "charenc"; - packageName = "charenc"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"; - sha512 = "yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA=="; - }; - }; - "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=="; - }; - }; - "color-convert-1.9.3" = { - name = "color-convert"; - packageName = "color-convert"; - version = "1.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; - sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; - }; - }; - "color-convert-2.0.1" = { - name = "color-convert"; - packageName = "color-convert"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; - sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; - }; - }; - "color-name-1.1.3" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; - sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; - }; - }; - "color-name-1.1.4" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; - sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; - }; - }; - "commander-2.20.3" = { - name = "commander"; - packageName = "commander"; - version = "2.20.3"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; - sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; - }; - }; - "component-type-1.2.1" = { - name = "component-type"; - packageName = "component-type"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/component-type/-/component-type-1.2.1.tgz"; - sha512 = "Kgy+2+Uwr75vAi6ChWXgHuLvd+QLD7ssgpaRq2zCvt80ptvAfMc/hijcJxXkBa2wMlEZcJvC2H8Ubo+A9ATHIg=="; - }; - }; - "config-chain-1.1.13" = { - name = "config-chain"; - packageName = "config-chain"; - version = "1.1.13"; - src = fetchurl { - url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz"; - sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; - }; - }; - "convert-source-map-1.9.0" = { - name = "convert-source-map"; - packageName = "convert-source-map"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz"; - sha512 = "ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="; - }; - }; - "cross-spawn-7.0.3" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "7.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"; - sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; - }; - }; - "crypt-0.0.2" = { - name = "crypt"; - packageName = "crypt"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"; - sha512 = "mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow=="; - }; - }; - "debug-4.3.4" = { - name = "debug"; - packageName = "debug"; - version = "4.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; - sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; - }; - }; - "editorconfig-0.15.3" = { - name = "editorconfig"; - packageName = "editorconfig"; - version = "0.15.3"; - src = fetchurl { - url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz"; - sha512 = "M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g=="; - }; - }; - "electron-to-chromium-1.4.284" = { - name = "electron-to-chromium"; - packageName = "electron-to-chromium"; - version = "1.4.284"; - src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz"; - sha512 = "M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="; - }; - }; - "emphasize-3.0.0" = { - name = "emphasize"; - packageName = "emphasize"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/emphasize/-/emphasize-3.0.0.tgz"; - sha512 = "xhtAWvxdkxsQbcCLGVjlfB7cQ4bWSPYXeaGDwK5Bl7n2y/9R+MVK5UNBTmZ9N8m/YShsiyGgQBgFGcjOWCWXHQ=="; - }; - }; - "encoding-0.1.13" = { - name = "encoding"; - packageName = "encoding"; - version = "0.1.13"; - src = fetchurl { - url = "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz"; - sha512 = "ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="; - }; - }; - "escalade-3.1.1" = { - name = "escalade"; - packageName = "escalade"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; - sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; - }; - }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; - }; - }; - "escape-string-regexp-4.0.0" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; - sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; - }; - }; - "fault-1.0.4" = { - name = "fault"; - packageName = "fault"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz"; - sha512 = "CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA=="; - }; - }; - "follow-redirects-1.15.2" = { - name = "follow-redirects"; - packageName = "follow-redirects"; - version = "1.15.2"; - src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"; - sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; - }; - }; - "format-0.2.2" = { - name = "format"; - packageName = "format"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/format/-/format-0.2.2.tgz"; - sha512 = "wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww=="; - }; - }; - "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"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; - }; - }; - "gensync-1.0.0-beta.2" = { - name = "gensync"; - packageName = "gensync"; - version = "1.0.0-beta.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"; - sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; - }; - }; - "glob-8.0.3" = { - name = "glob"; - packageName = "glob"; - version = "8.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz"; - sha512 = "ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ=="; - }; - }; - "globals-11.12.0" = { - name = "globals"; - packageName = "globals"; - version = "11.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"; - sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; - }; - }; - "handle-backspaces-1.0.0" = { - name = "handle-backspaces"; - packageName = "handle-backspaces"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/handle-backspaces/-/handle-backspaces-1.0.0.tgz"; - sha512 = "w11NXUn51gVN50nTW5MOuhKuko9xZonnHDe5LlapaOZvuyxDXVDn9b1ZtG0IJTABGbL/UGeSitqHgo9Bb7nDhQ=="; - }; - }; - "has-flag-3.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; - sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; - }; - }; - "has-flag-4.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; - sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; - }; - }; - "highlight.js-9.12.0" = { - name = "highlight.js"; - packageName = "highlight.js"; - version = "9.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz"; - sha512 = "qNnYpBDO/FQwYVur1+sQBQw7v0cxso1nOYLklqWh6af8ROwwTVoII5+kf/BVa8354WL4ad6rURHYGUXCbD9mMg=="; - }; - }; - "hijack-stream-1.0.0" = { - name = "hijack-stream"; - packageName = "hijack-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hijack-stream/-/hijack-stream-1.0.0.tgz"; - sha512 = "9riBbIorIgSvsLQHL/rKEK6vJBexhgSRZC/tkieuei7a1U+CHgrXJVqW+RPswgEyuPbxcGCpx0QXO3iJuKRrrw=="; - }; - }; - "iconv-lite-0.6.3" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"; - sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; - }; - }; - "ieee754-1.2.1" = { - name = "ieee754"; - packageName = "ieee754"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; - sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; - }; - }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; - }; - }; - "inherits-2.0.4" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; - sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; - }; - }; - "ini-1.3.8" = { - name = "ini"; - packageName = "ini"; - version = "1.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"; - sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; - }; - }; - "ip-2.0.0" = { - name = "ip"; - packageName = "ip"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz"; - sha512 = "WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="; - }; - }; - "is-buffer-1.1.6" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; - sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; - }; - }; - "is-recoverable-error-1.0.3" = { - name = "is-recoverable-error"; - packageName = "is-recoverable-error"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-recoverable-error/-/is-recoverable-error-1.0.3.tgz"; - sha512 = "T06goBQXH5WCzWtzuU+kYhT3Ui0d3wgk8n4GR/3n9UjgO6cuphhel+W02ps/Z2PYZB8C+l//XAJk9tR5Txo6/w=="; - }; - }; - "is-retry-allowed-1.2.0" = { - name = "is-retry-allowed"; - packageName = "is-retry-allowed"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz"; - sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg=="; - }; - }; - "isexe-2.0.0" = { - name = "isexe"; - packageName = "isexe"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; - }; - }; - "joi-17.7.0" = { - name = "joi"; - packageName = "joi"; - version = "17.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-17.7.0.tgz"; - sha512 = "1/ugc8djfn93rTE3WRKdCzGGt/EtiYKxITMO4Wiv6q5JL1gl9ePt4kBsl1S499nbosspfctIQTpYIhSmHA3WAg=="; - }; - }; - "join-component-1.1.0" = { - name = "join-component"; - packageName = "join-component"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/join-component/-/join-component-1.1.0.tgz"; - sha512 = "bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="; - }; - }; - "js-beautify-1.14.7" = { - name = "js-beautify"; - packageName = "js-beautify"; - version = "1.14.7"; - src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.7.tgz"; - sha512 = "5SOX1KXPFKx+5f6ZrPsIPEY7NwKeQz47n3jm2i+XeHx9MoRsfQenlOP13FQhWvg8JRS0+XLO6XYUQ2GX+q+T9A=="; - }; - }; - "js-tokens-4.0.0" = { - name = "js-tokens"; - packageName = "js-tokens"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; - sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; - }; - }; - "js-yaml-4.1.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"; - sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; - }; - }; - "jsesc-2.5.2" = { - name = "jsesc"; - packageName = "jsesc"; - version = "2.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"; - sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; - }; - }; - "json5-2.2.3" = { - name = "json5"; - packageName = "json5"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"; - sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; - }; - }; - "lodash-4.17.21" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.21"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; - sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; - }; - }; - "lodash.isstring-4.0.1" = { - name = "lodash.isstring"; - packageName = "lodash.isstring"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; - sha512 = "0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="; - }; - }; - "lowlight-1.9.2" = { - name = "lowlight"; - packageName = "lowlight"; - version = "1.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lowlight/-/lowlight-1.9.2.tgz"; - sha512 = "Ek18ElVCf/wF/jEm1b92gTnigh94CtBNWiZ2ad+vTgW7cTmQxUY3I98BjHK68gZAJEWmybGBZgx9qv3QxLQB/Q=="; - }; - }; - "lru-cache-4.1.5" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "4.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"; - sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; - }; - }; - "lru-cache-5.1.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; - sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; - }; - }; - "lru-cache-6.0.0" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; - sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; - }; - }; - "md5-2.3.0" = { - name = "md5"; - packageName = "md5"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz"; - sha512 = "T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g=="; - }; - }; - "memory-pager-1.5.0" = { - name = "memory-pager"; - packageName = "memory-pager"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz"; - sha512 = "ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg=="; - }; - }; - "minimatch-5.1.2" = { - name = "minimatch"; - packageName = "minimatch"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.2.tgz"; - sha512 = "bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg=="; - }; - }; - "minipass-3.3.6" = { - name = "minipass"; - packageName = "minipass"; - version = "3.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz"; - sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; - }; - }; - "minipass-4.0.0" = { - name = "minipass"; - packageName = "minipass"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-4.0.0.tgz"; - sha512 = "g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw=="; - }; - }; - "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-1.0.4" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; - sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; - }; - }; - "mongodb-4.13.0" = { - name = "mongodb"; - packageName = "mongodb"; - version = "4.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-4.13.0.tgz"; - sha512 = "+taZ/bV8d1pYuHL4U+gSwkhmDrwkWbH1l4aah4YpmpscMwgFBkufIKxgP/G7m87/NUuQzc2Z75ZTI7ZOyqZLbw=="; - }; - }; - "mongodb-build-info-1.5.0" = { - name = "mongodb-build-info"; - packageName = "mongodb-build-info"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mongodb-build-info/-/mongodb-build-info-1.5.0.tgz"; - sha512 = "D+cXTPet0X7fcMuXBR+Trzqjl9DX7lX7L36v527+5T8mp/wTUP9r/rA/PrmHrQLa9jGknxEbAZOHpC+g/lJ/UQ=="; - }; - }; - "mongodb-connection-string-url-2.6.0" = { - name = "mongodb-connection-string-url"; - packageName = "mongodb-connection-string-url"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz"; - sha512 = "WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ=="; - }; - }; - "mongodb-log-writer-1.1.4" = { - name = "mongodb-log-writer"; - packageName = "mongodb-log-writer"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-1.1.4.tgz"; - sha512 = "wVX/AmKaGlV3509FG17M5edJmv5/YN5I+X4dU5C4VYA0HnBNhnowMqwADAdObeP+jr5LbSDXXQcqGakDjpc2UA=="; - }; - }; - "mongodb-redact-0.2.2" = { - name = "mongodb-redact"; - packageName = "mongodb-redact"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mongodb-redact/-/mongodb-redact-0.2.2.tgz"; - sha512 = "tmgDpSBymFtKggsLzpa0vDYaqh2wEXOswBZtJkXvbPKP0ThfPwoFYXtOukactU6WZsC4RYmpSPM4P6582FR/Xw=="; - }; - }; - "ms-2.1.2" = { - name = "ms"; - packageName = "ms"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; - }; - }; - "mustache-4.2.0" = { - name = "mustache"; - packageName = "mustache"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz"; - sha512 = "71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ=="; - }; - }; - "node-fetch-2.6.7" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "2.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz"; - sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; - }; - }; - "node-releases-2.0.8" = { - name = "node-releases"; - packageName = "node-releases"; - version = "2.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz"; - sha512 = "dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="; - }; - }; - "nopt-6.0.0" = { - name = "nopt"; - packageName = "nopt"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz"; - sha512 = "ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g=="; - }; - }; - "numeral-2.0.6" = { - name = "numeral"; - packageName = "numeral"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/numeral/-/numeral-2.0.6.tgz"; - sha512 = "qaKRmtYPZ5qdw4jWJD6bxEf1FJEqllJrwxCLIm0sQU/A7v2/czigzOb+C2uSiFsa9lBUzeH7M1oK+Q+OLxL3kA=="; - }; - }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; - }; - }; - "path-key-3.1.1" = { - name = "path-key"; - packageName = "path-key"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"; - sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; - }; - }; - "picocolors-1.0.0" = { - name = "picocolors"; - packageName = "picocolors"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"; - sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; - }; - }; - "pretty-repl-3.1.1" = { - name = "pretty-repl"; - packageName = "pretty-repl"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-repl/-/pretty-repl-3.1.1.tgz"; - sha512 = "JHhsuel0+/j4nKIdRnCcdE5qx4FVpeJEXTCpmGdhv5ivKlXWoQw0x9AqocsGQ+HABJ63lJ6pYF1OCoWAF0rEhA=="; - }; - }; - "proto-list-1.2.4" = { - name = "proto-list"; - packageName = "proto-list"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"; - sha512 = "vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA=="; - }; - }; - "pseudomap-1.0.2" = { - name = "pseudomap"; - packageName = "pseudomap"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; - sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="; - }; - }; - "punycode-2.1.1" = { - name = "punycode"; - packageName = "punycode"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; - sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; - }; - }; - "remove-trailing-slash-0.1.1" = { - name = "remove-trailing-slash"; - packageName = "remove-trailing-slash"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/remove-trailing-slash/-/remove-trailing-slash-0.1.1.tgz"; - sha512 = "o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA=="; - }; - }; - "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=="; - }; - }; - "saslprep-git+https://github.com/mongodb-js/saslprep#v1.0.4" = { - name = "saslprep"; - packageName = "saslprep"; - version = "1.0.4"; - src = fetchgit { - url = "https://github.com/mongodb-js/saslprep"; - rev = "4dca1b4c242045dd40576b591396c5a58ef7471a"; - sha256 = "daff36e584e9d318cc9bd749d1052166c44bbad647e91133e4a85380946b99ac"; - }; - }; - "semver-5.7.1" = { - name = "semver"; - packageName = "semver"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; - sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; - }; - }; - "semver-6.3.0" = { - name = "semver"; - packageName = "semver"; - version = "6.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; - sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; - }; - }; - "semver-7.3.8" = { - name = "semver"; - packageName = "semver"; - version = "7.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"; - sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; - }; - }; - "shebang-command-2.0.0" = { - name = "shebang-command"; - packageName = "shebang-command"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"; - sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; - }; - }; - "shebang-regex-3.0.0" = { - name = "shebang-regex"; - packageName = "shebang-regex"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; - }; - }; - "sigmund-1.0.1" = { - name = "sigmund"; - packageName = "sigmund"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; - sha512 = "fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g=="; - }; - }; - "smart-buffer-4.2.0" = { - name = "smart-buffer"; - packageName = "smart-buffer"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz"; - sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; - }; - }; - "socks-2.7.1" = { - name = "socks"; - packageName = "socks"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz"; - sha512 = "7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ=="; - }; - }; - "source-map-0.5.7" = { - name = "source-map"; - packageName = "source-map"; - version = "0.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; - sha512 = "LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="; - }; - }; - "sparse-bitfield-3.0.3" = { - name = "sparse-bitfield"; - packageName = "sparse-bitfield"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz"; - sha512 = "kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ=="; - }; - }; - "strip-ansi-6.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; - sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; - }; - }; - "supports-color-5.5.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; - }; - }; - "supports-color-7.2.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; - sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; - }; - }; - "system-ca-1.0.2" = { - name = "system-ca"; - packageName = "system-ca"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/system-ca/-/system-ca-1.0.2.tgz"; - sha512 = "/6CCJOKB5Fpi0x7/DCbV7uiFPgwGCeJsAaSondXS2DjLBv7ER2worVGvQWJqPM0kgOKO6auaCcSWpJKnrDmXjw=="; - }; - }; - "tar-6.1.13" = { - name = "tar"; - packageName = "tar"; - version = "6.1.13"; - src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz"; - sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw=="; - }; - }; - "text-table-0.2.0" = { - name = "text-table"; - packageName = "text-table"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; - sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; - }; - }; - "to-fast-properties-2.0.0" = { - name = "to-fast-properties"; - packageName = "to-fast-properties"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; - sha512 = "/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="; - }; - }; - "tr46-0.0.3" = { - name = "tr46"; - packageName = "tr46"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; - sha512 = "N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="; - }; - }; - "tr46-3.0.0" = { - name = "tr46"; - packageName = "tr46"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz"; - sha512 = "l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA=="; - }; - }; - "update-browserslist-db-1.0.10" = { - name = "update-browserslist-db"; - packageName = "update-browserslist-db"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz"; - sha512 = "OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ=="; - }; - }; - "uuid-8.3.2" = { - name = "uuid"; - packageName = "uuid"; - version = "8.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"; - sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; - }; - }; - "webidl-conversions-3.0.1" = { - name = "webidl-conversions"; - packageName = "webidl-conversions"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; - sha512 = "2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="; - }; - }; - "webidl-conversions-7.0.0" = { - name = "webidl-conversions"; - packageName = "webidl-conversions"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz"; - sha512 = "VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g=="; - }; - }; - "whatwg-url-11.0.0" = { - name = "whatwg-url"; - packageName = "whatwg-url"; - version = "11.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz"; - sha512 = "RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ=="; - }; - }; - "whatwg-url-5.0.0" = { - name = "whatwg-url"; - packageName = "whatwg-url"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"; - sha512 = "saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="; - }; - }; - "which-2.0.2" = { - name = "which"; - packageName = "which"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; - sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; - }; - }; - "yallist-2.1.2" = { - name = "yallist"; - packageName = "yallist"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; - sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="; - }; - }; - "yallist-3.1.1" = { - name = "yallist"; - packageName = "yallist"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; - sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; - }; - }; - "yallist-4.0.0" = { - name = "yallist"; - packageName = "yallist"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; - sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; - }; - }; - "yargs-parser-20.2.9" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "20.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"; - sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; - }; - }; - }; -in -{ - mongosh = nodeEnv.buildNodePackage { - name = "mongosh"; - packageName = "mongosh"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mongosh/-/mongosh-1.6.2.tgz"; - sha512 = "KaY93VYRJS7vh6P8aIlXZnbeU6M6h4CD60SKdEVlbUdn7X9klBE2q8SozfS9J1wbadwobZ2ClzWmVOFZWGeLyw=="; - }; - dependencies = [ - sources."@ampproject/remapping-2.2.0" - sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" - (sources."@babel/core-7.20.12" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."@babel/generator-7.20.7" // { - dependencies = [ - sources."@jridgewell/gen-mapping-0.3.2" - ]; - }) - (sources."@babel/helper-compilation-targets-7.20.7" // { - dependencies = [ - sources."lru-cache-5.1.1" - sources."semver-6.3.0" - sources."yallist-3.1.1" - ]; - }) - sources."@babel/helper-environment-visitor-7.18.9" - sources."@babel/helper-function-name-7.19.0" - sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.11" - sources."@babel/helper-plugin-utils-7.20.2" - sources."@babel/helper-simple-access-7.20.2" - sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.19.4" - sources."@babel/helper-validator-identifier-7.19.1" - sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" - sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" - sources."@babel/plugin-transform-destructuring-7.20.7" - sources."@babel/plugin-transform-parameters-7.20.7" - sources."@babel/plugin-transform-shorthand-properties-7.18.6" - sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" - sources."@babel/types-7.20.7" - sources."@hapi/hoek-9.3.0" - sources."@hapi/topo-5.1.0" - sources."@jridgewell/gen-mapping-0.1.1" - sources."@jridgewell/resolve-uri-3.1.0" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.17" - sources."@mongodb-js/devtools-connect-1.4.3" - sources."@mongodb-js/mongodb-constants-0.1.5" - sources."@mongosh/arg-parser-1.6.2" - (sources."@mongosh/async-rewriter2-1.6.2" // { - dependencies = [ - sources."@babel/core-7.16.12" - sources."semver-6.3.0" - ]; - }) - sources."@mongosh/autocomplete-1.6.2" - sources."@mongosh/cli-repl-1.6.2" - sources."@mongosh/editor-1.6.2" - sources."@mongosh/errors-1.6.2" - sources."@mongosh/history-1.6.2" - sources."@mongosh/i18n-1.6.2" - sources."@mongosh/js-multiline-to-singleline-1.6.2" - sources."@mongosh/logging-1.6.2" - sources."@mongosh/service-provider-core-1.6.2" - sources."@mongosh/service-provider-server-1.6.2" - sources."@mongosh/shell-api-1.6.2" - sources."@mongosh/shell-evaluator-1.6.2" - (sources."@mongosh/snippet-manager-1.6.2" // { - dependencies = [ - sources."escape-string-regexp-4.0.0" - ]; - }) - sources."@mongosh/types-1.6.2" - sources."@segment/loosely-validate-event-2.0.0" - sources."@sideway/address-4.1.4" - sources."@sideway/formula-3.0.1" - sources."@sideway/pinpoint-2.0.0" - sources."@types/babel__core-7.1.20" - sources."@types/babel__generator-7.6.4" - sources."@types/babel__template-7.4.1" - sources."@types/babel__traverse-7.18.3" - sources."@types/chai-4.3.4" - sources."@types/node-18.11.18" - sources."@types/sinon-10.0.13" - sources."@types/sinon-chai-3.2.9" - sources."@types/sinonjs__fake-timers-8.1.2" - sources."@types/webidl-conversions-7.0.0" - sources."@types/whatwg-url-8.2.2" - sources."abbrev-1.1.1" - sources."acorn-8.8.1" - sources."acorn-class-fields-1.0.0" - sources."acorn-numeric-separator-0.3.6" - sources."acorn-private-class-elements-1.0.0" - sources."acorn-private-methods-1.0.0" - sources."acorn-static-class-features-1.0.0" - sources."analytics-node-5.2.0" - sources."ansi-escape-sequences-5.1.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" - sources."argparse-2.0.1" - sources."array-back-4.0.2" - sources."askcharacter-1.0.0" - sources."askpassword-1.2.4" - sources."aws4-1.12.0" - sources."axios-0.21.4" - sources."axios-retry-3.2.0" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."brace-expansion-2.0.1" - sources."browserslist-4.21.4" - sources."bson-4.7.1" - sources."buffer-5.7.1" - sources."caniuse-lite-1.0.30001442" - sources."chalk-2.4.2" - sources."charenc-0.0.2" - sources."chownr-2.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."commander-2.20.3" - sources."component-type-1.2.1" - sources."config-chain-1.1.13" - sources."convert-source-map-1.9.0" - sources."cross-spawn-7.0.3" - sources."crypt-0.0.2" - sources."debug-4.3.4" - (sources."editorconfig-0.15.3" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."electron-to-chromium-1.4.284" - (sources."emphasize-3.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."encoding-0.1.13" - sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" - sources."fault-1.0.4" - sources."follow-redirects-1.15.2" - sources."format-0.2.2" - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - sources."fs.realpath-1.0.0" - sources."gensync-1.0.0-beta.2" - sources."glob-8.0.3" - sources."globals-11.12.0" - sources."handle-backspaces-1.0.0" - sources."has-flag-3.0.0" - sources."highlight.js-9.12.0" - sources."hijack-stream-1.0.0" - sources."iconv-lite-0.6.3" - sources."ieee754-1.2.1" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."ip-2.0.0" - sources."is-buffer-1.1.6" - sources."is-recoverable-error-1.0.3" - sources."is-retry-allowed-1.2.0" - sources."isexe-2.0.0" - sources."joi-17.7.0" - sources."join-component-1.1.0" - sources."js-beautify-1.14.7" - sources."js-tokens-4.0.0" - sources."js-yaml-4.1.0" - sources."jsesc-2.5.2" - sources."json5-2.2.3" - sources."lodash-4.17.21" - sources."lodash.isstring-4.0.1" - sources."lowlight-1.9.2" - sources."lru-cache-4.1.5" - sources."md5-2.3.0" - sources."memory-pager-1.5.0" - sources."minimatch-5.1.2" - (sources."minipass-4.0.0" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - sources."mkdirp-1.0.4" - sources."mongodb-4.13.0" - sources."mongodb-build-info-1.5.0" - (sources."mongodb-connection-string-url-2.6.0" // { - dependencies = [ - sources."tr46-3.0.0" - sources."webidl-conversions-7.0.0" - sources."whatwg-url-11.0.0" - ]; - }) - sources."mongodb-log-writer-1.1.4" - sources."mongodb-redact-0.2.2" - sources."ms-2.1.2" - sources."mustache-4.2.0" - sources."node-fetch-2.6.7" - sources."node-releases-2.0.8" - sources."nopt-6.0.0" - sources."numeral-2.0.6" - sources."once-1.4.0" - sources."path-key-3.1.1" - sources."picocolors-1.0.0" - (sources."pretty-repl-3.1.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."proto-list-1.2.4" - sources."pseudomap-1.0.2" - sources."punycode-2.1.1" - sources."remove-trailing-slash-0.1.1" - sources."safer-buffer-2.1.2" - sources."saslprep-git+https://github.com/mongodb-js/saslprep#v1.0.4" - (sources."semver-7.3.8" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."yallist-4.0.0" - ]; - }) - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."sigmund-1.0.1" - sources."smart-buffer-4.2.0" - sources."socks-2.7.1" - sources."source-map-0.5.7" - sources."sparse-bitfield-3.0.3" - sources."strip-ansi-6.0.1" - sources."supports-color-5.5.0" - sources."system-ca-1.0.2" - (sources."tar-6.1.13" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) - sources."text-table-0.2.0" - sources."to-fast-properties-2.0.0" - sources."tr46-0.0.3" - sources."update-browserslist-db-1.0.10" - sources."uuid-8.3.2" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."which-2.0.2" - sources."wrappy-1.0.2" - sources."yallist-2.1.2" - sources."yargs-parser-20.2.9" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "MongoDB Shell CLI REPL"; - homepage = "https://github.com/mongodb-js/mongosh/"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/mongosh/source.json b/third_party/nixpkgs/pkgs/development/tools/mongosh/source.json new file mode 100644 index 0000000000..fda52f4e77 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/mongosh/source.json @@ -0,0 +1,6 @@ +{ + "version": "1.8.0", + "integrity": "sha512-9pHLqfYMWwP1L2t83TK5k6ho1faz+jFD9zXxnTtgnyu0c/uC39nx+tJT9AsxNZpY+GlhshDu1YcJm45f8l3gIw==", + "filename": "mongosh-1.8.0.tgz", + "deps": "sha256-8v4E9wNv3+JCGm7mUEA+z+g/4X37ACwVsn+9Cv7N+4o=" +} diff --git a/third_party/nixpkgs/pkgs/development/tools/mongosh/update.sh b/third_party/nixpkgs/pkgs/development/tools/mongosh/update.sh new file mode 100755 index 0000000000..5ed586873a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/mongosh/update.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodejs libarchive prefetch-npm-deps moreutils +# shellcheck shell=bash + +set -exuo pipefail + +cd -- "$(dirname -- "${BASH_SOURCE[0]}")" + +TMPDIR="$(mktemp -d)" +trap 'rm -r -- "$TMPDIR"' EXIT + +pushd -- "$TMPDIR" +npm pack mongosh --json | jq '.[0] | { version, integrity, filename }' > source.json +bsdtar -x -f "$(jq -r .filename source.json)" + +pushd package +npm install --omit=optional --package-lock-only +popd + +DEPS="$(prefetch-npm-deps package/package-lock.json)" +jq ".deps = \"$DEPS\"" source.json | sponge source.json + +popd + +cp -t . -- "$TMPDIR/source.json" "$TMPDIR/package/package-lock.json" diff --git a/third_party/nixpkgs/pkgs/development/tools/moq/default.nix b/third_party/nixpkgs/pkgs/development/tools/moq/default.nix index b7b7ffcfd8..f62aba7b6c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/moq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/moq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "moq"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "matryer"; repo = "moq"; rev = "v${version}"; - sha256 = "sha256-RdFffcj17CZdI6kL+d5fp8B8gX493k8h0EzDq8BN+SY="; + sha256 = "sha256-nareKBRPL7DVmclTqZCvImxXmHxXxbus1+U1QWCeSy0="; }; - vendorSha256 = "sha256-lfs61YK5HmUd3/qA4o9MiWeTFhu4MTAkNH+f0iGlRe0="; + vendorHash = "sha256-lfs61YK5HmUd3/qA4o9MiWeTFhu4MTAkNH+f0iGlRe0="; subPackages = [ "." ]; 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 f48ce5abf3..bcadfbc660 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { if [[ -n "$conflict" ]]; then echo "Conflicting ocaml packages detected"; echo "$conflict" + echo "Set dontDetectOcamlConflicts to false to disable this check." exit 1 fi } diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix index 2966756645..ae57eb3152 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -15,13 +15,13 @@ }: let - merlinVersion = "4.7"; + merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.8" else "4.7"; hashes = { "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y="; "4.7-413" = "sha256-aVmGWS4bJBLuwsxDKsng/n0A6qlyJ/pnDTcYab/5gyU="; - "4.7-414" = "sha256-bIZ4kwmnit/ujM2//jZA59rweo7Y0QfDb+BpoTxswHs="; - "4.7-500" = "sha256-elYb/0vVvohi9yYFe/54brb6Qh6fyiN1kYPRq5fP1zE="; + "4.8-414" = "sha256-HMXWhcVOXW058y143rNBcfEOmjt2tZJXcXKHmKZ5i68="; + "4.8-500" = "sha256-n5NHKuo0/lZmfe7WskqnW3xm1S0PmXKSS93BDKrpjCI="; }; ocamlVersionShorthand = lib.substring 0 3 diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix deleted file mode 100644 index 23a73002e6..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ stdenv, lib, fetchurl, makeWrapper, - ocaml, unzip, ncurses, curl, aspcud -}: - -assert lib.versionAtLeast ocaml.version "3.12.1"; - -let - srcs = { - cudf = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/33593/cudf-0.7.tar.gz"; - sha256 = "92c8a9ed730bbac73f3513abab41127d966c9b9202ab2aaffcd02358c030a701"; - }; - extlib = fetchurl { - url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz"; - sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021"; - }; - ocaml_re = fetchurl { - url = "https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.0.tar.gz"; - sha256 = "a34dd9d6136731436a963bbab5c4bbb16e5d4e21b3b851d34887a3dec451999f"; - }; - ocamlgraph = fetchurl { - url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.5.tar.gz"; - sha256 = "d167466435a155c779d5ec25b2db83ad851feb42ebc37dca8ffa345ddaefb82f"; - }; - dose3 = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/34277/dose3-3.3.tar.gz"; - sha256 = "8dc4dae9b1a81bb3a42abb283df785ba3eb00ade29b13875821c69f03e00680e"; - }; - cmdliner = fetchurl { - url = "https://erratique.ch/software/cmdliner/releases/cmdliner-0.9.7.tbz"; - sha256 = "9c19893cffb5d3c3469ee0cce85e3eeeba17d309b33b9ace31aba06f68f0bf7a"; - }; - uutf = fetchurl { - url = "https://erratique.ch/software/uutf/releases/uutf-0.9.3.tbz"; - sha256 = "1f364f89b1179e5182a4d3ad8975f57389d45548735d19054845e06a27107877"; - }; - jsonm = fetchurl { - url = "https://erratique.ch/software/jsonm/releases/jsonm-0.9.1.tbz"; - sha256 = "3fd4dca045d82332da847e65e981d8b504883571d299a3f7e71447d46bc65f73"; - }; - opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/1.2.2.zip"; - sha256 = "c590ce55ae69ec74f46215cf16a156a02b23c5f3ecb22f23a3ad9ba3d91ddb6e"; - }; - }; -in stdenv.mkDerivation { - pname = "opam"; - version = "1.2.2"; - - strictDeps = true; - - nativeBuildInputs = [ makeWrapper unzip curl ocaml ]; - buildInputs = [ ncurses ]; - - src = srcs.opam; - - postUnpack = '' - ln -sv ${srcs.cudf} $sourceRoot/src_ext/${srcs.cudf.name} - ln -sv ${srcs.extlib} $sourceRoot/src_ext/${srcs.extlib.name} - ln -sv ${srcs.ocaml_re} $sourceRoot/src_ext/${srcs.ocaml_re.name} - ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/${srcs.ocamlgraph.name} - ln -sv ${srcs.dose3} $sourceRoot/src_ext/${srcs.dose3.name} - ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/${srcs.cmdliner.name} - ln -sv ${srcs.uutf} $sourceRoot/src_ext/${srcs.uutf.name} - ln -sv ${srcs.jsonm} $sourceRoot/src_ext/${srcs.jsonm.name} - ''; - - preConfigure = '' - substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:" - ''; - - postConfigure = "make lib-ext"; - - # Dirty, but apparently ocp-build requires a TERM - makeFlags = ["TERM=screen"]; - - # change argv0 to "opam" as a workaround for - # https://github.com/ocaml/opam/issues/2142 - postInstall = '' - mv $out/bin/opam $out/bin/.opam-wrapped - makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ - --argv0 "opam" \ - --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin - ''; - - doCheck = false; - - meta = with lib; { - description = "A package manager for OCaml"; - homepage = "http://opam.ocamlpro.com/"; - maintainers = [ maintainers.henrytill ]; - platforms = platforms.all; - license = licenses.lgpl21Plus; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix b/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix index 0fc9506594..cb9a690650 100644 --- a/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "14.9.2"; + version = "14.14.1"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9ZIMAJVVrJk8ny3TgwXHSxrg713dSbPlgQnY/b0m2Ps="; + hash = "sha256-EdW9LnSYSa8ulXKSJz3LBktVlDev7CLVOZL9qAytjcQ="; }; vendorHash = "sha256-JZ5UiL2vGsXy/xmz+NcAKYDmp5hq7bx54/OdUyQHUp0="; diff --git a/third_party/nixpkgs/pkgs/development/tools/opcr-policy/default.nix b/third_party/nixpkgs/pkgs/development/tools/opcr-policy/default.nix index 919c8c0a48..46365e23fd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/opcr-policy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/opcr-policy/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "opcr-policy"; - version = "0.1.50"; + version = "0.1.51"; src = fetchFromGitHub { owner = "opcr-io"; repo = "policy"; rev = "v${version}"; - sha256 = "sha256-u7epE09WcbXAX1W+zkCOTDECnBTIOFC3gjNowtpuYtI="; + sha256 = "sha256-RpjuKtxiZA6l0ZW0TsEUn2AMLjU/V2RRfQLmfa0imW4="; }; vendorHash = "sha256-QoD6J+is+InumLiFdbL/y1tuWwBCdBebx6RrIZ4Irik="; diff --git a/third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix b/third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix index 212a710de6..4738ccd74a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix @@ -1,7 +1,8 @@ { lib , stdenv , fetchFromGitHub -, autoreconfHook +, cmake +, fetchpatch , pkg-config , curl , openssl @@ -9,16 +10,29 @@ stdenv.mkDerivation rec { pname = "osslsigncode"; - version = "2.3"; + version = "2.5"; src = fetchFromGitHub { owner = "mtrojnar"; repo = pname; rev = version; - sha256 = "sha256-KJyGDrT3dr8DfjfRrWIENoBFuiWrgQx4qz1V+mT8/yI="; + sha256 = "sha256-33uT9PFD1YEIMzifZkpbl2EAoC98IsM72K4rRjDfh8g="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + patches = [ + # Cygwin patch is prereq for Darwin fix applying -- committed to master after 2.5 release + (fetchpatch { + url = "https://github.com/mtrojnar/osslsigncode/commit/1c678bf926b78c947b14c46c3ce88e06268c738e.patch"; + sha256 = "sha256-vOBMGIJ3PHJTvmsXRRfAUJRi7P929PcfmrUiRuM0pf4="; + }) + # Fix build on Darwin when clang not identified as Apple (https://github.com/mtrojnar/osslsigncode/pull/247) + (fetchpatch { + url = "https://github.com/charles-dyfis-net/osslsigncode/commit/b2ed89b35c8a26faa7eb6515fecaff3c4c5f7fed.patch"; + sha256 = "sha256-FGKZK/IzHbbkTzSoAtpC75z79d5+qQvvJrjEDY31WJ0="; + }) + ]; + + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ curl openssl ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/paging-calculator/default.nix b/third_party/nixpkgs/pkgs/development/tools/paging-calculator/default.nix index f57d7b137b..eeb45802e3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/paging-calculator/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/paging-calculator/default.nix @@ -5,23 +5,23 @@ rustPlatform.buildRustPackage rec { pname = "paging-calculator"; - version = "0.1.2"; + version = "0.2.0"; src = fetchCrate { inherit pname version; - hash = "sha256-9DbpfJbarWXYGNzTqfHHSaKFqSJ59E/VhOhuMUWk8ho="; + hash = "sha256-GxugaNLkLy71X/E9EAn/2p2ReSHvs5TvXAxg8csu9uc="; }; - cargoHash = "sha256-IfOhJwR5eRHeeAbEZ8zeUVojQXtrYHdzAeht/lvdlUQ="; + cargoHash = "sha256-a1yryyKCcNQVurqnb+AZiBQ0rilNsuXmSsFoaaBe+r8="; meta = { description = "CLI utility that helps calculating page table indices from a virtual address"; longDescription = '' - paging-calculator is a CLI utility written in Rust that helps you find the indices that a virtual - address will have on different architectures or paging implementations. + paging-calculator is a CLI utility written in Rust that helps you finding the indices that a + virtual address will have into the page tables on different architectures. - It takes a (virtual) address in hexadecimal format and shows you which index will be used for - what page-table level. It can be installed with $ cargo install paging-calculator. + It takes a (virtual) address in hexadecimal format and shows you which index is used for + which level of the page table. ''; homepage = "https://github.com/phip1611/paging-calculator"; changelog = "https://github.com/phip1611/paging-calculator/blob/v${version}/CHANGELOG.md"; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/4.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/4.nix index 8753bb834d..94ca0fee52 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/4.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/4.nix @@ -42,11 +42,15 @@ let echo "#! ${stdenv.shell}" >> "$out/bin/antlr" echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' -Xmx500M org.antlr.v4.Tool \"\$@\"" >> "$out/bin/antlr" + echo "#! ${stdenv.shell}" >> "$out/bin/antlr-parse" + echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' -Xmx500M org.antlr.v4.gui.Interpreter \"\$@\"" >> "$out/bin/antlr-parse" + echo "#! ${stdenv.shell}" >> "$out/bin/grun" echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' org.antlr.v4.gui.TestRig \"\$@\"" >> "$out/bin/grun" - chmod a+x "$out/bin/antlr" "$out/bin/grun" + chmod a+x "$out/bin/antlr" "$out/bin/antlr-parse" "$out/bin/grun" ln -s "$out/bin/antlr"{,4} + ln -s "$out/bin/antlr"{,4}-parse ''; inherit jre; @@ -99,6 +103,20 @@ let }; in { + antlr4_12 = (mkAntlr { + version = "4.12.0"; + sourceSha256 = "sha256-0JMG8UYFT+IAWvARY2KnuXSr5X6LlVZN4LJHy5d4x08="; + jarSha256 = "sha256-iPGKK/rA3eEAntpcfc41ilKHf673ho9WIjpbzBUynkM="; + extraCppCmakeFlags = [ + # Generate CMake config files, which are not installed by default. + "-DANTLR4_INSTALL=ON" + + # Disable tests, since they require downloading googletest, which is + # not available in a sandboxed build. + "-DANTLR_BUILD_CPP_TESTS=OFF" + ]; + }).antlr; + antlr4_11 = (mkAntlr { version = "4.11.1"; sourceSha256 = "sha256-SUeDgfqLjYQorC8r/CKlwbYooTThMOILkizwQV8pocc="; diff --git a/third_party/nixpkgs/pkgs/development/tools/pifpaf/default.nix b/third_party/nixpkgs/pkgs/development/tools/pifpaf/default.nix new file mode 100644 index 0000000000..0268b90e8b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/pifpaf/default.nix @@ -0,0 +1,41 @@ +{ lib +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "pifpaf"; + version = "3.1.5"; + format = "setuptools"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "sha256-lmixfUP+pq0RdyXeY6MmUQOx1sMLHqojOKUK1mivbaU="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + click + daiquiri + fixtures + jinja2 + pbr + psutil + xattr + ]; + + preCheck = '' + export PATH=$out/bin:$PATH + ''; + + nativeCheckInputs = with python3.pkgs; [ + requests + ]; + + pythonImportsCheck = [ "pifpaf" ]; + + meta = with lib; { + description = "Suite of tools and fixtures to manage daemons for testing"; + homepage = "https://github.com/jd/pifpaf"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix b/third_party/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix index e7c3ee8c57..8b186b9be4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix @@ -6,8 +6,8 @@ let ## fetchgit info url = "git://sourceware.org/git/systemtap.git"; rev = "release-${version}"; - sha256 = "sha256-3LgqMBCnUG2UmsekaIvV43lBpSPEocEXmFV9WpE7wE0="; - version = "4.5"; + sha256 = "sha256-UiUMoqdfkk6mzaPGctpQW3dvOWKhNBNuScJ5BpCykVg="; + version = "4.8"; inherit (kernel) stdenv; diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go-grpc/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go-grpc/default.nix index b880921e1e..fab6bfec12 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go-grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go-grpc/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "protoc-gen-go-grpc"; - version = "1.2.0"; + version = "1.3.0"; modRoot = "cmd/protoc-gen-go-grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc-go"; rev = "cmd/protoc-gen-go-grpc/v${version}"; - sha256 = "sha256-pIHMykwwyu052rqwSV5Js0+JCKCNLrFVN6XQ3xjlEOI="; + sha256 = "sha256-Zy0k5X/KFzCao9xAGt5DNb0MMGEyqmEsDj+uvXI4xH4="; }; - vendorSha256 = "sha256-yxOfgTA5IIczehpWMM1kreMqJYKgRT5HEGbJ3SeQ/Lg="; + vendorHash = "sha256-y+/hjYUTFZuq55YAZ5M4T1cwIR+XFQBmWVE+Cg1Y7PI="; meta = with lib; { description = "The Go language implementation of gRPC. HTTP/2 based RPC"; diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix index 659b9c2c2a..a9c826a930 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.28.1"; + version = "1.29.1"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - sha256 = "sha256-7Cg7fByLR9jX3OSCqJfLw5PAHDQi/gopkjtkbobnyWM="; + sha256 = "sha256-xlRHhr25+gXlO6ggIQgijWYzIVZCpRVCnuLnSW1r15s="; }; vendorSha256 = "sha256-yb8l4ooZwqfvenlxDRg95rqiL+hmsn0weS/dPv/oD2Y="; diff --git a/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix b/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix index 1fb54f8c17..7f806df225 100644 --- a/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkg-config, libunwind, python3, runCommand, darwin }: +{ lib +, stdenv +, darwin +, fetchFromGitHub +, libunwind +, pkg-config +, pkgsBuildBuild +, python3 +, runCommand +, rustPlatform +}: rustPlatform.buildRustPackage rec { pname = "py-spy"; @@ -7,11 +17,19 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "benfred"; repo = "py-spy"; - rev = "v${version}"; - sha256 = "sha256-NciyzKiDKIMeuHhTjzmHIc3dYW4AniuCNjZugm4hMss="; + rev = "refs/tags/v${version}"; + hash = "sha256-NciyzKiDKIMeuHhTjzmHIc3dYW4AniuCNjZugm4hMss="; }; - nativeBuildInputs = [ rustPlatform.bindgenHook ]; + cargoHash = "sha256-nm+44YWSJOOg9a9d8b3APXW50ThV3iA2C/QsJMttscE="; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + ]; + + nativeCheckInputs = [ + python3 + ]; buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ # Pull a header that contains a definition of proc_pid_rusage(). @@ -27,13 +45,16 @@ rustPlatform.buildRustPackage rec { export RUSTFLAGS="-Clinker=$CC" ''; - nativeCheckInputs = [ python3 ]; - - cargoSha256 = "sha256-nm+44YWSJOOg9a9d8b3APXW50ThV3iA2C/QsJMttscE="; + checkFlags = [ + # thread 'python_data_access::tests::test_copy_string' panicked at 'called `Result::unwrap()` on an `Err` + "--skip=python_data_access::tests::test_copy_string" + ]; meta = with lib; { description = "Sampling profiler for Python programs"; + homepage = "https://github.com/benfred/py-spy"; + changelog = "https://github.com/benfred/py-spy/releases/tag/v${version}"; license = licenses.mit; - maintainers = [ maintainers.lnl7 ]; + maintainers = with maintainers; [ lnl7 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/railway/default.nix b/third_party/nixpkgs/pkgs/development/tools/railway/default.nix index 43eb79c0e1..7cac6d50d6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/railway/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/railway/default.nix @@ -1,28 +1,32 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, CoreServices +, Security }: -buildGoModule rec { +rustPlatform.buildRustPackage rec { pname = "railway"; - version = "2.1.0"; + version = "3.0.12"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-JpIy8u6L7yOZgTFxFft+vhcat3uPT9EvOXAQOmrpvpc="; + hash = "sha256-2RdB/X62/9HKKax+Y+RYPrLEHsWwzOwzJ1Go930bYN0="; }; - ldflags = [ "-s" "-w" ]; + cargoHash = "sha256-Aozg/Pyo7JlTEXul3MEfGLwbRo/qjogWeAUHzK8xssc="; - vendorHash = "sha256-nLuomuAScodgLUKzMTiygtFBnNHrqAojOySZgKLVGJY="; + nativeBuildInputs = [ pkg-config ]; - postInstall = '' - mv $out/bin/cli $out/bin/railway - ''; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; + + OPENSSL_NO_VENDOR = 1; meta = with lib; { - description = "Railway CLI"; - homepage = "https://railway.app"; + mainProgram = "railway"; + description = "Railway.app CLI"; + homepage = "https://github.com/railwayapp/cli"; + changelog = "https://github.com/railwayapp/cli/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ Crafter ]; + maintainers = with maintainers; [ Crafter techknowlogick ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-all-features/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-all-features/default.nix index 3d36b42ebe..6b3965afc2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-all-features/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-all-features/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-all-features"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "frewsxcv"; repo = pname; rev = version; - sha256 = "1pdr34ygc0qmh0dyrw1qcrh1vgg9jv9lm6ypl3fgjzz7npdj1dw4"; + sha256 = "sha256-p9UQaqytqpD2u9X9zaTPIgVEloU2UbD/AxVERNs1Lt8="; }; - cargoSha256 = "sha256-BsRJo55gYT8OkDUBepWq48sW7QPt5OZkm8RR9f7HqZY="; + cargoSha256 = "sha256-krtuLFQlInqdv7j8v13/X3lL0JdaMsApb9Ga5muThgw="; meta = with lib; { description = "A Cargo subcommand to build and test all feature flag combinations"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix index 5705b9039b..782eede39d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "0.20.1"; + version = "0.21.3"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-wM8DawrniyJxj8Omgj+hiePa521p4hIAngfzEHFNO58="; + hash = "sha256-K4NerJSW3ckXMFFnFCMXIqMeevE3Xzr/Wsz9nloolBI="; }; - cargoHash = "sha256-ZanPmdFMDGZhRHVVGt03OJWz8HnSYFdm42W6rpytu5Y="; + cargoHash = "sha256-YSKnfhSZ885evtEK40QTt90RwtH03aO/aJ6A/DddoVU="; nativeBuildInputs = [ pkg-config @@ -43,6 +43,13 @@ rustPlatform.buildRustPackage rec { "zstd-thin" ]; + checkFlags = [ + # requires internet access + "--skip=download::test::test_and_extract" + "--skip=gh_api_client::test::test_gh_api_client_cargo_binstall_no_such_release" + "--skip=gh_api_client::test::test_gh_api_client_cargo_binstall_v0_20_1" + ]; + # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu postPatch = '' rm .cargo/config diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix index 81a973547d..af3673e28b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain"; longDescription = '' - In order for this to work, you either need to run `rustup component add llvm-tools-preview` or install the `llvm-tools-preview` component using your Nix library (e.g. nixpkgs-mozilla, or rust-overlay) + In order for this to work, you either need to run `rustup component add llvm-tools-preview` or install the `llvm-tools-preview` component using your Nix library (e.g. fenix or rust-overlay) ''; homepage = "https://github.com/rust-embedded/cargo-binutils"; changelog = "https://github.com/rust-embedded/cargo-binutils/blob/v${version}/CHANGELOG.md"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deb/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deb/default.nix index 053e1a5ef0..2cc64a771e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deb/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "1.42.1"; + version = "1.42.2"; src = fetchFromGitHub { owner = "kornelski"; repo = pname; rev = "v${version}"; - hash = "sha256-8o3WQ/kaYhp1gjHLQeDU9JITv9crxAVCP8UReIVd4Fc="; + hash = "sha256-s/piZ8sCdBz5zFW9i7xdVrf7dQiMjQp/ixCDjFh5SLc="; }; - cargoHash = "sha256-EbcH2aBs9haXKBdEWJRPqJ1PSLj3pHdHJi38LH08uTk="; + cargoHash = "sha256-4iJghmSXsaijNCvYyrM3dEsqCDk6zeTU92oP5Qs6tOY="; nativeBuildInputs = [ makeWrapper diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index d8b94b298b..5fabbd96c3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { longDescription = '' In order for this to work, you either need to run `rustup component add llvm- tools-preview` or install the `llvm-tools-preview` component using your Nix - library (e.g. nixpkgs-mozilla, or rust-overlay) + library (e.g. fenix or rust-overlay) ''; license = with lib.licenses; [ asl20 /* or */ mit ]; maintainers = with lib.maintainers; [ wucke13 ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix index 4d8e76b59e..81f1c7e1cb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.49"; + version = "0.9.50"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - sha256 = "sha256-QonjtUw9CAEcGkjyq5Iv5CTo4gGUuFXSS2QVi/Ub2j4="; + sha256 = "sha256-xV2kDi/9gJ6sCQChy4eUowWSttrrp5yrcBucsJ6GcKc="; }; - cargoSha256 = "sha256-+L6+hRCnYqWmO5G1nctT0Ly74DhvUYhMvQroSDFMREg="; + cargoSha256 = "sha256-G5nEQ12mU7Hug4BqSaD24z3q2pZnQzvHoFVGDgw+xcU="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/buildPgxExtension.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/buildPgxExtension.nix new file mode 100644 index 0000000000..4b4f7f9d74 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/buildPgxExtension.nix @@ -0,0 +1,160 @@ +# preBuildAndTest and some small other bits +# taken from https://github.com/tcdi/pgx/blob/v0.4.5/nix/extension.nix +# (but now heavily modified) +# which uses MIT License with the following license file +# +# MIT License +# +# Portions Copyright 2019-2021 ZomboDB, LLC. +# Portions Copyright 2021-2022 Technology Concepts & Design, Inc. . +# All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +{ lib +, cargo-pgx +, pkg-config +, rustPlatform +, stdenv +, Security +, writeShellScriptBin +}: + +# The idea behind: Use it mostly like rustPlatform.buildRustPackage and so +# we hand most of the arguments down. +# +# Additional arguments are: +# - `postgresql` postgresql package of the version of postgresql this extension should be build for. +# Needs to be the build platform variant. +# - `useFakeRustfmt` Whether to use a noop fake command as rustfmt. cargo-pgx tries to call rustfmt. +# If the generated rust bindings aren't needed to use the extension, its a +# unnecessary and heavy dependency. If you set this to true, you also +# have to add `rustfmt` to `nativeBuildInputs`. + +{ buildAndTestSubdir ? null +, buildType ? "release" +, buildFeatures ? [ ] +, cargoBuildFlags ? [ ] +, postgresql +# cargo-pgx calls rustfmt on generated bindings, this is not strictly necessary, so we avoid the +# dependency here. Set to false and provide rustfmt in nativeBuildInputs, if you need it, e.g. +# if you include the generated code in the output via postInstall. +, useFakeRustfmt ? true +, ... +} @ args: +let + rustfmtInNativeBuildInputs = lib.lists.any (dep: lib.getName dep == "rustfmt") (args.nativeBuildInputs or []); +in + +assert lib.asserts.assertMsg ((args.installPhase or "") == "") + "buildPgxExtensions overwrites the installPhase, so providing one does nothing"; +assert lib.asserts.assertMsg ((args.buildPhase or "") == "") + "buildPgxExtensions overwrites the buildPhase, so providing one does nothing"; +assert lib.asserts.assertMsg (useFakeRustfmt -> !rustfmtInNativeBuildInputs) + "The parameter useFakeRustfmt is set to true, but rustfmt is included in nativeBuildInputs. Either set useFakeRustfmt to false or remove rustfmt from nativeBuildInputs."; +assert lib.asserts.assertMsg (!useFakeRustfmt -> rustfmtInNativeBuildInputs) + "The parameter useFakeRustfmt is set to false, but rustfmt is not included in nativeBuildInputs. Either set useFakeRustfmt to true or add rustfmt from nativeBuildInputs."; + +let + fakeRustfmt = writeShellScriptBin "rustfmt" '' + exit 0 + ''; + maybeDebugFlag = lib.optionalString (buildType != "release") "--debug"; + maybeEnterBuildAndTestSubdir = lib.optionalString (buildAndTestSubdir != null) '' + export CARGO_TARGET_DIR="$(pwd)/target" + pushd "${buildAndTestSubdir}" + ''; + maybeLeaveBuildAndTestSubdir = lib.optionalString (buildAndTestSubdir != null) "popd"; + + pgxPostgresMajor = lib.versions.major postgresql.version; + preBuildAndTest = '' + export PGX_HOME=$(mktemp -d) + export PGDATA="$PGX_HOME/data-${pgxPostgresMajor}/" + cargo-pgx pgx init "--pg${pgxPostgresMajor}" ${postgresql}/bin/pg_config + echo "unix_socket_directories = '$(mktemp -d)'" > "$PGDATA/postgresql.conf" + + # This is primarily for Mac or other Nix systems that don't use the nixbld user. + export USER="$(whoami)" + pg_ctl start + createuser -h localhost --superuser --createdb "$USER" || true + pg_ctl stop + ''; + + argsForBuildRustPackage = builtins.removeAttrs args [ "postgresql" "useFakeRustfmt" ]; + + # so we don't accidentally `(rustPlatform.buildRustPackage argsForBuildRustPackage) // { ... }` because + # we forgot parentheses + finalArgs = argsForBuildRustPackage // { + buildInputs = (args.buildInputs or [ ]) ++ lib.optionals stdenv.isDarwin [ Security ]; + + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ + cargo-pgx + postgresql + pkg-config + rustPlatform.bindgenHook + ] ++ lib.optionals useFakeRustfmt [ fakeRustfmt ]; + + buildPhase = '' + runHook preBuild + + echo "Executing cargo-pgx buildPhase" + ${preBuildAndTest} + ${maybeEnterBuildAndTestSubdir} + + NIX_PGLIBDIR="${postgresql}/lib" \ + PGX_BUILD_FLAGS="--frozen -j $NIX_BUILD_CORES ${builtins.concatStringsSep " " cargoBuildFlags}" \ + cargo-pgx pgx package \ + --pg-config ${postgresql}/bin/pg_config \ + ${maybeDebugFlag} \ + --features "${builtins.concatStringsSep " " buildFeatures}" \ + --out-dir "$out" + + ${maybeLeaveBuildAndTestSubdir} + + runHook postBuild + ''; + + preCheck = preBuildAndTest + args.preCheck or ""; + + installPhase = '' + runHook preInstall + + echo "Executing buildPgxExtension install" + + ${maybeEnterBuildAndTestSubdir} + + cargo-pgx pgx stop all + + mv $out/${postgresql}/* $out + rm -rf $out/nix + + ${maybeLeaveBuildAndTestSubdir} + + runHook postInstall + ''; + + PGX_PG_SYS_SKIP_BINDING_REWRITE = "1"; + CARGO_BUILD_INCREMENTAL = "false"; + RUST_BACKTRACE = "full"; + + checkNoDefaultFeatures = true; + checkFeatures = (args.checkFeatures or [ ]) ++ [ "pg_test pg${pgxPostgresMajor}" ]; + }; +in +rustPlatform.buildRustPackage finalArgs diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix index ba5dc4e1fc..2d178bda16 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.27.2"; + version = "0.27.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-6LXFrLSApEQXa34zTVgqUVYMiFnGi6i7gyXnMglHtFE="; + hash = "sha256-s5aPzaH08XvGm+hZy+dQkvp8rVFcGWoTgniIfOzQk4E="; }; - cargoHash = "sha256-3lMUKtHpCXN+fKDbU4QwVUol6aL6dxP5Bbf59xEkcjY="; + cargoHash = "sha256-q5Oq9Lg7cNteHvzaAWwzoHThYiXac/x1Y5LyFZjfSCo="; nativeBuildInputs = [ pkg-config ]; @@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "List and diff the public API of Rust library crates between releases and commits. Detect breaking API changes and semver violations"; homepage = "https://github.com/Enselic/cargo-public-api"; + changelog = "https://github.com/Enselic/cargo-public-api/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix index fc4fd46caa..e0fd373fab 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.24.5"; + version = "0.24.6"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "refs/tags/v${version}"; - hash = "sha256-6+Ej5hpwnoeE8WlrYeaddDZP/j8a5cn+2qqMQmFjIBU="; + hash = "sha256-IB+p2pxS+ycPlHgURujBDPppkgF8SjTBa+j1qvzFbjc="; }; - cargoHash = "sha256-mYrnATxRHYqWr0EgU7U3t2WUm72Lj8roX4WvGEMqZx8="; + cargoHash = "sha256-L2UnwFc5h/txMRIDCYCnsE+y2PQdt95XRsz2LupsXho="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-update/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-update/default.nix index 61dc0d655f..519e160e67 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-update/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-update/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-update"; - version = "11.1.1"; + version = "11.1.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ml+LqfnDld+I3G6+LaPJOeZa+swCtuu0ndW0yJraSxs="; + sha256 = "sha256-Hil4v9EUVEH1j7LV1icct6ggFzGVy3f8p+LuFrlBOVA="; }; - cargoSha256 = "sha256-0exatgmksg07KQO/3s9BD4uIZRHwjytQPtaRv+JydPc="; + cargoHash = "sha256-gOhZUJHBYti/kqfhyopRsY1PbXZdiGJZpjohMUbO/28="; nativeBuildInputs = [ cmake installShellFiles pkg-config ronn ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 00d4e4e694..37e85dc357 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.16.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3PzzaZ62My+11yXGrQSWpJvKvbcKXMfy7CLDBnSVDuI="; + sha256 = "sha256-IqGKK3g56RB9o6i+sJjlod3KuAAB9O7RerQshKoCOfk="; }; - cargoSha256 = "sha256-ZnsrqbB89C4E5yBDN/wgNgpSEh/aS078h2X+ewtMX8E="; + cargoSha256 = "sha256-RPOMc0+FwjhewqiMwVxAwg5g7GphOtXW8xMElDyTPUk="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix index 3c3dd234e2..e5c3272280 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "0.14.13"; + version = "0.14.15"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-a/i4pe+vjQRB4j0K6wBA5XVAih+a1ijLlDvROBjjxOw="; + hash = "sha256-+Fb0oaUr8oL5L3uGxN8jojrc6lQ3eTYqzVg4qNITQRA="; }; - cargoHash = "sha256-8IsXD6bKAkzxVOM04tA5+z1qQxZiV+enlTZrwiik4Ik="; + cargoHash = "sha256-HBHcoQT1rBd2DKMwQdBLS3r8QhMowdv6fBcsABGW9Xw="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/selene/default.nix b/third_party/nixpkgs/pkgs/development/tools/selene/default.nix index 238bf99384..87c4a0f3ee 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.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "kampfkarren"; repo = pname; rev = version; - sha256 = "sha256-tw9OLdXhqxgqROub0P/+nd4LQGNw3QDxlCyyf8ogRQM="; + sha256 = "sha256-aKU+1eoLm/h5Rj/vAZOyAnyl5/TpStL5g8PPdYCJ8o0="; }; - cargoSha256 = "sha256-5/xAX8BhB81cB7x2Pe/MKCV0Fi76ZcO6XHFQxTVIuLA="; + cargoSha256 = "sha256-y2BoV59oJPMBf9rUgMhHu87teurwPSNowRbuPfXubGA="; nativeBuildInputs = lib.optionals robloxSupport [ pkg-config 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 7a9f76d19c..222aa13698 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 = "2.14.3"; + version = "2.14.4"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-l2/gwguNQAcnBGQxVGBUecIFbp8CHrrqDrjRFxaeVe4="; + sha256 = "sha256-7uZPtMu6U6T5TwwnMy/xy7dKVl77Exmj1U3ue6S/rrI="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-h9rkTnGFMclTTyUy39rpKiorcy3953u2nbHiydOAmqI="; + cargoHash = "sha256-tezeakmPtujtdr1nc2anaJAWCJ3lS2L/LsH8qa1O3tI="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix index 4e1a51f515..cba9f174bf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "skaffold"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "sha256-D0KcnxfjPBGHLGs5YLdecuKL07jIhF6w/SIr/I/W1rI="; + sha256 = "sha256-4/FnuyesqW+9zA4TArm/7MpTzWURGG7ZjQKh3WFghZQ="; }; - vendorSha256 = "sha256-yy1BVorjLEcZR6PqupBiZx2plwPJ6xlxripbyB6RLek="; + vendorHash = "sha256-hy0xi21Lq3MzXnBB8+8FqNZsxp4fLshnaRm4v+GyLUg="; subPackages = ["cmd/skaffold"]; diff --git a/third_party/nixpkgs/pkgs/development/tools/sq/default.nix b/third_party/nixpkgs/pkgs/development/tools/sq/default.nix index f30b30a75b..ca0f28625c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sq/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sq"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "neilotoole"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KPH1IsvYQvyUsi4qxWKLpCQNrPCnulCqQLPK5iadm3I="; + sha256 = "sha256-7P29t90LbKM+ng8ac7HL5uA90rIvZIfue2bxZ6coQ9k="; }; vendorHash = "sha256-AL4ghkeTIkXZXpGeBnWIx3hY6uO2bO7eVcH6DR/5jQc="; diff --git a/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix b/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix index 60110d6c99..6e8b7df3cb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PpkJwCVZr21P1WmU2Kid+X9JwKdJs1krY6keQoMqDvc="; + sha256 = "sha256-Q+0B7O769blQVHC4++G+FZTKa1llmn6xkS1UDBcFLOA="; }; - cargoSha256 = "sha256-oCoE+Fk2zcVlV8H+f/soAWlhXNsLTysmqLXx9yjdnFY="; + cargoSha256 = "sha256-lnodLMqiJsxm5rO+FMbvVhzX3z9R4eyPf+ujDCDk8ow="; # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/tabnine/sources.json b/third_party/nixpkgs/pkgs/development/tools/tabnine/sources.json index 11ca370deb..7ce95a0e13 100644 --- a/third_party/nixpkgs/pkgs/development/tools/tabnine/sources.json +++ b/third_party/nixpkgs/pkgs/development/tools/tabnine/sources.json @@ -1,17 +1,17 @@ { - "version": "4.4.245", + "version": "4.4.265", "platforms": { "x86_64-linux": { "name": "x86_64-unknown-linux-musl", - "hash": "sha256-heumULn4DNYJVB8ZdQz8RcQYcLcdF85+Wjsz4K3SUDg=" + "hash": "sha256-HyRUlOSH/GmvBlOEtdIdv5cyHaw92OqWrYqaEI63NDE=" }, "aarch64-darwin": { "name": "aarch64-apple-darwin", - "hash": "sha256-eLzf2srpOh9YSdl2lK1KALQ/KERIcJJoeErLxeM3J+M=" + "hash": "sha256-ZcM7JnrPCWvhvpb7vbrLvqY9RmWjMaaAd7Wvx6Eveto=" }, "x86_64-darwin": { "name": "x86_64-apple-darwin", - "hash": "sha256-ZCATPu9cU2ZUUFE7vDx/xKyx8jChubrG1xby7I+0z/4=" + "hash": "sha256-eiZv5eidDynNOb5P6IUAVI3X8xub9U0GgWFkFq6mY74=" } } } diff --git a/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix b/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix index 428bb2f417..0a9524b0b0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "the-way"; - version = "0.19.1"; + version = "0.19.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-d4ws5EsYVaxjfDbzoMO3kcJsrk/Htw3Ath3z3UGW7rk="; + sha256 = "sha256-jTyKz9ZvA9xJlDQXv2LHrSMeSDbh4AJBxi1WtqUhjgE="; }; - cargoSha256 = "sha256-6zphQRhh32iophXSuzbQC5BOuKM92sLS5vXndwF+spg="; + cargoSha256 = "sha256-D0H8vChCzBCRjC/S/ceJbuNNAXISiFMZtgu8TMfic+0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/toast/default.nix b/third_party/nixpkgs/pkgs/development/tools/toast/default.nix index 9120500831..98c072164f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/toast/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/toast/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "toast"; - version = "0.46.1"; + version = "0.46.2"; src = fetchFromGitHub { owner = "stepchowfun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3ng1nVl5eqpa3YWqT/RYZo9sBl6Zkyc8NabG1GpjapQ="; + sha256 = "sha256-WsNBBivfw0tUF3TsJBbg7A13IcFEqclF9MR55xogI5Q="; }; - cargoHash = "sha256-22DtD0PeuDK1Gwy28ZD02LJYgOYuowf+pDQjHXiT6+A="; + cargoHash = "sha256-hZA5iWZ2KKifvHRx5p9LM/la80ezyzV2XOuxq0lRYB0="; checkFlags = [ "--skip=format::tests::code_str_display" ]; # fails diff --git a/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix index 3187fb28ee..0842a07049 100644 --- a/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.4.1"; + version = "5.4.2"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-UEfnwYMiYE+DAENwf3cfSE20ctAxVjbko428rDNIMzI="; + sha256 = "sha256-Zrn+4/zeqJXkKOSsbpPR2bO+ilApn8JUVAgqWydv/Is="; }; buildInputs = [ nodejs ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/viceroy/default.nix b/third_party/nixpkgs/pkgs/development/tools/viceroy/default.nix new file mode 100644 index 0000000000..11dfd22d51 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/viceroy/default.nix @@ -0,0 +1,29 @@ +{ rustPlatform, fetchFromGitHub, lib, stdenv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "viceroy"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "fastly"; + repo = pname; + rev = "v${version}"; + hash = "sha256-X+RmsS+GxdBiFt2Fo0MgkuyjQDwQNuOLDL1YVQdqhXo="; + }; + + buildInputs = lib.optional stdenv.isDarwin Security; + + cargoHash = "sha256-vbhBlfHrFcjtaUJHYvB106ElYP0NquOo+rgIx9cWenY="; + + cargoTestFlags = [ + "--package viceroy-lib" + ]; + + meta = with lib; { + description = "Viceroy provides local testing for developers working with Compute@Edge"; + homepage = "https://github.com/fastly/Viceroy"; + license = licenses.asl20; + maintainers = with maintainers; [ ereslibre shyim ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/xc/default.nix b/third_party/nixpkgs/pkgs/development/tools/xc/default.nix index 9b4643435b..ebdbbc4ac5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/xc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/xc/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "xc"; - version = "0.0.175"; + version = "0.1.181"; src = fetchFromGitHub { owner = "joerdav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Uc9MTxl32xQ7u6N0mocDAoD9tgv/YOPCzhonsavX9Vo="; + sha256 = "sha256-C6qZdO6+n9BWm69y09kvnEBF45sB6bfOfmteNO2x68I="; }; vendorHash = "sha256-cySflcTuAzbFZbtXmzZ98nfY8HUq1UedONTtKP4EICs="; diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix index 3352bfcc74..32736d0ffa 100644 --- a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.478"; + version = "0.0.484"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-tMDcEpRpmFYOiEz+bmR5O+fushGPeBU28HoDqNuOP+Y="; + hash = "sha256-2//mxYTF6lAolj5aQOXF12NOwEa/VPoen9LNxD7gYDo="; }; - vendorHash = "sha256-W5z6Rbr8dPP0kAhVG8UPy5rK9wz5mZVK9geYt9umftE="; + vendorHash = "sha256-2y671bvOmkKEqbcttcCG1L1by/J8gkGZxts7kFyTIxk="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/web/function-runner/default.nix b/third_party/nixpkgs/pkgs/development/web/function-runner/default.nix index 71e01aca94..60b8b2986e 100644 --- a/third_party/nixpkgs/pkgs/development/web/function-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/function-runner/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "function-runner"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4uW7gjvQjv10evBeYdRiQFsnA67VAzL74YBNUbVciHg="; + sha256 = "sha256-3HhtRzeOgn2fhC7qf95Wy04hI2/d9oReX9r/BTvW5nQ="; }; - cargoSha256 = "sha256-EZubfW4PNdBurLk3YJ/BLtDq3zxkQ3YxfWMMBa2TpWU="; + cargoHash = "sha256-27QY+QQHR+bK7Sf8I6wWyYMwBZYJbEBe5ZK+zYEansQ="; meta = with lib; { description = "A CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure"; diff --git a/third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix b/third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix index b62464d264..44b4af4408 100644 --- a/third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "lucky-cli"; - version = "0.30.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "luckyframework"; repo = "lucky_cli"; rev = "v${version}"; - hash = "sha256-fgrfVqRcb8xdvZ33XW3lBwR1GhjF/WeAglrPH2Fw31I="; + hash = "sha256-Ky4DmClSyAVBAetpZM5tFnQZ74fchCOgcxBftd+gwlE="; }; # the integration tests will try to clone a remote repos diff --git a/third_party/nixpkgs/pkgs/development/web/lucky-cli/shard.lock b/third_party/nixpkgs/pkgs/development/web/lucky-cli/shard.lock index a81bcf4830..9bf2212760 100644 --- a/third_party/nixpkgs/pkgs/development/web/lucky-cli/shard.lock +++ b/third_party/nixpkgs/pkgs/development/web/lucky-cli/shard.lock @@ -2,7 +2,7 @@ version: 2.0 shards: ameba: git: https://github.com/crystal-ameba/ameba.git - version: 1.0.0 + version: 1.1.0 lucky_task: git: https://github.com/luckyframework/lucky_task.git @@ -10,7 +10,7 @@ shards: nox: git: https://github.com/matthewmcgarvey/nox.git - version: 0.2.0 + version: 0.2.2 teeplate: git: https://github.com/luckyframework/teeplate.git diff --git a/third_party/nixpkgs/pkgs/development/web/lucky-cli/shards.nix b/third_party/nixpkgs/pkgs/development/web/lucky-cli/shards.nix index ea85b4b52e..fef8c1602b 100644 --- a/third_party/nixpkgs/pkgs/development/web/lucky-cli/shards.nix +++ b/third_party/nixpkgs/pkgs/development/web/lucky-cli/shards.nix @@ -1,8 +1,8 @@ { ameba = { url = "https://github.com/crystal-ameba/ameba.git"; - rev = "v1.0.0"; - sha256 = "01cgapdpk8dg7sdgnq6ql42g3kv5z2fmsc90z07d9zvjp9vs2idp"; + rev = "v1.1.0"; + sha256 = "0famv413myrshgv6y24mr84ny53rcsr777x323jlaf2isnhdd0b8"; }; lucky_task = { url = "https://github.com/luckyframework/lucky_task.git"; @@ -11,8 +11,8 @@ }; nox = { url = "https://github.com/matthewmcgarvey/nox.git"; - rev = "v0.2.0"; - sha256 = "041wh7nbi8jxg314p5s4080ll9ywc48knpxmrzwj5h4rgmk7g231"; + rev = "v0.2.2"; + sha256 = "1dfq0aknrxwp9wc0glri4w5j8pfbc6b1xrsxkahci109p6dhcna5"; }; teeplate = { url = "https://github.com/luckyframework/teeplate.git"; diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v19.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v19.nix index 5921c2a4e6..5def860721 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v19.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v19.nix @@ -9,8 +9,8 @@ let in buildNodejs { inherit enableNpm; - version = "19.7.0"; - sha256 = "sha256-URhH9yTqQF+F4lgDy8+LExsUzQay1wRmmL0nYMQEv8M="; + version = "19.8.0"; + sha256 = "sha256-O3wH4ngJIHGMGsfSS2czXwSN2cPdaVaR9B2oD06jSaY="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch diff --git a/third_party/nixpkgs/pkgs/games/anki/default.nix b/third_party/nixpkgs/pkgs/games/anki/default.nix index 28bf794a8a..f4d2125610 100644 --- a/third_party/nixpkgs/pkgs/games/anki/default.nix +++ b/third_party/nixpkgs/pkgs/games/anki/default.nix @@ -16,6 +16,7 @@ , requests , markdown , matplotlib +, mock , pytest , glibcLocales , nose @@ -104,7 +105,7 @@ buildPythonApplication rec { ++ lib.optionals stdenv.isDarwin [ CoreAudio ] ; - nativeCheckInputs = [ pytest glibcLocales nose ]; + nativeCheckInputs = [ pytest glibcLocales mock nose ]; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; buildInputs = [ lame mpv-unwrapped libpulseaudio ]; diff --git a/third_party/nixpkgs/pkgs/games/darkplaces/default.nix b/third_party/nixpkgs/pkgs/games/darkplaces/default.nix index 86e2a57274..876e002597 100644 --- a/third_party/nixpkgs/pkgs/games/darkplaces/default.nix +++ b/third_party/nixpkgs/pkgs/games/darkplaces/default.nix @@ -7,7 +7,7 @@ , libvorbis }: stdenv.mkDerivation rec { - name = "darkplaces"; + pname = "darkplaces"; version = "unstable-2022-05-10"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/games/endless-sky/default.nix b/third_party/nixpkgs/pkgs/games/endless-sky/default.nix index 7806ae4906..ac44390faf 100644 --- a/third_party/nixpkgs/pkgs/games/endless-sky/default.nix +++ b/third_party/nixpkgs/pkgs/games/endless-sky/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, fetchFromGitHub -, SDL2, libpng, libjpeg, glew, openal, scons, libmad +, SDL2, libpng, libjpeg, glew, openal, scons, libmad, libuuid }: stdenv.mkDerivation rec { pname = "endless-sky"; - version = "0.9.14"; + version = "0.9.16.1"; src = fetchFromGitHub { owner = "endless-sky"; repo = "endless-sky"; rev = "v${version}"; - sha256 = "sha256-Vcck+zGcv39DXyhZF2DLUrXq3gDwkgL0NtPT5rVOpHs="; + sha256 = "sha256-bohljxAtSVqsfnge6t4LF3pC1s1r99v3hNLKTBquC20="; }; patches = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ - SDL2 libpng libjpeg glew openal scons libmad + SDL2 libpng libjpeg glew openal scons libmad libuuid ]; prefixKey = "PREFIX="; diff --git a/third_party/nixpkgs/pkgs/games/factorio/versions.json b/third_party/nixpkgs/pkgs/games/factorio/versions.json index 2dceedf776..1662e6a198 100644 --- a/third_party/nixpkgs/pkgs/games/factorio/versions.json +++ b/third_party/nixpkgs/pkgs/games/factorio/versions.json @@ -2,20 +2,20 @@ "x86_64-linux": { "alpha": { "experimental": { + "name": "factorio_alpha_x64-1.1.77.tar.xz", + "needsAuth": true, + "sha256": "1qcjp51sykq0ygq4j4zih3yp1x517b2j54xfyi8g4minfk57zwk9", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/1.1.77/alpha/linux64", + "version": "1.1.77" + }, + "stable": { "name": "factorio_alpha_x64-1.1.76.tar.xz", "needsAuth": true, "sha256": "1kz93imyddivpp8zslggldm8zyb9j0zdj67pgkxazn8fd9avrq1p", "tarDirectory": "x64", "url": "https://factorio.com/get-download/1.1.76/alpha/linux64", "version": "1.1.76" - }, - "stable": { - "name": "factorio_alpha_x64-1.1.74.tar.xz", - "needsAuth": true, - "sha256": "0ygnqlw92gz2s2c4pdhb11lvh86d7byhw5l3qw1fjsx0xv3qnxrs", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.74/alpha/linux64", - "version": "1.1.74" } }, "demo": { @@ -28,30 +28,30 @@ "version": "1.1.76" }, "stable": { - "name": "factorio_demo_x64-1.1.69.tar.xz", + "name": "factorio_demo_x64-1.1.76.tar.xz", "needsAuth": false, - "sha256": "08nakf6f31dra3rzv2l57pnww04i4ppil6c3vvvhjcv8j35b5k29", + "sha256": "0f3m0p5baakc6cv9fr3rwyq39bydraji9wh3ivblg1mj6dwpqnlj", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.69/demo/linux64", - "version": "1.1.69" + "url": "https://factorio.com/get-download/1.1.76/demo/linux64", + "version": "1.1.76" } }, "headless": { "experimental": { + "name": "factorio_headless_x64-1.1.77.tar.xz", + "needsAuth": false, + "sha256": "1ygzlr26bp7l9znbjyqj7il6yq9faxjfr6cvfqbs8ls66qiv0ls6", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/1.1.77/headless/linux64", + "version": "1.1.77" + }, + "stable": { "name": "factorio_headless_x64-1.1.76.tar.xz", "needsAuth": false, "sha256": "19xx6sv382ijwv8nbqw3c3izckvqkpsf949bn4g09qmg7b663g94", "tarDirectory": "x64", "url": "https://factorio.com/get-download/1.1.76/headless/linux64", "version": "1.1.76" - }, - "stable": { - "name": "factorio_headless_x64-1.1.74.tar.xz", - "needsAuth": false, - "sha256": "1lqxprmai3vrm3hf9zdj9c9c6w05086nzn0vy88zy7xm2dgw7ylv", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.74/headless/linux64", - "version": "1.1.74" } } } diff --git a/third_party/nixpkgs/pkgs/games/fheroes2/default.nix b/third_party/nixpkgs/pkgs/games/fheroes2/default.nix index 30ba8eaabe..18a2353616 100644 --- a/third_party/nixpkgs/pkgs/games/fheroes2/default.nix +++ b/third_party/nixpkgs/pkgs/games/fheroes2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-l7MFvcUOv1jA7moA8VYcaQO15eyK/06x6Jznz5jsNNg="; + sha256 = "sha256-Y1D9oLqO4al+1OXV9QhlzlZxSZtcQJtBQAzXqyhBFKI="; }; buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; diff --git a/third_party/nixpkgs/pkgs/games/naev/default.nix b/third_party/nixpkgs/pkgs/games/naev/default.nix index f4daedd672..ca2efff3e9 100644 --- a/third_party/nixpkgs/pkgs/games/naev/default.nix +++ b/third_party/nixpkgs/pkgs/games/naev/default.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { enet freetype glpk - intltool libpng libunibreak libvorbis @@ -61,6 +60,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config + intltool ]; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/games/openmw/tes3mp.nix b/third_party/nixpkgs/pkgs/games/openmw/tes3mp.nix index 09eec3ef1e..f236bc8cd5 100644 --- a/third_party/nixpkgs/pkgs/games/openmw/tes3mp.nix +++ b/third_party/nixpkgs/pkgs/games/openmw/tes3mp.nix @@ -3,13 +3,9 @@ , cmake , openmw , fetchFromGitHub -, formats , luajit , makeWrapper , symlinkJoin -, mygui -, crudini -, bullet }: # revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy @@ -18,17 +14,22 @@ let # raknet could also be split into dev and lib outputs raknet = stdenv.mkDerivation { pname = "raknet"; - version = "unstable-2018-07-14"; + version = "unstable-2020-01-19"; src = fetchFromGitHub { owner = "TES3MP"; repo = "CrabNet"; # usually fixed: # https://github.com/GrimKriegor/TES3MP-deploy/blob/d2a4a5d3acb64b16d9b8ca85906780aeea8d311b/tes3mp-deploy.sh#L589 - rev = "4eeeaad2f6c11aeb82070df35169694b4fb7b04b"; - sha256 = "0p0li9l1i5lcliswm5w9jql0zff9i6fwhiq0bl130m4i7vpr4cr3"; + rev = "19e66190e83f53bcdcbcd6513238ed2e54878a21"; + sha256 = "WIaJkSQnoOm9T7GoAwmWl7fNg79coIo/ILUsWcbH+lA="; }; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DCRABNET_ENABLE_DLL=OFF" + ]; + nativeBuildInputs = [ cmake ]; installPhase = '' @@ -38,14 +39,14 @@ let coreScripts = stdenv.mkDerivation { pname = "corescripts"; - version = "unstable-2020-07-27"; + version = "0.8.1"; src = fetchFromGitHub { owner = "TES3MP"; repo = "CoreScripts"; # usually latest in stable branch (e.g. 0.7.1) - rev = "3c2d31595344db586d8585db0ef1fc0da89898a0"; - sha256 = "sha256-m/pt2Et58HOMc1xqllGf4hjPLXNcc14+X0h84ouZDeg="; + rev = "6ae0a2a5d16171de3764817a7f8b1067ecde3def"; + sha256 = "8j/Sr9IRMNFPEVfFzdb42PckHS3KW7FH7x7rRxIh5gY="; }; buildCommand = '' @@ -59,20 +60,19 @@ let # case the scripts or wrapper scripts change. unwrapped = openmw.overrideAttrs (oldAttrs: rec { pname = "openmw-tes3mp-unwrapped"; - version = "unstable-2020-08-07"; + version = "0.8.1"; src = fetchFromGitHub { owner = "TES3MP"; - repo = "openmw-tes3mp"; + repo = "TES3MP"; # usually latest in stable branch (e.g. 0.7.1) - rev = "ce5df6d18546e37aac9746d99c00d27a7f34b00d"; - sha256 = "sha256-xLslShNA6rVFl9kt6BNGDpSYMpO25jBTCteLJoSTXdg="; + rev = "68954091c54d0596037c4fb54d2812313b7582a1"; + sha256 = "8/bV4sw7Q8l8bDTHGQ0t4owf6J6h9q468JFx4KegY5o="; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeWrapper ]; - buildInputs = (builtins.map (x: if x.pname or "" == "bullet" then bullet else x) oldAttrs.buildInputs) - ++ [ luajit ]; + buildInputs = oldAttrs.buildInputs ++ [ luajit ]; cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DBUILD_OPENCS=OFF" @@ -108,16 +108,24 @@ let license = licenses.gpl3Only; maintainers = with maintainers; [ peterhoeg ]; platforms = [ "x86_64-linux" "i686-linux" ]; - broken = true; }; }); - cfgFile = (formats.ini { }).generate "tes3mp-server.cfg" { - Plugins.home = "${coreScripts}/share/openmw-tes3mp/CoreScripts"; - }; + tes3mp-server-run = '' + config="''${XDG_CONFIG_HOME:-''$HOME/.config}"/openmw + data="''${XDG_DATA_HOME:-''$HOME/.local/share}"/openmw + if [[ ! -f "$config"/tes3mp-server.cfg && ! -d "$data"/server ]]; then + mkdir -p "$config" + echo [Plugins] > "$config"/tes3mp-server.cfg + echo "home = $data/server" >> "$config"/tes3mp-server.cfg + mkdir -p "$data" + cp -r ${coreScripts}/share/openmw-tes3mp/CoreScripts "$data"/server + chmod -R u+w "$data"/server + fi + ''; in -symlinkJoin rec { +symlinkJoin { name = "openmw-tes3mp-${unwrapped.version}"; inherit (unwrapped) version meta; @@ -125,18 +133,14 @@ symlinkJoin rec { paths = [ unwrapped ]; - # crudini --merge will create the file if it doesn't exist postBuild = '' mkdir -p $out/bin - dir=\''${XDG_CONFIG_HOME:-\$HOME/.config}/openmw - makeWrapper ${unwrapped}/libexec/tes3mp-browser $out/bin/tes3mp-browser \ --chdir "$out/bin" makeWrapper ${unwrapped}/libexec/tes3mp-server $out/bin/tes3mp-server \ - --run "mkdir -p $dir" \ - --run "${crudini}/bin/crudini --merge $dir/${cfgFile.name} < ${cfgFile}" \ + --run '${tes3mp-server-run}' \ --chdir "$out/bin" ''; } diff --git a/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix b/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix index 4abd40e24a..b3875245f8 100644 --- a/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix +++ b/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix @@ -55,7 +55,6 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ] ++ lib.optionals (lib.versionAtLeast qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=6" ]; - dontWrapQtApps = true; postUnpack = '' rm -rf source/libraries/libnbtplusplus @@ -65,7 +64,7 @@ stdenv.mkDerivation rec { chown -R $USER: source/libraries/libnbtplusplus ''; - postInstall = + qtWrapperArgs = let libpath = with xorg; lib.makeLibraryPath [ @@ -81,13 +80,12 @@ stdenv.mkDerivation rec { stdenv.cc.cc.lib ]; in - '' + [ + "--set LD_LIBRARY_PATH /run/opengl-driver/lib:${libpath}" + "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 - wrapQtApp $out/bin/prismlauncher \ - --set LD_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \ - --prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks} \ - --prefix PATH : ${lib.makeBinPath [xorg.xrandr]} - ''; + "--prefix PATH : ${lib.makeBinPath [xorg.xrandr]}" + ]; meta = with lib; { homepage = "https://prismlauncher.org/"; diff --git a/third_party/nixpkgs/pkgs/games/runelite/default.nix b/third_party/nixpkgs/pkgs/games/runelite/default.nix index a3c686eee9..0f71164f62 100644 --- a/third_party/nixpkgs/pkgs/games/runelite/default.nix +++ b/third_party/nixpkgs/pkgs/games/runelite/default.nix @@ -2,26 +2,26 @@ stdenv.mkDerivation rec { pname = "runelite"; - version = "2.1.5"; + version = "2.5.0"; jar = fetchurl { url = "https://github.com/runelite/launcher/releases/download/${version}/RuneLite.jar"; - sha256 = "4BX188QIjIFTxng2ktqlKn7AqQ9tdBcKWmgOj/5yd10="; + hash = "sha512-uEvlxXtnq7pgt8H5/hYIMu/kl32/dNojcHrPW6n2/RD/nzywreDw4kZ3G1kx0gGBY71x0RIEseEbm4BM+fhJlQ=="; }; icon = fetchurl { url = "https://github.com/runelite/launcher/raw/${version}/appimage/runelite.png"; - sha256 = "04fcjm7p546gr82g0jbh497j7rnh70lrvas0k171bff4v3knrjw1"; + hash = "sha512-Yh8mpc6z9xd6ePe3f1f+KzrpE9r3fsdtQ0pfAvOhK/0hrCo/17eQA6v73yFXZcPQogVwm9CmJlrx4CkfzB25RQ=="; }; # The `.so` files provided by these two jars aren't detected by RuneLite for some reason, so we have to provide them manually jogl = fetchurl { url = "https://repo.runelite.net/net/runelite/jogl/jogl-all/2.4.0-rc-20200429/jogl-all-2.4.0-rc-20200429-natives-linux-amd64.jar"; - sha256 = "S60qxyWY9RfyhLFygn/OxZFWnc8qVRtTFdWMbdu+2U0="; + hash = "sha512-OmJIbk5pKtvf1n1I5UHu6iaOKNrPgmaJTPhqC8yMjaRh/Hso1vV/+Eu+zKu7d5UiVggVUzJxqDKatmEnqFrzbg=="; }; gluegen = fetchurl { - url = "https://repo.runelite.net/net/runelite/gluegen/gluegen-rt/2.4.0-rc-20200429/gluegen-rt-2.4.0-rc-20200429-natives-linux-amd64.jar"; - sha256 = "eF8S5sQkJFDtW8rcVBKIyeyKm5Ze5rXK5r/yosZcHjU="; + url = "https://repo.runelite.net/net/runelite/gluegen/gluegen-rt/2.4.0-rc-20220318/gluegen-rt-2.4.0-rc-20220318-natives-linux-amd64.jar"; + hash = "sha512-kF+RdDzYEhBuZOJ6ZwMhaEVcjYLxiwR8tYAm08FXDML45iP4HBEfmqHOLJpIakK06aQFj99/296vx810eDFX5A=="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/games/sm64ex/coop.nix b/third_party/nixpkgs/pkgs/games/sm64ex/coop.nix index 9e34e184ad..742f41cea3 100644 --- a/third_party/nixpkgs/pkgs/games/sm64ex/coop.nix +++ b/third_party/nixpkgs/pkgs/games/sm64ex/coop.nix @@ -7,13 +7,13 @@ callPackage ./generic.nix { pname = "sm64ex-coop"; - version = "0.pre+date=2022-08-05"; + version = "unstable-2023-02-22"; src = fetchFromGitHub { owner = "djoslin0"; repo = "sm64ex-coop"; - rev = "68634493de4cdd9db263e0f4f0b9b6772a60d30a"; - sha256 = "sha256-3Ve93WGyBd8SAA0TBrpIrhj+ernjn1q7qXSi9mp36cQ="; + rev = "8746a503086793c87860daadfaeaaf0a31b2d6cf"; + sha256 = "sha256-iwJsq0FN9npxveIoMiB7zL5j1V72IExtEpzGj6lwLXQ="; }; extraNativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/sm64ex/sm64ex.nix b/third_party/nixpkgs/pkgs/games/sm64ex/sm64ex.nix index 66c84dd0b1..ddac79697c 100644 --- a/third_party/nixpkgs/pkgs/games/sm64ex/sm64ex.nix +++ b/third_party/nixpkgs/pkgs/games/sm64ex/sm64ex.nix @@ -4,13 +4,13 @@ callPackage ./generic.nix { pname = "sm64ex"; - version = "0.pre+date=2021-11-30"; + version = "unstable-2022-12-19"; src = fetchFromGitHub { owner = "sm64pc"; repo = "sm64ex"; - rev = "db9a6345baa5acb41f9d77c480510442cab26025"; - sha256 = "sha256-q7JWDvNeNrDpcKVtIGqB1k7I0FveYwrfqu7ZZK7T8F8="; + rev = "afc7e8da695bdf1aea5400a0d5c8b188d16a2088"; + sha256 = "sha256-TbA9yGPtP2uGsxN3eFaQwFeNjAjZ5hSk8Qmx1pRQxf8="; }; extraMeta = { diff --git a/third_party/nixpkgs/pkgs/games/unciv/default.nix b/third_party/nixpkgs/pkgs/games/unciv/default.nix index e616033d68..91d6fa9b2d 100644 --- a/third_party/nixpkgs/pkgs/games/unciv/default.nix +++ b/third_party/nixpkgs/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.5.2"; + version = "4.5.5"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-HhMccVlpIJoGW3LLqg1clw+dWcRUVHwCgtrmBcOXFSE="; + hash = "sha256-m7wyWxTKXrxJUtUpG2Dwg4s91TBbE0eFNAyDhS98ggo="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/games/unnethack/default.nix b/third_party/nixpkgs/pkgs/games/unnethack/default.nix index 03928ff48f..af402a7de9 100644 --- a/third_party/nixpkgs/pkgs/games/unnethack/default.nix +++ b/third_party/nixpkgs/pkgs/games/unnethack/default.nix @@ -33,7 +33,11 @@ stdenv.mkDerivation rec { }) ]; - enableParallelBuilding = true; + # Fails the build occasionally due to missing buid depends: + # ./../sys/unix/unixmain.c:9:10: fatal error: date.h: No such file or directory + # TODO: remove once upstream issue is fixed: + # https://github.com/UnNetHack/UnNetHack/issues/56 + enableParallelBuilding = false; postInstall = '' cp -r /tmp/unnethack $out/share/unnethack/profile diff --git a/third_party/nixpkgs/pkgs/games/vassal/default.nix b/third_party/nixpkgs/pkgs/games/vassal/default.nix index c7971c7d38..0c6704eeab 100644 --- a/third_party/nixpkgs/pkgs/games/vassal/default.nix +++ b/third_party/nixpkgs/pkgs/games/vassal/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.6.13"; + version = "3.6.14"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-5YswOh2jnOafctp7q8INtIqQwx1ugGm0QP9vDfal7t0="; + sha256 = "sha256-0/QJyntLV1DLzLJ8p4f+tCXPKl3DMf+j4/gkI+Mt+rc="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/xivlauncher/default.nix b/third_party/nixpkgs/pkgs/games/xivlauncher/default.nix index 0fe7981f96..888a8fe53f 100644 --- a/third_party/nixpkgs/pkgs/games/xivlauncher/default.nix +++ b/third_party/nixpkgs/pkgs/games/xivlauncher/default.nix @@ -1,5 +1,5 @@ -{ lib, buildDotnetModule, fetchFromGitHub, dotnetCorePackages, SDL2, libsecret, glib, gnutls, aria2, steam-run -, copyDesktopItems, makeDesktopItem +{ lib, buildDotnetModule, fetchFromGitHub, dotnetCorePackages, SDL2, libsecret, glib, gnutls, aria2, steam-run, gst_all_1 +, copyDesktopItems, makeDesktopItem, makeWrapper , useSteamRun ? true }: let @@ -17,7 +17,9 @@ in fetchSubmodules = true; }; - nativeBuildInputs = [ copyDesktopItems ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + + buildInputs = with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]; projectFile = "src/XIVLauncher.Core/XIVLauncher.Core.csproj"; nugetDeps = ./deps.nix; # File generated with `nix-build -A xivlauncher.passthru.fetch-deps` @@ -40,6 +42,8 @@ in postFixup = lib.optionalString useSteamRun '' substituteInPlace $out/bin/XIVLauncher.Core \ --replace 'exec' 'exec ${steam-run}/bin/steam-run' + '' + '' + wrapProgram $out/bin/XIVLauncher.Core --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0" ''; executables = [ "XIVLauncher.Core" ]; diff --git a/third_party/nixpkgs/pkgs/games/xmage/default.nix b/third_party/nixpkgs/pkgs/games/xmage/default.nix index cc359f7882..15a65efeb7 100644 --- a/third_party/nixpkgs/pkgs/games/xmage/default.nix +++ b/third_party/nixpkgs/pkgs/games/xmage/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "xmage"; + pname = "xmage"; version = "1.4.42V6"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/misc/cups/filters.nix b/third_party/nixpkgs/pkgs/misc/cups/filters.nix index e44c9634b0..6da2226fa6 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/filters.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/filters.nix @@ -75,6 +75,9 @@ stdenv.mkDerivation rec { makeFlags = [ "CUPS_SERVERBIN=$(out)/lib/cups" "CUPS_DATADIR=$(out)/share/cups" "CUPS_SERVERROOT=$(out)/etc/cups" ]; + # https://github.com/OpenPrinting/cups-filters/issues/512 + env.NIX_CFLAGS_COMPILE = "-std=c++17"; + postConfigure = '' # Ensure that bannertopdf can find the PDF templates in diff --git a/third_party/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix index 0aeb5f2e96..11663d5d4c 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix @@ -18,12 +18,9 @@ buildPythonApplication rec { sha256 = "sha256-ym5fkOTRhibBaUqT0+p/jyqqKOVsyMz5INgfkoz0IJA="; }; - # see https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; - nativeBuildInputs = [ wrapGAppsHook ]; - - buildInputs = [ gtk3 gobject-introspection libappindicator-gtk3 librsvg ]; + buildInputs = [ gtk3 libappindicator-gtk3 librsvg ]; propagatedBuildInputs = [ evdev pygobject3 pylibacl vdf ]; diff --git a/third_party/nixpkgs/pkgs/misc/dxvk/default.nix b/third_party/nixpkgs/pkgs/misc/dxvk/default.nix index 0e46011e7e..e553d9b365 100644 --- a/third_party/nixpkgs/pkgs/misc/dxvk/default.nix +++ b/third_party/nixpkgs/pkgs/misc/dxvk/default.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: dxvk64 = if stdenv.isDarwin then pkgsCross.mingwW64.dxvk_1 else pkgsCross.mingwW64.dxvk_2; in { - name = "dxvk"; + pname = "dxvk"; inherit (dxvk64) version; outputs = [ "out" "bin" "lib" ]; diff --git a/third_party/nixpkgs/pkgs/misc/dxvk/dxvk.nix b/third_party/nixpkgs/pkgs/misc/dxvk/dxvk.nix index 793264f9b3..e0aa7105bb 100644 --- a/third_party/nixpkgs/pkgs/misc/dxvk/dxvk.nix +++ b/third_party/nixpkgs/pkgs/misc/dxvk/dxvk.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { inherit (srcs.${dxvkVersion}) version src patches; nativeBuildInputs = [ glslang meson ninja ]; - buildInputs = lib.optional isWindows [ windows.pthreads ] + buildInputs = lib.optionals isWindows [ windows.pthreads ] ++ lib.optionals isDxvk2 ( [ spirv-headers vulkan-headers ] ++ lib.optional (!isWindows && sdl2Support) SDL2 diff --git a/third_party/nixpkgs/pkgs/misc/dxvk/setup_dxvk.sh b/third_party/nixpkgs/pkgs/misc/dxvk/setup_dxvk.sh index 8fadb264fd..4926acd3ba 100644 --- a/third_party/nixpkgs/pkgs/misc/dxvk/setup_dxvk.sh +++ b/third_party/nixpkgs/pkgs/misc/dxvk/setup_dxvk.sh @@ -2,11 +2,14 @@ set -eu -o pipefail -dxvk32_dir=@dxvk32@/bin -dxvk64_dir=@dxvk64@/bin +# shellcheck disable=SC2034 +{ + dxvk32_dir=@dxvk32@/bin + dxvk64_dir=@dxvk64@/bin -mcfgthreads32_dir=@mcfgthreads32@/bin -mcfgthreads64_dir=@mcfgthreads64@/bin + mcfgthreads32_dir=@mcfgthreads32@/bin + mcfgthreads64_dir=@mcfgthreads64@/bin +} ## Defaults @@ -42,7 +45,7 @@ usage() { exit 1 } -case "$1" in +case "${1:-}" in uninstall|install) action=$1 shift @@ -51,7 +54,7 @@ case "$1" in usage ;; *) - if [ ! -z "${1:-}" ]; then + if [ -n "${1:-}" ]; then echo "Unrecognized command: $1" fi usage @@ -62,19 +65,19 @@ esac do_symlink=false do_makeprefix=false -while [ ! -z "${1:-}" ]; do +while [ -n "${1:-}" ]; do case "$1" in --with-dxgi) targets[dxgi]=1 ;; --without-dxgi) - unset targets[dxgi] + unset "targets[dxgi]" ;; --with-d3d10) targets[d3d10]=1 ;; --without-d3d10) - unset targets[d3d10] + unset "targets[d3d10]" ;; -s|--symlink) do_symlink=true @@ -90,7 +93,7 @@ while [ ! -z "${1:-}" ]; do ;; -p|--prefix) shift - if [ ! -z "${1:-}" ]; then + if [ -n "${1:-}" ]; then WINEPREFIX=$1 else echo "Required PREFIX missing" @@ -223,8 +226,7 @@ uninstall_file() { install_override() { dll=$(basename "$1") - $wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "$dll" /d native /f >/dev/null 2>&1 - if [ $? -ne 0 ]; then + if ! $wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "$dll" /d native /f >/dev/null 2>&1; then echo -e "Failed to add override for $dll" exit 1 fi @@ -232,8 +234,7 @@ install_override() { uninstall_override() { dll=$(basename "$1") - $wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "$dll" /f > /dev/null 2>&1 - if [ $? -ne 0 ]; then + if ! $wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "$dll" /f > /dev/null 2>&1; then echo "Failed to remove override for $dll" fi } @@ -243,16 +244,16 @@ uninstall_override() { declare -A paths for target in "${!targets[@]}"; do - [ ${targets[$target]} -eq 1 ] || continue + [ "${targets[$target]}" -eq 1 ] || continue for dll in ${dlls[$target]}; do dllname=$(basename "$dll") basedir=$(dirname "$dll") - if [ ! -z "${win32_sys_path:-}" ]; then + if [ -n "${win32_sys_path:-}" ]; then basedir32=${basedir}32_dir paths["${!basedir32}/$dllname"]="$win32_sys_path/$dllname" fi - if [ ! -z "${win64_sys_path:-}" ]; then + if [ -n "${win64_sys_path:-}" ]; then basedir64=${basedir}64_dir paths["${!basedir64}/$dllname"]="$win64_sys_path/$dllname" fi @@ -260,6 +261,6 @@ for target in "${!targets[@]}"; do done for srcpath in "${!paths[@]}"; do - ${action}_file "$srcpath" "${paths["$srcpath"]}" - ${action}_override "$(basename srcpath)" + "${action}_file" "$srcpath" "${paths["$srcpath"]}" + "${action}_override" "$(basename "$srcpath" .dll)" done diff --git a/third_party/nixpkgs/pkgs/misc/fastly/default.nix b/third_party/nixpkgs/pkgs/misc/fastly/default.nix index e8db6a8eec..743d8cd1c5 100644 --- a/third_party/nixpkgs/pkgs/misc/fastly/default.nix +++ b/third_party/nixpkgs/pkgs/misc/fastly/default.nix @@ -4,17 +4,19 @@ , installShellFiles , buildGoModule , go +, makeWrapper +, viceroy }: buildGoModule rec { pname = "fastly"; - version = "7.0.1"; + version = "8.0.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-6M1vdwtw+qjKldW642JN2sanaKV3u9J1qWAoLRNupzE="; + hash = "sha256-Bwof1Np0eSjmBXQ6dqFmw3TA/2u+VzzyIn/95m9eXVo="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -31,10 +33,11 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-oQwlhlZHpUvGaOyozBpK5W9glzo8VKH7S3vih5c15OA="; + vendorHash = "sha256-/tdvIX839NkhUoj/bfJ/68K8RtPCidydNQZCdDvizzU="; nativeBuildInputs = [ installShellFiles + makeWrapper ]; # Flags as provided by the build automation of the project: @@ -49,14 +52,19 @@ buildGoModule rec { ]; preBuild = let cliConfigToml = fetchurl { - url = "https://web.archive.org/web/20230207211120/https://developer.fastly.com/api/internal/cli-config"; - hash = "sha256-Vkl8V5AkiJMZLswSN0vTnz7S7/5lXftlWD5UZh//vUw="; + url = "https://web.archive.org/web/20230308181550/https://developer.fastly.com/api/internal/cli-config"; + hash = "sha256-Y2KBTiUQlugKjfhOY+8W7/IUSjgeRVc2NgmL+nhb6aQ="; }; in '' cp ${cliConfigToml} ./pkg/config/config.toml ldflags+=" -X github.com/fastly/cli/pkg/revision.GitCommit=$(cat COMMIT)" ''; + preFixup = '' + wrapProgram $out/bin/fastly --prefix PATH : ${lib.makeBinPath [ viceroy ]} \ + --set FASTLY_VICEROY_USE_PATH 1 + ''; + postInstall = '' export HOME="$(mktemp -d)" installShellCompletion --cmd fastly \ diff --git a/third_party/nixpkgs/pkgs/misc/kitty-themes/default.nix b/third_party/nixpkgs/pkgs/misc/kitty-themes/default.nix deleted file mode 100644 index f9ac2181a4..0000000000 --- a/third_party/nixpkgs/pkgs/misc/kitty-themes/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ fetchFromGitHub, lib, stdenv }: - -stdenv.mkDerivation rec { - pname = "kitty-themes"; - version = "unstable-2023-01-08"; - - src = fetchFromGitHub { - owner = "kovidgoyal"; - repo = pname; - rev = "e0bb9d751033e82e455bf658744872c83f04b89d"; - sha256 = "sha256-ol/AWScGsskoxOEW32aGkJFgg8V6pIujoYIMQaVskWM="; - }; - - 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/scrcpy/default.nix b/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix index fa2fab2d96..277a53e253 100644 --- a/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix +++ b/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, makeWrapper +{ lib +, stdenv +, fetchpatch +, fetchurl +, fetchFromGitHub +, makeWrapper , meson , ninja , pkg-config @@ -12,10 +17,10 @@ }: let - version = "1.25"; + version = "2.0"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "sha256-zgMGx7vQaucvbQb37A7jN3SZWmXeceCoOBPstnrsm9s="; + sha256 = "sha256-niQWFfV4zWkLtDMRAA3r3s9qnFCnCCsAGVLxj28h3cI="; }; in stdenv.mkDerivation rec { @@ -26,9 +31,18 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4U/ChooesjhZSvxvk9dZrpZ/X0lf62+LEn72Ubrm2eM="; + sha256 = "sha256-PWH+XLKraFfjXovnZpREXBaQVyOyP8yIMYDMiF6ddXg="; }; + # Remove in the next patch release + patches = [ + (fetchpatch { + name = "fix-macos-build-error.patch"; + url = "https://github.com/Genymobile/scrcpy/commit/6b769675fa68e60c9765022e43c4d7b1e329353a.patch"; + hash = "sha256-lQx01HI0nTWdZFusLIswZT2iOgkP84btqF6F58tGNko="; + }) + ]; + # postPatch: # screen.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. # This can happen when running on non-NixOS because then scrcpy seems to have a hard time using the host OpenGL-supporting hardware. @@ -63,7 +77,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Genymobile/scrcpy"; sourceProvenance = with sourceTypes; [ fromSource - binaryBytecode # server + binaryBytecode # server ]; license = licenses.asl20; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/misc/solfege/default.nix b/third_party/nixpkgs/pkgs/misc/solfege/default.nix index 121933f69e..64ddfae7b3 100644 --- a/third_party/nixpkgs/pkgs/misc/solfege/default.nix +++ b/third_party/nixpkgs/pkgs/misc/solfege/default.nix @@ -35,13 +35,11 @@ buildPythonApplication rec { texinfo txt2man - # https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-1131643663 gobject-introspection wrapGAppsHook ]; buildInputs = [ - gobject-introspection gtk3 librsvg ]; diff --git a/third_party/nixpkgs/pkgs/misc/wiki-tui/default.nix b/third_party/nixpkgs/pkgs/misc/wiki-tui/default.nix index bb5fef313f..13f029ecd1 100644 --- a/third_party/nixpkgs/pkgs/misc/wiki-tui/default.nix +++ b/third_party/nixpkgs/pkgs/misc/wiki-tui/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl - ] ++ lib.optional stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix index 3b1a263687..79418a6474 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix @@ -89,6 +89,7 @@ stdenv.mkDerivation { passthru = { inherit targetPrefix; + isCCTools = true; }; meta = { diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/port.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/port.nix index 3c48c3ebc0..4d80799775 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/port.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/port.nix @@ -3,6 +3,7 @@ , libuuid , libobjc ? null, maloader ? null , enableTapiSupport ? true, libtapi +, fetchpatch }: let @@ -42,6 +43,14 @@ stdenv.mkDerivation { patches = [ ./ld-ignore-rpath-link.patch ./ld-rpath-nonfinal.patch + (fetchpatch { + url = "https://github.com/tpoechtrager/cctools-port/commit/4a734070cd2838e49658464003de5b92271d8b9e.patch"; + hash = "sha256-72KaJyu7CHXxJJ1GNq/fz+kW1RslO3UaKI91LhBtiXA="; + }) + (fetchpatch { + url = "https://github.com/MercuryTechnologies/cctools-port/commit/025899b7b3593dedb0c681e689e57c0e7bbd9b80.patch"; + hash = "sha256-SWVUzFaJHH2fu9y8RcU3Nx/QKx60hPE5zFx0odYDeQs="; + }) ] ++ lib.optional stdenv.isDarwin ./darwin-no-memstream.patch; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/goku/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/goku/default.nix index af70aaccc4..13aadfce24 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/goku/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/goku/default.nix @@ -2,22 +2,32 @@ , stdenv , fetchurl , unzip +, joker }: stdenv.mkDerivation rec { pname = "goku"; - version = "0.5.2"; + version = "0.6.0"; - src = fetchurl { - url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.zip"; - sha256 = "506eccdabedc68c112778b13ded65099327267c2e3fd488916e3a340bc312954"; - }; + src = if stdenv.isAarch64 then + fetchurl { + url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku-arm.zip"; + hash = "sha256-TIoda2kDckK1FBLAmKudsDs3LXO4J0KWiAD2JlFb4rk="; + } + else fetchurl { + url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.zip"; + hash = "sha256-8HdIwtpzR6O2WCbMYIJ6PHcM27Xmb+4Tc5Fmjl0dABQ="; + }; nativeBuildInputs = [ unzip ]; - sourceRoot = "."; + buildInputs = [ + joker + ]; + + sourceRoot = if stdenv.isAarch64 then "goku" else "."; installPhase = '' chmod +x goku diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/smimesign/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/smimesign/default.nix index d50e00f984..48164d387f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/smimesign/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/smimesign/default.nix @@ -2,18 +2,21 @@ buildGoModule rec { pname = "smimesign"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "github"; repo = "smimesign"; rev = "v${version}"; - sha256 = "12f8vprp4v78l9ifrlql0mvpyw5qa8nlrh5ajq5js8wljzpx7wsv"; + hash = "sha256-W9Hj/+snx+X6l95Gt9d8DiLnBPV9npKydc/zMN9G0vQ="; }; - vendorSha256 = "1cldxykm9qj5rvyfafam45y5xj4f19700s2f9w7ndhxgfp9vahvz"; + vendorHash = "sha256-wLqYUICL+gdvRCLNrA0ZNcFI4oV3Oik762q7xF115Lw="; - ldflags = [ "-X main.versionString=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.versionString=v${version}" ]; + + # Fails in sandbox + doCheck = false; meta = with lib; { description = "An S/MIME signing utility for macOS and Windows that is compatible with Git"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix index 2d1b57417e..c71980d943 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix @@ -22,7 +22,7 @@ }: let - apparmor-version = "3.1.2"; + apparmor-version = "3.1.3"; apparmor-meta = component: with lib; { homepage = "https://apparmor.net/"; @@ -36,7 +36,7 @@ let owner = "apparmor"; repo = "apparmor"; rev = "v${apparmor-version}"; - hash = "sha256-0csF6dPel1CxbvNkg7fIrdPpnCM+hqht2a5nwPlR58A="; + hash = "sha256-6N1BStOXKui6BxSriWVoOkvyGRUJ4btsloHh/SsG/JE="; }; aa-teardown = writeShellScript "aa-teardown" '' @@ -214,7 +214,7 @@ let }; apparmor-parser = stdenv.mkDerivation { - name = "apparmor-parser"; + pname = "apparmor-parser"; version = apparmor-version; src = apparmor-sources; 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 1ac2ccf842..0e7988f4d9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "cryptsetup"; - version = "2.5.0"; + version = "2.6.1"; outputs = [ "bin" "out" "dev" "man" ]; separateDebugInfo = true; src = fetchurl { - url = "mirror://kernel/linux/utils/cryptsetup/v2.5/${pname}-${version}.tar.xz"; - sha256 = "sha256-kYSm672c5+shEVLn90GmyC8tHMDiSoTsnFKTnu4PBUI="; + url = "mirror://kernel/linux/utils/cryptsetup/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + hash = "sha256-QQ3tZaEHKrnI5Brd7Te5cpwIf+9NLbArtO9SmtbaRpM="; }; patches = [ @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gitlab.com/cryptsetup/cryptsetup/"; description = "LUKS for dm-crypt"; + changelog = "https://gitlab.com/cryptsetup/cryptsetup/-/raw/v${version}/docs/v${version}-ReleaseNotes"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ ]; platforms = with lib.platforms; linux; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix index 6243076a21..0dd9fcb45b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.55"; + version = "0.56"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; rev = version; - sha256 = "sha256-vMWs+0iaszq+p55Z9AhqkNHWeOwlgt2iq7uuA8xGjJ4="; + sha256 = "sha256-aCQ7I4XgxswQRfzzZG3MYe+W3dPWWex5MErMc0ZilSA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix index 331492b2d3..615df19c70 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -382,6 +382,9 @@ stdenv.mkDerivation (finalAttrs: { # For updating. inherit test-firmware; + # For downstream consumers that need the fwupd-efi this was built with. + inherit fwupd-efi; + tests = let listToPy = list: "[${lib.concatMapStringsSep ", " (f: "'${f}'") list}]"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix new file mode 100644 index 0000000000..b8c9d9d0d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchFromGitHub + +# Pick one of +# - ipu6 (Tiger Lake) +# - ipu6ep (Alder Lake) +, ipuVersion ? "ipu6" +}: + +stdenv.mkDerivation { + pname = "${ipuVersion}-camera-bin"; + version = "unstable-2022-11-12"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "ipu6-camera-bins"; + rev = "4694ba7ee51652d29ef41e7fde846b83a2a1c53b"; + hash = "sha256-XPT3dbV6Kl1/TEeiQESF4Q4s95hjtiv4VLlqlahQXqE="; + }; + + sourceRoot = "source/${ipuVersion}"; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp --no-preserve=mode --recursive \ + lib \ + include \ + $out/ + + install -D ../LICENSE $out/share/doc + + runHook postInstall + ''; + + postFixup = '' + for pcfile in $out/lib/pkgconfig/*.pc; do + substituteInPlace $pcfile \ + --replace 'exec_prefix=/usr' 'exec_prefix=''${prefix}' \ + --replace 'prefix=/usr' "prefix=$out" \ + --replace 'libdir=/usr/lib' 'libdir=''${prefix}/lib' \ + --replace 'includedir=/usr/include' 'includedir=''${prefix}/include' + done + ''; + + passthru = { + inherit ipuVersion; + }; + + meta = let + generation = { + ipu6 = "Tiger Lake"; + ipu6ep = "Alder Lake"; + }.${ipuVersion}; + in with lib; { + description = "${generation} IPU firmware and proprietary image processing libraries"; + homepage = "https://github.com/intel/ipu6-camera-bins"; + license = licenses.issl; + sourceProvenance = with sourceTypes; [ + binaryFirmware + ]; + maintainers = with maintainers; [ + hexa + ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix new file mode 100644 index 0000000000..fb2f940ddc --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation { + pname = "ivsc-firmware"; + version = "unstable-2022-11-02"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "ivsc-firmware"; + rev = "29c5eff4cdaf83e90ef2dcd2035a9cdff6343430"; + hash = "sha256-GuD1oTnDEs0HslJjXx26DkVQIe0eS+js4UoaTDa77ME="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/firmware/vsc + cp --no-preserve=mode --recursive ./firmware/* $out/lib/firmware/vsc/ + install -D ./LICENSE $out/share/doc + + runHook postInstall + ''; + + meta = with lib; { + description = "Firmware binaries for the Intel Vision Sensing Controller"; + homepage = "https://github.com/intel/ivsc-firmware"; + license = licenses.issl; + sourceProvenance = with sourceTypes; [ + binaryFirmware + ]; + maintainers = with maintainers; [ + hexa + ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/source.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/source.nix index 4e59ca0b89..eb917fc68d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/source.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/source.nix @@ -1,6 +1,6 @@ # This file is autogenerated! Run ./update.sh to regenerate. { - version = "20230210"; - sourceHash = "sha256-sjUO+DTjAMszfCkNSYjLS+AbceIVPVVH0OEho5VOIFA="; - outputHash = "sha256-ZcmMLenblgQngdYui0wNANXhB5a/z635nNXo/MO83R8="; + version = "20230310"; + sourceHash = "sha256-a0Or/ov+YDbDbyUy65j95wgW1ZBo2LIxYWR7L6z6Usw="; + outputHash = "sha256-BL1dSTAjg5F1JWhoVYelMJRv+lMZNA8S7FbGIQWemMo="; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix index d9ae091f8f..9c2dab7038 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.367"; + version = "0.368"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - sha256 = "sha256-cFusLjRH7E3TCEREQH4Y9fZLjB6b5IJV/NThdS7c19A="; + sha256 = "sha256-+9UyF4tcy5cJPjbyQ2RuWVJkBsZut+YX2ncUJIqIQZo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 3380eeb881..22cb2aba5a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , patchelf , cmake , pkg-config @@ -13,24 +12,15 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "22.49.25018.24"; + version = "23.05.25593.11"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - sha256 = "sha256-/onHHIG5jWFObC8pSjpFMadjwaAN6vMNjAsj8/D3qNw="; + sha256 = "sha256-AsJGcyVqRGz7OBWTlQeTS412iUzMAbIsA4w6CmEf1G8="; }; - patches = [ - # fix compile with level-zero 1.9.4 - (fetchpatch { - url = "https://github.com/intel/compute-runtime/commit/dce17d319f91b39806b2cd39b6eecd5c5cff2a68.patch"; - excludes = [ "manifests/manifest.yml" ]; - sha256 = "sha256-YGzS4LeNO8FO1GXowD2gARj0TL6tBFaeZJNLZOwSsWQ="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ intel-gmmlib intel-graphics-compiler libva level-zero ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix index 9a63a28a7a..719527607a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix @@ -39,6 +39,10 @@ stdenv.mkDerivation rec { "SBINDIR=$(out)/sbin" "DOCDIR=$(TMPDIR)/share/doc/${pname}" # Don't install docs "HDRDIR=$(dev)/include/iproute2" + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + "SHARED_LIBS=n" + # all build .so plugins: + "TC_CONFIG_NO_XT=y" ]; buildFlags = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ipu6-drivers/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ipu6-drivers/default.nix new file mode 100644 index 0000000000..155e384a11 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ipu6-drivers/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitHub +, ivsc-driver +, kernel +}: + +stdenv.mkDerivation rec { + pname = "ipu6-drivers"; + version = "unstable-2023-01-17"; + + src = fetchFromGitHub { + owner = "intel"; + repo = pname; + rev = "f83b0747b297cc42325668aaf69471d89253b88e"; + hash = "sha256-yl2ZtJUTh1/qmTA8USd+FBCUAY5qNdh4bSvFRPImQNI="; + }; + + postPatch = '' + cp --no-preserve=mode --recursive --verbose \ + ${ivsc-driver.src}/backport-include \ + ${ivsc-driver.src}/drivers \ + ${ivsc-driver.src}/include \ + . + ''; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = kernel.makeFlags ++ [ + "KERNELRELEASE=${kernel.modDirVersion}" + "KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + enableParallelBuilding = true; + + preInstall = '' + sed -i -e "s,INSTALL_MOD_DIR=,INSTALL_MOD_PATH=$out INSTALL_MOD_DIR=," Makefile + ''; + + installTargets = [ + "modules_install" + ]; + + meta = { + homepage = "https://github.com/intel/ipu6-drivers"; + description = "IPU6 kernel driver"; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ hexa ]; + platforms = [ "x86_64-linux" ]; + broken = kernel.kernelOlder "5.15"; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ivsc-driver/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ivsc-driver/default.nix new file mode 100644 index 0000000000..fbcf619553 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ivsc-driver/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, kernel +}: + +stdenv.mkDerivation rec { + pname = "ivsc-drivers"; + version = "unstable-2023-01-06"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "ivsc-driver"; + rev = "94ecb88b3ac238d9145ac16230d6e0779bb4fd32"; + hash = "sha256-Q7iyKw4WFSX42E4AtoW/zYRKpknWZSU66V5VPAx6AjA="; + }; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = kernel.makeFlags ++ [ + "KERNELRELEASE=${kernel.modDirVersion}" + "KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + enableParallelBuilding = true; + + preInstall = '' + sed -i -e "s,INSTALL_MOD_DIR=,INSTALL_MOD_PATH=$out INSTALL_MOD_DIR=," Makefile + ''; + + installTargets = [ + "modules_install" + ]; + + meta = { + homepage = "https://github.com/intel/ivsc-drivers"; + description = "Intel Vision Sensing Controller kernel driver"; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ hexa ]; + platforms = [ "x86_64-linux" ]; + broken = kernel.kernelOlder "5.15"; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix index 2d37d07dbe..fa4b5847c6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "2.1"; + version = "2.3"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "sha256-Aq038SG8vuxCA6mYOP5I6VWCUty5vgdbpAa9J+bIfZM="; + sha256 = "sha256-xI/zl7yYWZpoag7RZIL06aUNVgrHDOBEn93dbWBG48I="; }; outputs = [ "out" "man" "doc" ] 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 a64787cac1..719b9a1216 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 @@ -111,12 +111,12 @@ let in { inherit makeLinuxHeaders; - linuxHeaders = let version = "6.1"; in + linuxHeaders = let version = "6.2"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz"; - sha256 = "sha256-LKHxcFGkMPb+0RluSVJxdQcXGs/ZfZZXchJQJwOyXes="; + hash = "sha256-dIYvqKtA7a6FuzOFwLcf4QMoi85RhSbWMZeACzy97LE="; }; 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 bbd743b4df..4b1318d911 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 @@ -285,7 +285,7 @@ let video = { DRM_LEGACY = no; - NOUVEAU_LEGACY_CTX_SUPPORT = whenAtLeast "5.2" no; + NOUVEAU_LEGACY_CTX_SUPPORT = whenBetween "5.2" "6.3" no; # Allow specifying custom EDID on the kernel command line DRM_LOAD_EDID_FIRMWARE = yes; 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 9cfcfdfe66..d017d1e1d8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,51 +12,51 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.274-hardened1.patch", - "sha256": "0hc2ci4jy2jhjmmqmmv6i2g6lj997d8hwgrh68qrraifzd3rjm23", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.274-hardened1/linux-hardened-4.19.274-hardened1.patch" + "name": "linux-hardened-4.19.275-hardened1.patch", + "sha256": "0ni0ig82zbmfngcm1la2frcihxjaaf0y1ki0vv6gqzxpsp5xz0nq", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.275-hardened1/linux-hardened-4.19.275-hardened1.patch" }, - "sha256": "1a2w6knszfqg7ilnvxrs0kbgcviq90iqw9wp2d6y3qy9jfhnb8k4", - "version": "4.19.274" + "sha256": "02l6f5y1cbjc9997lmcak5j8dllkzr8q47nqscqsyvz2c2hnzsdg", + "version": "4.19.275" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.170-hardened1.patch", - "sha256": "0fr0rzxrpmcddzamdnc15ywpd396dl8j7ycy19a789vhfz3132bz", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.170-hardened1/linux-hardened-5.10.170-hardened1.patch" + "name": "linux-hardened-5.10.172-hardened1.patch", + "sha256": "1ik2l453bgqcpqrhdf4gy6qdlvqknz9i7s9s9pynvk4lpvva34zc", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.172-hardened1/linux-hardened-5.10.172-hardened1.patch" }, - "sha256": "0pw2jnsnq2yxxvl4dkx6f7a8gczj8l484qpd4ibw737vprv1idd2", - "version": "5.10.170" + "sha256": "1c9757gma0dksd1ch8pljbsmf586bq66gxqpsv53676z8kivl3gj", + "version": "5.10.172" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.96-hardened1.patch", - "sha256": "032311r4phsp8cb4vzgdh3gsm4l5494138x1jfwfxhzkgmp4g4yh", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.96-hardened1/linux-hardened-5.15.96-hardened1.patch" + "name": "linux-hardened-5.15.98-hardened1.patch", + "sha256": "1d1jfx0m59j4b7kk476x11af5h5hy8f5n4d6h419qylnibm22573", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.98-hardened1/linux-hardened-5.15.98-hardened1.patch" }, - "sha256": "167g34xjbqxr5klqp127j2j15pms4jmgs0y7gr8zipiz2i69g39l", - "version": "5.15.96" + "sha256": "11vpngxqih2f3sn9v1h8ccjywsj0m5p8i98n0fvck5azlk9jrikx", + "version": "5.15.98" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.233-hardened1.patch", - "sha256": "11df6i0v7xsp363hdqfdixadn5db41ig51pd5fhknpdh1yrpx9by", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.233-hardened1/linux-hardened-5.4.233-hardened1.patch" + "name": "linux-hardened-5.4.234-hardened1.patch", + "sha256": "06jc2060v259wblbl38dcsk5vi61lbf4y8aipppy5lqd25rpm12y", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.234-hardened1/linux-hardened-5.4.234-hardened1.patch" }, - "sha256": "09vnp4qcv7kwahbbvjznnv7pxq1cvbn11n0rn5rzx97jnia5f7js", - "version": "5.4.233" + "sha256": "1489jnp4vb8p879hq1nx3xgyzjdwj1zalk3x4vcbnc9f7yrrrixc", + "version": "5.4.234" }, "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.14-hardened1.patch", - "sha256": "1r76nhg11sv654hg90gf6s9bmwdbmc88jh7wbpb9cyj63dw8dliv", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.14-hardened1/linux-hardened-6.1.14-hardened1.patch" + "name": "linux-hardened-6.1.15-hardened1.patch", + "sha256": "14svc378i43jv9cbv97gibmmr8pwf39dcjvjaqlbwfmhiwikj975", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.15-hardened1/linux-hardened-6.1.15-hardened1.patch" }, - "sha256": "03c1pszgm0qwwz7l5fnmbr6ank632bsl81pdx48svizy3q0pcw52", - "version": "6.1.14" + "sha256": "1zf48h34cz4chv0n12xlif0n7fdzbri2v8am1nn68bla2vidy5ic", + "version": "6.1.15" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/update.py b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/update.py index e289a97c56..5d6a2eba96 100755 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/update.py +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/update.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python -p "python3.withPackages (ps: [ps.PyGithub])" git gnupg +#! nix-shell -i python -p "python3.withPackages (ps: [ps.pygithub])" git gnupg # This is automatically called by ../update.sh. 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 612665fdfe..fbc5c4f365 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.307"; + version = "4.14.309"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "00dp0vj9572ig4zsnmhl2a2v5vx40hnjibyifw24x1q6qdaia72f"; + sha256 = "1rwhz9w5x2x3idy2f0bpk945qam6xxswbn69wmz8y1ik9b1nns09"; }; } // (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 d07a496046..5d0bc148da 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.275"; + version = "4.19.277"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "02l6f5y1cbjc9997lmcak5j8dllkzr8q47nqscqsyvz2c2hnzsdg"; + sha256 = "137mjk6hzpr120bb6ky3b8q4jnkbgqla0cpgnhzpcng00aidk0pn"; }; } // (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 53758bd5ec..94e55a5714 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.172"; + version = "5.10.174"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1c9757gma0dksd1ch8pljbsmf586bq66gxqpsv53676z8kivl3gj"; + sha256 = "092ai8ggplsa933s3qlayyjkw9d3z6sg782byh7rz0ym0380r2ig"; }; } // (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 da30828247..a2bd4e054c 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.97"; + version = "5.15.102"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1cxk1w43apw2b6w6r8m1magz08qzlljzn8ihn42jgamyn7sddp9c"; + sha256 = "1rh1kcvaz42brn5sxqq00mvy0b36fck196yvxfg7b5qbjzxxs724"; }; } // (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 cb006eddfa..e62fa1c41c 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.234"; + version = "5.4.236"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1489jnp4vb8p879hq1nx3xgyzjdwj1zalk3x4vcbnc9f7yrrrixc"; + sha256 = "0la92nvqihg4284risb2ljsrdh8x4wy0dwc3wsyq09bgm7x95j6c"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix index d890f5fdc7..ec276b05ac 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.15"; + version = "6.1.19"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "1zf48h34cz4chv0n12xlif0n7fdzbri2v8am1nn68bla2vidy5ic"; + sha256 = "0iw6b9gmhpk6r1asds5kfg6drqvaxy15xicqx9ga873cbxp1r6cy"; }; } // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.2.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.2.nix index e08f21c7bb..790d9aae9f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.2.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.2.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.2.2"; + version = "6.2.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "1c5zxkpahg92as14h8j2yilc4302w6g98zkjawsfh68fpfi5a9y1"; + sha256 = "179x1fqgi3drg1q1xy0648hvy7cpc79yzn2r248rq4mprvbz3qhz"; }; } // (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 7e3ffb4720..59622c6270 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 = "19049"; - sha256 = "0873qyk69p8hr91qjaq5rd9z2i6isd3yq3slh1my5y33gc7d3bj2"; + rev = "19102"; + sha256 = "1w9zl7grws1nzq4zp4mj1v5a6akqwkzy9lf0wwdar68jbxav3fvf"; } , ... }: diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix index cef442ad20..356f811974 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.2-rc6"; + version = "6.3-rc1"; extraMeta.branch = lib.versions.majorMinor version; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - hash = "sha256-rEpJYw5O6OHSwNY8LxlCsw0p9+u9BUjTQ8FsB6+fLbc="; + hash = "sha256-oZhG9dYlRthT4TbRNuJ+/Kw/mRuGTIu2E9Dw5ge+xCo="; }; # Should the testing kernels ever be built on Hydra? diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix index 21e6790eb0..b01805e83d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix @@ -179,7 +179,6 @@ let exit 1 fi - # Note: we can get rid of this once http://permalink.gmane.org/gmane.linux.kbuild.devel/13800 is merged. buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=$(date -u -d @$SOURCE_DATE_EPOCH)") cd $buildRoot @@ -370,7 +369,6 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal ] ++ optional (stdenv.hostPlatform.linux-kernel.target == "uImage") buildPackages.ubootTools ++ optional (lib.versionOlder version "5.8") libelf - # Removed util-linuxMinimal since it should not be a dependency. ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ] ++ optional (lib.versionAtLeast version "5.8") elfutils diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index fe7ecc6fa1..345f3cf4b2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,14 +3,14 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "6.1.15"; - hash = "sha256-KQ/1C8/nCQL8y/eTHQNJDYb/BSjwzdrUKdK05bSwuSI="; + version = "6.1.16"; + hash = "sha256-w44mynSAcxx9jpTfj/3LiB2eZKzOBzH2rBKzvXqKQJU="; variant = "lts"; }; mainVariant = { - version = "6.2.2"; - hash = "sha256-YQSaIiGzszuOSO3rYnuBeucvhVlnue24b3ECRTH55bg="; + version = "6.2.3"; + hash = "sha256-C3Vwgk3UyD638CYeO2z+GBjmCTMVC2fwU7HyX8bxgxg="; variant = "main"; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix index 9f172447f1..1464bd40e2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.2.2"; #zen + version = "6.2.6"; #zen suffix = "zen1"; #zen - sha256 = "004aghwdclky7w341yg9nkr5r58qnp4hxnmvxrp2z06pzcbsq933"; #zen + sha256 = "1cbga42b4kz03kgf5vxzh93fa8kgszffki5pwalxj6a2rab8888c"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.1.14"; #lqx + version = "6.2.6"; #lqx suffix = "lqx1"; #lqx - sha256 = "026nnmbpipk4gg7llsvm4fgws3ka0hjdywl7h0a8bvq6n9by15i6"; #lqx + sha256 = "1b454badr366pbxiyz7h2n47405wy5pa35rdkk1is8q574yf6scy"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { @@ -32,7 +32,7 @@ let extraMeta = { branch = lib.versions.majorMinor version + "/master"; - maintainers = with lib.maintainers; [ andresilva pedrohlc ]; + maintainers = with lib.maintainers; [ pedrohlc ]; description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads." + lib.optionalString isLqx " (Same as linux_zen but less aggressive release schedule)"; }; 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 88410654f3..54622253ed 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/keyutils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/keyutils/default.nix @@ -20,6 +20,12 @@ stdenv.mkDerivation rec { # 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 + + # Fix build for s390-linux, where size_t is different from ptrdiff_t. + (fetchurl { + url = "https://lore.kernel.org/keyrings/20230301134250.301819-1-hi@alyssa.is/raw"; + sha256 = "1cbgwxq28fw5ldh38ngcs7xiqvpnmrw0hw9zzhbhb1hdxkavrc1s"; + }) ]; makeFlags = lib.optionals stdenv.hostPlatform.isStatic "NO_SOLIB=1"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kmod/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kmod/default.nix index 669a145358..0843ca3556 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kmod/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kmod/default.nix @@ -26,12 +26,15 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" ] ++ lib.optional withDevdoc "devdoc"; + strictDeps = true; nativeBuildInputs = [ autoconf automake docbook_xsl libtool libxslt pkg-config docbook_xml_dtd_42 # for the man pages ] ++ lib.optionals withDevdoc [ docbook_xml_dtd_43 gtk-doc ]; - buildInputs = [ xz zstd ]; + buildInputs = [ xz zstd ] + # gtk-doc is looked for with pkg-config + ++ lib.optionals withDevdoc [ gtk-doc ]; preConfigure = '' ./autogen.sh diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix index 75ba871044..fcd42e3279 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix @@ -7,11 +7,11 @@ assert usePam -> pam != null; stdenv.mkDerivation rec { pname = "libcap"; - version = "2.66"; + version = "2.67"; src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; - sha256 = "sha256-FcQO3tswA9cKKD/lh6NrfRnIs7VU4z+GEpwFmku0ZrI="; + sha256 = "sha256-zpsi/cJxvrba51Q9pfdM8ky4LmhIz9CIpaBp3sXqUZg="; }; outputs = [ "out" "dev" "lib" "man" "doc" ] diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix index 1dd15e1b0e..abe797f74b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "libsepol"; - version = "3.3"; + version = "3.5"; se_url = "https://github.com/SELinuxProject/selinux/releases/download"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "${se_url}/${version}/libsepol-${version}.tar.gz"; - sha256 = "12r39ygn7aa1kz52wibfr4520m0cp75hlrn3i6rnjqa6p0zdz5rd"; + sha256 = "sha256-eP2vaZJNt4C6x4VG5D2cRAdLrXmMLEFdC5u5bQZe6KI="; }; postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/2_02.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/2_02.nix deleted file mode 100644 index 07d8de0b22..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/2_02.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common.nix { - version = "2.02.188"; - hash = "sha256-cQHosIFq135DkP7ZdJoJAhS6UgBhzQg0N4ceGeUMyb0="; -} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/2_03.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/2_03.nix index 5a5193997b..0237a0555a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.18"; - hash = "sha256-n2g+KYDZXA3Ou9JcfBdwMsVhXXJnv8iF6r/OWSgPR2k="; + version = "2.03.19"; + hash = "sha256-7J/58dmYzisF8a0i3c+UAdIC0CFYEdxGjXjLprCyaHk="; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/common.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/common.nix index 0ea8a97bdb..27a160033b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/common.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/common.nix @@ -1,7 +1,6 @@ { version, hash }: { lib, stdenv -, fetchpatch , fetchurl , pkg-config , coreutils @@ -52,6 +51,7 @@ stdenv.mkDerivation rec { "--with-default-locking-dir=/run/lock/lvm" "--with-default-run-dir=/run/lvm" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "--with-systemd-run=/run/current-system/systemd/bin/systemd-run" ] ++ lib.optionals (!enableCmdlib) [ "--bindir=${placeholder "bin"}/bin" "--sbindir=${placeholder "bin"}/bin" @@ -68,28 +68,17 @@ stdenv.mkDerivation rec { ] ++ lib.optionals udevSupport [ "--enable-udev_rules" "--enable-udev_sync" + ] ++ lib.optionals enableVDO [ + "--enable-vdo" ] ++ lib.optionals stdenv.hostPlatform.isStatic [ "--enable-static_link" - ] ++ lib.optionals enableVDO [ - "--enable-vdo" ]; preConfigure = '' sed -i /DEFAULT_SYS_DIR/d Makefile.in sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in - '' + lib.optionalString (lib.versionOlder version "2.03.15") '' - substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ - --replace /usr/bin/udevadm /run/current-system/systemd/bin/udevadm - # https://github.com/lvmteam/lvm2/issues/36 - '' + lib.optionalString (lib.versionOlder version "2.03.14") '' - substituteInPlace udev/69-dm-lvm-metad.rules.in \ - --replace "(BINDIR)/systemd-run" /run/current-system/systemd/bin/systemd-run - '' + lib.optionalString (lib.versionAtLeast version "2.03.14") '' - substituteInPlace udev/69-dm-lvm.rules.in \ - --replace "/usr/bin/systemd-run" /run/current-system/systemd/bin/systemd-run - '' + '' + substituteInPlace make.tmpl.in --replace "@systemdsystemunitdir@" "$out/lib/systemd/system" - '' + lib.optionalString (lib.versionAtLeast version "2.03") '' substituteInPlace libdm/make.tmpl.in --replace "@systemdsystemunitdir@" "$out/lib/systemd/system" substituteInPlace scripts/blk_availability_systemd_red_hat.service.in \ @@ -100,9 +89,8 @@ stdenv.mkDerivation rec { sed -i 's|^#define LVM_CONFIGURE_LINE.*$|#define LVM_CONFIGURE_LINE ""|g' ./include/configure.h ''; - patches = lib.optionals (lib.versionAtLeast version "2.03.15") [ + patches = [ # fixes paths to and checks for tools - # TODO: needs backport to LVM 2.02 used by static/musl (substituteAll (let optionalTool = cond: pkg: if cond then pkg else "/run/current-system/sw"; in { @@ -113,22 +101,16 @@ stdenv.mkDerivation rec { multipath_tools = optionalTool enableMultipath multipath-tools; vdo = optionalTool enableVDO vdo; })) - ] ++ lib.optionals (lib.versionOlder version "2.03.15") [ - # Musl fixes from Alpine. + # Musl fix from Alpine ./fix-stdio-usage.patch - (fetchpatch { - name = "mallinfo.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; - sha256 = "0g6wlqi215i5s30bnbkn8w7axrs27y3bnygbpbnf64wwx7rxxlj0"; - }) ] ++ lib.optionals stdenv.hostPlatform.isStatic [ - ./no-shared.diff + ./no-shared.patch ]; doCheck = false; # requires root makeFlags = lib.optionals udevSupport [ - "SYSTEMD_GENERATOR_DIR=$(out)/lib/systemd/system-generators" + "SYSTEMD_GENERATOR_DIR=${placeholder "out"}/lib/systemd/system-generators" ] ++ lib.optionals onlyLib [ "libdm.device-mapper" ]; @@ -164,7 +146,10 @@ stdenv.mkDerivation rec { moveToOutput lib/libdevmapper.so $lib ''; - passthru.tests.installer = nixosTests.installer.lvm; + passthru.tests = { + installer = nixosTests.installer.lvm; + lvm2 = nixosTests.lvm2; + }; meta = with lib; { homepage = "http://sourceware.org/lvm2/"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/fix-stdio-usage.patch b/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/fix-stdio-usage.patch index 59666ffbad..98cdc6eb3e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/fix-stdio-usage.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/fix-stdio-usage.patch @@ -1,8 +1,18 @@ +From 63b1c7332bee6080bffecf9ce9d75ff15d799166 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Wed, 16 Nov 2022 10:42:39 +0100 +Subject: [PATCH] fix stdio usage + +--- + lib/commands/toolcontext.c | 4 ++-- + tools/lvmcmdline.c | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c -index 296618686..96343eeb7 100644 +index b630554a9..f20080d18 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c -@@ -1619,7 +1619,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd, +@@ -1667,7 +1667,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd, /* FIXME Make this configurable? */ reset_lvm_errno(1); @@ -11,20 +21,20 @@ index 296618686..96343eeb7 100644 /* Set in/out stream buffering before glibc */ if (set_buffering #ifdef SYS_gettid -@@ -2006,7 +2006,7 @@ void destroy_toolcontext(struct cmd_context *cmd) +@@ -2045,7 +2045,7 @@ void destroy_toolcontext(struct cmd_context *cmd) + dm_hash_destroy(cmd->cft_def_hash); - if (cmd->pending_delete_mem) - dm_pool_destroy(cmd->pending_delete_mem); + dm_device_list_destroy(&cmd->cache_dm_devs); -#ifndef VALGRIND_POOL +#if !defined(VALGRIND_POOL) && defined(__GLIBC__) if (cmd->linebuffer) { /* Reset stream buffering to defaults */ if (is_valid_fd(STDIN_FILENO) && diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c -index d97ff5720..bbbda82bd 100644 +index a5bb6a5c5..0ebfa375c 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c -@@ -3342,7 +3342,7 @@ static int _check_standard_fds(void) +@@ -3422,7 +3422,7 @@ static int _check_standard_fds(void) int err = is_valid_fd(STDERR_FILENO); if (!is_valid_fd(STDIN_FILENO) && @@ -33,7 +43,7 @@ index d97ff5720..bbbda82bd 100644 if (err) perror("stdin stream open"); else -@@ -3352,7 +3352,7 @@ static int _check_standard_fds(void) +@@ -3432,7 +3432,7 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDOUT_FILENO) && @@ -42,7 +52,7 @@ index d97ff5720..bbbda82bd 100644 if (err) perror("stdout stream open"); /* else no stdout */ -@@ -3360,7 +3360,7 @@ static int _check_standard_fds(void) +@@ -3440,7 +3440,7 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDERR_FILENO) && @@ -51,3 +61,6 @@ index d97ff5720..bbbda82bd 100644 printf("stderr stream open: %s\n", strerror(errno)); return 0; +-- +2.38.1 + diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/no-shared.diff b/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/no-shared.diff deleted file mode 100644 index d40dd85dfc..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/no-shared.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/libdm/Makefile.in b/libdm/Makefile.in -index 66ec39513..ab7123dae 100644 ---- a/libdm/Makefile.in -+++ b/libdm/Makefile.in -@@ -44,7 +44,6 @@ endif - - LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX) - LIB_VERSION = $(LIB_VERSION_DM) --TARGETS = libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION) - - CFLOW_LIST = $(SOURCES) - CFLOW_LIST_TARGET = libdevmapper.cflow -diff --git a/make.tmpl.in b/make.tmpl.in -index e7780e8d4..ca4aa9fdd 100644 ---- a/make.tmpl.in -+++ b/make.tmpl.in -@@ -346,7 +346,7 @@ SUBDIRS.cflow := $(SUBDIRS:=.cflow) - SUBDIRS.clean := $(SUBDIRS:=.clean) - SUBDIRS.distclean := $(SUBDIRS:=.distclean) - --TARGETS += $(LIB_SHARED) $(LIB_STATIC) -+TARGETS += $(LIB_STATIC) - - all: $(SUBDIRS) $(TARGETS) - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/no-shared.patch b/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/no-shared.patch new file mode 100644 index 0000000000..23a82a0fa2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/no-shared.patch @@ -0,0 +1,46 @@ +diff --git a/libdm/Makefile.in b/libdm/Makefile.in +index 2758648e6..f305a12b0 100644 +--- a/libdm/Makefile.in ++++ b/libdm/Makefile.in +@@ -47,7 +47,6 @@ endif + + LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX) + LIB_VERSION = $(LIB_VERSION_DM) +-TARGETS = libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION) .symver_check + + CFLOW_LIST = $(SOURCES) + CFLOW_LIST_TARGET = libdevmapper.cflow +diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in +index a731687c2..9366cdf1c 100644 +--- a/libdm/make.tmpl.in ++++ b/libdm/make.tmpl.in +@@ -314,7 +314,7 @@ SUBDIRS.cflow := $(SUBDIRS:=.cflow) + SUBDIRS.clean := $(SUBDIRS:=.clean) + SUBDIRS.distclean := $(SUBDIRS:=.distclean) + +-TARGETS += $(LIB_SHARED) $(LIB_STATIC) ++TARGETS += $(LIB_STATIC) + + all: $(SUBDIRS) $(TARGETS) + +@@ -431,7 +431,6 @@ DEFS+=-D_FILE_OFFSET_BITS=64 + + ifneq (,$(LIB_SHARED)) + +-TARGETS += $(LIB_SHARED).$(LIB_VERSION) + $(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS) + @echo " [CC] $@" + ifeq ("@LIB_SUFFIX@","so") +diff --git a/make.tmpl.in b/make.tmpl.in +index b73176f5a..6100d0dfd 100644 +--- a/make.tmpl.in ++++ b/make.tmpl.in +@@ -368,7 +368,7 @@ SUBDIRS.cflow := $(SUBDIRS:=.cflow) + SUBDIRS.clean := $(SUBDIRS:=.clean) + SUBDIRS.distclean := $(SUBDIRS:=.distclean) + +-TARGETS += $(LIB_SHARED) $(LIB_STATIC) ++TARGETS += $(LIB_STATIC) + + INTERNAL_LIBS = \ + $(top_builddir)/libdaemon/client/libdaemonclient.a \ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix index 7a0fabf9d4..454c817474 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix @@ -4,20 +4,24 @@ }: let cdefs_h = fetchurl { - url = "http://git.alpinelinux.org/cgit/aports/plain/main/libc-dev/sys-cdefs.h"; + name = "sys-cdefs.h"; + url = "https://git.alpinelinux.org/aports/plain/main/libc-dev/sys-cdefs.h?id=7ca0ed62d4c0d713d9c7dd5b9a077fba78bce578"; sha256 = "16l3dqnfq0f20rzbkhc38v74nqcsh9n3f343bpczqq8b1rz6vfrh"; }; queue_h = fetchurl { - url = "http://git.alpinelinux.org/cgit/aports/plain/main/libc-dev/sys-queue.h"; + name = "sys-queue.h"; + url = "http://git.alpinelinux.org/aports/plain/main/libc-dev/sys-queue.h?id=7ca0ed62d4c0d713d9c7dd5b9a077fba78bce578"; sha256 = "12qm82id7zys92a1qh2l1qf2wqgq6jr4qlbjmqyfffz3s3nhfd61"; }; tree_h = fetchurl { - url = "http://git.alpinelinux.org/cgit/aports/plain/main/libc-dev/sys-tree.h"; + name = "sys-tree.h"; + url = "http://git.alpinelinux.org/aports/plain/main/libc-dev/sys-tree.h?id=7ca0ed62d4c0d713d9c7dd5b9a077fba78bce578"; sha256 = "14igk6k00bnpfw660qhswagyhvr0gfqg4q55dxvaaq7ikfkrir71"; }; stack_chk_fail_local_c = fetchurl { - url = "https://git.alpinelinux.org/aports/plain/main/musl/__stack_chk_fail_local.c?h=3.10-stable"; + name = "__stack_chk_fail_local.c"; + url = "https://git.alpinelinux.org/aports/plain/main/musl/__stack_chk_fail_local.c?id=9afbe3cbbf4c30ff23c733218c3c03d7e8c6461d"; sha256 = "1nhkzzy9pklgjcq2yg89d3l18jif331srd3z3vhy5qwxl1spv6i9"; }; 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 db966722f7..156bb150c5 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 @@ -71,6 +71,22 @@ rec { sha256_64bit = "sha256-Xagqf4x254Hn1/C+e3mNtNNE8mvU+s+avPPHHHH+dkA="; settingsSha256 = "sha256-ryUSiI8PsY3knkJLg0k1EmyYW5OWkhuZma/hmXNuojw="; persistencedSha256 = "sha256-/2h90Gq9NQd9Q+9eLVE6vrxXmINXxlLcSNOHxKToOEE="; + + prePatch = "pushd kernel"; + postPatch = "popd"; + + patches = [ + # source: https://gist.github.com/joanbm/963906fc6772d8955faf1b9cc46c6b04 + (fetchpatch { + url = "https://gist.github.com/joanbm/963906fc6772d8955faf1b9cc46c6b04/raw/0f99aa10d47b524aa0e6e3845664deac3a1ad9d9/nvidia-470xx-fix-linux-6.2.patch"; + hash = "sha256-5n5/4ivK8od8EJNJf0PI9ZZ4U5RjOw+h4HakA+lmW1c="; + }) + # source: https://gist.github.com/joanbm/d10e9cbbbb8e245b6e7e27b2db338faf + (fetchpatch { + url = "https://gist.github.com/joanbm/d10e9cbbbb8e245b6e7e27b2db338faf/raw/f5d5238bdbaa16cd4008658a0f82b9dd84f1b38f/nvidia-470xx-fix-linux-6.3.patch"; + hash = "sha256-mR+vXDHgVhWC0JeLgGlbNVCH8XTs7XnhEJS6BV75tI8="; + }) + ]; }; # Last one supporting x86 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 ea9dbcabd0..e56318deca 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 @@ -13,6 +13,7 @@ , settings32Bit ? false , prePatch ? "" +, postPatch ? null , patches ? [] , broken ? false , brokenOpen ? broken @@ -68,7 +69,7 @@ let else throw "nvidia-x11 does not support platform ${stdenv.hostPlatform.system}"; patches = if libsOnly then null else patches; - inherit prePatch; + inherit prePatch postPatch; inherit version useGLVND useProfiles; inherit (stdenv.hostPlatform) system; inherit i686bundled; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/piper/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/piper/default.nix index 293425897e..39b0eaf532 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/piper/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/piper/default.nix @@ -19,9 +19,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk3 glib gnome.adwaita-icon-theme python3 librsvg ]; - propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ] ++ [ - gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now - ]; + propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ]; mesonFlags = [ "-Druntime-dependency-checks=false" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821au/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821au/default.nix index c709c702f9..aa4a7f661e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821au/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "ARCH=${stdenv.hostPlatform.linuxArch}" ("CONFIG_PLATFORM_I386_PC=" + (if stdenv.hostPlatform.isx86 then "y" else "n")) ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n")) - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch index 431e79a55d..1e602fdee6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch @@ -4,19 +4,30 @@ Date: Thu, 1 May 2014 14:10:10 +0200 Subject: [PATCH] Look for fsck in the right place --- - src/fsck/fsck.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/fsck/fsck.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c -index 595434ab57..374a4e6c76 100644 +index 73c76fceea..d00cea7158 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c -@@ -373,7 +373,7 @@ static int run(int argc, char *argv[]) { +@@ -352,6 +352,7 @@ static int run(int argc, char *argv[]) { + if (r == 0) { + char dash_c[STRLEN("-C") + DECIMAL_STR_MAX(int) + 1]; + int progress_socket = -1; ++ _cleanup_free_ char *fsck_name = NULL; + const char *cmdline[9]; + int i = 0; + +@@ -372,7 +373,10 @@ static int run(int argc, char *argv[]) { } else dash_c[0] = 0; - cmdline[i++] = "/sbin/fsck"; -+ cmdline[i++] = "/run/current-system/sw/bin/fsck"; ++ r = find_executable("fsck", &fsck_name); ++ if (r < 0) ++ return r; ++ cmdline[i++] = fsck_name; cmdline[i++] = arg_repair; cmdline[i++] = "-T"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/vmm_clock/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/vmm_clock/default.nix index 1a10df62d4..648a61b5e8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/vmm_clock/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/vmm_clock/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { - name = "vmm_clock"; + pname = "vmm_clock"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix index 1c909f3208..1a6d077aa2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix @@ -17,6 +17,7 @@ # for determining the latest compatible linuxPackages , linuxPackages_6_1 ? pkgs.linuxKernel.packages.linux_6_1 +, linuxPackages_6_2 ? pkgs.linuxKernel.packages.linux_6_2 }: let @@ -233,8 +234,17 @@ in { zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "6.2"; - latestCompatibleLinuxPackages = linuxPackages_6_1; + # NOTE: + # zfs-2.1.9<=x<=2.1.10 is broken with aarch64-linux-6.2 + # for future releases, please delete this condition. + kernelCompatible = + if stdenv'.isx86_64 + then kernel.kernelOlder "6.3" + else kernel.kernelOlder "6.2"; + latestCompatibleLinuxPackages = + if stdenv'.isx86_64 + then linuxPackages_6_2 + else linuxPackages_6_1; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the diff --git a/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix b/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix index f72f4dfcbf..8c897bf33c 100644 --- a/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix +++ b/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix @@ -1,31 +1,31 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-mOn0RYWmGzIeHyVwVTGPUvFyVQ8Zu57KW7UkGMWRejA="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.25/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-hGa1SrueZWGokeJb+p/6eaYv1AP1a2TUiGo+rcJBw3Y="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.26/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-urdLtEOMJ2ZeaWezihpv5UU8Li2gnmYk6+gzn9E/3Nw="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.25/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-wm8scjBaQuKJQu2OfYWDQqF2TLdPEZQEGSgaLzoGTb0="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.26/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-yWlo7adaQcPrM4zOPq5BLw6rZPYg2Qr2T1R7H8QZuvA="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.25/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-nie5WOeMajq8ucOwLHDXMG1FU7wBS3GTQHKCn0XjBCQ="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.26/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-pD1vs4NHWByZmEozdgpzBXDeSzbEBouyawd41Emf8QE="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.25/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-Ai6QzmNrALHKxJIX5gx5GQiLlcpKRuT+ALxN0PDJQ9E="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.26/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-BpknO9qL4Jo31d/vRXjuU/wJWfCVvLfgh6tZLG/6ipI="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.25/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-cJ7vvv4Yyo0r01eOuZI6jqc4LFmSDmVl84aJjwxkuR4="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.26/AdGuardHome_linux_arm64.tar.gz"; }; armv6l-linux = fetchurl { - sha256 = "sha256-yUyRz/2hqvN8XkuzfMfG6ibYOb68WjJaqgAIAfoZH0s="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.25/AdGuardHome_linux_armv6.tar.gz"; + sha256 = "sha256-DfeSBIOO/vZQExbrqku28s8a9s22tfuojccIwe37tS4="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.26/AdGuardHome_linux_armv6.tar.gz"; }; armv7l-linux = fetchurl { - sha256 = "sha256-MOvDKvq24+NFmgseZZA3zz0z6Vr/7OvO8sHpsDWvMuo="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.25/AdGuardHome_linux_armv7.tar.gz"; + sha256 = "sha256-OHoU8dP5b2jqFTfn4FCxL88HrQntcxZ5enMFr/YN1zI="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.26/AdGuardHome_linux_armv7.tar.gz"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix b/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix index 77a5530d30..b6252ef604 100644 --- a/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix +++ b/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.25"; + version = "0.107.26"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = ./update.sh; - schema_version = 16; + schema_version = 17; tests.adguardhome = nixosTests.adguardhome; }; diff --git a/third_party/nixpkgs/pkgs/servers/baserow/default.nix b/third_party/nixpkgs/pkgs/servers/baserow/default.nix index b64592d989..92007bd6ee 100644 --- a/third_party/nixpkgs/pkgs/servers/baserow/default.nix +++ b/third_party/nixpkgs/pkgs/servers/baserow/default.nix @@ -82,6 +82,7 @@ with python.pkgs; buildPythonApplication rec { importlib-resources itsdangerous pillow + pyparsing psutil psycopg2 redis diff --git a/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix b/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix index 0fd0ecd637..e52685f1a2 100644 --- a/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix +++ b/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix @@ -5,7 +5,21 @@ , fetchpatch }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec { + version = "1.4.46"; + src = self.fetchPypi { + pname = "SQLAlchemy"; + inherit version; + hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; + }; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "calibre-web"; version = "0.6.19"; @@ -16,8 +30,8 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-mNYLQ+3u6xRaoZ5oH6HdylFfgz1fq1ZB86AWk9vULWQ="; }; - propagatedBuildInputs = with python3.pkgs; [ - APScheduler + propagatedBuildInputs = with python.pkgs; [ + apscheduler advocate chardet flask-babel @@ -64,6 +78,7 @@ python3.pkgs.buildPythonApplication rec { substituteInPlace setup.cfg \ --replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \ + --replace "APScheduler>=3.6.3,<3.10.0" "APScheduler>=3.6.3" \ --replace "chardet>=3.0.0,<4.1.0" "chardet>=3.0.0,<6" \ --replace "Flask>=1.0.2,<2.1.0" "Flask>=1.0.2" \ --replace "Flask-Babel>=0.11.1,<2.1.0" "Flask-Babel>=0.11.1" \ diff --git a/third_party/nixpkgs/pkgs/servers/dendrite/default.nix b/third_party/nixpkgs/pkgs/servers/dendrite/default.nix index 6f459e7ad2..1bc4bcbbf4 100644 --- a/third_party/nixpkgs/pkgs/servers/dendrite/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dendrite/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - sha256 = "sha256-EJUHpV+ZsMMSMsJGhF0Atblksg5rgI3a2qcRxLyZP38="; + hash = "sha256-+REY5an0gTbADEozCI6bkUWbW9VWTtWZ4xXj9qcIkwc="; }; - vendorHash = "sha256-Ygd5wC4j0kAbEMMVct5WXZvkcYSqqK8d7ZZ9CDU1RHU="; + vendorHash = "sha256-/O7zzXYM03K+MresuXIHtgMuD9yS2+NIaLEnm/WRYeA="; subPackages = [ # The server as a monolith: https://matrix-org.github.io/dendrite/installation/install/monolith 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 539dbd6a80..9ed93e623b 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit knot-resolver; } // lib.optionalAttrs stdenv.isLinux { - inherit (nixosTests) knot; + inherit (nixosTests) knot kea; # Some dependencies are very version-sensitive, so the might get dropped # or embedded after some update, even if the nixPackagers didn't intend to. # For non-linux I don't know a good replacement for `ldd`. diff --git a/third_party/nixpkgs/pkgs/servers/haste-server/default.nix b/third_party/nixpkgs/pkgs/servers/haste-server/default.nix index cc445312e6..14ec58afa3 100644 --- a/third_party/nixpkgs/pkgs/servers/haste-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/haste-server/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "haste-server"; - version = "ccc5049b07e9f90ec19fc2a88e5056367c53e202"; + version = "b52b394bad909ddf151073987671e843540d91d6"; src = fetchFromGitHub { owner = "toptal"; repo = "haste-server"; rev = version; - hash = "sha256-ODFHB2QwfLPxfjFsHrblSeiqLc9nPo7EOPGQ3AoqzSQ="; + hash = "sha256-AVoz5MY5gNxQrHtDMPbQ85IjmHii1v6C2OXpEQj9zC8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/haste-server/node-deps.nix b/third_party/nixpkgs/pkgs/servers/haste-server/node-deps.nix index 36a5d6fd39..2c8e11bb92 100644 --- a/third_party/nixpkgs/pkgs/servers/haste-server/node-deps.nix +++ b/third_party/nixpkgs/pkgs/servers/haste-server/node-deps.nix @@ -850,13 +850,13 @@ let sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; }; }; - "pg-8.8.0" = { + "pg-8.10.0" = { name = "pg"; packageName = "pg"; - version = "8.8.0"; + version = "8.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.8.0.tgz"; - sha512 = "UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw=="; + url = "https://registry.npmjs.org/pg/-/pg-8.10.0.tgz"; + sha512 = "ke7o7qSTMb47iwzOSaZMfeR7xToFdkE71ifIipOAAaLIM0DYzfOAXlgFFmYUIE2BcJtvnVlGCID84ZzCegE8CQ=="; }; }; "pg-connection-string-2.5.0" = { @@ -877,22 +877,22 @@ let sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; }; }; - "pg-pool-3.5.2" = { + "pg-pool-3.6.0" = { name = "pg-pool"; packageName = "pg-pool"; - version = "3.5.2"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.2.tgz"; - sha512 = "His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.6.0.tgz"; + sha512 = "clFRf2ksqd+F497kWFyM21tMjeikn60oGDmqMT8UBrynEwVEX/5R5xd2sdvdo1cZCFlguORNpVuqxIj+aK4cfQ=="; }; }; - "pg-protocol-1.5.0" = { + "pg-protocol-1.6.0" = { name = "pg-protocol"; packageName = "pg-protocol"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz"; - sha512 = "muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="; + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.0.tgz"; + sha512 = "M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q=="; }; }; "pg-types-2.2.0" = { @@ -985,13 +985,13 @@ let sha512 = "+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ=="; }; }; - "readable-stream-3.6.0" = { + "readable-stream-3.6.1" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; - sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz"; + sha512 = "+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ=="; }; }; "readdirp-3.5.0" = { @@ -1350,7 +1350,7 @@ let name = "haste"; packageName = "haste"; version = "0.1.0"; - src = ../../../../../../../../../nix/store/zmi5rwpy1kmyj52ymv3yc8ziiypjgrxd-source; + src = ../../../../../../../../../nix/store/v45nw2igqcjw58j7ns9xrqj6f6n3jafd-source; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" sources."ansi-colors-4.1.1" @@ -1365,7 +1365,7 @@ let sources."binary-extensions-2.2.0" (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."string_decoder-1.3.0" ]; }) @@ -1466,11 +1466,11 @@ let sources."parseurl-1.3.3" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."pg-8.8.0" + sources."pg-8.10.0" sources."pg-connection-string-2.5.0" sources."pg-int8-1.0.1" - sources."pg-pool-3.5.2" - sources."pg-protocol-1.5.0" + sources."pg-pool-3.6.0" + sources."pg-protocol-1.6.0" sources."pg-types-2.2.0" sources."pgpass-1.0.5" sources."picomatch-2.3.1" diff --git a/third_party/nixpkgs/pkgs/servers/hbase/default.nix b/third_party/nixpkgs/pkgs/servers/hbase/default.nix index aa00fe8074..a295086ed1 100644 --- a/third_party/nixpkgs/pkgs/servers/hbase/default.nix +++ b/third_party/nixpkgs/pkgs/servers/hbase/default.nix @@ -39,13 +39,13 @@ let common = { version, hash, jdk ? jdk11_headless, tests }: in { hbase_2_4 = common { - version = "2.4.15"; - hash = "sha256-KJXpfQ91POVd7ZnKQyIX5qzX4JIZqh3Zn2Pz0chW48g="; + version = "2.4.16"; + hash = "sha256-vMuTqS2bXFRcCsZ7bOaNLVGyOG38HhL8WlCq2MFmAaE="; tests.standalone = nixosTests.hbase_2_4; }; hbase_2_5 = common { - version = "2.5.1"; - hash = "sha256-ddSa4q43PSJv1W4lzzaXfv4LIThs4n8g8wYufHgsZVE="; + version = "2.5.3"; + hash = "sha256-h08jnDQaakpkYFHHn9qeg4JCSBtwRjv42qKLpyOVdsI="; tests.standalone = nixosTests.hbase2; }; hbase_3_0 = common { diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix index d44145dfec..b104bb1599 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { azure-mgmt-storage azure-storage-blob bcrypt - cchardet + faust-cchardet deepdiff feedparser iso8601 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 00b8f30fe5..6c6fe319c5 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.3.1"; + version = "2023.3.4"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -325,7 +325,7 @@ blinkpy ]; "blinksticklight" = ps: with ps; [ - BlinkStick + blinkstick ]; "bliss_automation" = ps: with ps; [ ]; @@ -513,7 +513,7 @@ plexapi plexauth plexwebsocket - PyChromecast + pychromecast sqlalchemy zeroconf ]; @@ -2381,7 +2381,7 @@ mutesync ]; "mvglive" = ps: with ps; [ - PyMVGLive + pymvglive ]; "my" = ps: with ps; [ aiohttp-cors diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 89d6ead490..47dd527221 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -160,7 +160,7 @@ let hash = "sha256-EViSjr/nnuJIDTwV8j/O50hJkWV3M5aTNnWyzrinoyg="; }; propagatedBuildInputs = [ - self.APScheduler + self.apscheduler self.cachetools self.certifi self.cryptography @@ -181,11 +181,11 @@ let }); sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "2.0.4"; + version = "2.0.6"; src = super.fetchPypi { pname = "SQLAlchemy"; inherit version; - hash = "sha256-laGOGmryEU29nuTxaK0zBw1jF+Ebr6KNmDzHtYX+kAs="; + hash = "sha256-w0PwtUZJX116I5xwv1CpmkjXMhwWW4Kvr6hIO56+v24="; }; nativeCheckInputs = oldAttrs.nativeCheckInputs ++ (with super; [ pytest-xdist @@ -263,7 +263,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.3.1"; + hassVersion = "2023.3.4"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -279,7 +279,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-FvdMNtiLJ6p9I6aEeICukx9mykGGMoONGNdM/I4u/eY="; + hash = "sha256-BJCik8TxNzOsehD1fBNQO8Kvmb6ZaqEy4oEVmtIhwp0="; }; # Secondary source is git for tests @@ -287,7 +287,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-2usXU1a/QKEIaeg8JFBf/4ID2nzZLoGsfK7KXreKEBE="; + hash = "sha256-iwRjyOgQNTs54mnL3mlL9O3wVD5SWZIl+Hhxir6F+3o="; }; nativeBuildInputs = with python3.pkgs; [ @@ -320,10 +320,12 @@ in python.pkgs.buildPythonApplication rec { "httpx" "ifaddr" "orjson" + "pip" "PyJWT" "pyOpenSSL" "requests" "typing-extensions" + "voluptuous-serialize" "yarl" ]; in '' @@ -442,6 +444,7 @@ in python.pkgs.buildPythonApplication rec { python supportedComponentsWithTests; pythonPath = python3.pkgs.makePythonPath (componentBuildInputs ++ extraBuildInputs); + frontend = python.pkgs.home-assistant-frontend; intents = python.pkgs.home-assistant-intents; tests = { nixos = nixosTests.home-assistant; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix index 6c7329d207..76462fc851 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20230302.0"; + version = "20230309.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-G+XexUc5yvADjbXBgg97FB03Al3zR9WTb4cuVBBrSuI="; + hash = "sha256-gHc93xKIm0LDQrkTtlMdLv/N2smfYz5lQ6uLV+Cqj+s="; }; # there is nothing to strip in this package diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py b/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py index 162bb4af04..7f0cb37176 100755 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ mypy attrs packaging rich ]) +#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ attrs packaging rich ])" -p nodePackages.pyright ruff isort" # # This script downloads Home Assistant's source tarball. # Inside the homeassistant/components directory, each integration has an associated manifest.json, @@ -25,8 +25,9 @@ import tarfile import tempfile from functools import reduce from io import BytesIO -from typing import Dict, Optional, Set, Any +from typing import Any, Dict, List, Optional, Set from urllib.request import urlopen + from packaging import version as Version from rich.console import Console from rich.table import Table @@ -45,17 +46,21 @@ PKG_PREFERENCES = { } -def run_mypy() -> None: - cmd = ["mypy", "--ignore-missing-imports", __file__] + +def run_sync(cmd: List[str]) -> None: print(f"$ {' '.join(cmd)}") - subprocess.run(cmd, check=True) + process = subprocess.run(cmd) + + if process.returncode != 0: + sys.exit(1) -def get_version(): +def get_version() -> str: with open(os.path.dirname(sys.argv[0]) + "/default.nix") as f: # A version consists of digits, dots, and possibly a "b" (for beta) - m = re.search('hassVersion = "([\\d\\.b]+)";', f.read()) - return m.group(1) + if match := re.search('hassVersion = "([\\d\\.b]+)";', f.read()): + return match.group(1) + raise RuntimeError("hassVersion not in default.nix") def parse_components(version: str = "master"): @@ -74,7 +79,7 @@ def parse_components(version: str = "master"): components_with_tests.append(entry.name) sys.path.append(core_path) - from script.hassfest.model import Integration + from script.hassfest.model import Integration # type: ignore integrations = Integration.load_dir( pathlib.Path( os.path.join(core_path, "homeassistant/components") @@ -270,5 +275,7 @@ def main() -> None: if __name__ == "__main__": - run_mypy() + run_sync(["pyright", __file__]) + run_sync(["ruff", "--ignore=E501", __file__]) + run_sync(["isort", __file__]) main() diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix index 4e31078381..83c1f74547 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.3.1"; + version = "2023.3.4"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-WMuQgoWwri4nfKkZ8cW5o6S6G3PbHqlUxC9wyJSZhxQ="; + hash = "sha256-uNwh1IYn3rDwj+FB8h9SwbFaju7cnCWl7HjX0mdw/UA="; }; nativeBuildInputs = [ @@ -25,6 +25,14 @@ buildPythonPackage rec { home-assistant ]; + postPatch = '' + # Relax constraint to year and month + substituteInPlace pyproject.toml --replace \ + 'homeassistant = "${version}"' \ + 'homeassistant = "~${lib.versions.majorMinor home-assistant.version}"' + cat pyproject.toml + ''; + pythonImportsCheck = [ "homeassistant-stubs" ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix index 182034818e..15baefc8ce 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix @@ -18,7 +18,7 @@ let hassio = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; homeassistant_sky_connect = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zwave-js-server-python ]; homeassistant_yellow = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; - lovelace = [ PyChromecast ]; + lovelace = [ pychromecast ]; mopeka = [ pyswitchbot ]; nest = [ av ]; onboarding = [ pymetno radios rpi-bad-power ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/update.py b/third_party/nixpkgs/pkgs/servers/home-assistant/update.py new file mode 100755 index 0000000000..c914979e28 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/update.py @@ -0,0 +1,263 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=channel:nixpkgs-unstable -i python3 -p "python3.withPackages (ps: with ps; [ aiohttp packaging ])" -p git nurl nodePackages.pyright ruff isort + +import asyncio +import json +import os +import re +import sys +from subprocess import check_output, run +from typing import Dict, Final, List, Optional, Union + +import aiohttp +from aiohttp import ClientSession +from packaging.version import Version + +ROOT: Final = check_output([ + "git", + "rev-parse", + "--show-toplevel", +]).decode().strip() + + +def run_sync(cmd: List[str]) -> None: + print(f"$ {' '.join(cmd)}") + process = run(cmd) + + if process.returncode != 0: + sys.exit(1) + + +async def check_async(cmd: List[str]) -> str: + print(f"$ {' '.join(cmd)}") + process = await asyncio.create_subprocess_exec( + *cmd, + stdout=asyncio.subprocess.PIPE, + stderr=asyncio.subprocess.PIPE + ) + stdout, stderr = await process.communicate() + + if process.returncode != 0: + error = stderr.decode() + raise RuntimeError(f"{cmd[0]} failed: {error}") + + return stdout.decode().strip() + + +async def run_async(cmd: List[str]): + print(f"$ {' '.join(cmd)}") + + process = await asyncio.create_subprocess_exec( + *cmd, + stdout=asyncio.subprocess.PIPE, + stderr=asyncio.subprocess.PIPE, + ) + stdout, stderr = await process.communicate() + + print(stdout.decode()) + + if process.returncode != 0: + error = stderr.decode() + raise RuntimeError(f"{cmd[0]} failed: {error}") + + +class File: + def __init__(self, path: str): + self.path = os.path.join(ROOT, path) + + def __enter__(self): + with open(self.path, "r") as handle: + self.text = handle.read() + return self + + def get_exact_match(self, attr: str, value: str): + matches = re.findall( + rf'{re.escape(attr)}\s+=\s+\"?{re.escape(value)}\"?', + self.text + ) + + n = len(matches) + if n > 1: + raise ValueError(f"multiple occurrences found for {attr}={value}") + elif n == 1: + return matches.pop() + else: + raise ValueError(f"no occurrence found for {attr}={value}") + + def substitute(self, attr: str, old_value: str, new_value: str) -> None: + old_line = self.get_exact_match(attr, old_value) + new_line = old_line.replace(old_value, new_value) + self.text = self.text.replace(old_line, new_line) + print(f"Substitute `{attr}` value `{old_value}` with `{new_value}`") + + def __exit__(self, exc_type, exc_val, exc_tb): + with open(self.path, "w") as handle: + handle.write(self.text) + +class Nurl: + @classmethod + async def prefetch(cls, url: str, version: str, *extra_args: str) -> str: + cmd = [ + "nurl", + "--hash", + url, + version, + ] + cmd.extend(extra_args) + return await check_async(cmd) + + +class Nix: + base_cmd: Final = [ + "nix", + "--show-trace", + "--extra-experimental-features", "nix-command" + ] + + @classmethod + async def _run(cls, args: List[str]) -> Optional[str]: + return await check_async(cls.base_cmd + args) + + @classmethod + async def eval(cls, expr: str) -> Union[List, Dict, int, float, str, bool]: + response = await cls._run([ + "eval", + "-f", f"{ROOT}/default.nix", + "--json", + expr + ]) + if response is None: + raise RuntimeError("Nix eval expression returned no response") + try: + return json.loads(response) + except (TypeError, ValueError): + raise RuntimeError("Nix eval response could not be parsed from JSON") + + @classmethod + async def hash_to_sri(cls, algorithm: str, value: str) -> Optional[str]: + return await cls._run([ + "hash", + "to-sri", + "--type", algorithm, + value + ]) + + +class HomeAssistant: + def __init__(self, session: ClientSession): + self._session = session + + async def get_latest_core_version( + self, + owner: str = "home-assistant", + repo: str = "core" + ) -> str: + async with self._session.get( + f"https://api.github.com/repos/{owner}/{repo}/releases/latest" + ) as response: + document = await response.json() + try: + return str(document.get("name")) + except KeyError: + raise RuntimeError("No tag name in response document") + + + async def get_latest_frontend_version( + self, + core_version: str + ) -> str: + async with self._session.get( + f"https://raw.githubusercontent.com/home-assistant/core/{core_version}/homeassistant/components/frontend/manifest.json" + ) as response: + document = await response.json(content_type="text/plain") + + requirements = [ + requirement + for requirement in document.get("requirements", []) + if requirement.startswith("home-assistant-frontend==") + ] + + if len(requirements) > 1: + raise RuntimeError( + "Found more than one version specifier for the frontend package" + ) + elif len(requirements) == 1: + requirement = requirements.pop() + _, version = requirement.split("==", maxsplit=1) + return str(version) + else: + raise RuntimeError( + "Found no version specifier for frontend package" + ) + + + async def update_core(self, old_version: str, new_version: str) -> None: + old_sdist_hash = str(await Nix.eval("home-assistant.src.outputHash")) + new_sdist_hash = await Nurl.prefetch("https://pypi.org/project/homeassistant/", new_version) + print(f"sdist: {old_sdist_hash} -> {new_sdist_hash}") + + old_git_hash = str(await Nix.eval("home-assistant.gitSrc.outputHash")) + new_git_hash = await Nurl.prefetch("https://github.com/home-assistant/core/", new_version) + print(f"git: {old_git_hash} -> {new_git_hash}") + + with File("pkgs/servers/home-assistant/default.nix") as file: + file.substitute("hassVersion", old_version, new_version) + file.substitute("hash", old_sdist_hash, new_sdist_hash) + file.substitute("hash", old_git_hash, new_git_hash) + + async def update_frontend(self, old_version: str, new_version: str) -> None: + old_hash = str(await Nix.eval("home-assistant.frontend.src.outputHash")) + new_hash = await Nurl.prefetch( + "https://pypi.org/project/home_assistant_frontend/", + new_version, + "-A", "format", "wheel", + "-A", "dist", "py3", + "-A", "python", "py3" + ) + print(f"frontend: {old_hash} -> {new_hash}") + + with File("pkgs/servers/home-assistant/frontend.nix") as file: + file.substitute("version", old_version, new_version) + file.substitute("hash", old_hash, new_hash) + + async def update_components(self): + await run_async([ + f"{ROOT}/pkgs/servers/home-assistant/parse-requirements.py" + ]) + + +async def main(): + headers = {} + if token := os.environ.get("GITHUB_TOKEN", None): + headers.update({"GITHUB_TOKEN": token}) + + async with aiohttp.ClientSession(headers=headers) as client: + hass = HomeAssistant(client) + + core_current = str(await Nix.eval("home-assistant.version")) + core_latest = await hass.get_latest_core_version() + + if Version(core_latest) > Version(core_current): + print(f"New Home Assistant version {core_latest} is available") + await hass.update_core(str(core_current), str(core_latest)) + + frontend_current = str(await Nix.eval("home-assistant.frontend.version")) + frontend_latest = await hass.get_latest_frontend_version(str(core_latest)) + + if Version(frontend_latest) > Version(frontend_current): + await hass.update_frontend(str(frontend_current), str(frontend_latest)) + + await hass.update_components() + + else: + print(f"Home Assistant {core_current} is still the latest version.") + + # wait for async client sessions to close + # https://docs.aiohttp.org/en/stable/client_advanced.html#graceful-shutdown + await asyncio.sleep(0) + +if __name__ == "__main__": + run_sync(["pyright", __file__]) + run_sync(["ruff", "--ignore=E501", __file__]) + run_sync(["isort", __file__]) + asyncio.run(main()) diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/update.sh b/third_party/nixpkgs/pkgs/servers/home-assistant/update.sh deleted file mode 100755 index 05f2e93dfe..0000000000 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/update.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -p nix -p jq -p curl -p bash -p git -p nix-update -i bash - -set -eux - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -cd "$DIR" - -CURRENT_VERSION=$(nix-instantiate ../../.. --eval --strict -A home-assistant.version | tr -d '"') -TARGET_VERSION=$(curl https://api.github.com/repos/home-assistant/core/releases/latest | jq -r '.name') -MANIFEST=$(curl https://raw.githubusercontent.com/home-assistant/core/${TARGET_VERSION}/homeassistant/components/frontend/manifest.json) -FRONTEND_VERSION=$(echo $MANIFEST | jq -r '.requirements[] | select(startswith("home-assistant-frontend")) | sub(".*==(?.*)"; .vers)') - -if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then - echo "home-assistant is up-to-date: ${CURRENT_VERSION}" - exit 0 -fi - - -sed -i -e "s/version =.*/version = \"${TARGET_VERSION}\";/" \ - component-packages.nix - -sed -i -e "s/hassVersion =.*/hassVersion = \"${TARGET_VERSION}\";/" \ - default.nix - -( - # update the frontend before running parse-requirements, so it doesn't get shown as outdated - cd ../../.. - nix-update --version "$FRONTEND_VERSION" home-assistant.python.pkgs.home-assistant-frontend -) - -./parse-requirements.py - -read - -( - cd ../../.. - nix-update --version "$TARGET_VERSION" --build home-assistant -) - -#git add ./component-packages.nix ./default.nix ./frontend.nix -#git commit -m "home-assistant: ${CURRENT_VERSION} -> ${TARGET_VERSION}" diff --git a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix b/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix index a10c29a568..9ab8e9b44a 100644 --- a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix @@ -3,12 +3,12 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.13.2"; + version = "3.14.0"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-0VB2nXVUtnAqM+cblYaulHFMv6dmztqiBwAxW/Ui1hs="; + sha256 = "sha256-12yThmRsRW0RLNAgafZaciqJP5sRonyrkVSUf+LM7J0="; rev = "v${version}"; }; diff --git a/third_party/nixpkgs/pkgs/servers/invidious/versions.json b/third_party/nixpkgs/pkgs/servers/invidious/versions.json index 9258e5a3f8..925fcf3eff 100644 --- a/third_party/nixpkgs/pkgs/servers/invidious/versions.json +++ b/third_party/nixpkgs/pkgs/servers/invidious/versions.json @@ -4,9 +4,9 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "0995e0447c2b54d80b55231830b847d41c19b404", - "sha256": "sha256-hXF836jxMriMJ/qcBJIF5cRvQG719PStKqTZQcIRqlw=", - "version": "unstable-2023-02-22" + "rev": "d79d6f38b20376f27b3472e7f359f286b54760a1", + "sha256": "sha256-bek+tUAT99WikwVTKAC9sJxTauD9NoebWujWHO006a8=", + "version": "unstable-2023-03-07" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", diff --git a/third_party/nixpkgs/pkgs/servers/jellyseerr/default.nix b/third_party/nixpkgs/pkgs/servers/jellyseerr/default.nix new file mode 100644 index 0000000000..80dffed68e --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/jellyseerr/default.nix @@ -0,0 +1,93 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, mkYarnPackage +, nodejs +, sqlite +, fetchYarnDeps +, python3 +, pkg-config +, glib +}: + +let + pin = lib.importJSON ./pin.json; +in + +mkYarnPackage rec { + pname = "jellyseerr"; + inherit (pin) version; + + src = fetchFromGitHub { + owner = "Fallenbagel"; + repo = "jellyseerr"; + rev = "v${version}"; + sha256 = pin.srcSha256; + }; + + packageJSON = ./package.json; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + sha256 = pin.yarnSha256; + }; + + doDist = false; + + nativeBuildInputs = [ + nodejs + makeWrapper + ]; + + # Fixes "SQLite package has not been found installed" at launch + pkgConfig.sqlite3 = { + nativeBuildInputs = [ nodejs.pkgs.node-pre-gyp python3 ]; + postInstall = '' + export CPPFLAGS="-I${nodejs}/include/node" + node-pre-gyp install --prefer-offline --build-from-source --nodedir=${nodejs}/include/node + rm -r build-tmp-napi-v6 + ''; + }; + + pkgConfig.bcrypt = { + nativeBuildInputs = [ nodejs.pkgs.node-pre-gyp python3 ]; + postInstall = '' + export CPPFLAGS="-I${nodejs}/include/node" + node-pre-gyp install --prefer-offline --build-from-source --nodedir=${nodejs}/include/node + ''; + }; + + buildPhase = '' + runHook preBuild + ( + shopt -s dotglob + cd deps/jellyseerr + rm -r config/* + yarn build + rm -r .next/cache + ) + runHook postBuild + ''; + + postInstall = '' + makeWrapper '${nodejs}/bin/node' "$out/bin/jellyseerr" \ + --add-flags "$out/libexec/jellyseerr/deps/jellyseerr/dist/index.js" \ + --set NODE_ENV production + ''; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "Fork of overseerr for jellyfin support"; + homepage = "https://github.com/Fallenbagel/jellyseerr"; + longDescription = '' + Jellyseerr is a free and open source software application for managing + requests for your media library. It is a a fork of Overseerr built to + bring support for Jellyfin & Emby media servers! + ''; + license = licenses.mit; + maintainers = with maintainers; [ camillemndn ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/jellyseerr/package.json b/third_party/nixpkgs/pkgs/servers/jellyseerr/package.json new file mode 100644 index 0000000000..dd5fb6cf18 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/jellyseerr/package.json @@ -0,0 +1,246 @@ +{ + "name": "jellyseerr", + "version": "1.4.1", + "private": true, + "scripts": { + "dev": "nodemon -e ts --watch server --watch overseerr-api.yml -e .json,.ts,.yml -x ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/index.ts", + "build:server": "tsc --project server/tsconfig.json && copyfiles -u 2 server/templates/**/*.{html,pug} dist/templates && tsc-alias -p server/tsconfig.json", + "build:next": "next build", + "build": "yarn build:next && yarn build:server", + "lint": "eslint \"./server/**/*.{ts,tsx}\" \"./src/**/*.{ts,tsx}\" --cache", + "start": "NODE_ENV=production node dist/index.js", + "i18n:extract": "extract-messages -l=en -o src/i18n/locale -d en --flat true --overwriteDefault true \"./src/**/!(*.test).{ts,tsx}\"", + "migration:generate": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:generate -d server/datasource.ts", + "migration:create": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:create -d server/datasource.ts", + "migration:run": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:run -d server/datasource.ts", + "format": "prettier --loglevel warn --write --cache .", + "format:check": "prettier --check --cache .", + "typecheck": "yarn typecheck:server && yarn typecheck:client", + "typecheck:server": "tsc --project server/tsconfig.json --noEmit", + "typecheck:client": "tsc --noEmit", + "prepare": "husky install", + "cypress:open": "cypress open", + "cypress:prepare": "ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/scripts/prepareTestDb.ts", + "cypress:build": "yarn build && yarn cypress:prepare" + }, + "repository": { + "type": "git", + "url": "https://github.com/fallenbagel/jellyseerr.git" + }, + "license": "MIT", + "dependencies": { + "@formatjs/intl-displaynames": "6.2.3", + "@formatjs/intl-locale": "3.0.11", + "@formatjs/intl-pluralrules": "5.1.8", + "@formatjs/intl-utils": "3.8.4", + "@headlessui/react": "1.7.7", + "@heroicons/react": "2.0.13", + "@supercharge/request-ip": "1.2.0", + "@svgr/webpack": "6.5.1", + "@tanem/react-nprogress": "5.0.22", + "ace-builds": "1.14.0", + "axios": "1.2.2", + "axios-rate-limit": "1.3.0", + "bcrypt": "5.1.0", + "bowser": "2.11.0", + "connect-typeorm": "1.1.4", + "cookie-parser": "1.4.6", + "copy-to-clipboard": "3.3.3", + "country-flag-icons": "1.5.5", + "cronstrue": "2.21.0", + "csurf": "1.11.0", + "date-fns": "2.29.3", + "dayjs": "1.11.7", + "email-templates": "9.0.0", + "email-validator": "2.0.4", + "express": "4.18.2", + "express-openapi-validator": "4.13.8", + "express-rate-limit": "6.7.0", + "express-session": "1.17.3", + "formik": "2.2.9", + "gravatar-url": "3.1.0", + "intl": "1.2.5", + "lodash": "4.17.21", + "next": "12.3.4", + "node-cache": "5.1.2", + "node-gyp": "9.3.1", + "node-schedule": "2.1.0", + "nodemailer": "6.8.0", + "openpgp": "5.5.0", + "plex-api": "5.3.2", + "pug": "3.0.2", + "pulltorefreshjs": "0.1.22", + "react": "18.2.0", + "react-ace": "10.1.0", + "react-animate-height": "2.1.2", + "react-aria": "3.22.0", + "react-dom": "18.2.0", + "react-intersection-observer": "9.4.1", + "react-intl": "6.2.5", + "react-markdown": "8.0.4", + "react-popper-tooltip": "4.4.2", + "react-select": "5.7.0", + "react-spring": "9.6.1", + "react-tailwindcss-datepicker-sct": "1.3.4", + "react-toast-notifications": "2.5.1", + "react-truncate-markup": "5.1.2", + "react-use-clipboard": "1.0.9", + "reflect-metadata": "0.1.13", + "secure-random-password": "0.2.3", + "semver": "7.3.8", + "sqlite3": "5.1.4", + "swagger-ui-express": "4.6.0", + "swr": "2.0.0", + "typeorm": "0.3.11", + "web-push": "3.5.0", + "winston": "3.8.2", + "winston-daily-rotate-file": "4.7.1", + "xml2js": "0.4.23", + "yamljs": "0.3.0", + "yup": "0.32.11", + "zod": "3.20.2" + }, + "devDependencies": { + "@babel/cli": "7.20.7", + "@commitlint/cli": "17.4.0", + "@commitlint/config-conventional": "17.4.0", + "@semantic-release/changelog": "6.0.2", + "@semantic-release/commit-analyzer": "9.0.2", + "@semantic-release/exec": "6.0.3", + "@semantic-release/git": "10.0.1", + "@tailwindcss/aspect-ratio": "0.4.2", + "@tailwindcss/forms": "0.5.3", + "@tailwindcss/typography": "0.5.8", + "@types/bcrypt": "5.0.0", + "@types/cookie-parser": "1.4.3", + "@types/country-flag-icons": "1.2.0", + "@types/csurf": "1.11.2", + "@types/email-templates": "8.0.4", + "@types/express": "4.17.15", + "@types/express-session": "1.17.5", + "@types/lodash": "4.14.191", + "@types/node": "17.0.36", + "@types/node-schedule": "2.1.0", + "@types/nodemailer": "6.4.7", + "@types/pulltorefreshjs": "0.1.5", + "@types/react": "18.0.26", + "@types/react-dom": "18.0.10", + "@types/react-transition-group": "4.4.5", + "@types/secure-random-password": "0.2.1", + "@types/semver": "7.3.13", + "@types/swagger-ui-express": "4.1.3", + "@types/web-push": "3.3.2", + "@types/xml2js": "0.4.11", + "@types/yamljs": "0.2.31", + "@types/yup": "0.29.14", + "@typescript-eslint/eslint-plugin": "5.48.0", + "@typescript-eslint/parser": "5.48.0", + "autoprefixer": "10.4.13", + "babel-plugin-react-intl": "8.2.25", + "babel-plugin-react-intl-auto": "3.3.0", + "commitizen": "4.2.6", + "copyfiles": "2.4.1", + "cy-mobile-commands": "0.3.0", + "cypress": "12.3.0", + "cz-conventional-changelog": "3.3.0", + "eslint": "8.31.0", + "eslint-config-next": "12.3.4", + "eslint-config-prettier": "8.6.0", + "eslint-plugin-formatjs": "4.3.9", + "eslint-plugin-jsx-a11y": "6.6.1", + "eslint-plugin-no-relative-import-paths": "1.5.2", + "eslint-plugin-prettier": "4.2.1", + "eslint-plugin-react": "7.31.11", + "eslint-plugin-react-hooks": "4.6.0", + "extract-react-intl-messages": "4.1.1", + "husky": "8.0.3", + "lint-staged": "13.1.0", + "nodemon": "2.0.20", + "postcss": "8.4.20", + "prettier": "2.8.1", + "prettier-plugin-organize-imports": "3.2.1", + "prettier-plugin-tailwindcss": "0.2.1", + "semantic-release": "19.0.5", + "semantic-release-docker-buildx": "1.0.1", + "tailwindcss": "3.2.4", + "ts-node": "10.9.1", + "tsc-alias": "1.8.2", + "tsconfig-paths": "4.1.2", + "typescript": "4.9.4" + }, + "resolutions": { + "sqlite3/node-gyp": "8.4.1", + "@types/react": "18.0.26", + "@types/react-dom": "18.0.10" + }, + "config": { + "commitizen": { + "path": "./node_modules/cz-conventional-changelog" + } + }, + "lint-staged": { + "**/*.{ts,tsx,js}": [ + "prettier --write", + "eslint" + ], + "**/*.{json,md,css}": [ + "prettier --write" + ] + }, + "commitlint": { + "extends": [ + "@commitlint/config-conventional" + ] + }, + "release": { + "plugins": [ + "@semantic-release/commit-analyzer", + "@semantic-release/release-notes-generator", + [ + "@semantic-release/changelog", + { + "changelogFile": "CHANGELOG.md" + } + ], + "@semantic-release/npm", + [ + "@semantic-release/git", + { + "assets": [ + "package.json", + "CHANGELOG.md" + ], + "message": "chore(release): ${nextRelease.version}" + } + ], + "semantic-release-docker-buildx", + [ + "@semantic-release/github", + { + "addReleases": "bottom" + } + ] + ], + "branches": [ + "main" + ], + "npmPublish": false, + "publish": [ + { + "path": "semantic-release-docker-buildx", + "buildArgs": { + "COMMIT_TAG": "$GIT_SHA" + }, + "imageNames": [ + "fallenbagel/jellyseerr" + ], + "platforms": [ + "linux/amd64", + "linux/arm64", + "linux/arm/v7" + ] + }, + "@semantic-release/github" + ] + } +} diff --git a/third_party/nixpkgs/pkgs/servers/jellyseerr/pin.json b/third_party/nixpkgs/pkgs/servers/jellyseerr/pin.json new file mode 100644 index 0000000000..3681e3df68 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/jellyseerr/pin.json @@ -0,0 +1,5 @@ +{ + "version": "1.4.1", + "srcSha256": "LDqlQfy1bm2xMNn1oulImfanQmJX57P48VaZn0Jxwpk=", + "yarnSha256": "162aip7r5vcpfj1sn42qwwdlwnaii32bd2k0gp9py1z0zmw0lwlf" +} diff --git a/third_party/nixpkgs/pkgs/servers/jellyseerr/update.sh b/third_party/nixpkgs/pkgs/servers/jellyseerr/update.sh new file mode 100755 index 0000000000..b1561bae21 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/jellyseerr/update.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix curl jq prefetch-yarn-deps nix-prefetch-github + +set -euo pipefail + +if [[ "$#" -gt 1 || "$1" == -* ]]; then + echo "Regenerates packaging data for jellyseerr." + echo "Usage: $0 [git release tag]" + exit 1 +fi + +tag="$1" + +if [ -z "$tag" ]; then + tag="$( + curl "https://api.github.com/repos/Fallenbagel/jellyseerr/releases?per_page=1" | + jq -r '.[0].tag_name' + )" +fi + +src="https://raw.githubusercontent.com/Fallenbagel/jellyseerr/$tag" +src_sha256=$(nix-prefetch-github Fallenbagel jellyseerr --rev ${tag} | jq -r .sha256) + +tmpdir=$(mktemp -d) +trap 'rm -rf "$tmpdir"' EXIT + +pushd $tmpdir +curl -O "$src/yarn.lock" +yarn_sha256=$(prefetch-yarn-deps yarn.lock) +popd + +curl -O "$src/package.json" +cat > pin.json << EOF +{ + "version": "$(echo $tag | grep -P '(\d|\.)+' -o)", + "srcSha256": "$src_sha256", + "yarnSha256": "$yarn_sha256" +} +EOF diff --git a/third_party/nixpkgs/pkgs/servers/komga/default.nix b/third_party/nixpkgs/pkgs/servers/komga/default.nix index 5af5a44d16..1f651a5f46 100644 --- a/third_party/nixpkgs/pkgs/servers/komga/default.nix +++ b/third_party/nixpkgs/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "0.162.0"; + version = "0.163.0"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar"; - sha256 = "sha256-RcEAqMfpXH7PudLOROpSZw/5HrEeuBFBkllOjGdXZCU="; + sha256 = "sha256-dKbdzfjb+brY++uflVvuF1LaOIaYn1UqIGIjCsyLMv8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/krill/default.nix b/third_party/nixpkgs/pkgs/servers/krill/default.nix index abe468ce7f..8025f6b9d3 100644 --- a/third_party/nixpkgs/pkgs/servers/krill/default.nix +++ b/third_party/nixpkgs/pkgs/servers/krill/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "krill"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - hash = "sha256-IT4Rc74G8EFp+AbJCRWMKIvi5sZg/h7QT0M7U9B0Fu4="; + hash = "sha256-N12Uc2Dh0JFCEOzFvU5YzPeupcaOetW6ehRuAYOYJn0="; }; - cargoHash = "sha256-AvOE6SvsztqutGDfew0fkluercpF+lQQlJ1E7/YKtBM="; + cargoHash = "sha256-pcoGFXano34Sc+iVqJfrUo+wWASpAA1gslCHfVcEoJ4="; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/libreddit/default.nix b/third_party/nixpkgs/pkgs/servers/libreddit/default.nix index 442d590cf6..f7a77c6962 100644 --- a/third_party/nixpkgs/pkgs/servers/libreddit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/libreddit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "libreddit"; - version = "0.29.4"; + version = "0.30.0"; src = fetchFromGitHub { owner = "libreddit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xGjCki0fQWXLXqCvNj6GjQ7qbFBcaJBPuPb8Aj1whLk="; + hash = "sha256-jV8U7znBFCYBmtI6fm+/5oKsLJ3/tQG16GUvNnBlp7A="; }; - cargoHash = "sha256-+fEHD648za4tNEQiu1AYfFXf3Hbe9f0D3MFYJ0OCfqQ="; + cargoHash = "sha256-V7bT1uwSk9IW5rhKHW+6yHv+o+H3w7O/yuRpPDrcFic="; buildInputs = lib.optionals stdenv.isDarwin [ Security diff --git a/third_party/nixpkgs/pkgs/servers/maddy/default.nix b/third_party/nixpkgs/pkgs/servers/maddy/default.nix index 27ee1e3d6d..d008bdf939 100644 --- a/third_party/nixpkgs/pkgs/servers/maddy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/maddy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "maddy"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "foxcpp"; repo = "maddy"; rev = "v${version}"; - sha256 = "sha256-DBSqC4EteESYb6RbC2xyS+6YczGviWYnyMz7QvCO3Uc="; + sha256 = "sha256-vf+jkXerdwvQhtyiOObBRxh8sYMEcgXC5vNzm5wquBs="; }; vendorSha256 = "sha256-10cLNl9jWYX8XIKQkCxJ+/ymZC1YJRHUJWZQhq7zeV4="; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix index c993b18b70..3e9fadea76 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -12,20 +12,20 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.78.0"; + version = "1.79.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-UMP/JQ77qGfAQ+adLBLB8NFI2OiuwjILEbEecEDcK1A="; + hash = "sha256-2MHP4Gu+C5yyXObbd7NLYWCy1E0L7fUwpzYsoD7ULDo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-UTuMvTWfOlFlL+4qsCEfVljnkeylBKq0wd5FlAOYAFQ="; + hash = "sha256-yDKs6KRStjJMC/48dZcyQ4OmBXY1TombjH/ZDfBJbSc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index d96e60ba78..8c6e8a1025 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -9,16 +9,16 @@ buildNpmPackage rec { pname = "matrix-appservice-irc"; - version = "0.37.0"; + version = "0.37.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "matrix-appservice-irc"; rev = "refs/tags/${version}"; - hash = "sha256-krF/eUyGHB4M3sQVaBh7+OaHnM/g9XVaBa8gizPkLKE="; + hash = "sha256-d/CA27A0txnVnSCJeS/qeK90gOu1QjQaFBk+gblEdH8="; }; - npmDepsHash = "sha256-VkVpFt3cwnBkN0AGDaE5Bd6xINGL6XugZ4TBsDONWCg="; + npmDepsHash = "sha256-s/b/G49HlDbYsSmwRYrm4Bcv/81tHLC8Ac1IMEwGFW8="; nativeBuildInputs = [ python3 diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix index 19ddce8cc8..21e49c9b1e 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix @@ -47,7 +47,7 @@ mkYarnPackage rec { meta = with lib; { description = "A Matrix <--> Slack bridge"; - maintainers = with maintainers; [ beardhatcode ]; + maintainers = with maintainers; [ beardhatcode chvp ]; license = licenses.asl20; }; } diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json index dd5c93989c..aa3225725d 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json @@ -1,6 +1,6 @@ { "name": "matrix-appservice-slack", - "version": "2.1.0", + "version": "2.1.1", "description": "A Matrix <--> Slack bridge", "engines": { "node": ">=16 <=18" @@ -42,7 +42,7 @@ "axios": "^0.27.2", "classnames": "^2.3.2", "escape-string-regexp": "^4.0.0", - "matrix-appservice-bridge": "^8.1.0", + "matrix-appservice-bridge": "^8.1.1", "matrix-widget-api": "^1.1.1", "minimist": "^1.2.6", "nedb": "^1.8.0", diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json index 06d4e4b142..7a9f4b44e2 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json @@ -1,5 +1,5 @@ { - "version": "2.1.0", - "srcHash": "qAmbW/aDeBWTi1czQtrsb6d5TEYw9gYJ4lpJbaX9nb0=", - "yarnHash": "1r5fqw7y8fzgjnl5xlr8djfmmkm8kqw5p3w12ffll6irwz90wajx" + "version": "2.1.1", + "srcHash": "+NO/V3EyqdxavnSTBU7weJnueL6+aCH3UWkqclpsId0=", + "yarnHash": "1pqv7g3xbfs4zhmyxy5p216kq2jwjfjzxw2dv2a7hl0qwk6igyki" } diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-facebook/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-facebook/default.nix index 017501ded0..178da1e6ad 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-facebook/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-facebook/default.nix @@ -18,9 +18,10 @@ python3.pkgs.buildPythonPackage rec { }; propagatedBuildInputs = with python3.pkgs; [ - CommonMark + commonmark aiohttp asyncpg + commonmark mautrix paho-mqtt pillow diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-googlechat/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-googlechat/default.nix index 7438966345..e9431215b3 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-googlechat/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-googlechat/default.nix @@ -48,10 +48,11 @@ propagatedBuildInputs = with python3.pkgs; [ aiohttp + commonmark yarl asyncpg ruamel-yaml - CommonMark + commonmark python-magic protobuf3 mautrix diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix index 8ff6f1d366..c1dbb84930 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix @@ -26,10 +26,11 @@ python3.pkgs.buildPythonPackage rec { ]; propagatedBuildInputs = with python3.pkgs; [ - CommonMark + commonmark aiohttp asyncpg attrs + commonmark mautrix phonenumbers pillow diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix index 7e2b4bfbca..47db76b3ca 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix @@ -38,13 +38,13 @@ python.pkgs.buildPythonPackage rec { propagatedBuildInputs = with python.pkgs; ([ ruamel-yaml python-magic - CommonMark + commonmark aiohttp yarl mautrix tulir-telethon asyncpg - Mako + mako # speedups cryptg aiodns diff --git a/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix b/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix index 770ca8c76e..7a48fa7dae 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix @@ -14,13 +14,13 @@ let - version = "0.49.1"; + version = "0.49.3"; src = fetchFromGitHub { owner = "navidrome"; repo = "navidrome"; rev = "v${version}"; - hash = "sha256-YaBtzMW2zUHRYJDDF+mMll2rMBAg5os2HSP0uEujoWI="; + hash = "sha256-JBvY+0QAouEc0im62aVSJ27GAB7jt0qVnYtc6VN2qTA="; }; ui = callPackage ./ui { @@ -35,7 +35,7 @@ buildGoModule { inherit src version; - vendorSha256 = "sha256-9JDP58UxlSadMXD7gUl2oN+uiYN9RlGO4HMuZJhO9mw="; + vendorSha256 = "sha256-C8w/qCts8VqNDTQVXtykjmSbo5uDrvS9NOu3SHpAlDE="; nativeBuildInputs = [ makeWrapper pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix b/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix index b14efeaabe..42d86bedfc 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.15.1"; + version = "0.15.3"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "sha256-Ob+0Ak0ELyHrZfeCiACX2IHsp+6jE//iqPoW6je6GfQ="; + sha256 = "sha256-HbtKEWDCT6DpJYc25I+WZw6HwZeeYRUz+OzPcf8bCfw="; }; sourceRoot = "source/src"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/karma/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/karma/default.nix index 48044b14da..272680dc50 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/karma/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/karma/default.nix @@ -19,16 +19,16 @@ in buildGoModule rec { pname = "karma"; - version = "0.112"; + version = "0.113"; src = fetchFromGitHub { owner = "prymitive"; repo = "karma"; rev = "v${version}"; - hash = "sha256-Dzz5BgWrI5f9HlRm7Mna8JgUJlTVJia31v1In2zzcBY="; + hash = "sha256-q0RGdwZQv8ypBcjrf0UjBSp2PlaKzM0wX5q4GzUNX9o="; }; - vendorHash = "sha256-iYm19oAYPi3OUxp0wQsqgEkBLp3Fw2nCSdDI2vbV37w="; + vendorHash = "sha256-8YyTHPIr5Kk7M0LH662KQw4t2CuHZ/3jD0Rzhl8ps0M="; nativeBuildInputs = [ nodejs-18_x diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 1708ff4cb5..202f1ce13f 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.60.0"; + version = "2.61.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - hash = "sha256-BWzhsIiEjRb4Yq8vf3N1lnwT3uU1Unr/ThxfhEiMBtw="; + hash = "sha256-BePgfyVtEhm81kDtjRt0P6O9zgWA4f+5pH//w9PxD8w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix index ade935f16d..1724c0f53f 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix @@ -21,6 +21,7 @@ , enableMoby ? true , enableNomad ? true , enableOpenstack ? true +, enableOVHCloud ? true , enablePuppetDB ? true , enableScaleway ? true , enableTriton ? true @@ -31,24 +32,26 @@ }: let - version = "2.41.0"; + version = "2.42.0"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - sha256 = "sha256-0EFeAuhQUu+4TCoHsWHTbWTGJLjS37POacP1K42sGqI="; + sha256 = "sha256-QOnt8YZkq+/cmoaI8ZOrVbgVh5MnaKpDBVtPTckl4+A="; }; in buildGoModule rec { pname = "prometheus"; inherit version; + outputs = [ "out" "doc" "cli" ]; + src = fetchFromGitHub { - rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "sha256-J3KDN02m639bUGrnUrqeCLferrqIHaJ2VEBjIqfm/GY="; + rev = "v${version}"; + sha256 = "sha256-UwowidKKn3fp2z/MSbwESpl2E4IIioEC0oV1QRE7ViQ="; }; - vendorSha256 = "sha256-4Of1euBp5Lka6Bb2UJYUQuRa7t2/B1HaXCWSOqCASYw="; + vendorSha256 = "sha256-wUniz7E9l/5ldgPHo+wZkKaZuAH5kvjT0VDl4qkcoNs="; excludedPackages = [ "documentation/prometheus-mixin" ]; @@ -59,51 +62,30 @@ buildGoModule rec { # Enable only select service discovery to shrink binaries. ( - true # prevent bash syntax error when all plugins are disabled - ${lib.optionalString (enableAWS) - "echo - github.com/prometheus/prometheus/discovery/aws"} - ${lib.optionalString (enableAzure) - "echo - github.com/prometheus/prometheus/discovery/azure"} - ${lib.optionalString (enableConsul) - "echo - github.com/prometheus/prometheus/discovery/consul"} - ${lib.optionalString (enableDigitalOcean) - "echo - github.com/prometheus/prometheus/discovery/digitalocean"} - ${lib.optionalString (enableDNS) - "echo - github.com/prometheus/prometheus/discovery/dns"} - ${lib.optionalString (enableEureka) - "echo - github.com/prometheus/prometheus/discovery/eureka"} - ${lib.optionalString (enableGCE) - "echo - github.com/prometheus/prometheus/discovery/gce"} - ${lib.optionalString (enableHetzner) - "echo - github.com/prometheus/prometheus/discovery/hetzner"} - ${lib.optionalString (enableIONOS) - "echo - github.com/prometheus/prometheus/discovery/ionos"} - ${lib.optionalString (enableKubernetes) - "echo - github.com/prometheus/prometheus/discovery/kubernetes"} - ${lib.optionalString (enableLinode) - "echo - github.com/prometheus/prometheus/discovery/linode"} - ${lib.optionalString (enableMarathon) - "echo - github.com/prometheus/prometheus/discovery/marathon"} - ${lib.optionalString (enableMoby) - "echo - github.com/prometheus/prometheus/discovery/moby"} - ${lib.optionalString (enableNomad) - "echo - github.com/prometheus/prometheus/discovery/nomad"} - ${lib.optionalString (enableOpenstack) - "echo - github.com/prometheus/prometheus/discovery/openstack"} - ${lib.optionalString (enablePuppetDB) - "echo - github.com/prometheus/prometheus/discovery/puppetdb"} - ${lib.optionalString (enableScaleway) - "echo - github.com/prometheus/prometheus/discovery/scaleway"} - ${lib.optionalString (enableTriton) - "echo - github.com/prometheus/prometheus/discovery/triton"} - ${lib.optionalString (enableUyuni) - "echo - github.com/prometheus/prometheus/discovery/uyuni"} - ${lib.optionalString (enableVultr) - "echo - github.com/prometheus/prometheus/discovery/vultr"} - ${lib.optionalString (enableXDS) - "echo - github.com/prometheus/prometheus/discovery/xds"} - ${lib.optionalString (enableZookeeper) - "echo - github.com/prometheus/prometheus/discovery/zookeeper"} + true # prevent bash syntax error when all plugins are disabled + ${lib.optionalString enableAWS "echo - github.com/prometheus/prometheus/discovery/aws"} + ${lib.optionalString enableAzure "echo - github.com/prometheus/prometheus/discovery/azure"} + ${lib.optionalString enableConsul "echo - github.com/prometheus/prometheus/discovery/consul"} + ${lib.optionalString enableDigitalOcean "echo - github.com/prometheus/prometheus/discovery/digitalocean"} + ${lib.optionalString enableDNS "echo - github.com/prometheus/prometheus/discovery/dns"} + ${lib.optionalString enableEureka "echo - github.com/prometheus/prometheus/discovery/eureka"} + ${lib.optionalString enableGCE "echo - github.com/prometheus/prometheus/discovery/gce"} + ${lib.optionalString enableHetzner "echo - github.com/prometheus/prometheus/discovery/hetzner"} + ${lib.optionalString enableIONOS "echo - github.com/prometheus/prometheus/discovery/ionos"} + ${lib.optionalString enableKubernetes "echo - github.com/prometheus/prometheus/discovery/kubernetes"} + ${lib.optionalString enableLinode "echo - github.com/prometheus/prometheus/discovery/linode"} + ${lib.optionalString enableMarathon "echo - github.com/prometheus/prometheus/discovery/marathon"} + ${lib.optionalString enableMoby "echo - github.com/prometheus/prometheus/discovery/moby"} + ${lib.optionalString enableNomad "echo - github.com/prometheus/prometheus/discovery/nomad"} + ${lib.optionalString enableOpenstack "echo - github.com/prometheus/prometheus/discovery/openstack"} + ${lib.optionalString enableOVHCloud "echo - github.com/prometheus/prometheus/discovery/ovhcloud"} + ${lib.optionalString enablePuppetDB "echo - github.com/prometheus/prometheus/discovery/puppetdb"} + ${lib.optionalString enableScaleway "echo - github.com/prometheus/prometheus/discovery/scaleway"} + ${lib.optionalString enableTriton "echo - github.com/prometheus/prometheus/discovery/triton"} + ${lib.optionalString enableUyuni "echo - github.com/prometheus/prometheus/discovery/uyuni"} + ${lib.optionalString enableVultr "echo - github.com/prometheus/prometheus/discovery/vultr"} + ${lib.optionalString enableXDS "echo - github.com/prometheus/prometheus/discovery/xds"} + ${lib.optionalString enableZookeeper "echo - github.com/prometheus/prometheus/discovery/zookeeper"} ) > plugins.yml ''; @@ -118,6 +100,8 @@ buildGoModule rec { t = "github.com/prometheus/common/version"; in [ + "-s" + "-w" "-X ${t}.Version=${version}" "-X ${t}.Revision=unknown" "-X ${t}.Branch=unknown" @@ -132,6 +116,10 @@ buildGoModule rec { cp -a $src/console_libraries $src/consoles $out/etc/prometheus ''; + postInstall = '' + moveToOutput bin/promtool $cli + ''; + doCheck = !stdenv.isDarwin; # https://hydra.nixos.org/build/130673870/nixlog/1 passthru.tests = { inherit (nixosTests) prometheus; }; @@ -140,7 +128,6 @@ buildGoModule rec { description = "Service monitoring system and time series database"; homepage = "https://prometheus.io"; license = licenses.asl20; - maintainers = with maintainers; [ benley fpletz globin willibutz Frostman ]; - platforms = platforms.unix; + maintainers = with maintainers; [ fpletz willibutz Frostman ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix index f4b96b1cf7..8f40e61bc9 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "influxdb_exporter"; - version = "0.11.2"; + version = "0.11.3"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "influxdb_exporter"; - hash = "sha256-UIB6/0rYOrS/B7CFffg0lPaAhSbmk0KSEogjCundXAU="; + hash = "sha256-jb384/i76KxQEgqnebEDkH33iPLAAzKFkA8OtmExrWc="; }; - vendorHash = "sha256-ueE1eE0cxr7+APvIEzR26Uprx0CXN1jfNLzGVgDmJQk="; + vendorHash = "sha256-pD/oWbFa6pg9miNA2z6RubsBd3+X/DWRoQuaVwjuOmI="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index 6930398407..309ccfd4df 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "statsd_exporter"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "prometheus"; repo = "statsd_exporter"; rev = "v${version}"; - hash = "sha256-7atRLwucO09yN2odu0uNe7xrtKLq9kmy6JyI1y4Sww8="; + hash = "sha256-JbRkLRXTQo40wBynfG6BRR4+yPqy7VLJ33vsjus5okg="; }; - vendorHash = "sha256-H0f7bDnSddlabpRbMpk9tInlne2tI5J+MQ23mw1N71E="; + vendorHash = "sha256-YzcgEQ1S2qn7v2SVSBiodprtc+D4cSZOFBJwpq3jz8Y="; meta = with lib; { description = "Receives StatsD-style metrics and exports them to Prometheus"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix index 68ecb29169..0d4a916db0 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix @@ -4,19 +4,19 @@ let generic = { subPackages, pname, postInstall ? "", mainProgram }: buildGoModule rec { inherit pname; - version = "6.9.1"; + version = "6.9.2"; shortRev = "3a1ac58"; # for internal version info src = fetchFromGitHub { owner = "sensu"; repo = "sensu-go"; rev = "v${version}"; - sha256 = "sha256-vw5A5Cg4envrDfLsdauSONgd6rPZSu5wPiPOoNIcS9w="; + sha256 = "sha256-Xd15fkoSmQXbkyEMsBvc8ewLvn+wlsZoclfDjarp1FQ="; }; inherit subPackages postInstall; - vendorSha256 = "sha256-zrwTdMlDfG1RudOfV52qOP9NMU3/XYb5TND6xyglJ0I="; + vendorHash = "sha256-zrwTdMlDfG1RudOfV52qOP9NMU3/XYb5TND6xyglJ0I="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix index 85e9fe5022..2f43e2c402 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, lua, pkg-config, nixosTests +{ lib, stdenv, fetchurl, fetchpatch, lua, pkg-config, nixosTests , tcl, which, ps, getconf , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd # dependency ordering is broken at the moment when building with openssl @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { hash = "sha256-93E1wqR8kVHUAov+o7NEcKtNMk0UhPeahMbzKjz7n2U="; }; + patches = [ + # Fix flaky test tests/unit/memefficiency.tcl + (fetchpatch { + url = "https://github.com/redis/redis/commit/bfe50a30edff6837897964ac3374c082b0d9e5da.patch"; + sha256 = "sha256-0GMiygbO7LbL1rnuOByOJYE2BKUSI+yy6YH781E2zBw="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lua ] diff --git a/third_party/nixpkgs/pkgs/servers/pinnwand/default.nix b/third_party/nixpkgs/pkgs/servers/pinnwand/default.nix index edf7255e22..58e1e19b3f 100644 --- a/third_party/nixpkgs/pkgs/servers/pinnwand/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pinnwand/default.nix @@ -21,6 +21,11 @@ with python3.pkgs; buildPythonApplication rec { poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'sqlalchemy = "^1.4"' 'sqlalchemy = "*"' + ''; + propagatedBuildInputs = [ click docutils diff --git a/third_party/nixpkgs/pkgs/servers/plex/raw.nix b/third_party/nixpkgs/pkgs/servers/plex/raw.nix index 5a0368d36f..b1afed46ec 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.31.1.6733-bc0674160"; + version = "1.31.1.6782-77dfff442"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "0nj9n250lhin58xlqvn2l0pjxdbajj0bla2wrgan8gs2m45nk3q9"; + sha256 = "1ssnqkyghjpc81jmh67j5bwqqbvjb9aaan9j1yp2rj89fgg9br2c"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0a5h151gh1ja3frqzaqw3pj1kyh5p0wgnfmmxiz0q3zx1drjs611"; + sha256 = "0mnqbh5cfpvbhq2s0jg207cy45dm6dkz3d88qgwsi8spwfaj84p7"; }; outputs = [ "out" "basedb" ]; diff --git a/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix b/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix index c8da1b233c..34b2324c81 100644 --- a/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.12.3"; + version = "0.13.2"; src = fetchFromGitHub { owner = "pocketbase"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/uqUOuNHFyah6nrQI3lRNkB2vpV9vKXJog1ck0zoruo="; + sha256 = "sha256-P150wEJHTC294LcRhSHF5/+w08WKBvhUZsJ9ENi1EM8="; }; - vendorHash = "sha256-8NBudXcU3cjSbo6qpGZVLtbrLedzwijwrbiTgC+OMcU="; + vendorHash = "sha256-hvziOq5zyYwWcvqa23IzHXj/DT27MAcNVegYR38beJ4="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/third_party/nixpkgs/pkgs/servers/pufferpanel/default.nix b/third_party/nixpkgs/pkgs/servers/pufferpanel/default.nix index d89a859b89..bfb9106b90 100644 --- a/third_party/nixpkgs/pkgs/servers/pufferpanel/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pufferpanel/default.nix @@ -2,23 +2,53 @@ , buildGoModule , fetchFromGitHub , makeWrapper -, pkgs -, stdenv , fetchzip -, jdk -, nodejs +, fetchpatch , pathDeps ? [ ] }: buildGoModule rec { pname = "pufferpanel"; - version = "2.2.0"; + version = "2.6.6"; + + patches = [ + # Bump go-sqlite3 version to avoid a GNU C compiler error. + # See https://github.com/PufferPanel/PufferPanel/pull/1240 + (fetchpatch { + url = "https://github.com/PufferPanel/PufferPanel/pull/1240/commits/3065dca2d9b05a56789971ccf0f43a7079a390b8.patch"; + hash = "sha256-ygMrhJoba8swoRBBii7BEiLihqOebLUtSH7os7W3s+k="; + }) + + # Fix errors in tests. + # See https://github.com/PufferPanel/PufferPanel/pull/1241 + (fetchpatch { + url = "https://github.com/PufferPanel/PufferPanel/pull/1241/commits/ffd21bce4bff3040c8e3e783e5b4779222e7a3a5.patch"; + hash = "sha256-BzGfcWhzRrCHKkAhWf0uvXiiiutWqthn/ed7bN2hR8U="; + }) + + # Seems to be an anti-feature. Startup is the only place where user/group is + # hardcoded and checked. + # + # There is no technical reason PufferPanel cannot run as a different user, + # especially for simple commands like `pufferpanel version`. + ./disable-group-checks.patch + + # Some tests do not have network requests stubbed :( + ./skip-network-tests.patch + ]; + + ldflags = [ + "-s" + "-w" + "-X=github.com/pufferpanel/pufferpanel/v2.Hash=none" + "-X=github.com/pufferpanel/pufferpanel/v2.Version=${version}-nixpkgs" + ]; src = fetchFromGitHub { owner = "pufferpanel"; repo = pname; rev = "v${version}"; - sha256 = "1ifig8ckjlg47wj0lfk4q941dan7llb1i5l76akcpjq726b2j8lh"; + hash = "sha256-0Vyi47Rkpe3oODHfsl/7tCerENpiEa3EWBHhfTO/uu4="; }; # PufferPanel is split into two parts: the backend daemon and the @@ -28,25 +58,35 @@ buildGoModule rec { # we just download the built frontend and package that. frontend = fetchzip { url = "https://github.com/PufferPanel/PufferPanel/releases/download/v${version}/pufferpanel_${version}_linux_arm64.zip"; - sha256 = "0phbf4asr0dns7if84crx05kfgr44yaxrbsbihdywbhh2mb16052"; + hash = "sha256-z7HWhiEBma37OMGEkTGaEbnF++Nat8wAZE2UeOoaO/U="; stripRoot = false; - } + "/www"; + postFetch = '' + mv $out $TMPDIR/subdir + mv $TMPDIR/subdir/www $out + ''; + }; nativeBuildInputs = [ makeWrapper ]; - vendorSha256 = "061l1sy0z3kd7rc2blqh333gy66nbadfxy9hyxgq07dszds4byys"; + vendorHash = "sha256-fB8MxSl9E2W+BdO6i+drbCe9Z3bPHPi0MvpJEomU9co="; + proxyVendor = true; postFixup = '' mkdir -p $out/share/pufferpanel cp -r ${src}/assets/email $out/share/pufferpanel/templates cp -r ${frontend} $out/share/pufferpanel/www - # Wrap the binary with the path to the external files. - mv $out/bin/cmd $out/bin/pufferpanel - wrapProgram "$out/bin/pufferpanel" \ - --set PUFFER_PANEL_EMAIL_TEMPLATES $out/share/pufferpanel/templates/emails.json \ - --set GIN_MODE release \ - --set PUFFER_PANEL_WEB_FILES $out/share/pufferpanel/www \ + # Rename cmd to pufferpanel and remove other binaries. + mv $out/bin $TMPDIR/bin + mkdir $out/bin + mv $TMPDIR/bin/cmd $out/bin/pufferpanel + + # Wrap the binary with the path to the external files, but allow setting + # custom paths if needed. + wrapProgram $out/bin/pufferpanel \ + --set-default GIN_MODE release \ + --set-default PUFFER_PANEL_EMAIL_TEMPLATES $out/share/pufferpanel/templates/emails.json \ + --set-default PUFFER_PANEL_WEB_FILES $out/share/pufferpanel/www \ --prefix PATH : ${lib.escapeShellArg (lib.makeBinPath pathDeps)} ''; @@ -55,6 +95,5 @@ buildGoModule rec { homepage = "https://www.pufferpanel.com/"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ ckie ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/pufferpanel.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/servers/pufferpanel/disable-group-checks.patch b/third_party/nixpkgs/pkgs/servers/pufferpanel/disable-group-checks.patch new file mode 100644 index 0000000000..a3f0aa074b --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/pufferpanel/disable-group-checks.patch @@ -0,0 +1,34 @@ +diff --git a/cmd/main.go b/cmd/main.go +index f9af7038..099ff2e2 100644 +--- a/cmd/main.go ++++ b/cmd/main.go +@@ -24,11 +24,6 @@ import ( + ) + + func main() { +- if !pufferpanel.UserInGroup("pufferpanel") { +- fmt.Println("You do not have permission to use this command") +- return +- } +- + defer logging.Close() + + defer func() { +diff --git a/cmd/user.go b/cmd/user.go +index d4a27aaf..9bf21910 100644 +--- a/cmd/user.go ++++ b/cmd/user.go +@@ -218,10 +218,9 @@ type userCreate struct { + } + + func editUser(cmd *cobra.Command, args []string) { +- if !pufferpanel.UserInGroup() { +- fmt.Printf("You do not have permission to use this command") +- return +- } ++ // Keeping import to avoid merge conflicts with future updates in case ++ // PufferPanel starts using this import elsewhere in this file. ++ _ = pufferpanel.UserInGroup + + db, err := database.GetConnection() + if err != nil { diff --git a/third_party/nixpkgs/pkgs/servers/pufferpanel/skip-network-tests.patch b/third_party/nixpkgs/pkgs/servers/pufferpanel/skip-network-tests.patch new file mode 100644 index 0000000000..b2bddd191d --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/pufferpanel/skip-network-tests.patch @@ -0,0 +1,61 @@ +diff --git a/operations/javadl/javadl_test.go b/operations/javadl/javadl_test.go +index 3938a58c..a51e2f4a 100644 +--- a/operations/javadl/javadl_test.go ++++ b/operations/javadl/javadl_test.go +@@ -22,6 +22,8 @@ import ( + ) + + func Test_downloadJava(t *testing.T) { ++ t.Skip("requires network access") ++ + tests := []struct { + name string + wantErr bool +diff --git a/operations/spongedl/spongedl_test.go b/operations/spongedl/spongedl_test.go +index efb1665c..1b93be8c 100644 +--- a/operations/spongedl/spongedl_test.go ++++ b/operations/spongedl/spongedl_test.go +@@ -5,6 +5,8 @@ import ( + ) + + func TestSpongeDl_Run(t *testing.T) { ++ t.Skip("requires network access") ++ + type fields struct { + Recommended bool + SpongeType string +diff --git a/operations/steamgamedl/dl_test.go b/operations/steamgamedl/dl_test.go +index f4df4bf3..f7cd9681 100644 +--- a/operations/steamgamedl/dl_test.go ++++ b/operations/steamgamedl/dl_test.go +@@ -19,6 +19,8 @@ import ( + ) + + func Test_downloadSteamcmd(t *testing.T) { ++ t.Skip("requires network access") ++ + tests := []struct { + name string + wantErr bool +diff --git a/services/templates_test.go b/services/templates_test.go +index 5305dbc0..127efc54 100644 +--- a/services/templates_test.go ++++ b/services/templates_test.go +@@ -9,6 +9,8 @@ import ( + ) + + func TestTemplate_GetImportableTemplates(t1 *testing.T) { ++ t1.Skip("requires network access") ++ + t1.Run("GetImportableTemplates", func(t1 *testing.T) { + t := &Template{} + +@@ -26,6 +28,8 @@ func TestTemplate_GetImportableTemplates(t1 *testing.T) { + } + + func TestTemplate_ImportTemplates(t1 *testing.T) { ++ t1.Skip("requires network access") ++ + t1.Run("GetImportableTemplates", func(t1 *testing.T) { + db := prepareDatabase(t1) + if t1.Failed() { diff --git a/third_party/nixpkgs/pkgs/servers/readarr/default.nix b/third_party/nixpkgs/pkgs/servers/readarr/default.nix new file mode 100644 index 0000000000..9fdec49888 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/readarr/default.nix @@ -0,0 +1,53 @@ +{ lib, stdenv, fetchurl, libmediainfo, sqlite, curl, makeWrapper, icu, dotnet-runtime, openssl, nixosTests }: + +let + os = if stdenv.isDarwin then "osx" else "linux"; + arch = { + x86_64-linux = "x64"; + aarch64-linux = "arm64"; + x86_64-darwin = "x64"; + }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + hash = { + x64-linux_hash = "sha256-ABk2wxNse8dcFWEMpaXnsALz171/1JQaAFzmpz36we0="; + arm64-linux_hash = "sha256-c1eVCPE8RH9u99hYJZBiNBpanBv3WeSTVaD+Gq1yxUk="; + x64-osx_hash = "sha256-9UEi8YbpZ1baZ9lnG7SJcYnvJRgP7BsqcIt9Z3UdDv8="; + }."${arch}-${os}_hash"; +in stdenv.mkDerivation rec { + pname = "readarr"; + version = "0.1.4.1596"; + + src = fetchurl { + url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; + sha256 = hash; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/${pname}-${version}} + cp -r * $out/share/${pname}-${version}/. + makeWrapper "${dotnet-runtime}/bin/dotnet" $out/bin/Readarr \ + --add-flags "$out/share/${pname}-${version}/Readarr.dll" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ curl sqlite libmediainfo icu openssl ]} + + runHook postInstall + ''; + + + passthru = { + updateScript = ./update.sh; + tests.smoke-test = nixosTests.readarr; + }; + + meta = with lib; { + description = "A Usenet/BitTorrent ebook downloader"; + homepage = "https://readarr.com"; + license = licenses.gpl3; + maintainers = [ maintainers.jocelynthode ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/servers/readarr/update.sh b/third_party/nixpkgs/pkgs/servers/readarr/update.sh new file mode 100755 index 0000000000..0372ac9fa1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/readarr/update.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused nix-prefetch jq + +set -e + +dirname="$(dirname "$0")" + +updateHash() +{ + version=$1 + arch=$2 + os=$3 + + hashKey="${arch}-${os}_hash" + + url="https://github.com/Readarr/Readarr/releases/download/v$version/Readarr.develop.$version.$os-core-$arch.tar.gz" + hash=$(nix-prefetch-url --type sha256 $url) + sriHash="$(nix hash to-sri --type sha256 $hash)" + + sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix" +} + +updateVersion() +{ + sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix" +} + +currentVersion=$(cd $dirname && nix eval --raw -f ../../.. readarr.version) + +# We cannot use the latest releases as in the past Readarr released old version with v2.0 and then went back to 0.1 +latestTag=$(curl https://api.github.com/repos/Readarr/Readarr/releases | jq -r ".[0].tag_name") +latestVersion="$(expr $latestTag : 'v\(.*\)')" + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "Readarr is up-to-date: ${currentVersion}" + exit 0 +fi + +updateVersion $latestVersion + +updateHash $latestVersion x64 linux +updateHash $latestVersion arm64 linux +updateHash $latestVersion x64 osx + diff --git a/third_party/nixpkgs/pkgs/servers/redpanda/default.nix b/third_party/nixpkgs/pkgs/servers/redpanda/default.nix index c59aa621cc..fde3454dd3 100644 --- a/third_party/nixpkgs/pkgs/servers/redpanda/default.nix +++ b/third_party/nixpkgs/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "22.3.13"; + version = "23.1.1"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-cUQFDXWnQYSLcfKFYg6BLrxF77iX+Yx3hcul4tMxdoc="; + sha256 = "sha256-3IRhr+XQLZXCeKhUHOlE8REwUkxLw1jcHYIataG3BaM="; }; server = callPackage ./server.nix { inherit src version; }; in @@ -21,7 +21,7 @@ buildGoModule rec { inherit doCheck src version; modRoot = "./src/go/rpk"; runVend = false; - vendorSha256 = "sha256-JVZuHRh3gavIGArxDkqUQsL5oBjz35EKGsC75Sy+cMo="; + vendorHash = "sha256-hG1UPy6Lp0F6y0h9Py28zRPS/s5JvoJ2P3OSOrrjz8U="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' diff --git a/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix b/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix index 526dcde57f..985f9bff5f 100644 --- a/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.21.5"; + version = "0.21.6"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - hash = "sha256-BwifUZxTM5/7UdSCN7glPU1MWLu7yBxfVAHInGLf4yA="; + hash = "sha256-b9sb5XU+wE14N4N7NELE26gSntu7wJgpneIF+T2w6WY="; }; - vendorHash = "sha256-OO4Ak+dmf6yOCZmV/lVhrHnseWoi2MysUh+NKpwrZxI="; + vendorHash = "sha256-rKmaxsDQ6+cLp6eaw8TRjpPsNcQlPauqmX6hcslc2Wo="; # Tests need docker doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/search/qdrant/default.nix b/third_party/nixpkgs/pkgs/servers/search/qdrant/default.nix index 47e4f04bac..87a73a7e85 100644 --- a/third_party/nixpkgs/pkgs/servers/search/qdrant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/qdrant/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "qdrant"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant"; rev = "refs/tags/v${version}"; - sha256 = "sha256-AVglZr3J9fEWgE2g5UHt1j6YQud/viGp0IvuR9XRntE="; + sha256 = "sha256-r47mfyuM3z3SKbUi1bz8cz7BS/X8/tsIOAMKavNTgN4="; }; - cargoSha256 = "sha256-4hzixh1/nVIMRsBSoldmbtpcpBMmvxik3lV/h4FPOrk="; + cargoHash = "sha256-EwB0Vz0NyKCek2rn1QHqk5zpReMjP0o46ajete9KmWk="; prePatch = lib.optionalString stdenv.isAarch64 '' substituteInPlace .cargo/config.toml \ diff --git a/third_party/nixpkgs/pkgs/servers/snappymail/default.nix b/third_party/nixpkgs/pkgs/servers/snappymail/default.nix index 4309aaadf9..bdc94c57bc 100644 --- a/third_party/nixpkgs/pkgs/servers/snappymail/default.nix +++ b/third_party/nixpkgs/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.26.3"; + version = "2.26.4"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-kNfFQnUFfIS9x6da0nmm4cHK16ZTScQXOa7lL6QFBDQ="; + sha256 = "sha256-BWjkdzAm9/bvPTjsdg+Vr+gr0fqzEvARmaySth95fsI="; }; sourceRoot = "snappymail"; diff --git a/third_party/nixpkgs/pkgs/servers/spicedb/default.nix b/third_party/nixpkgs/pkgs/servers/spicedb/default.nix index ee6cb17ff0..50c6b2a5ed 100644 --- a/third_party/nixpkgs/pkgs/servers/spicedb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/spicedb/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "spicedb"; - version = "1.16.2"; + version = "1.17.0"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-OH5O0wOg36sAKWr8sFPYU8RX/S9DbbSnGJvQ1v2pXmQ="; + hash = "sha256-oTmEMFoSIW1JQIzhGxAuHW/VSZZk5FnzdLZvjhg90ZQ="; }; - vendorHash = "sha256-drnVAWMj7x8HlEQXoichgl35qW07tsk3JvXU/d1ukAc="; + vendorHash = "sha256-tIjHgEfq7kKwyQ9iCzI51ne88WrxUATYvJYcHbVX4jQ="; subPackages = [ "cmd/spicedb" ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 14078659ae..d804dc4d1d 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "2.3.0"; + version = "2.3.3"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - hash = "sha256-zl7AF+1hj6UFnf9sKO40ZTzm7edKguUYFqaT5/qf8Ic="; + hash = "sha256-+ao0J3LpEcyTon4vCRIc5629KpCYMP+xRXNqxZEJYF8="; }; buildInputs = [ postgresql ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 045e381edd..a476d3e21d 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.10.0"; + version = "2.10.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = version; - sha256 = "sha256-3Pne4L9P8mJv2ja6EpxtpCBCYvlCP6D5CzDtkkvE23c="; + sha256 = "sha256-D0jo1Z9hpaJBFJQhypo76cKaahNF498OLDco2YNktA8="; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix new file mode 100644 index 0000000000..d672928cd3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix @@ -0,0 +1,42 @@ +{ lib +, fetchFromGitHub +, buildPgxExtension +, postgresql +, stdenv +, nixosTests +}: + +buildPgxExtension rec { + inherit postgresql; + + pname = "timescaledb_toolkit"; + version = "1.14.0"; + + src = fetchFromGitHub { + owner = "timescale"; + repo = "timescaledb-toolkit"; + rev = version; + sha256 = "sha256-ADmYALsCzZGqTX0XSkCif7ndvXwa8nEqddQpty4hbZ0="; + }; + + cargoSha256 = "sha256-ukjJ11LmfG+k8D20rj68i43gOWUN80nf3hIAjUWXihI="; + buildAndTestSubdir = "extension"; + + passthru.tests = { + timescaledb_toolkit = nixosTests.timescaledb; + }; + + # tests take really long + doCheck = false; + + meta = with lib; { + description = "Provide additional tools to ease all things analytic when using TimescaleDB"; + homepage = "https://github.com/timescale/timescaledb-toolkit"; + maintainers = with maintainers; [ typetetris ]; + platforms = postgresql.meta.platforms; + license = licenses.asl20; + + # as it needs to be used with timescaledb, simply use the condition from there + broken = versionOlder postgresql.version "12"; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix index 2bf9db061a..b6fc6480ae 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix @@ -56,6 +56,8 @@ self: super: { timescaledb = super.callPackage ./ext/timescaledb.nix { }; + timescaledb_toolkit = super.callPackage ./ext/timescaledb_toolkit.nix { }; + tsearch_extras = super.callPackage ./ext/tsearch_extras.nix { }; tds_fdw = super.callPackage ./ext/tds_fdw.nix { }; diff --git a/third_party/nixpkgs/pkgs/servers/static-web-server/default.nix b/third_party/nixpkgs/pkgs/servers/static-web-server/default.nix index 0e0c84e97d..a390dab526 100644 --- a/third_party/nixpkgs/pkgs/servers/static-web-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/static-web-server/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "static-web-server"; - version = "2.14.2"; + version = "2.15.0"; src = fetchFromGitHub { owner = "static-web-server"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c+bPe1t7Nhpx5fwwpLYtsuzxleLd4b1SwBFBaySmLOg="; + sha256 = "sha256-TzMXVwtvslM57ucHT5NHMjsLex2VjuvyqP9gMdQXfFs="; }; - cargoSha256 = "sha256-K+YXl1SFVe6aBt663QXlQFD8jB5pvlLwNqUvUP+5aU8="; + cargoSha256 = "sha256-sx6zlSpJNeLpmM64eyhKI7M422dEBaud7q4iz4zmmf0="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/servers/sunshine/default.nix b/third_party/nixpkgs/pkgs/servers/sunshine/default.nix index dedd9daf67..21ffb28a25 100644 --- a/third_party/nixpkgs/pkgs/servers/sunshine/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sunshine/default.nix @@ -1,7 +1,10 @@ { lib , stdenv +, callPackage , fetchFromGitHub +, fetchurl , autoPatchelfHook +, makeWrapper , buildNpmPackage , cmake , avahi @@ -11,7 +14,7 @@ , libxcb , openssl , libopus -, ffmpeg-full +, ffmpeg_5-full , boost , pkg-config , libdrm @@ -23,19 +26,29 @@ , libva , libvdpau , numactl +, amf-headers +, svt-av1 +, vulkan-loader , cudaSupport ? false , cudaPackages ? {} }: - +let + libcbs = callPackage ./libcbs.nix { }; + # get cmake file used to find external ffmpeg from previous sunshine version + findFfmpeg = fetchurl { + url = "https://raw.githubusercontent.com/LizardByte/Sunshine/6702802829869547708dfec98db5b8cbef39be89/cmake/FindFFMPEG.cmake"; + sha256 = "sha256:1hl3sffv1z8ghdql5y9flk41v74asvh23y6jmaypll84f1s6k1xa"; + }; +in stdenv.mkDerivation rec { pname = "sunshine"; - version = "0.16.0"; + version = "0.18.4"; src = fetchFromGitHub { owner = "LizardByte"; repo = "Sunshine"; rev = "v${version}"; - sha256 = "sha256-o489IPza1iLoe74Onn2grP5oeNy0ZYdrvBoMEWlbwCE="; + sha256 = "sha256-nPUWBka/fl1oTB0vTv6qyL7EHh7ptFnxwfV/jYtloTc="; fetchSubmodules = true; }; @@ -46,8 +59,7 @@ stdenv.mkDerivation rec { ui = buildNpmPackage { inherit src version; pname = "sunshine-ui"; - sourceRoot = "source/src_assets/common/assets/web"; - npmDepsHash = "sha256-fg/turcpPMHUs6GBwSoJl4Pxua/lGfCA1RzT1R5q53M="; + npmDepsHash = "sha256-k8Vfi/57AbGxYFPYSNh8bv4KqHnZjk3BDp8SJQHzuR8="; dontNpmBuild = true; @@ -66,13 +78,15 @@ stdenv.mkDerivation rec { cmake pkg-config autoPatchelfHook + makeWrapper ] ++ lib.optionals cudaSupport [ cudaPackages.autoAddOpenGLRunpathHook ]; buildInputs = [ + libcbs avahi - ffmpeg-full + ffmpeg_5-full libevdev libpulseaudio xorg.libX11 @@ -94,6 +108,8 @@ stdenv.mkDerivation rec { libvdpau numactl mesa + amf-headers + svt-av1 ] ++ lib.optionals cudaSupport [ cudaPackages.cudatoolkit ]; @@ -117,16 +133,24 @@ stdenv.mkDerivation rec { ]; postPatch = '' - # Don't force the need for a static boost, fix hardcoded libevdev path + # fix hardcoded libevdev path substituteInPlace CMakeLists.txt \ - --replace 'set(Boost_USE_STATIC_LIBS ON)' '# set(Boost_USE_STATIC_LIBS ON)' \ --replace '/usr/include/libevdev-1.0' '${libevdev}/include/libevdev-1.0' + + # add FindFFMPEG to source tree + cp ${findFfmpeg} cmake/FindFFMPEG.cmake ''; preBuild = '' # copy node_modules where they can be picked up by build - mkdir -p ../src_assets/common/assets/web/node_modules - cp -r ${ui}/node_modules/* ../src_assets/common/assets/web/node_modules + mkdir -p ../node_modules + cp -r ${ui}/node_modules/* ../node_modules + ''; + + # allow Sunshine to find libvulkan + postFixup = lib.optionalString cudaSupport '' + wrapProgram $out/bin/sunshine \ + --set LD_LIBRARY_PATH ${lib.makeLibraryPath [ vulkan-loader ]} ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/sunshine/ffmpeg.diff b/third_party/nixpkgs/pkgs/servers/sunshine/ffmpeg.diff index 66fd6c9c15..b34cd9cc2c 100644 --- a/third_party/nixpkgs/pkgs/servers/sunshine/ffmpeg.diff +++ b/third_party/nixpkgs/pkgs/servers/sunshine/ffmpeg.diff @@ -1,49 +1,73 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index fad60ef..64b68ae 100644 +index 1842c67..8afd0e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -212,6 +212,8 @@ else() - set(WAYLAND_FOUND OFF) - endif() +@@ -280,6 +280,8 @@ else() + set(WAYLAND_FOUND OFF) + endif() -+ find_package(FFMPEG REQUIRED) ++ find_package(FFMPEG REQUIRED) + - if(X11_FOUND) - add_compile_definitions(SUNSHINE_BUILD_X11) - include_directories(${X11_INCLUDE_DIR}) -@@ -372,35 +374,6 @@ set(SUNSHINE_TARGET_FILES - - set_source_files_properties(src/upnp.cpp PROPERTIES COMPILE_FLAGS -Wno-pedantic) + if(X11_FOUND) + add_compile_definitions(SUNSHINE_BUILD_X11) + include_directories(${X11_INCLUDE_DIR}) +@@ -451,51 +453,12 @@ set_source_files_properties(src/upnp.cpp PROPERTIES COMPILE_FLAGS -Wno-pedantic) + set_source_files_properties(third-party/nanors/rs.c + PROPERTIES COMPILE_FLAGS "-include deps/obl/autoshim.h -ftree-vectorize") -# Pre-compiled binaries -if(WIN32) -- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-windows-x86_64") -- set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid) +- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-windows-x86_64") +- set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid mfx) -elseif(APPLE) -- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-macos-x86_64") +- if (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") +- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-macos-aarch64") +- else() +- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-macos-x86_64") +- endif() -else() -- if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") -- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-linux-aarch64") -- else() -- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-linux-x86_64") -- endif() -- set(FFMPEG_PLATFORM_LIBRARIES va va-drm va-x11 vdpau X11) +- set(FFMPEG_PLATFORM_LIBRARIES va va-drm va-x11 vdpau X11) +- if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") +- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-linux-aarch64") +- else() +- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-linux-x86_64") +- list(APPEND FFMPEG_PLATFORM_LIBRARIES mfx) +- set(CPACK_DEB_PLATFORM_PACKAGE_DEPENDS "libmfx1,") +- set(CPACK_RPM_PLATFORM_PACKAGE_REQUIRES "intel-mediasdk >= 22.3.0,") +- endif() -endif() -set(FFMPEG_INCLUDE_DIRS -- ${FFMPEG_PREPARED_BINARIES}/include) +- ${FFMPEG_PREPARED_BINARIES}/include) -if(EXISTS ${FFMPEG_PREPARED_BINARIES}/lib/libhdr10plus.a) -- set(HDR10_PLUS_LIBRARY -- ${FFMPEG_PREPARED_BINARIES}/lib/libhdr10plus.a) +- set(HDR10_PLUS_LIBRARY +- ${FFMPEG_PREPARED_BINARIES}/lib/libhdr10plus.a) -endif() -set(FFMPEG_LIBRARIES -- ${FFMPEG_PREPARED_BINARIES}/lib/libavcodec.a -- ${FFMPEG_PREPARED_BINARIES}/lib/libavutil.a -- ${FFMPEG_PREPARED_BINARIES}/lib/libswscale.a -- ${FFMPEG_PREPARED_BINARIES}/lib/libx264.a -- ${FFMPEG_PREPARED_BINARIES}/lib/libx265.a -- ${HDR10_PLUS_LIBRARY} -- ${FFMPEG_PLATFORM_LIBRARIES}) +- ${FFMPEG_PREPARED_BINARIES}/lib/libavcodec.a +- ${FFMPEG_PREPARED_BINARIES}/lib/libavutil.a +- ${FFMPEG_PREPARED_BINARIES}/lib/libcbs.a +- ${FFMPEG_PREPARED_BINARIES}/lib/libSvtAv1Enc.a +- ${FFMPEG_PREPARED_BINARIES}/lib/libswscale.a +- ${FFMPEG_PREPARED_BINARIES}/lib/libx264.a +- ${FFMPEG_PREPARED_BINARIES}/lib/libx265.a +- ${HDR10_PLUS_LIBRARY} +- ${FFMPEG_PLATFORM_LIBRARIES}) - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/third-party + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/third-party + ${CMAKE_CURRENT_SOURCE_DIR}/third-party/moonlight-common-c/enet/include + ${CMAKE_CURRENT_SOURCE_DIR}/third-party/nanors + ${CMAKE_CURRENT_SOURCE_DIR}/third-party/nanors/deps/obl +- ${FFMPEG_INCLUDE_DIRS} + ${PLATFORM_INCLUDE_DIRS} + ) + +@@ -529,6 +492,7 @@ list(APPEND SUNSHINE_EXTERNAL_LIBRARIES + ${CMAKE_THREAD_LIBS_INIT} + enet + opus ++ cbs + ${FFMPEG_LIBRARIES} + ${Boost_LIBRARIES} + ${OPENSSL_LIBRARIES} diff --git a/third_party/nixpkgs/pkgs/servers/sunshine/libcbs.nix b/third_party/nixpkgs/pkgs/servers/sunshine/libcbs.nix new file mode 100644 index 0000000000..566c28123a --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sunshine/libcbs.nix @@ -0,0 +1,48 @@ +{ stdenv +, fetchFromGitHub +, cmake +, nasm +}: +stdenv.mkDerivation { + pname = "libcbs"; + version = "unstable-2022-02-07"; + + src = fetchFromGitHub { + owner = "LizardByte"; + repo = "build-deps"; + # repo is not versioned -- used latest commit combined with sunshine release + rev = "d6e889188ca10118d769ee1ee3cddf9cf485642b"; + fetchSubmodules = true; + sha256 = "sha256-6xQDJey5JrZXyZxS/yhUBvFi6UD5MsQ3uVtUFrG09Vc="; + }; + + nativeBuildInputs = [ + cmake + nasm + ]; + + # modify paths to allow patches to be applied directly by derivation + prePatch = '' + substituteInPlace ffmpeg_patches/cbs/* \ + --replace 'a/libavcodec' 'a/ffmpeg_sources/ffmpeg/libavcodec' \ + --replace 'b/libavcodec' 'b/ffmpeg_sources/ffmpeg/libavcodec' \ + --replace 'a/libavutil' 'a/ffmpeg_sources/ffmpeg/libavutil' \ + --replace 'b/libavutil' 'b/ffmpeg_sources/ffmpeg/libavutil' + + substituteInPlace cmake/ffmpeg_cbs.cmake \ + --replace '--enable-static' '--enable-shared --enable-pic' \ + --replace 'add_library(cbs' 'add_library(cbs SHARED' \ + --replace 'libcbs.a' 'libcbs.so' + ''; + + patches = [ + "ffmpeg_patches/cbs/01-explicit-intmath.patch" + "ffmpeg_patches/cbs/02-include-cbs-config.patch" + "ffmpeg_patches/cbs/03-remove-register.patch" + "ffmpeg_patches/cbs/04-size-specifier.patch" + ]; + + CFLAGS = [ + "-Wno-format-security" + ]; +} diff --git a/third_party/nixpkgs/pkgs/servers/sunshine/package-lock.json b/third_party/nixpkgs/pkgs/servers/sunshine/package-lock.json index 34102859f3..41f61a5f0a 100644 --- a/third_party/nixpkgs/pkgs/servers/sunshine/package-lock.json +++ b/third_party/nixpkgs/pkgs/servers/sunshine/package-lock.json @@ -1,19 +1,19 @@ { - "name": "web", + "name": "Sunshine", "lockfileVersion": 2, "requires": true, "packages": { "": { "dependencies": { - "@fortawesome/fontawesome-free": "6.2.0", - "bootstrap": "5.0.0", + "@fortawesome/fontawesome-free": "6.2.1", + "bootstrap": "5.2.3", "vue": "2.6.12" } }, "node_modules/@fortawesome/fontawesome-free": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz", - "integrity": "sha512-CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz", + "integrity": "sha512-viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A==", "hasInstallScript": true, "engines": { "node": ">=6" @@ -30,15 +30,21 @@ } }, "node_modules/bootstrap": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0.tgz", - "integrity": "sha512-tmhPET9B9qCl8dCofvHeiIhi49iBt0EehmIsziZib65k1erBW1rHhj2s/2JsuQh5Pq+xz2E9bEbzp9B7xHG+VA==", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/bootstrap" - }, + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz", + "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/twbs" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + } + ], "peerDependencies": { - "@popperjs/core": "^2.9.2" + "@popperjs/core": "^2.11.6" } }, "node_modules/vue": { @@ -49,9 +55,9 @@ }, "dependencies": { "@fortawesome/fontawesome-free": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz", - "integrity": "sha512-CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ==" + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz", + "integrity": "sha512-viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A==" }, "@popperjs/core": { "version": "2.11.6", @@ -60,9 +66,9 @@ "peer": true }, "bootstrap": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0.tgz", - "integrity": "sha512-tmhPET9B9qCl8dCofvHeiIhi49iBt0EehmIsziZib65k1erBW1rHhj2s/2JsuQh5Pq+xz2E9bEbzp9B7xHG+VA==", + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz", + "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==", "requires": {} }, "vue": { diff --git a/third_party/nixpkgs/pkgs/servers/syncstorage-rs/default.nix b/third_party/nixpkgs/pkgs/servers/syncstorage-rs/default.nix index e71d71dc78..da6bc19d8b 100644 --- a/third_party/nixpkgs/pkgs/servers/syncstorage-rs/default.nix +++ b/third_party/nixpkgs/pkgs/servers/syncstorage-rs/default.nix @@ -21,13 +21,13 @@ in rustPlatform.buildRustPackage rec { pname = "syncstorage-rs"; - version = "0.13.5"; + version = "0.13.6"; src = fetchFromGitHub { owner = "mozilla-services"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-eFrrZ/+8OsmIfCEoXPAKqVkZlgN8sfXueJQvQN8VCB0="; + hash = "sha256-LCMbhFoxi/fYaivW5gNyDhfytW/avhrrd29fXobSxJU="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { --prefix PATH : ${lib.makeBinPath [ pyFxADeps ]} ''; - cargoHash = "sha256-SgOxXzI6IZcP5Q06Aj5Pv6Rrvb7xVShUcGaViLuESOw="; + cargoHash = "sha256-OPPU1SKR+zNmJ1NNAv4B3C9FOF/Ddg53genUkVwNgSs="; buildFeatures = [ "grpcio/openssl" ]; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/changedetection-io/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/changedetection-io/default.nix index cb7d703b5c..9b1810fab8 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/changedetection-io/default.nix @@ -3,60 +3,40 @@ , fetchurl , python3 }: -let - py = python3.override { - packageOverrides = final: prev: { - flask = prev.flask.overridePythonAttrs (old: rec { - version = "2.1.3"; - src = old.src.override { - inherit version; - sha256 = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss="; - }; - }); - flask-restful = prev.flask-restful.overridePythonAttrs (old: rec { - disabledTests = old.disabledTests or [ ] ++ [ - # fails because of flask or werkzeug downgrade - "test_redirect" - ]; - }); - werkzeug = prev.werkzeug.overridePythonAttrs (old: rec { - version = "2.0.3"; - src = old.src.override { - inherit version; - sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw="; - }; - }); - }; - }; -in -py.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.39.22.1"; + version = "0.40.3"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; rev = version; - sha256 = "sha256-qK44m64/skmeoBgHToTyOpeWUF2kgks10OHoAoLim+k="; + sha256 = "sha256-RYxhkCSL17rU3C4rOArYptmYpdK/CDPw9xfXkKja2xs="; }; postPatch = '' substituteInPlace requirements.txt \ - --replace "bs4" "beautifulsoup4" \ --replace "cryptography~=3.4" "cryptography" \ - --replace "selenium~=4.1.0" "selenium" + --replace "dnspython<2.3.0" "dnspython" \ + --replace "pytest ~=6.2" "" \ + --replace "pytest-flask ~=1.2" "" \ + --replace "selenium~=4.1.0" "selenium" \ + --replace "werkzeug~=2.0.0" "werkzeug" ''; - propagatedBuildInputs = with py.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ apprise beautifulsoup4 brotli chardet cryptography + dnspython eventlet feedgen flask + flask-compress + flask-expects-json flask-login flask-restful flask-wtf @@ -83,7 +63,7 @@ py.pkgs.buildPythonApplication rec { # tests can currently not be run in one pytest invocation and without docker doCheck = false; - nativeCheckInputs = with py.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest-flask pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix index eee76b1bf5..ed67fc57e9 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix @@ -3,14 +3,15 @@ let phpExt = php.withExtensions ({ enabled, all }: with all; [ filter mysqlnd mysqli pdo pdo_mysql ]); -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "engelsystem"; - version = "3.1.0"; + version = "3.3.0"; src = fetchzip { url = - "https://github.com/engelsystem/engelsystem/releases/download/v3.1.0/engelsystem-v3.1.0.zip"; - sha256 = "01wra7li7n5kn1l6xkrmw4vlvvyqh089zs43qzn98hj0mw8gw7ai"; + "https://github.com/engelsystem/engelsystem/releases/download/v3.3.0/engelsystem-v3.3.0.zip"; + hash = "sha256-DS0klm26udXsiiFToeOJooA1WUR8gk0qf/UJL8E77ps="; }; buildInputs = [ phpExt ]; @@ -20,7 +21,6 @@ in stdenv.mkDerivation rec { # prepare rm -r ./storage/ - rm -r ./docker/ ln -sf /etc/engelsystem/config.php ./config/config.php ln -sf /var/lib/engelsystem/storage/ ./storage @@ -43,6 +43,7 @@ in stdenv.mkDerivation rec { description = "Coordinate your volunteers in teams, assign them to work shifts or let them decide for themselves when and where they want to help with what"; homepage = "https://engelsystem.de"; + changelog = "https://github.com/engelsystem/engelsystem/releases/tag/v${version}"; license = licenses.gpl2; maintainers = with maintainers; [ kloenk ]; mainProgram = "migrate"; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/nifi/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/nifi/default.nix index fafff02010..a3f6ce5fe0 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/nifi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/nifi/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre8, nixosTests }: +{ lib, stdenv, fetchzip, makeWrapper, jdk11, nixosTests }: stdenv.mkDerivation rec { pname = "nifi"; - version = "1.16.3"; + version = "1.20.0"; - src = fetchurl { - url = "https://archive.apache.org/dist/nifi/${version}/nifi-${version}-bin.tar.gz"; - sha256 = "sha256-57ZtgK1Z8G/nX2rtf7osmymvE4RukGi7CIvCvRQNKuE="; + src = fetchzip { + url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip"; + sha256 = "sha256-xeBu20AeG035nB/jUsOsAvqDtwklM+9ZsZlJoAZ4iu4="; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre8 ]; + buildInputs = [ jdk11 ]; installPhase = '' mv ../$sourceRoot $out @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/nifi.sh \ --replace "/bin/sh" "${stdenv.shell}" substituteInPlace $out/bin/nifi-env.sh \ - --replace "#export JAVA_HOME=/usr/java/jdk1.8.0/" "export JAVA_HOME=${jre8}" + --replace "#export JAVA_HOME=/usr/java/jdk1.8.0/" "export JAVA_HOME=${jdk11}" ''; passthru = { diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/api.nix b/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/api.nix index 7dd98c553f..76947cdddf 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/api.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/api.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "vikunja-api"; - version = "0.20.2"; + version = "0.20.4"; src = fetchFromGitea { domain = "kolaente.dev"; owner = "vikunja"; repo = "api"; rev = "v${version}"; - sha256 = "sha256-VSzjP6fC9zxUnY3ZhapRUXUS4V7+BVvXJKrxm71CK4o="; + hash = "sha256-SkZf8LFU4/HFEWVEEj7Gl2jVwIL834GRwyua4cw9nh4="; }; nativeBuildInputs = @@ -24,7 +24,7 @@ buildGoModule rec { ''; in [ fakeGit mage ]; - vendorSha256 = "sha256-8qaEMHBZcop1wH3tmNKAAMEYA4qrE6dlwxhRsCDeZaY="; + vendorSha256 = "sha256-TY6xJnz6phIrybZ2Ix7xwuMzGQ1f0xk0KwgPnaTaKYw="; # checks need to be disabled because of needed internet for some checks doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/frontend.nix b/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/frontend.nix index 14787835f7..40dbca76cc 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/frontend.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/frontend.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "vikunja-frontend"; - version = "0.20.3"; + version = "0.20.5"; src = fetchurl { url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip"; - sha256 = "sha256-+VtdgbJaXcPlO70Gqsur6osBb7iAvVnPv2iaHbs2Rmk="; + hash = "sha256-fUWMlayE8pxVBGloLrywVAFCXF/3vlrz/CHjHNBa7U8="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix index 97f8ce4a71..6333125a74 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix @@ -896,7 +896,7 @@ self: with self; { builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libX11-1.8.4.tar.xz"; - sha256 = "sha256-yaKHpa76mATOPPr89Rb+lu0/fo5FwOLuWehMhnV99Rg="; + sha256 = "067mgmsqck78b7pf5h25irz3zvcnzqbgbz7s7k70967smsjqg8n9"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1356,11 +1356,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXxf86vm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { pname = "libXxf86vm"; - version = "1.1.4"; + version = "1.1.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2"; - sha256 = "0mydhlyn72i7brjwypsqrpkls3nm6vxw0li8b2nw0caz7kwjgvmg"; + url = "mirror://xorg/individual/lib/libXxf86vm-1.1.5.tar.xz"; + sha256 = "1rw8z01vgfc4wvf0q75sgnj6n04dkrw1w7z455qydrz0nd4fyzr4"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3052,11 +3052,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xkbcomp = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { pname = "xkbcomp"; - version = "1.4.5"; + version = "1.4.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xkbcomp-1.4.5.tar.bz2"; - sha256 = "0pmhshqinwqh5rip670l3szjpywky67hv232ql6gvdj489n0hlb8"; + url = "mirror://xorg/individual/app/xkbcomp-1.4.6.tar.xz"; + sha256 = "164fqnpq80vbl7693x82h38kvxcdf668vggpg9439q21xw8xcl7s"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3328,7 +3328,7 @@ self: with self; { builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/xserver/xorg-server-21.1.7.tar.xz"; - sha256 = "sha256-2cYLLdDsUjJspqsg2w5JCx/09Wb1nKdC1lMuknlYd7s="; + sha256 = "1fvpb1wr4bjksr1ag77mcvsz87qb947dn85blrn34lpcs0nhpinr"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix index eade1460b0..7438f35e74 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix @@ -773,6 +773,7 @@ self: super: "--with-apple-applications-dir=\${out}/Applications" "--with-bundle-id-prefix=org.nixos.xquartz" "--with-sha1=CommonCrypto" + "--without-dtrace" # requires Command Line Tools for Xcode ]; preConfigure = '' mkdir -p $out/Applications diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list b/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list index 120d9b1acf..e9be26b401 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list @@ -46,7 +46,7 @@ mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 mirror://xorg/individual/app/xhost-1.0.9.tar.xz mirror://xorg/individual/app/xinit-1.4.1.tar.bz2 mirror://xorg/individual/app/xinput-1.6.3.tar.bz2 -mirror://xorg/individual/app/xkbcomp-1.4.5.tar.bz2 +mirror://xorg/individual/app/xkbcomp-1.4.6.tar.xz mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 @@ -207,7 +207,7 @@ mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2 mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2 mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2 mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 -mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2 +mirror://xorg/individual/lib/libXxf86vm-1.1.5.tar.xz mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2 mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz mirror://xorg/individual/proto/xorgproto-2021.5.tar.bz2 diff --git a/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix b/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix index cfdde9ab2d..80ff140122 100644 --- a/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix +++ b/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix @@ -57,13 +57,13 @@ let in stdenv.mkDerivation rec { pname = "zoneminder"; - version = "1.36.28"; + version = "1.36.32"; src = fetchFromGitHub { owner = "ZoneMinder"; repo = "zoneminder"; rev = version; - sha256 = "sha256-x00u7AWMNS+wAO/tdWi7GYbMZZM7XnszCO57ZDlm0J0="; + sha256 = "sha256-8iRoGpkpZVOOr0wSY9iey2x4gPfKTfUNtt5TCHCCRIQ="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/shells/bash/blesh/default.nix b/third_party/nixpkgs/pkgs/shells/bash/blesh/default.nix index 8c1fc27164..caadb94f4f 100644 --- a/third_party/nixpkgs/pkgs/shells/bash/blesh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/bash/blesh/default.nix @@ -7,7 +7,7 @@ }: stdenvNoCC.mkDerivation rec { - name = "blesh"; + pname = "blesh"; version = "unstable-2022-07-29"; src = fetchzip { diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/async-prompt.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/async-prompt.nix new file mode 100644 index 0000000000..ff3a1e6d98 --- /dev/null +++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/async-prompt.nix @@ -0,0 +1,20 @@ +{ lib, buildFishPlugin, fetchFromGitHub }: + +buildFishPlugin rec { + pname = "async-prompt"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "acomagu"; + repo = "fish-async-prompt"; + rev = "v${version}"; + hash = "sha256-B7Ze0a5Zp+5JVsQUOv97mKHh5wiv3ejsDhJMrK7YOx4="; + }; + + meta = with lib; { + description = "Make your prompt asynchronous to improve the reactivity"; + homepage = "https://github.com/acomagu/fish-async-prompt"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/autopair-fish.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/autopair-fish.nix deleted file mode 100644 index 292d492f20..0000000000 --- a/third_party/nixpkgs/pkgs/shells/fish/plugins/autopair-fish.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, buildFishPlugin, fetchFromGitHub }: - -buildFishPlugin rec { - pname = "autopair.fish"; - version = "1.0.4"; - - src = fetchFromGitHub { - owner = "jorgebucaran"; - repo = pname; - rev = version; - sha256 = "sha256-s1o188TlwpUQEN3X5MxUlD/2CFCpEkWu83U9O+wg3VU="; - }; - - meta = with lib; { - description = "Auto-complete matching pairs in the Fish command line."; - homepage = "https://github.com/jorgebucaran/autopair.fish"; - license = licenses.mit; - maintainers = with maintainers; [ thehedgeh0g ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/autopair.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/autopair.nix index d1036829bf..50b5a30b1d 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/plugins/autopair.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/autopair.nix @@ -2,19 +2,19 @@ buildFishPlugin rec { pname = "autopair"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "jorgebucaran"; repo = "autopair.fish"; rev = version; - sha256 = "sha256-l6WJ2kjDO/TnU9FSigjxk5xFp90xl68gDfggkE/wrlM="; + sha256 = "sha256-s1o188TlwpUQEN3X5MxUlD/2CFCpEkWu83U9O+wg3VU="; }; meta = with lib; { description = "Auto-complete matching pairs in the Fish command line"; homepage = "https://github.com/jorgebucaran/autopair.fish"; license = licenses.mit; - maintainers = with maintainers; [ kidonng ]; + maintainers = with maintainers; [ figsoda kidonng thehedgeh0g ]; }; } diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/default.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/default.nix index 718dbfec7a..8f8dd128c8 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/default.nix @@ -1,9 +1,9 @@ -{ lib, newScope }: +{ lib, newScope, config }: lib.makeScope newScope (self: with self; { - autopair = callPackage ./autopair.nix { }; + async-prompt = callPackage ./async-prompt.nix { }; - autopair-fish = callPackage ./autopair-fish.nix { }; + autopair = callPackage ./autopair.nix { }; buildFishPlugin = callPackage ./build-fish-plugin.nix { }; @@ -41,4 +41,6 @@ lib.makeScope newScope (self: with self; { sponge = callPackage ./sponge.nix { }; tide = callPackage ./tide.nix { }; +} // lib.optionalAttrs config.allowAliases { + autopair-fish = self.autopair; # Added 2023-03-10 }) diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix index e1355062dd..f07d17e00f 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage ( let - version = "0.76.0"; + version = "0.77.0"; pname = "nushell"; in { inherit version pname; @@ -35,10 +35,10 @@ rustPlatform.buildRustPackage ( owner = pname; repo = pname; rev = version; - sha256 = "sha256-dGsnbKsg0nQFFXZDRDei2uGhGWEQSeSHGpXJp+8QUC8="; + sha256 = "sha256-cffAxuM12wdd7IeLbKSpL6dpvpZVscA8nMOh3jFqY3E="; }; - cargoSha256 = "sha256-9oXMojQA4tSoIxY1lwMPGhQz3WHcxEKtwl+4LsAYbDo="; + cargoSha256 = "sha256-OcYE9d3hO3JtxF3REWev0Rz97Kr9l7P7nUxhIb5fhi0="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] diff --git a/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix index 0671964884..f973e7125c 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spaceship-prompt"; - version = "4.13.2"; + version = "4.13.3"; src = fetchFromGitHub { owner = "denysdovhan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mCztJ35HTsbN7Uv6ivnAC6+CAPBt8lujNci2HD1oax4="; + sha256 = "sha256-uFmGld5paCLNnE9yWgBLtthEBfwwMzlGCJFX6KqGJdw="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/stdenv/adapters.nix b/third_party/nixpkgs/pkgs/stdenv/adapters.nix index 8ff64ff9a3..43fa87d14d 100644 --- a/third_party/nixpkgs/pkgs/stdenv/adapters.nix +++ b/third_party/nixpkgs/pkgs/stdenv/adapters.nix @@ -189,6 +189,28 @@ rec { }); }); + useMoldLinker = stdenv: let + bintools = stdenv.cc.bintools.override { + extraBuildCommands = '' + wrap ld.mold ${../build-support/bintools-wrapper/ld-wrapper.sh} ${pkgs.mold}/bin/ld.mold + wrap ld ${../build-support/bintools-wrapper/ld-wrapper.sh} ${pkgs.mold}/bin/ld.mold + ''; + }; + in stdenv.override (old: { + cc = stdenv.cc.override { + inherit bintools; + }; + allowedRequisites = + lib.mapNullable (rs: rs ++ [ bintools pkgs.mold (lib.getLib pkgs.mimalloc) (lib.getLib pkgs.openssl) ]) (stdenv.allowedRequisites or null); + # gcc >12.1.0 supports '-fuse-ld=mold' + # the wrap ld above in bintools supports gcc <12.1.0 and shouldn't harm >12.1.0 + # https://github.com/rui314/mold#how-to-use + } // lib.optionalAttrs (stdenv.cc.isClang || (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12")) { + mkDerivationFromStdenv = extendMkDerivationArgs old (args: { + NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -fuse-ld=mold"; + }); + }); + /* Modify a stdenv so that it builds binaries optimized specifically for the machine they are built on. 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 2cc44b319f..5433e7afec 100644 --- a/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -37,8 +37,7 @@ in rec { build = stdenv.mkDerivation { name = "stdenv-bootstrap-tools"; - nativeBuildInputs = [ buildPackages.nukeReferences buildPackages.cpio ] - ++ lib.optionals targetPlatform.isAarch64 [ buildPackages.darwin.sigtool ]; + nativeBuildInputs = [ nukeReferences dumpnar ]; buildCommand = '' mkdir -p $out/bin $out/lib $out/lib/system $out/lib/darwin @@ -49,20 +48,21 @@ in rec { # Resolv is actually a link to another package, so let's copy it properly cp -L ${lib.getLib darwin.Libsystem}/lib/libresolv.9.dylib $out/lib - - cp -rL ${darwin.Libsystem}/include $out - chmod -R u+w $out/include - cp -rL ${darwin.ICU}/include* $out/include - cp -rL ${libiconv}/include/* $out/include - cp -rL ${gnugrep.pcre.dev}/include/* $out/include - mv $out/include $out/include-Libsystem ''} + cp -rL ${darwin.Libsystem}/include $out + chmod -R u+w $out/include + cp -rL ${darwin.ICU}/include* $out/include + cp -rL ${libiconv}/include/* $out/include + cp -rL ${lib.getDev gnugrep.pcre}/include/* $out/include + mv $out/include $out/include-Libsystem + # Copy coreutils, bash, etc. cp ${coreutils_}/bin/* $out/bin (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users) cp ${bash}/bin/bash $out/bin + ln -s bash $out/bin/sh cp ${findutils}/bin/find $out/bin cp ${findutils}/bin/xargs $out/bin cp -d ${diffutils}/bin/* $out/bin @@ -73,9 +73,11 @@ in rec { cp ${gnutar}/bin/tar $out/bin cp ${gzip}/bin/.gzip-wrapped $out/bin/gzip cp ${bzip2_.bin}/bin/bzip2 $out/bin + ln -s bzip2 $out/bin/bunzip2 cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin cp -d ${xz.bin}/bin/xz $out/bin + cp ${cpio}/bin/cpio $out/bin # This used to be in-nixpkgs, but now is in the bundle # because I can't be bothered to make it partially static @@ -114,11 +116,9 @@ in rec { cp -d ${lib.getLib pkgs.xar}/lib/libxar*.dylib $out/lib cp -d ${pkgs.bzip2.out}/lib/libbz2*.dylib $out/lib - ${lib.optionalString targetPlatform.isAarch64 '' - # copy sigtool - cp -d ${pkgs.darwin.sigtool}/bin/sigtool $out/bin - cp -d ${pkgs.darwin.sigtool}/bin/codesign $out/bin - ''} + # copy sigtool + cp -d ${pkgs.darwin.sigtool}/bin/sigtool $out/bin + cp -d ${pkgs.darwin.sigtool}/bin/codesign $out/bin cp -d ${lib.getLib darwin.ICU}/lib/libicu*.dylib $out/lib cp -d ${zlib.out}/lib/libz.* $out/lib @@ -132,8 +132,9 @@ in rec { cp -d ${lib.getLib darwin.libtapi}/lib/libtapi* $out/lib - ${lib.optionalString targetPlatform.isx86_64 '' - cp -rd ${pkgs.darwin.CF}/Library $out + cp -rd ${pkgs.darwin.CF}/Library $out + ${lib.optionalString stdenv.targetPlatform.isAarch64 '' + cp -rd ${pkgs.darwin.libobjc}/lib/* $out/lib/ ''} chmod -R u+w $out @@ -150,46 +151,44 @@ in rec { # Strip executables even further for i in $out/bin/*; do - if test -x $i -a ! -L $i; then + if [[ ! -L $i ]]; then chmod +w $i ${stdenv.cc.targetPrefix}strip $i || true fi done - for i in $out/bin/* $out/lib/*.dylib $out/lib/darwin/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do - if test -x "$i" -a ! -L "$i"; then - echo "Adding rpath to $i" + for i in $out/bin/* $out/lib/*.dylib $out/lib/darwin/*.dylib; do + if [[ ! -L "$i" ]]; then rpathify $i fi done for i in $out/bin/*; do - if test -x "$i" -a ! -L "$i"; then - echo "Adding @executable_path to rpath in $i" + if [[ ! -L "$i" ]]; then ${stdenv.cc.targetPrefix}install_name_tool -add_rpath '@executable_path/../lib' $i fi done + ${if stdenv.targetPlatform.isx86_64 then '' + rpathify $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation + '' else '' + sed -i -e 's|/nix/store/.*/libobjc.A.dylib|@executable_path/../libobjc.A.dylib|g' \ + $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation.tbd + ''} + nuke-refs $out/lib/* nuke-refs $out/lib/system/* nuke-refs $out/lib/darwin/* - nuke-refs $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation + ${lib.optionalString stdenv.targetPlatform.isx86_64 '' + nuke-refs $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation + ''} mkdir $out/.pack mv $out/* $out/.pack mv $out/.pack $out/pack mkdir $out/on-server - cp ${stdenv.shell} $out/on-server/sh - cp ${cpio}/bin/cpio $out/on-server - cp ${coreutils_}/bin/mkdir $out/on-server - cp ${bzip2_.bin}/bin/bzip2 $out/on-server - - chmod u+w $out/on-server/* - ${stdenv.cc.targetPrefix}strip $out/on-server/* - nuke-refs $out/on-server/* - - (cd $out/pack && (find | cpio -o -H newc)) | bzip2 > $out/on-server/bootstrap-tools.cpio.bz2 + dumpnar $out/pack | ${xz}/bin/xz > $out/on-server/bootstrap-tools.nar.xz ''; allowedReferences = []; @@ -204,98 +203,42 @@ in rec { buildCommand = '' mkdir -p $out/nix-support - echo "file tarball ${build}/on-server/bootstrap-tools.cpio.bz2" >> $out/nix-support/hydra-build-products - echo "file sh ${build}/on-server/sh" >> $out/nix-support/hydra-build-products - echo "file cpio ${build}/on-server/cpio" >> $out/nix-support/hydra-build-products - echo "file mkdir ${build}/on-server/mkdir" >> $out/nix-support/hydra-build-products - echo "file bzip2 ${build}/on-server/bzip2" >> $out/nix-support/hydra-build-products + echo "file tools ${build}/on-server/bootstrap-tools.nar.xz" >> $out/nix-support/hydra-build-products ''; }; bootstrapLlvmVersion = llvmPackages.llvm.version; bootstrapFiles = { - sh = "${build}/on-server/sh"; - bzip2 = "${build}/on-server/bzip2"; - mkdir = "${build}/on-server/mkdir"; - cpio = "${build}/on-server/cpio"; - tarball = "${build}/on-server/bootstrap-tools.cpio.bz2"; + tools = "${build}/pack"; }; - unpack = stdenv.mkDerivation (bootstrapFiles // { - name = "unpack"; + bootstrapTools = derivation { + inherit system; - # This is by necessity a near-duplicate of unpack-bootstrap-tools.sh. If we refer to it directly, + name = "bootstrap-tools"; + builder = "${bootstrapFiles.tools}/bin/bash"; + + # This is by necessity a near-duplicate of patch-bootstrap-tools.sh. If we refer to it directly, # we can't make any changes to it due to our testing stdenv depending on it. Think of this as the - # unpack-bootstrap-tools.sh for the next round of bootstrap tools. - # TODO: think through alternate designs, such as hosting this script as an output of the process. - buildCommand = '' - # Unpack the bootstrap tools tarball. - echo Unpacking the bootstrap tools... - $mkdir $out - $bzip2 -d < $tarball | (cd $out && $cpio -i) + # patch-bootstrap-tools.sh for the next round of bootstrap tools. + args = [ ./patch-bootstrap-tools-next.sh ]; - # Set the ELF interpreter / RPATH in the bootstrap binaries. - echo Patching the tools... - - export PATH=$out/bin - - for i in $out/bin/*; do - if ! test -L $i; then - echo patching $i - install_name_tool -add_rpath $out/lib $i || true - fi - done - - ln -s libresolv.9.dylib $out/lib/libresolv.dylib - - for i in $out/lib/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do - if test ! -L "$i" -a "$i" != "$out/lib/libSystem*.dylib"; then - echo "Patching $i" - - id=$(otool -D "$i" | tail -n 1) - install_name_tool -id "$(dirname $i)/$(basename $id)" $i - - libs=$(otool -L "$i" | tail -n +2 | grep -v libSystem | cat) - if [ -n "$libs" ]; then - install_name_tool -add_rpath $out/lib $i - fi - fi - done - - ln -s bash $out/bin/sh - ln -s bzip2 $out/bin/bunzip2 - - # Provide a gunzip script. - cat > $out/bin/gunzip < $out/bin/egrep - echo "exec $out/bin/grep -E \"\$@\"" >> $out/bin/egrep - echo "#! $out/bin/sh" > $out/bin/fgrep - echo "exec $out/bin/grep -F \"\$@\"" >> $out/bin/fgrep - - cat >$out/bin/dsymutil << EOF - #!$out/bin/sh - EOF - - chmod +x $out/bin/egrep $out/bin/fgrep $out/bin/dsymutil - ''; + inherit (bootstrapFiles) tools; allowedReferences = [ "out" ]; - }); + }; test = stdenv.mkDerivation { name = "test"; - realBuilder = "${unpack}/bin/bash"; + realBuilder = "${bootstrapTools}/bin/bash"; + tools = bootstrapTools; buildCommand = '' - export PATH=${unpack}/bin + # Create a pure environment where we use just what's in the bootstrap tools. + export PATH=$tools/bin + ls -l mkdir $out mkdir $out/bin @@ -313,14 +256,12 @@ in rec { # an SSL-capable curl curl --version | grep SSL - ${build}/on-server/sh -c 'echo Hello World' - # This approximates a bootstrap version of libSystem can that be # assembled via fetchurl. Adapted from main libSystem expression. mkdir libSystem-boot cp -vr \ - ${darwin.darwin-stubs}/usr/lib/libSystem.B.tbd \ - ${darwin.darwin-stubs}/usr/lib/system \ + ${stdenv.cc.libc_dev}/lib/libSystem.B.tbd \ + ${stdenv.cc.libc_dev}/lib/system \ libSystem-boot substituteInPlace libSystem-boot/libSystem.B.tbd \ @@ -328,28 +269,38 @@ in rec { ln -s libSystem.B.tbd libSystem-boot/libSystem.tbd # End of bootstrap libSystem - export flags="-idirafter ${unpack}/include-Libsystem --sysroot=${unpack} -L${unpack}/lib -L$PWD/libSystem-boot" + export flags="-idirafter $tools/include-Libsystem --sysroot=$tools -L$tools/lib -L$PWD/libSystem-boot" export CPP="clang -E $flags" - export CC="clang $flags -Wl,-rpath,${unpack}/lib -Wl,-v -Wl,-sdk_version,10.10" - export CXX="clang++ $flags --stdlib=libc++ -lc++abi -isystem${unpack}/include/c++/v1 -Wl,-rpath,${unpack}/lib -Wl,-v -Wl,-sdk_version,10.10" + export CC="clang $flags -rpath $tools/lib" + export CXX="clang++ $flags --stdlib=libc++ -lc++abi -isystem$tools/include/c++/v1 -rpath $tools/lib" - echo '#include ' >> foo.c - echo '#include ' >> foo.c - echo '#include ' >> foo.c - echo 'int main() { printf("Hello World\n"); return 0; }' >> foo.c - $CC -o $out/bin/foo foo.c - $out/bin/foo + # NOTE: These tests do a separate 'install' step (using cp), because + # having clang write directly to the final location apparently will make + # running the executable fail signature verification. (SIGKILL'd) + # + # Suspect this is creating a corrupt entry in the kernel cache, but it is + # unique to cctools ld. (The problem goes away with `-fuse-ld=lld`.) - echo '#include ' >> bar.c - echo 'int main() { CFShow(CFSTR("Hullo")); return 0; }' >> bar.c - $CC -F${unpack}/Library/Frameworks -framework CoreFoundation -o $out/bin/bar bar.c - $out/bin/bar + echo '#include ' >> hello1.c + echo '#include ' >> hello1.c + echo '#include ' >> hello1.c + echo 'int main() { printf("Hello World\n"); return 0; }' >> hello1.c + $CC -o hello1 hello1.c + cp hello1 $out/bin/ + $out/bin/hello1 - echo '#include ' >> bar.cc - echo 'int main() { std::cout << "Hello World\n"; }' >> bar.cc - $CXX -v -o $out/bin/bar bar.cc - $out/bin/bar + echo '#include ' >> hello2.c + echo 'int main() { CFShow(CFSTR("Hullo")); return 0; }' >> hello2.c + $CC -F$tools/Library/Frameworks -framework CoreFoundation -o hello2 hello2.c + cp hello2 $out/bin/ + $out/bin/hello2 + + echo '#include ' >> hello3.cc + echo 'int main() { std::cout << "Hello World\n"; }' >> hello3.cc + $CXX -v -o hello3 hello3.cc + cp hello3 $out/bin/ + $out/bin/hello3 tar xvf ${hello.src} cd hello-* @@ -357,7 +308,6 @@ in rec { am_cv_func_iconv=no ./configure --prefix=$out make make install - $out/bin/hello ''; }; diff --git a/third_party/nixpkgs/pkgs/stdenv/darwin/patch-bootstrap-tools-next.sh b/third_party/nixpkgs/pkgs/stdenv/darwin/patch-bootstrap-tools-next.sh new file mode 100644 index 0000000000..a5b9edff7c --- /dev/null +++ b/third_party/nixpkgs/pkgs/stdenv/darwin/patch-bootstrap-tools-next.sh @@ -0,0 +1,38 @@ +set -euo pipefail + +export PATH=$tools/bin + +cp -R $tools $out +chmod -R u+w $out + +updateInstallName() { + local path="$1" + + cp "$path" "$path.new" + install_name_tool -id "$path" "$path.new" + codesign -f -i "$(basename "$path")" -s - "$path.new" + mv -f "$path.new" "$path" +} + +find $out/lib -type f -name '*.dylib' -print0 | while IFS= read -r -d $'\0' lib; do + updateInstallName "$lib" +done + +# Provide a gunzip script. +cat > $out/bin/gunzip < $out/bin/egrep +echo "exec $out/bin/grep -E \"\$@\"" >> $out/bin/egrep +echo "#! $out/bin/sh" > $out/bin/fgrep +echo "exec $out/bin/grep -F \"\$@\"" >> $out/bin/fgrep + +cat >$out/bin/dsymutil << EOF +#!$out/bin/sh +EOF + +chmod +x $out/bin/egrep $out/bin/fgrep $out/bin/dsymutil diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix index 6bf319d073..46b22f3373 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix @@ -171,7 +171,7 @@ let doCheck' = doCheck && stdenv.buildPlatform.canExecute stdenv.hostPlatform; doInstallCheck' = doInstallCheck && stdenv.buildPlatform.canExecute stdenv.hostPlatform; - separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux && !(stdenv.hostPlatform.useLLVM or false); + separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux; outputs' = outputs ++ lib.optional separateDebugInfo' "debug"; # Turn a derivation into its outPath without a string context attached. @@ -186,21 +186,29 @@ let ++ buildInputs ++ propagatedBuildInputs ++ depsTargetTarget ++ depsTargetTargetPropagated) == 0; dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || !stdenv.hasCC; - supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ]; + + hardeningDisable' = if lib.any (x: x == "fortify") hardeningDisable + # disabling fortify implies fortify3 should also be disabled + then lib.unique (hardeningDisable ++ [ "fortify3" ]) + else hardeningDisable; + supportedHardeningFlags = [ "fortify" "fortify3" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ]; # Musl-based platforms will keep "pie", other platforms will not. # If you change this, make sure to update section `{#sec-hardening-in-nixpkgs}` # in the nixpkgs manual to inform users about the defaults. - defaultHardeningFlags = if stdenv.hostPlatform.isMusl && - # Except when: - # - static aarch64, where compilation works, but produces segfaulting dynamically linked binaries. - # - static armv7l, where compilation fails. - !(stdenv.hostPlatform.isAarch && stdenv.hostPlatform.isStatic) - then supportedHardeningFlags - else lib.remove "pie" supportedHardeningFlags; + defaultHardeningFlags = let + # not ready for this by default + supportedHardeningFlags' = lib.remove "fortify3" supportedHardeningFlags; + in if stdenv.hostPlatform.isMusl && + # Except when: + # - static aarch64, where compilation works, but produces segfaulting dynamically linked binaries. + # - static armv7l, where compilation fails. + !(stdenv.hostPlatform.isAarch && stdenv.hostPlatform.isStatic) + then supportedHardeningFlags' + else lib.remove "pie" supportedHardeningFlags'; enabledHardeningOptions = - if builtins.elem "all" hardeningDisable + if builtins.elem "all" hardeningDisable' then [] - else lib.subtractLists hardeningDisable (defaultHardeningFlags ++ hardeningEnable); + else lib.subtractLists hardeningDisable' (defaultHardeningFlags ++ hardeningEnable); # hardeningDisable additionally supports "all". erroneousHardeningFlags = lib.subtractLists supportedHardeningFlags (hardeningEnable ++ lib.remove "all" hardeningDisable); diff --git a/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/aarch64.nix b/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/aarch64.nix index aa81cbd84a..6719e7ca30 100644 --- a/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/aarch64.nix +++ b/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/aarch64.nix @@ -1,11 +1,11 @@ { busybox = import { - url = "http://tarballs.nixos.org/stdenv-linux/aarch64/c7c997a0662bf88264db52cbc41e67884eb7a1ff/busybox"; - sha256 = "sha256-4EN2vLvXUkelZZR2eKaAQA5kCEuHNvRZN6dcohxVY+c="; + url = "http://tarballs.nixos.org/stdenv-linux/aarch64/21ec906463ea8f11abf3f9091ddd4c3276516e58/busybox"; executable = true; + hash = "sha256-0MuIeQlBUaeisqoFSu8y+8oB6K4ZG5Lhq8RcS9JqkFQ="; }; bootstrapTools = import { - url = "http://tarballs.nixos.org/stdenv-linux/aarch64/c7c997a0662bf88264db52cbc41e67884eb7a1ff/bootstrap-tools.tar.xz"; - sha256 = "sha256-AjOvmaW8JFVZaBSRUMKufr9kJozg/tsZr7PvUEBQyi4="; + url = "http://tarballs.nixos.org/stdenv-linux/aarch64/21ec906463ea8f11abf3f9091ddd4c3276516e58/bootstrap-tools.tar.xz"; + hash = "sha256-aJvtsWeuQHbb14BGZ2EiOKzjQn46h3x3duuPEawG0eE="; }; } diff --git a/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix b/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix new file mode 100644 index 0000000000..cf26c2113e --- /dev/null +++ b/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix @@ -0,0 +1,25 @@ +# +# Files came from this Hydra build: +# +# https://hydra.nixos.org/build/188389586 +# +# Which used nixpkgs revision 97d9c84e1df4397b43ecb39359f1bd003cd44585 +# to instantiate: +# +# /nix/store/hakn8s85s9011v61r6svp5qy8x1y64fv-stdenv-bootstrap-tools-mips64el-unknown-linux-gnuabin32.drv +# +# and then built: +# +# /nix/store/rjgybpnf3yiqyhvl2n2lx31jf800fii2-stdenv-bootstrap-tools-mips64el-unknown-linux-gnuabin32 +# +{ + busybox = import { + url = "http://tarballs.nixos.org/stdenv-linux/mips64el-n32/97d9c84e1df4397b43ecb39359f1bd003cd44585/busybox"; + sha256 = "sha256-4N3G1qYA7vitjhsIW17pR6UixIuzrq4vZXa8F0/X4iI="; + executable = true; + }; + bootstrapTools = import { + url = "http://tarballs.nixos.org/stdenv-linux/mips64el-n32/97d9c84e1df4397b43ecb39359f1bd003cd44585/bootstrap-tools.tar.xz"; + sha256 = "sha256-LWrpN6su2yNVurUyhZP34OiZyzgh7MfN13fIIbou8KI="; + }; +} diff --git a/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix b/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix index d690f40267..569f0c6f31 100644 --- a/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix @@ -15,4 +15,5 @@ derivation ({ langC = true; langCC = true; isGNU = true; + hardeningUnsupportedFlags = [ "fortify3" ]; } // extraAttrs) diff --git a/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-tools/default.nix b/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-tools/default.nix index d690f40267..569f0c6f31 100644 --- a/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-tools/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-tools/default.nix @@ -15,4 +15,5 @@ derivation ({ langC = true; langCC = true; isGNU = true; + hardeningUnsupportedFlags = [ "fortify3" ]; } // extraAttrs) diff --git a/third_party/nixpkgs/pkgs/stdenv/linux/default.nix b/third_party/nixpkgs/pkgs/stdenv/linux/default.nix index 8781907382..51f217f03b 100644 --- a/third_party/nixpkgs/pkgs/stdenv/linux/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/linux/default.nix @@ -69,7 +69,10 @@ armv7l-linux = import ./bootstrap-files/armv7l.nix; aarch64-linux = import ./bootstrap-files/aarch64.nix; mipsel-linux = import ./bootstrap-files/loongson2f.nix; - mips64el-linux = import ./bootstrap-files/mips64el.nix; + mips64el-linux = import + (if localSystem.isMips64n32 + then ./bootstrap-files/mips64el-n32.nix + else ./bootstrap-files/mips64el.nix); powerpc64le-linux = import ./bootstrap-files/powerpc64le.nix; riscv64-linux = import ./bootstrap-files/riscv64.nix; }; @@ -100,6 +103,14 @@ assert crossSystem == localSystem; let inherit (localSystem) system; + isFromNixpkgs = pkg: !(isFromBootstrapFiles pkg); + isFromBootstrapFiles = + pkg: pkg.passthru.isFromBootstrapFiles or false; + isBuiltByNixpkgsCompiler = + pkg: isFromNixpkgs pkg && isFromNixpkgs pkg.stdenv.cc.cc; + isBuiltByBootstrapFilesCompiler = + pkg: isFromNixpkgs pkg && isFromBootstrapFiles pkg.stdenv.cc.cc; + commonPreHook = '' export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}" @@ -117,16 +128,14 @@ let # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...). - bootstrapTools = import (if localSystem.libc == "musl" then ./bootstrap-tools-musl else ./bootstrap-tools) { + bootstrapTools = (import (if localSystem.libc == "musl" then ./bootstrap-tools-musl else ./bootstrap-tools) { inherit system bootstrapFiles; - extraAttrs = lib.optionalAttrs - config.contentAddressedByDefault - { - __contentAddressed = true; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - }; - }; + extraAttrs = lib.optionalAttrs config.contentAddressedByDefault { + __contentAddressed = true; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + }; + }) // { passthru.isFromBootstrapFiles = true; }; getLibc = stage: stage.${localSystem.libc}; @@ -186,7 +195,7 @@ let }; in - + assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check [ ({}: { @@ -200,9 +209,6 @@ in # Build a dummy stdenv with no GCC or working fetchurl. This is # because we need a stdenv to build the GCC wrapper and fetchurl. - # - # resulting stage0 stdenv: - # - coreutils, binutils, glibc, gcc: from bootstrapFiles (prevStage: stageFun prevStage { name = "bootstrap-stage0"; @@ -230,6 +236,7 @@ in '' + lib.optionalString (localSystem.libc == "musl") '' ln -s ${bootstrapTools}/include-libc $out/include ''; + passthru.isFromBootstrapFiles = true; }; gcc-unwrapped = bootstrapTools; binutils = import ../../build-support/bintools-wrapper { @@ -258,10 +265,14 @@ in # If we ever need to use a package from more than one stage back, we # simply re-export those packages in the middle stage(s) using the # overrides attribute and the inherit syntax. - # - # resulting stage1 stdenv: - # - coreutils, binutils, glibc, gcc: from bootstrapFiles - (prevStage: stageFun prevStage { + (prevStage: + # previous stage0 stdenv: + assert isFromBootstrapFiles prevStage.binutils.bintools; + assert isFromBootstrapFiles prevStage."${localSystem.libc}"; + assert isFromBootstrapFiles prevStage.gcc-unwrapped; + assert isFromBootstrapFiles prevStage.coreutils; + assert isFromBootstrapFiles prevStage.gnugrep; + stageFun prevStage { name = "bootstrap-stage1"; # Rebuild binutils to use from stage2 onwards. @@ -288,10 +299,14 @@ in # 2nd stdenv that contains our own rebuilt binutils and is used for # compiling our own Glibc. # - # resulting stage2 stdenv: - # - coreutils, glibc, gcc: from bootstrapFiles - # - binutils: from nixpkgs, built by bootstrapFiles toolchain - (prevStage: stageFun prevStage { + (prevStage: + # previous stage1 stdenv: + assert isBuiltByBootstrapFilesCompiler prevStage.binutils-unwrapped; + assert isFromBootstrapFiles prevStage."${localSystem.libc}"; + assert isFromBootstrapFiles prevStage.gcc-unwrapped; + assert isFromBootstrapFiles prevStage.coreutils; + assert isFromBootstrapFiles prevStage.gnugrep; + stageFun prevStage { name = "bootstrap-stage2"; overrides = self: super: { @@ -334,6 +349,7 @@ in bintools = self.stdenvNoCC.mkDerivation { pname = prevStage.bintools.bintools.pname + "-patchelfed-ld"; inherit (prevStage.bintools.bintools) version; + passthru = { inherit (prevStage.bintools.passthru) isFromBootstrapFiles; }; enableParallelBuilding = true; dontUnpack = true; dontBuild = true; @@ -360,11 +376,14 @@ in # Construct a third stdenv identical to the 2nd, except that this # one uses the rebuilt Glibc from stage2. It still uses the recent # binutils and rest of the bootstrap tools, including GCC. - # - # resulting stage3 stdenv: - # - coreutils, gcc: from bootstrapFiles - # - glibc, binutils: from nixpkgs, built by bootstrapFiles toolchain - (prevStage: stageFun prevStage { + (prevStage: + # previous stage2 stdenv: + assert isBuiltByBootstrapFilesCompiler prevStage.binutils-unwrapped; + assert isBuiltByBootstrapFilesCompiler prevStage.${localSystem.libc}; + assert isFromBootstrapFiles prevStage.gcc-unwrapped; + assert isFromBootstrapFiles prevStage.coreutils; + assert isFromBootstrapFiles prevStage.gnugrep; + stageFun prevStage { name = "bootstrap-stage3"; overrides = self: super: rec { @@ -401,17 +420,21 @@ in # Construct a fourth stdenv that uses the new GCC. But coreutils is # still from the bootstrap tools. # - # resulting stage4 stdenv: - # - coreutils: from bootstrapFiles - # - glibc, binutils: from nixpkgs, built by bootstrapFiles toolchain - # - gcc: from nixpkgs, built by bootstrapFiles toolchain. Can assume - # it has almost no code from bootstrapTools as gcc bootstraps - # internally. The only exceptions are crt files from glibc - # built by bootstrapTools used to link executables and libraries, - # and the bootstrapTools-built, statically-linked - # lib{mpfr,mpc,gmp,isl}.a which are linked into the final gcc - # (see commit cfde88976ba4cddd01b1bb28b40afd12ea93a11d). - (prevStage: stageFun prevStage { + (prevStage: + # previous stage3 stdenv: + assert isBuiltByBootstrapFilesCompiler prevStage.binutils-unwrapped; + assert isBuiltByBootstrapFilesCompiler prevStage.${localSystem.libc}; + assert isBuiltByBootstrapFilesCompiler prevStage.gcc-unwrapped; + assert isFromBootstrapFiles prevStage.coreutils; + assert isFromBootstrapFiles prevStage.gnugrep; + # Can assume prevStage.gcc-unwrapped has almost no code from + # bootstrapTools as gcc bootstraps internally. The only + # exceptions are crt files from glibc built bybootstrapTools + # used to link executables and libraries, and the + # bootstrapTools-built, statically-linked + # lib{mpfr,mpc,gmp,isl}.a which are linked into the final gcc + # (see commit cfde88976ba4cddd01b1bb28b40afd12ea93a11d). + stageFun prevStage { name = "bootstrap-stage4"; overrides = self: super: { @@ -468,17 +491,15 @@ in # dependency (`nix-store -qR') on bootstrapTools or the first # binutils built. # - # resulting stage5 (final) stdenv: - # - coreutils, binutils: from nixpkgs, built by nixpkgs toolchain - # - glibc: from nixpkgs, built by bootstrapFiles toolchain - # - gcc: from nixpkgs, built by bootstrapFiles toolchain. Can assume - # it has almost no code from bootstrapTools as gcc bootstraps - # internally. The only exceptions are crt files from glibc - # built by bootstrapTools used to link executables and libraries, - # and the bootstrapTools-built, statically-linked - # lib{mpfr,mpc,gmp,isl}.a which are linked into the final gcc - # (see commit cfde88976ba4cddd01b1bb28b40afd12ea93a11d). - (prevStage: { + (prevStage: + # previous stage4 stdenv; see stage3 comment regarding gcc, + # which applies here as well. + assert isBuiltByNixpkgsCompiler prevStage.binutils-unwrapped; + assert isBuiltByBootstrapFilesCompiler prevStage.${localSystem.libc}; + assert isBuiltByBootstrapFilesCompiler prevStage.gcc-unwrapped; + assert isBuiltByNixpkgsCompiler prevStage.coreutils; + assert isBuiltByNixpkgsCompiler prevStage.gnugrep; + { inherit config overlays; stdenv = import ../generic rec { name = "stdenv-linux"; @@ -554,4 +575,14 @@ in }; }) + # This "no-op" stage is just a place to put the assertions about stage5. + (prevStage: + # previous stage5 stdenv; see stage3 comment regarding gcc, + # which applies here as well. + assert isBuiltByNixpkgsCompiler prevStage.binutils-unwrapped; + assert isBuiltByBootstrapFilesCompiler prevStage.${localSystem.libc}; + assert isBuiltByBootstrapFilesCompiler prevStage.gcc-unwrapped; + assert isBuiltByNixpkgsCompiler prevStage.coreutils; + assert isBuiltByNixpkgsCompiler prevStage.gnugrep; + { inherit (prevStage) config overlays stdenv; }) ] diff --git a/third_party/nixpkgs/pkgs/test/default.nix b/third_party/nixpkgs/pkgs/test/default.nix index 71d065179d..5d154d1630 100644 --- a/third_party/nixpkgs/pkgs/test/default.nix +++ b/third_party/nixpkgs/pkgs/test/default.nix @@ -63,8 +63,6 @@ with pkgs; overriding = callPackage ./overriding.nix { }; - patch-shebangs = callPackage ./patch-shebangs {}; - texlive = callPackage ./texlive {}; cuda = callPackage ./cuda { }; diff --git a/third_party/nixpkgs/pkgs/test/patch-shebangs/default.nix b/third_party/nixpkgs/pkgs/test/patch-shebangs/default.nix deleted file mode 100644 index 5c49787eee..0000000000 --- a/third_party/nixpkgs/pkgs/test/patch-shebangs/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, stdenv, runCommand }: - -let - tests = { - bad-shebang = stdenv.mkDerivation { - name = "bad-shebang"; - dontUnpack = true; - installPhase = '' - mkdir -p $out/bin - echo "#!/bin/sh" > $out/bin/test - echo "echo -n hello" >> $out/bin/test - chmod +x $out/bin/test - ''; - passthru = { - assertion = "grep -v '^#!/bin/sh' $out/bin/test > /dev/null"; - }; - }; - - ignores-nix-store = stdenv.mkDerivation { - name = "ignores-nix-store"; - dontUnpack = true; - installPhase = '' - mkdir -p $out/bin - echo "#!$NIX_STORE/path/to/sh" > $out/bin/test - echo "echo -n hello" >> $out/bin/test - chmod +x $out/bin/test - ''; - passthru = { - assertion = "grep \"^#!$NIX_STORE/path/to/sh\" $out/bin/test > /dev/null"; - }; - }; - }; -in runCommand "patch-shebangs-test" { - passthru = { inherit (tests) bad-shebang ignores-nix-store; }; - meta.platforms = lib.platforms.all; -} '' - validate() { - local name=$1 - local testout=$2 - local assertion=$3 - - echo -n "... $name: " >&2 - - local rc=0 - (out=$testout eval "$assertion") || rc=1 - - if [ "$rc" -eq 0 ]; then - echo "yes" >&2 - else - echo "no" >&2 - fi - - return "$rc" - } - - echo "checking whether patchShebangs works properly... ">&2 - - fail= - ${lib.concatStringsSep "\n" (lib.mapAttrsToList (_: test: '' - validate "${test.name}" "${test}" ${lib.escapeShellArg test.assertion} || fail=1 - '') tests)} - - if [ "$fail" ]; then - echo "failed" - exit 1 - else - echo "succeeded" - touch $out - fi -'' diff --git a/third_party/nixpkgs/pkgs/test/stdenv/default.nix b/third_party/nixpkgs/pkgs/test/stdenv/default.nix index c7bb07f625..ba9ea8cb75 100644 --- a/third_party/nixpkgs/pkgs/test/stdenv/default.nix +++ b/third_party/nixpkgs/pkgs/test/stdenv/default.nix @@ -98,7 +98,7 @@ in { # tests for hooks in `stdenv.defaultNativeBuildInputs` - hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenv; pkgs = earlyPkgs; }); + hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenv; pkgs = earlyPkgs; inherit lib; }); outputs-no-out = runCommand "outputs-no-out-assert" { result = testers.testBuildFailure (stdenv.mkDerivation { @@ -158,7 +158,7 @@ in structuredAttrsByDefault = lib.recurseIntoAttrs { - hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenvStructuredAttrsByDefault; pkgs = earlyPkgs; }); + hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenvStructuredAttrsByDefault; pkgs = earlyPkgs; inherit lib; }); test-cc-wrapper-substitutions = ccWrapperSubstitutionsTest { name = "test-cc-wrapper-substitutions-structuredAttrsByDefault"; diff --git a/third_party/nixpkgs/pkgs/test/stdenv/hooks.nix b/third_party/nixpkgs/pkgs/test/stdenv/hooks.nix index d7c409e621..ba5da511c6 100644 --- a/third_party/nixpkgs/pkgs/test/stdenv/hooks.nix +++ b/third_party/nixpkgs/pkgs/test/stdenv/hooks.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs }: +{ stdenv, pkgs, lib }: # ordering should match defaultNativeBuildInputs @@ -91,7 +91,7 @@ ''; }; # TODO: add multiple-outputs - # TODO: move patch-shebangs test from pkgs/test/patch-shebangs/default.nix to here + patch-shebangs = import ./patch-shebangs.nix { inherit stdenv lib pkgs; }; prune-libtool-files = let libFoo = pkgs.writeText "libFoo" '' diff --git a/third_party/nixpkgs/pkgs/test/stdenv/patch-shebangs.nix b/third_party/nixpkgs/pkgs/test/stdenv/patch-shebangs.nix new file mode 100644 index 0000000000..fb52f38ecc --- /dev/null +++ b/third_party/nixpkgs/pkgs/test/stdenv/patch-shebangs.nix @@ -0,0 +1,98 @@ +{ lib, stdenv, pkgs }: + +# since the tests are using a early stdenv, the stdenv will have dontPatchShebangs=1, so it has to be unset +# https://github.com/NixOS/nixpkgs/blob/768a982bfc9d29a6bd3beb963ed4b054451ce3d0/pkgs/stdenv/linux/default.nix#L148-L153 + +# strictDeps has to be disabled because the shell isn't in buildInputs + +let + tests = { + bad-shebang = stdenv.mkDerivation { + name = "bad-shebang"; + strictDeps = false; + dontUnpack = true; + installPhase = '' + mkdir -p $out/bin + echo "#!/bin/bash" > $out/bin/test + echo "echo -n hello" >> $out/bin/test + chmod +x $out/bin/test + dontPatchShebangs= + ''; + passthru = { + assertion = "grep '^#!${stdenv.shell}' $out/bin/test > /dev/null"; + }; + }; + + ignores-nix-store = stdenv.mkDerivation { + name = "ignores-nix-store"; + strictDeps = false; + dontUnpack = true; + installPhase = '' + mkdir -p $out/bin + echo "#!$NIX_STORE/path/to/bash" > $out/bin/test + echo "echo -n hello" >> $out/bin/test + chmod +x $out/bin/test + dontPatchShebangs= + ''; + passthru = { + assertion = "grep \"^#!$NIX_STORE/path/to/bash\" $out/bin/test > /dev/null"; + }; + }; + + split-string = stdenv.mkDerivation { + name = "split-string"; + strictDeps = false; + dontUnpack = true; + installPhase = '' + mkdir -p $out/bin + echo "#!/usr/bin/env -S bash --posix" > $out/bin/test + echo "echo -n hello" >> $out/bin/test + chmod +x $out/bin/test + dontPatchShebangs= + ''; + passthru = { + assertion = "grep -v '^#!${pkgs.coreutils}/bin/env -S ${stdenv.shell} --posix' $out/bin/test > /dev/null"; + }; + }; + + }; +in +stdenv.mkDerivation { + name = "test-patch-shebangs"; + passthru = { inherit (tests) bad-shebang ignores-nix-store split-string; }; + buildCommand = '' + validate() { + local name=$1 + local testout=$2 + local assertion=$3 + + echo -n "... $name: " >&2 + + local rc=0 + (out=$testout eval "$assertion") || rc=1 + + if [ "$rc" -eq 0 ]; then + echo "yes" >&2 + else + echo "no" >&2 + fi + + return "$rc" + } + + echo "checking whether patchShebangs works properly... ">&2 + + fail= + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (_: test: '' + validate "${test.name}" "${test}" ${lib.escapeShellArg test.assertion} || fail=1 + '') tests)} + + if [ "$fail" ]; then + echo "failed" + exit 1 + else + echo "succeeded" + touch $out + fi + ''; +} diff --git a/third_party/nixpkgs/pkgs/test/texlive/default.nix b/third_party/nixpkgs/pkgs/test/texlive/default.nix index 217a862e1c..db83bd5149 100644 --- a/third_party/nixpkgs/pkgs/test/texlive/default.nix +++ b/third_party/nixpkgs/pkgs/test/texlive/default.nix @@ -1,6 +1,35 @@ { lib, runCommand, fetchurl, file, texlive, writeShellScript }: { + + tlpdb-nix = runCommand "texlive-test-tlpdb-nix" { + nixpkgsTlpdbNix = ../../tools/typesetting/tex/texlive/tlpdb.nix; + tlpdbNix = texlive.tlpdb-nix; + } + '' + mkdir -p "$out" + diff -u "''${nixpkgsTlpdbNix}" "''${tlpdbNix}" | tee "$out/tlpdb.nix.patch" + ''; + + luaotfload-fonts = runCommand "texlive-test-lualatex" { + nativeBuildInputs = [ + (with texlive; combine { inherit scheme-medium libertinus-fonts; }) + ]; + input = builtins.toFile "lualatex-testfile.tex" '' + \documentclass{article} + \usepackage{fontspec} + \setmainfont{Libertinus Serif} + \begin{document} + \LaTeX{} is great + \end{document} + ''; + } + '' + export HOME="$(mktemp -d)" + lualatex -halt-on-error "$input" + echo success > $out + ''; + chktex = runCommand "texlive-test-chktex" { nativeBuildInputs = [ (with texlive; combine { inherit scheme-infraonly chktex; }) diff --git a/third_party/nixpkgs/pkgs/tools/X11/alttab/default.nix b/third_party/nixpkgs/pkgs/tools/X11/alttab/default.nix index 9f71ba2fc8..ab4a8156f9 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/alttab/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/alttab/default.nix @@ -2,7 +2,7 @@ libpng, uthash , which, xnee, xorg, python3Packages }: stdenv.mkDerivation rec { - version = "1.6.1"; + version = "1.7.0"; pname = "alttab"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "sagb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g56207IGNDnBIqZmbpcgOLcfAGKwBE0DYu2Dq0bLS8o="; + sha256 = "sha256-AxHagyGbU3bWJ+sP2S7YjHBHsIbd/doONPgd2tsBtKY="; }; nativeBuildInputs = [ @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { description = "X11 window switcher designed for minimalistic window managers or standalone X11 session"; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = [ maintainers.sgraf ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/X11/arandr/default.nix b/third_party/nixpkgs/pkgs/tools/X11/arandr/default.nix index 0d8303c0df..6c4c89e888 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/arandr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/arandr/default.nix @@ -27,10 +27,6 @@ buildPythonApplication rec { # no tests doCheck = false; - # hook for gobject-introspection doesn't like strictDeps - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - buildInputs = [ docutils gsettings-desktop-schemas gtk3 ]; nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; propagatedBuildInputs = [ xrandr pygobject3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/X11/caffeine-ng/default.nix b/third_party/nixpkgs/pkgs/tools/X11/caffeine-ng/default.nix index 5aab492c75..344e3a8924 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/caffeine-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/caffeine-ng/default.nix @@ -28,16 +28,17 @@ let version = "7.1.2"; src = old.src.override { inherit version; - sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; }; }); in buildPythonApplication rec { pname = "caffeine-ng"; version = "4.0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-umIjXJ0et6Pi5Ejj96Q+ZhiKS+yj7bsgb4uQW6Ym6rU="; + hash = "sha256-umIjXJ0et6Pi5Ejj96Q+ZhiKS+yj7bsgb4uQW6Ym6rU="; }; nativeBuildInputs = [ wrapGAppsHook glib gobject-introspection setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix index 53a43dde30..c3b1dd546f 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, fetchFromGitHub +{ lib, stdenv, fetchFromGitLab, fetchFromGitHub, fetchpatch , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto , w3m, gnugrep, gnused, coreutils, xset, perlPackages , mimiSupport ? false, gawk @@ -36,6 +36,13 @@ stdenv.mkDerivation rec { # Allow forcing the use of XDG portals using NIXOS_XDG_OPEN_USE_PORTAL environment variable. # Upstream PR: https://github.com/freedesktop/xdg-utils/pull/12 ./allow-forcing-portal-use.patch + # Allow opening files when using portal with xdg-open. + # Upstream PR: https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/65 + (fetchpatch { + name = "support-openfile-with-portal.patch"; + url = "https://gitlab.freedesktop.org/xdg/xdg-utils/-/commit/5cd8c38f58d9db03240f4bc67267fe3853b66ec7.diff"; + hash = "sha256-snkhxwGF9hpqEh5NGG8xixTi/ydAk5apXRtgYrVgNY8="; + }) ]; # just needed when built from git 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 49c5e99a35..cb9e3d1255 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "aws-vault"; - version = "7.0.0"; + version = "7.0.2"; src = fetchFromGitHub { owner = "99designs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i7wL59MvjsLhEIs3Ejc/DB2m6IfrZqLCeSs1ziPCz+0="; + sha256 = "sha256-uNe2dltwLoUBUH/p4CN6HCOvBsq2yASxxwkSEtkJRbQ="; }; - vendorHash = "sha256-kcaQw2ooJupMsK9rYlYZOIAW5H4Oa346K9VGjdnaq1E="; + vendorHash = "sha256-CPn4JLIZz23ZNcl3LPJumx20WOXTI13s69MVo/Pof+s="; 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 04c87d780c..f440aa17b4 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.27.40"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.27.79"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-xP+ugapi6KJE+UokGKmG67ze5dH6nJuJk7BjIr6dtTE="; + hash = "sha256-A3MVM5MV+PTwR4W2ALrqEtMaFtVAEt8yqkd4ZLsvHGE="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix index bf588d2178..9068b91601 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix @@ -11,6 +11,18 @@ let py = python3.override { packageOverrides = self: super: { + ipython = super.ipython.overridePythonAttrs (oldAttrs: rec { + pname = "ipython"; + version = "8.5.0"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "sha256-CXvfXNh1dv0GYXnJ9/IIAE96aGTuGyDzfTRsC8sJn4Q="; + }; + + disabledTests = [ "testIPythonLexer" ] ++ oldAttrs.disabledTests; + }); + prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec { version = "3.0.28"; src = self.fetchPypi { @@ -25,17 +37,19 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.11.0"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.11.2"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256-i5ZGq51ZKEkyt6+d/Q4NzGS/zEaoqNql2IPZ2xlTV6k="; + hash = "sha256-GFdkE+XClm0L5Y+ZSwMW8gieNoRmNL3K8kVPxpH510k="; }; postPatch = '' + substituteInPlace requirements/bootstrap.txt \ + --replace "pip>=22.0.0,<23.0.0" "pip>=22.0.0,<24.0.0" substituteInPlace pyproject.toml \ --replace "distro>=1.5.0,<1.6.0" "distro>=1.5.0" \ --replace "cryptography>=3.3.2,<38.0.5" "cryptography>=3.3.2" diff --git a/third_party/nixpkgs/pkgs/tools/admin/awslogs/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awslogs/default.nix index af8f427fe2..ff4924c1cc 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awslogs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awslogs/default.nix @@ -30,7 +30,8 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace "jmespath>=0.7.1,<1.0.0" "jmespath>=0.7.1" + --replace "jmespath>=0.7.1,<1.0.0" "jmespath>=0.7.1" \ + --replace '>=3.5.*' '>=3.5' ''; disabledTests = [ 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 189ae296fa..bd3afcb532 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix @@ -131,13 +131,13 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { colorama cryptography distro - Fabric + fabric jsmin knack mock paramiko pydocumentdb - PyGithub + pygithub pygments pynacl pyopenssl 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 b1411531ab..9450365019 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 @@ -3,14 +3,14 @@ let buildAzureCliPackage = with py.pkgs; buildPythonPackage; - overrideAzureMgmtPackage = package: version: extension: sha256: + overrideAzureMgmtPackage = package: version: extension: hash: # check to make sure overriding is even necessary package.overrideAttrs(oldAttrs: rec { inherit version; src = py.pkgs.fetchPypi { inherit (oldAttrs) pname; - inherit version sha256 extension; + inherit version hash extension; }; }); @@ -115,7 +115,7 @@ let "sha256-3V/I3pHi+JCO+kxkyn9jz4OzBoqbpCYpjeO1QTnpZlw="; azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "3.0.0" "zip" - "9262f54ed387eb083d8dae66d32a8df35647319b902bd498cdc376f50a12d154"; + "sha256-kmL1TtOH6wg9ja5m0yqN81ZHMZuQK9SYzcN29QoS0VQ="; azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "17.0.0" "zip" "sha256-hkM4WVLuwxj4qgXsY8Ya7zu7/v37gKdP0Xbf2EqrsWo="; @@ -124,7 +124,7 @@ let "sha256-mT6vvjWbq0RWQidugR229E8JeVEiobPD3XA/nDM3I6Y="; azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "6.0.0" "zip" - "d4f5c5a4188a456fe1eb32b6c45f55ca2069c74be41eb76921840b39f2f5c07f"; + "sha256-1PXFpBiKRW/h6zK2xF9VyiBpx0vkHrdpIYQLOfL1wH8="; azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "2.0.0b3" "zip" "sha256-XZGQOeMw8usyQ1tl8j57fZ3uqLshomHY9jO/rbpQOvM="; @@ -157,7 +157,7 @@ let "sha256-wkRmH/3MMxeTZr7KQMZQbjPHs2GSxAjJFZlSp75pUPI="; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" - "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; + "sha256-moWonzDyJNJhdJviC0YWoOuJSFhvfw8gVzuOoy8mUYk="; azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "9.1.0" "zip" "sha256-IhZLDFkTize8SLptR2v2NRUrxCjctCC1IaFLjCXHl60="; @@ -169,10 +169,10 @@ let "sha256-/6ySVfCjr1YiiZIZJElrd1EfirV+TJvE/FvKs7UhoKo="; azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "1.0.0" "zip" - "04090062bc1e8f00c2f45315a3bceb0fb3b3479ec1474d71b88342e13499b087"; + "sha256-BAkAYrwejwDC9FMVo7zrD7OzR57BR01xuINC4TSZsIc="; azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip" - "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6"; + "sha256-RuNCInmT/JrKsd2kLy61ZrUiqMlFq50O6lYna0b21zA="; azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "10.2.0b2" "zip" "sha256-QcHY1wCwQyVOEdUi06/wEa4dqJH5Ccd33gJ1Sju0qZA="; @@ -190,16 +190,16 @@ let "sha256-1CiZuTXYhIb74eGQZUJHHzovYNnnVd3Ydu1UCy2Bu00="; azure-mgmt-kusto = overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip" - "1pmcdgimd66h964a3d5m2j2fbydshcwhrk87wblhwhfl3xwbgf4y"; + "sha256-nri3eB/UQQ7p4gfNDDmDuvnlhBS1tKGISdCYVuNrrN4="; azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" - "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; + "sha256-WVScTEBo8mRmsQl7V0qOUJn7LNbIvgoAOVsG07KeJ40=r"; azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "9.0.1" "zip" "sha256-PYRMOWaJUXrRgqW3+pLBY+L6HvU1WlPvaatFe4O7RY8="; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip" - "407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8"; + "sha256-QHwtrLM1E/++nKS+Wt216dS64Mt++mE8P31THve/jeg="; azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "13.0.0b4" "zip" "sha256-Jm1t7v5vyFjNNM/evVaEI9sXJKNwJk6XAXuJSRSnKHk="; @@ -208,16 +208,16 @@ let "sha256-7PduPg0JK4f/3q/b5pq58TjqVk+Iu+vxa+aJKDnScy8="; azure-mgmt-maps = overrideAzureMgmtPackage super.azure-mgmt-maps "2.0.0" "zip" - "384e17f76a68b700a4f988478945c3a9721711c0400725afdfcb63cf84e85f0e"; + "sha256-OE4X92potwCk+YhHiUXDqXIXEcBAByWv38tjz4ToXw4="; azure-mgmt-managedservices = overrideAzureMgmtPackage super.azure-mgmt-managedservices "1.0.0" "zip" "sha256-/tg5n8Z3Oq2jfB0ElqRvWUENd8lJTQyllnxTHDN2rRk="; azure-mgmt-managementgroups = overrideAzureMgmtPackage super.azure-mgmt-managementgroups "1.0.0" "zip" - "bab9bd532a1c34557f5b0ab9950e431e3f00bb96e8a3ce66df0f6ce2ae19cd73"; + "sha256-urm9UyocNFV/Wwq5lQ5DHj8Au5boo85m3w9s4q4ZzXM="; azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "1.1.0" "zip" - "68b381f52a4df4435dacad5a97e1c59ac4c981f667dcca8f9d04453417d60ad8"; + "sha256-aLOB9SpN9ENdrK1al+HFmsTJgfZn3MqPnQRFNBfWCtg="; azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "9.0.0" "zip" "sha256-TI7l8sSQ2QUgPqiE3Cu/F67Wna+KHbQS3fuIjOb95ZM="; @@ -226,12 +226,12 @@ let version = "6.1.0"; src = old.src.override { inherit version; - sha256 = "sha256-lS8da3Al1z1pMLDBf6ZtWc1UFUVgkN1qpKTxt4VXdlQ="; + hash = "sha256-lS8da3Al1z1pMLDBf6ZtWc1UFUVgkN1qpKTxt4VXdlQ="; }; }); azure-mgmt-privatedns = overrideAzureMgmtPackage super.azure-mgmt-privatedns "1.0.0" "zip" - "b60f16e43f7b291582c5f57bae1b083096d8303e9d9958e2c29227a55cc27c45"; + "sha256-tg8W5D97KRWCxfV7rhsIMJbYMD6dmVjiwpInpVzCfEU="; azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "7.0.0" "zip" "sha256-WvyNgfiliEt6qawqy8Le8eifhxusMkoZbf6YcyY1SBA="; @@ -246,7 +246,7 @@ let "sha256-5vXdXiRubnzPk4uTFeNHR6rwiHSGbeUREX9eW1pqC3E="; azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "8.0.0" "zip" - "a96d50c88507233a293e757202deead980c67808f432b8e897c4df1ca088da7e"; + "sha256-qW1QyIUHIzopPnVyAt7q2YDGeAj0Mrjol8TfHKCI2n4="; azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "3.0.0" "zip" "sha256-vLp874V/awKi2Yr+sH+YcbFij6M9iGGrE4fnMufbP4Q="; @@ -264,10 +264,10 @@ let "sha256-5E6Yf1GgNyNVjd+SeFDbhDxnOA6fOAG6oojxtCP4m+k="; azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "10.0.0" "zip" - "5cee70f97fe3a093c3cb70c2a190c2df936b772e94a09ef7e3deb1ed177c9f32"; + "sha256-XO5w+X/joJPDy3DCoZDC35Nrdy6UoJ73496x7Rd8nzI="; azure-mgmt-relay = overrideAzureMgmtPackage super.azure-mgmt-relay "0.1.0" "zip" - "1jss6qhvif8l5s0lblqw3qzijjf0h88agciiydaa7f4q577qgyfr"; + "sha256-2fmHzymYuKNU8zGypxCCwEkZPx4c00WBLhS5uCE2Wss="; azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "10.1.0" "zip" "sha256-MZqhSBkwypvEefhoEWEPsBUFidWYD7qAX6edcBDDSSA="; @@ -285,13 +285,13 @@ let "sha256-eL9KJowxTF7hZJQQQCNJZ7l+rKPFM8wP5vEigt3ZFGE="; azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "9.0.0" "zip" - "fc408b37315fe84781b519124f8cb1b8ac10b2f4241e439d0d3e25fd6ca18d7b"; + "sha256-/ECLNzFf6EeBtRkST4yxuKwQsvQkHkOdDT4l/WyhjXs="; azure-mgmt-applicationinsights = overrideAzureMgmtPackage super.azure-mgmt-applicationinsights "1.0.0" "zip" - "c287a2c7def4de19f92c0c31ba02867fac6f5b8df71b5dbdab19288bb455fc5b"; + "sha256-woeix9703hn5LAwxugKGf6xvW433G129qxkoi7RV/Fs="; azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip" - "0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m"; + "sha256-9czuo63QTpRF6ohJLxXuz2wSbwQG2WfJX25It5vo23U="; azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "21.0.0" "zip" "sha256-brE+7s+JGVsrX0e+Bnnj8niI79e9ITLux+vLznXLE3c="; @@ -300,13 +300,13 @@ let "sha256-R8Narn7eC7j59tDjsgbk9lF0PcOgOwSnzoMp3Qu0rmg="; azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "1.0.0" "zip" - "de35e117912832c1a9e93109a8d24cab94f55703a9087b2eb1c5b0655b3b1913"; + "sha256-3jXhF5EoMsGp6TEJqNJMq5T1VwOpCHsuscWwZVs7GRM="; azure-mgmt-servicelinker = overrideAzureMgmtPackage super.azure-mgmt-servicelinker "1.2.0b1" "zip" "sha256-RK1Q51Q0wAG55oKrFmv65/2AUKl+gRdp27t/EcuMONk="; azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "9.0.0" "zip" - "41ebdc69c0d1f81d25dd30438c14fff4331f66639f55805b918b9649eaffe78a"; + "sha256-QevcacDR+B0l3TBDjBT/9DMfZmOfVYBbkYuWSer/54o="; azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "1.0.0" "tar.gz" "sha256-x5v3e3/poSm+JMt0SWI1lcM6YAUcP+o2Sn8TluXOyIg="; @@ -317,7 +317,7 @@ let src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "sha256-uDzSy2PZMiXehOJ6u/wFkhL43id2b0xY3Tq7g53/C+Q="; + hash = "sha256-uDzSy2PZMiXehOJ6u/wFkhL43id2b0xY3Tq7g53/C+Q="; extension = "zip"; }; }); @@ -328,7 +328,7 @@ let src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "1zna5vb887clvpyfp5439vhlz3j4z95blw9r7y86n6cfpzc65fyh"; + hash = "sha256-0Lti2L+OGWuQPzlxukr6RI5P4U6DlOv83ZQdhNYuyv4="; extension = "zip"; }; }); @@ -338,7 +338,7 @@ let src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "0b15dzy75fml994gdfmaw5qcyij15gvh968mk3hg94d1wxwai1zi"; + hash = "sha256-8YeoeOehkfTgmBWZBPcrQUbPcOGquvZISrS6cvxvJSw="; }; }); @@ -347,7 +347,7 @@ let src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "00g41b5q4ijlv02zvzjgfwrwy71cgr3lc3if4nayqmyl6xsprj2f"; + hash = "sha256-Tsh8dTfUV+yVJS4ORkd+LBzPM3dP/v0F2FRGgssK5AE="; }; }); @@ -369,7 +369,7 @@ let src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "sha256-g14ySiByqPgkJGRH8EnIRJO9Q6H2usS5FOeMCQiUuwQ="; + hash = "sha256-g14ySiByqPgkJGRH8EnIRJO9Q6H2usS5FOeMCQiUuwQ="; extension = "zip"; }; }); @@ -379,7 +379,7 @@ let src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "sha256-fN1IuZ9fjxgRZv6qh9gg6v6KYpnKlXfnoLqfZCDXoRY="; + hash = "sha256-fN1IuZ9fjxgRZv6qh9gg6v6KYpnKlXfnoLqfZCDXoRY="; extension = "zip"; }; }); @@ -389,7 +389,7 @@ let src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "1qijqp6llshqas422lnqvpv45iv99n7f13v86znql40y3jp5n3ir"; + hash = "sha256-OQ5brhweEIrtN2iP4I5NacdC9t3YUiGIVhhqSs3FMuI="; extension = "zip"; }; }); @@ -400,7 +400,7 @@ let inherit (oldAttrs) pname; inherit version; extension = "zip"; - sha256 = "0jfxm8lx8dzs3v2b04ljizk8gfckbm5l2v86rm7k0npbfvryba1p"; + hash = "sha256-N6jl83brWjBPzQZtQUtdk7mH5o+SErDEHvo31Cmq3Uk="; }; propagatedBuildInputs = with self; [ @@ -416,7 +416,7 @@ let inherit (oldAttrs) pname; inherit version; extension = "zip"; - sha256 = "sha256-d3tJWObM3plRurzfqWmHkn5CqVL9ekQfn9AeDc/KxLQ="; + hash = "sha256-d3tJWObM3plRurzfqWmHkn5CqVL9ekQfn9AeDc/KxLQ="; }; }); @@ -438,7 +438,7 @@ let src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "192icfx82gcl3igr18w062744376r2ivh63c8nd7v17mjk860yac"; + hash = "sha256-THlg0JT1hH2aRWwYuKPI5gxCjjCAo5BfHJQ9gbpjUaQ="; extension = "zip"; }; @@ -455,7 +455,7 @@ let src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "sha256-k3bTVJVmHRn4rMVgT2ewvFlJOxg1u8SA+aGVL5ABekw="; + hash = "sha256-k3bTVJVmHRn4rMVgT2ewvFlJOxg1u8SA+aGVL5ABekw="; extension = "zip"; }; @@ -472,7 +472,7 @@ let src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "sha256-109FuBMXRU2W6YL9HFDm+1yZrCIjcorqh2RDOjn1ZvE="; + hash = "sha256-109FuBMXRU2W6YL9HFDm+1yZrCIjcorqh2RDOjn1ZvE="; }; # sdist doesn't provide tests @@ -495,7 +495,7 @@ let src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "sha256-+g/ici7hw/V+rEeIIMOlri9iSvgmTL35AAyYD/f3Xj8="; + hash = "sha256-+g/ici7hw/V+rEeIIMOlri9iSvgmTL35AAyYD/f3Xj8="; }; }); @@ -504,7 +504,7 @@ let src = oldAttrs.src.override { inherit version; - sha256 = "sha256-J5WETvB17IorjThcTVn16kiwjnGA/OPLJ4e+DbALH7Q="; + hash = "sha256-J5WETvB17IorjThcTVn16kiwjnGA/OPLJ4e+DbALH7Q="; }; }); @@ -535,7 +535,7 @@ let src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "0jcjppp6mdfsqrbfc3ddfxg1ybgvkjv7ri7azwv3j778m36zs4y8"; + hash = "sha256-yBP9zajoHDk2/+rEfLac+y0fXnetDeZWxtq1au69kkk="; }; }); diff --git a/third_party/nixpkgs/pkgs/tools/admin/berglas/default.nix b/third_party/nixpkgs/pkgs/tools/admin/berglas/default.nix index f82aebacec..c6b8e49930 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/berglas/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/berglas/default.nix @@ -27,16 +27,16 @@ in buildGoModule rec { pname = "berglas"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A4TUVNsiWODH8jJzV4AYchIQjDWXysJbFPYQ5W63T08="; + sha256 = "sha256-OMmvoUzdi5rie/YCkylSKjNm2ty2HnnAuFZrLAgJHZk="; }; - vendorSha256 = "sha256-jJuwfP0zJ70r62IFTPsXBCAEKDcuBwHsBR24jGx/IqY="; + vendorHash = "sha256-WIbT1N7tRAt5vJO6j06fwUAaFxfAevRo0+r2wyy+feE="; postPatch = skipTestsCommand; diff --git a/third_party/nixpkgs/pkgs/tools/admin/coldsnap/default.nix b/third_party/nixpkgs/pkgs/tools/admin/coldsnap/default.nix index 6ff4f44398..75fd7b7803 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/coldsnap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/coldsnap/default.nix @@ -9,15 +9,15 @@ rustPlatform.buildRustPackage rec { pname = "coldsnap"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - hash = "sha256-kL9u+IBlC9Pxm5yaJagY9dy0Pm0xlKfVxFVBmwDMSak="; + hash = "sha256-M3TzzaOTbe0VbAd2HSUC/S5Sfuanv8Ad17C6vBNb2og="; }; - cargoHash = "sha256-eYBmke0FQ9CK3cCaM7ecmp1vkNlZO3SHRnxFzmelYhU="; + cargoHash = "sha256-N6066QMGA2XAQ7xr6d34Ts7lVcnRC0uFo0/xpPceNcQ="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix index b00d8327b4..8cea35d5ac 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.132.0"; + version = "0.133.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-wKTESd+YKJd94yUuqm1v4biyGCABbhwTlKLzbiOg6H0="; + sha256 = "sha256-QRm0a7x39vhxRT29+tTrpr3ZyPPHtHtxLWiyqTgPYCM="; }; - vendorHash = "sha256-A06vwsadznqe1xraMZnseRAJkrpCdciKBxPUBus39ws="; + vendorHash = "sha256-R/VFq+SO/ZWf9ztg/75ASidqznCkO47T2PFsgKJwEWM="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/elasticsearch-curator/default.nix b/third_party/nixpkgs/pkgs/tools/admin/elasticsearch-curator/default.nix index 87ad72ea47..b33aa22dd3 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/elasticsearch-curator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/elasticsearch-curator/default.nix @@ -7,7 +7,7 @@ let version = "7.1.2"; src = old.src.override { inherit version; - sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; }; }); requests-aws4auth = super.requests-aws4auth.overridePythonAttrs (old: { diff --git a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/default.nix b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/default.nix index f87c649b3d..42dd6441ce 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-16_x, jq, dos2unix }: yarn2nix-moretea.mkYarnPackage { - version = "1.1.2"; + version = "1.1.4"; src = fetchzip { - url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.2.tgz"; - sha256 = "0fhmvh10wlf17fwxdclra06z1bq5bg6n53smzwni1v1h4967hhk3"; + url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.4.tgz"; + sha256 = "1q13d01ar3nhg3v7w22byn02sga5qkzxbjzpzp30qrvb3gx8prmp"; }; patches = [ ./fix-js-include-paths.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/package.json b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/package.json index 44e37f8f1b..898949369d 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": "1.1.2", + "version": "1.1.4", "keywords": [ "Remote Device Management", "Remote Device Monitoring", @@ -41,7 +41,7 @@ "body-parser": "^1.19.0", "cbor": "~5.2.0", "compression": "^1.7.4", - "cookie-session": "^1.4.0", + "cookie-session": "^2.0.0", "express": "^4.17.0", "express-handlebars": "^5.3.5", "express-ws": "^4.0.0", @@ -85,7 +85,7 @@ "express-ws": "4.0.0", "compression": "*", "body-parser": "*", - "cookie-session": "1.4.0", + "cookie-session": "2.0.0", "express-handlebars": "*", "node-windows": "0.1.4", "loadavg-windows": "*", @@ -98,7 +98,7 @@ "aedes": "0.39.0", "mysql": "*", "@mysql/xdevapi": "*", - "mongodb": "4.12.1", + "mongodb": "4.13.0", "saslprep": "*", "pg": "8.7.1", "pgtools": "0.3.2", diff --git a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.lock b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.lock index 5735c798bb..98f9a46fd3 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.lock +++ b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.lock @@ -2,7 +2,7 @@ # yarn lockfile v1 -"@ampproject/remapping@^2.1.0": +"@ampproject/remapping@^2.2.0": version "2.2.0" resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== @@ -10,382 +10,370 @@ "@jridgewell/gen-mapping" "^0.1.0" "@jridgewell/trace-mapping" "^0.3.9" -"@aws-crypto/ie11-detection@^2.0.0": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@aws-crypto/ie11-detection/-/ie11-detection-2.0.2.tgz#9c39f4a5558196636031a933ec1b4792de959d6a" - integrity sha512-5XDMQY98gMAf/WRTic5G++jfmS/VLM0rwpiOpaainKi4L0nqWMSB1SzsrEG5rjFZGYN6ZAefO+/Yta2dFM0kMw== +"@aws-crypto/ie11-detection@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz#640ae66b4ec3395cee6a8e94ebcd9f80c24cd688" + integrity sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q== dependencies: tslib "^1.11.1" -"@aws-crypto/sha256-browser@2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-browser/-/sha256-browser-2.0.0.tgz#741c9024df55ec59b51e5b1f5d806a4852699fb5" - integrity sha512-rYXOQ8BFOaqMEHJrLHul/25ckWH6GTJtdLSajhlqGMx0PmSueAuvboCuZCTqEKlxR8CQOwRarxYMZZSYlhRA1A== +"@aws-crypto/sha256-browser@3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz#05f160138ab893f1c6ba5be57cfd108f05827766" + integrity sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ== dependencies: - "@aws-crypto/ie11-detection" "^2.0.0" - "@aws-crypto/sha256-js" "^2.0.0" - "@aws-crypto/supports-web-crypto" "^2.0.0" - "@aws-crypto/util" "^2.0.0" - "@aws-sdk/types" "^3.1.0" + "@aws-crypto/ie11-detection" "^3.0.0" + "@aws-crypto/sha256-js" "^3.0.0" + "@aws-crypto/supports-web-crypto" "^3.0.0" + "@aws-crypto/util" "^3.0.0" + "@aws-sdk/types" "^3.222.0" "@aws-sdk/util-locate-window" "^3.0.0" "@aws-sdk/util-utf8-browser" "^3.0.0" tslib "^1.11.1" -"@aws-crypto/sha256-js@2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-2.0.0.tgz#f1f936039bdebd0b9e2dd834d65afdc2aac4efcb" - integrity sha512-VZY+mCY4Nmrs5WGfitmNqXzaE873fcIZDu54cbaDaaamsaTOP1DBImV9F4pICc3EHjQXujyE8jig+PFCaew9ig== +"@aws-crypto/sha256-js@3.0.0", "@aws-crypto/sha256-js@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz#f06b84d550d25521e60d2a0e2a90139341e007c2" + integrity sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ== dependencies: - "@aws-crypto/util" "^2.0.0" - "@aws-sdk/types" "^3.1.0" + "@aws-crypto/util" "^3.0.0" + "@aws-sdk/types" "^3.222.0" tslib "^1.11.1" -"@aws-crypto/sha256-js@^2.0.0": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-2.0.2.tgz#c81e5d378b8a74ff1671b58632779986e50f4c99" - integrity sha512-iXLdKH19qPmIC73fVCrHWCSYjN/sxaAvZ3jNNyw6FclmHyjLKg0f69WlC9KTnyElxCR5MO9SKaG00VwlJwyAkQ== - dependencies: - "@aws-crypto/util" "^2.0.2" - "@aws-sdk/types" "^3.110.0" - tslib "^1.11.1" - -"@aws-crypto/supports-web-crypto@^2.0.0": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-2.0.2.tgz#9f02aafad8789cac9c0ab5faaebb1ab8aa841338" - integrity sha512-6mbSsLHwZ99CTOOswvCRP3C+VCWnzBf+1SnbWxzzJ9lR0mA0JnY2JEAhp8rqmTE0GPFy88rrM27ffgp62oErMQ== +"@aws-crypto/supports-web-crypto@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz#5d1bf825afa8072af2717c3e455f35cda0103ec2" + integrity sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg== dependencies: tslib "^1.11.1" -"@aws-crypto/util@^2.0.0", "@aws-crypto/util@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@aws-crypto/util/-/util-2.0.2.tgz#adf5ff5dfbc7713082f897f1d01e551ce0edb9c0" - integrity sha512-Lgu5v/0e/BcrZ5m/IWqzPUf3UYFTy/PpeED+uc9SWUR1iZQL8XXbGQg10UfllwwBryO3hFF5dizK+78aoXC1eA== +"@aws-crypto/util@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@aws-crypto/util/-/util-3.0.0.tgz#1c7ca90c29293f0883468ad48117937f0fe5bfb0" + integrity sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w== dependencies: - "@aws-sdk/types" "^3.110.0" + "@aws-sdk/types" "^3.222.0" "@aws-sdk/util-utf8-browser" "^3.0.0" tslib "^1.11.1" -"@aws-sdk/abort-controller@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/abort-controller/-/abort-controller-3.226.0.tgz#3adffb8ee5af57ddb154e8544a8eeec76ad32271" - integrity sha512-cJVzr1xxPBd08voknXvR0RLgtZKGKt6WyDpH/BaPCu3rfSqWCDZKzwqe940eqosjmKrxC6pUZNKASIqHOQ8xxQ== +"@aws-sdk/abort-controller@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/abort-controller/-/abort-controller-3.289.0.tgz#94278f94c66ea48b0a2da70256abc036c85de6a9" + integrity sha512-Xakz8EeTl0Q3KaWRdCaRQrrYxBAkQGj6eeT+DVmMLMz4gzTcSHwvfR5tVBIPHk4+IjboJJKM5l1xAZ90AGFPAQ== dependencies: - "@aws-sdk/types" "3.226.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/client-cognito-identity@3.236.0": - version "3.236.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.236.0.tgz#bec1a6625d1b34b0014a8ded15d70557643ee7e9" - integrity sha512-lWGuTVA+q3h1KS3nxTWeRGOfsuQ+GNwq5IxFJ8ko441mpwo5A2t6u25Z+G6t5Eh+q4EcoxMX64HYA+cu91lr7g== +"@aws-sdk/client-cognito-identity@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.289.0.tgz#e7dd436f1730c5e69c89e0ec9fc5d03d40f8d6c4" + integrity sha512-rerSVZadAQu34Dxhsx+tpUdhru8Dpu/oW/ABJnVBZMbs5kXtl3wgWw8vRPiE0jFfjeA+dPZRXfuBzDulzsMcsg== dependencies: - "@aws-crypto/sha256-browser" "2.0.0" - "@aws-crypto/sha256-js" "2.0.0" - "@aws-sdk/client-sts" "3.236.0" - "@aws-sdk/config-resolver" "3.234.0" - "@aws-sdk/credential-provider-node" "3.236.0" - "@aws-sdk/fetch-http-handler" "3.226.0" - "@aws-sdk/hash-node" "3.226.0" - "@aws-sdk/invalid-dependency" "3.226.0" - "@aws-sdk/middleware-content-length" "3.226.0" - "@aws-sdk/middleware-endpoint" "3.226.0" - "@aws-sdk/middleware-host-header" "3.226.0" - "@aws-sdk/middleware-logger" "3.226.0" - "@aws-sdk/middleware-recursion-detection" "3.226.0" - "@aws-sdk/middleware-retry" "3.235.0" - "@aws-sdk/middleware-serde" "3.226.0" - "@aws-sdk/middleware-signing" "3.226.0" - "@aws-sdk/middleware-stack" "3.226.0" - "@aws-sdk/middleware-user-agent" "3.226.0" - "@aws-sdk/node-config-provider" "3.226.0" - "@aws-sdk/node-http-handler" "3.226.0" - "@aws-sdk/protocol-http" "3.226.0" - "@aws-sdk/smithy-client" "3.234.0" - "@aws-sdk/types" "3.226.0" - "@aws-sdk/url-parser" "3.226.0" + "@aws-crypto/sha256-browser" "3.0.0" + "@aws-crypto/sha256-js" "3.0.0" + "@aws-sdk/client-sts" "3.289.0" + "@aws-sdk/config-resolver" "3.289.0" + "@aws-sdk/credential-provider-node" "3.289.0" + "@aws-sdk/fetch-http-handler" "3.289.0" + "@aws-sdk/hash-node" "3.289.0" + "@aws-sdk/invalid-dependency" "3.289.0" + "@aws-sdk/middleware-content-length" "3.289.0" + "@aws-sdk/middleware-endpoint" "3.289.0" + "@aws-sdk/middleware-host-header" "3.289.0" + "@aws-sdk/middleware-logger" "3.289.0" + "@aws-sdk/middleware-recursion-detection" "3.289.0" + "@aws-sdk/middleware-retry" "3.289.0" + "@aws-sdk/middleware-serde" "3.289.0" + "@aws-sdk/middleware-signing" "3.289.0" + "@aws-sdk/middleware-stack" "3.289.0" + "@aws-sdk/middleware-user-agent" "3.289.0" + "@aws-sdk/node-config-provider" "3.289.0" + "@aws-sdk/node-http-handler" "3.289.0" + "@aws-sdk/protocol-http" "3.289.0" + "@aws-sdk/smithy-client" "3.289.0" + "@aws-sdk/types" "3.289.0" + "@aws-sdk/url-parser" "3.289.0" "@aws-sdk/util-base64" "3.208.0" "@aws-sdk/util-body-length-browser" "3.188.0" "@aws-sdk/util-body-length-node" "3.208.0" - "@aws-sdk/util-defaults-mode-browser" "3.234.0" - "@aws-sdk/util-defaults-mode-node" "3.234.0" - "@aws-sdk/util-endpoints" "3.226.0" - "@aws-sdk/util-retry" "3.229.0" - "@aws-sdk/util-user-agent-browser" "3.226.0" - "@aws-sdk/util-user-agent-node" "3.226.0" - "@aws-sdk/util-utf8-browser" "3.188.0" - "@aws-sdk/util-utf8-node" "3.208.0" + "@aws-sdk/util-defaults-mode-browser" "3.289.0" + "@aws-sdk/util-defaults-mode-node" "3.289.0" + "@aws-sdk/util-endpoints" "3.289.0" + "@aws-sdk/util-retry" "3.289.0" + "@aws-sdk/util-user-agent-browser" "3.289.0" + "@aws-sdk/util-user-agent-node" "3.289.0" + "@aws-sdk/util-utf8" "3.254.0" tslib "^2.3.1" -"@aws-sdk/client-sso-oidc@3.236.0": - version "3.236.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.236.0.tgz#501cc3f69bdfc1b538b3b89d1166bc80dd86a461" - integrity sha512-9TuigSXGafVto+GjKsVkhNLlnSgNWzRL5/ClZ5lY3dWrcDEJGZjFwwRB3ICerFQJBdDfsYwjNjJPhYEHzdyBfQ== +"@aws-sdk/client-sso-oidc@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.289.0.tgz#dd1945682685b05c7b8700593f95c8cb9788fe08" + integrity sha512-+09EK4aWdNjF+5+nK6Dmlwx3es8NTkyABTOj9H4eKB90rXQVX8PjoaFhK/b+NcNKDxgb1E6k6evZEpAb8dYQHg== dependencies: - "@aws-crypto/sha256-browser" "2.0.0" - "@aws-crypto/sha256-js" "2.0.0" - "@aws-sdk/config-resolver" "3.234.0" - "@aws-sdk/fetch-http-handler" "3.226.0" - "@aws-sdk/hash-node" "3.226.0" - "@aws-sdk/invalid-dependency" "3.226.0" - "@aws-sdk/middleware-content-length" "3.226.0" - "@aws-sdk/middleware-endpoint" "3.226.0" - "@aws-sdk/middleware-host-header" "3.226.0" - "@aws-sdk/middleware-logger" "3.226.0" - "@aws-sdk/middleware-recursion-detection" "3.226.0" - "@aws-sdk/middleware-retry" "3.235.0" - "@aws-sdk/middleware-serde" "3.226.0" - "@aws-sdk/middleware-stack" "3.226.0" - "@aws-sdk/middleware-user-agent" "3.226.0" - "@aws-sdk/node-config-provider" "3.226.0" - "@aws-sdk/node-http-handler" "3.226.0" - "@aws-sdk/protocol-http" "3.226.0" - "@aws-sdk/smithy-client" "3.234.0" - "@aws-sdk/types" "3.226.0" - "@aws-sdk/url-parser" "3.226.0" + "@aws-crypto/sha256-browser" "3.0.0" + "@aws-crypto/sha256-js" "3.0.0" + "@aws-sdk/config-resolver" "3.289.0" + "@aws-sdk/fetch-http-handler" "3.289.0" + "@aws-sdk/hash-node" "3.289.0" + "@aws-sdk/invalid-dependency" "3.289.0" + "@aws-sdk/middleware-content-length" "3.289.0" + "@aws-sdk/middleware-endpoint" "3.289.0" + "@aws-sdk/middleware-host-header" "3.289.0" + "@aws-sdk/middleware-logger" "3.289.0" + "@aws-sdk/middleware-recursion-detection" "3.289.0" + "@aws-sdk/middleware-retry" "3.289.0" + "@aws-sdk/middleware-serde" "3.289.0" + "@aws-sdk/middleware-stack" "3.289.0" + "@aws-sdk/middleware-user-agent" "3.289.0" + "@aws-sdk/node-config-provider" "3.289.0" + "@aws-sdk/node-http-handler" "3.289.0" + "@aws-sdk/protocol-http" "3.289.0" + "@aws-sdk/smithy-client" "3.289.0" + "@aws-sdk/types" "3.289.0" + "@aws-sdk/url-parser" "3.289.0" "@aws-sdk/util-base64" "3.208.0" "@aws-sdk/util-body-length-browser" "3.188.0" "@aws-sdk/util-body-length-node" "3.208.0" - "@aws-sdk/util-defaults-mode-browser" "3.234.0" - "@aws-sdk/util-defaults-mode-node" "3.234.0" - "@aws-sdk/util-endpoints" "3.226.0" - "@aws-sdk/util-retry" "3.229.0" - "@aws-sdk/util-user-agent-browser" "3.226.0" - "@aws-sdk/util-user-agent-node" "3.226.0" - "@aws-sdk/util-utf8-browser" "3.188.0" - "@aws-sdk/util-utf8-node" "3.208.0" + "@aws-sdk/util-defaults-mode-browser" "3.289.0" + "@aws-sdk/util-defaults-mode-node" "3.289.0" + "@aws-sdk/util-endpoints" "3.289.0" + "@aws-sdk/util-retry" "3.289.0" + "@aws-sdk/util-user-agent-browser" "3.289.0" + "@aws-sdk/util-user-agent-node" "3.289.0" + "@aws-sdk/util-utf8" "3.254.0" tslib "^2.3.1" -"@aws-sdk/client-sso@3.236.0": - version "3.236.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.236.0.tgz#eba16f73abb9639bfdafeeb64d5c9771db2a4cc9" - integrity sha512-2E/XHiVSRI+L2SlVscmV/+z4A2iWF6BTUjVBFBGMmsailvGDV6XKPFocTBsHI64G25/SYkhMdELvjn5jHLKBGQ== +"@aws-sdk/client-sso@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.289.0.tgz#a77f13b1de5923c0a3048e0e1548ceef09d49cab" + integrity sha512-GIpxPaEwqXC+P8wH+G4mIDnxYFJ+2SyYTrnoxb4OUH+gAkU6tybgvsv0fy+jsVD6GAWPdfU1AYk2ZjofdFiHeA== dependencies: - "@aws-crypto/sha256-browser" "2.0.0" - "@aws-crypto/sha256-js" "2.0.0" - "@aws-sdk/config-resolver" "3.234.0" - "@aws-sdk/fetch-http-handler" "3.226.0" - "@aws-sdk/hash-node" "3.226.0" - "@aws-sdk/invalid-dependency" "3.226.0" - "@aws-sdk/middleware-content-length" "3.226.0" - "@aws-sdk/middleware-endpoint" "3.226.0" - "@aws-sdk/middleware-host-header" "3.226.0" - "@aws-sdk/middleware-logger" "3.226.0" - "@aws-sdk/middleware-recursion-detection" "3.226.0" - "@aws-sdk/middleware-retry" "3.235.0" - "@aws-sdk/middleware-serde" "3.226.0" - "@aws-sdk/middleware-stack" "3.226.0" - "@aws-sdk/middleware-user-agent" "3.226.0" - "@aws-sdk/node-config-provider" "3.226.0" - "@aws-sdk/node-http-handler" "3.226.0" - "@aws-sdk/protocol-http" "3.226.0" - "@aws-sdk/smithy-client" "3.234.0" - "@aws-sdk/types" "3.226.0" - "@aws-sdk/url-parser" "3.226.0" + "@aws-crypto/sha256-browser" "3.0.0" + "@aws-crypto/sha256-js" "3.0.0" + "@aws-sdk/config-resolver" "3.289.0" + "@aws-sdk/fetch-http-handler" "3.289.0" + "@aws-sdk/hash-node" "3.289.0" + "@aws-sdk/invalid-dependency" "3.289.0" + "@aws-sdk/middleware-content-length" "3.289.0" + "@aws-sdk/middleware-endpoint" "3.289.0" + "@aws-sdk/middleware-host-header" "3.289.0" + "@aws-sdk/middleware-logger" "3.289.0" + "@aws-sdk/middleware-recursion-detection" "3.289.0" + "@aws-sdk/middleware-retry" "3.289.0" + "@aws-sdk/middleware-serde" "3.289.0" + "@aws-sdk/middleware-stack" "3.289.0" + "@aws-sdk/middleware-user-agent" "3.289.0" + "@aws-sdk/node-config-provider" "3.289.0" + "@aws-sdk/node-http-handler" "3.289.0" + "@aws-sdk/protocol-http" "3.289.0" + "@aws-sdk/smithy-client" "3.289.0" + "@aws-sdk/types" "3.289.0" + "@aws-sdk/url-parser" "3.289.0" "@aws-sdk/util-base64" "3.208.0" "@aws-sdk/util-body-length-browser" "3.188.0" "@aws-sdk/util-body-length-node" "3.208.0" - "@aws-sdk/util-defaults-mode-browser" "3.234.0" - "@aws-sdk/util-defaults-mode-node" "3.234.0" - "@aws-sdk/util-endpoints" "3.226.0" - "@aws-sdk/util-retry" "3.229.0" - "@aws-sdk/util-user-agent-browser" "3.226.0" - "@aws-sdk/util-user-agent-node" "3.226.0" - "@aws-sdk/util-utf8-browser" "3.188.0" - "@aws-sdk/util-utf8-node" "3.208.0" + "@aws-sdk/util-defaults-mode-browser" "3.289.0" + "@aws-sdk/util-defaults-mode-node" "3.289.0" + "@aws-sdk/util-endpoints" "3.289.0" + "@aws-sdk/util-retry" "3.289.0" + "@aws-sdk/util-user-agent-browser" "3.289.0" + "@aws-sdk/util-user-agent-node" "3.289.0" + "@aws-sdk/util-utf8" "3.254.0" tslib "^2.3.1" -"@aws-sdk/client-sts@3.236.0": - version "3.236.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.236.0.tgz#8f3d793d627edf72ae80ffc50e7982b6cbcfd3f7" - integrity sha512-ruEALU0oPwsA8xZ/HBCoUO9rsyhPyalj20GMGpzVaNcf1dr1jMTThDQvQvvjAHjY3W56mI7ApxjK+D+gok55aw== +"@aws-sdk/client-sts@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.289.0.tgz#4da58cfd24f6a974d7e07aae57753bf084637a51" + integrity sha512-n+8zDCzk0NvCIXX3MGS8RV/+/MkJso0jkqkPOgPcS8Kf7Zbjlx8FyeGQ5LS7HjhCDk+jExH/s9h1kd3sL1pHQA== dependencies: - "@aws-crypto/sha256-browser" "2.0.0" - "@aws-crypto/sha256-js" "2.0.0" - "@aws-sdk/config-resolver" "3.234.0" - "@aws-sdk/credential-provider-node" "3.236.0" - "@aws-sdk/fetch-http-handler" "3.226.0" - "@aws-sdk/hash-node" "3.226.0" - "@aws-sdk/invalid-dependency" "3.226.0" - "@aws-sdk/middleware-content-length" "3.226.0" - "@aws-sdk/middleware-endpoint" "3.226.0" - "@aws-sdk/middleware-host-header" "3.226.0" - "@aws-sdk/middleware-logger" "3.226.0" - "@aws-sdk/middleware-recursion-detection" "3.226.0" - "@aws-sdk/middleware-retry" "3.235.0" - "@aws-sdk/middleware-sdk-sts" "3.226.0" - "@aws-sdk/middleware-serde" "3.226.0" - "@aws-sdk/middleware-signing" "3.226.0" - "@aws-sdk/middleware-stack" "3.226.0" - "@aws-sdk/middleware-user-agent" "3.226.0" - "@aws-sdk/node-config-provider" "3.226.0" - "@aws-sdk/node-http-handler" "3.226.0" - "@aws-sdk/protocol-http" "3.226.0" - "@aws-sdk/smithy-client" "3.234.0" - "@aws-sdk/types" "3.226.0" - "@aws-sdk/url-parser" "3.226.0" + "@aws-crypto/sha256-browser" "3.0.0" + "@aws-crypto/sha256-js" "3.0.0" + "@aws-sdk/config-resolver" "3.289.0" + "@aws-sdk/credential-provider-node" "3.289.0" + "@aws-sdk/fetch-http-handler" "3.289.0" + "@aws-sdk/hash-node" "3.289.0" + "@aws-sdk/invalid-dependency" "3.289.0" + "@aws-sdk/middleware-content-length" "3.289.0" + "@aws-sdk/middleware-endpoint" "3.289.0" + "@aws-sdk/middleware-host-header" "3.289.0" + "@aws-sdk/middleware-logger" "3.289.0" + "@aws-sdk/middleware-recursion-detection" "3.289.0" + "@aws-sdk/middleware-retry" "3.289.0" + "@aws-sdk/middleware-sdk-sts" "3.289.0" + "@aws-sdk/middleware-serde" "3.289.0" + "@aws-sdk/middleware-signing" "3.289.0" + "@aws-sdk/middleware-stack" "3.289.0" + "@aws-sdk/middleware-user-agent" "3.289.0" + "@aws-sdk/node-config-provider" "3.289.0" + "@aws-sdk/node-http-handler" "3.289.0" + "@aws-sdk/protocol-http" "3.289.0" + "@aws-sdk/smithy-client" "3.289.0" + "@aws-sdk/types" "3.289.0" + "@aws-sdk/url-parser" "3.289.0" "@aws-sdk/util-base64" "3.208.0" "@aws-sdk/util-body-length-browser" "3.188.0" "@aws-sdk/util-body-length-node" "3.208.0" - "@aws-sdk/util-defaults-mode-browser" "3.234.0" - "@aws-sdk/util-defaults-mode-node" "3.234.0" - "@aws-sdk/util-endpoints" "3.226.0" - "@aws-sdk/util-retry" "3.229.0" - "@aws-sdk/util-user-agent-browser" "3.226.0" - "@aws-sdk/util-user-agent-node" "3.226.0" - "@aws-sdk/util-utf8-browser" "3.188.0" - "@aws-sdk/util-utf8-node" "3.208.0" - fast-xml-parser "4.0.11" + "@aws-sdk/util-defaults-mode-browser" "3.289.0" + "@aws-sdk/util-defaults-mode-node" "3.289.0" + "@aws-sdk/util-endpoints" "3.289.0" + "@aws-sdk/util-retry" "3.289.0" + "@aws-sdk/util-user-agent-browser" "3.289.0" + "@aws-sdk/util-user-agent-node" "3.289.0" + "@aws-sdk/util-utf8" "3.254.0" + fast-xml-parser "4.1.2" tslib "^2.3.1" -"@aws-sdk/config-resolver@3.234.0": - version "3.234.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/config-resolver/-/config-resolver-3.234.0.tgz#29d8936b713b7ee59b26b335d4f6715d644fc089" - integrity sha512-uZxy4wzllfvgCQxVc+Iqhde0NGAnfmV2hWR6ejadJaAFTuYNvQiRg9IqJy3pkyDPqXySiJ8Bom5PoJfgn55J/A== +"@aws-sdk/config-resolver@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/config-resolver/-/config-resolver-3.289.0.tgz#a6f148afe9ba57fff5e1168c128adbda15378772" + integrity sha512-QYrBJeFJwx9wL73xMJgSTS6zY5SQh0tbZXpVlSZcNDuOufsu5zdcZZCOp0I20yGf8zxKX59u7O73OUlppkk+Wg== dependencies: - "@aws-sdk/signature-v4" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/signature-v4" "3.289.0" + "@aws-sdk/types" "3.289.0" "@aws-sdk/util-config-provider" "3.208.0" - "@aws-sdk/util-middleware" "3.226.0" + "@aws-sdk/util-middleware" "3.289.0" tslib "^2.3.1" -"@aws-sdk/credential-provider-cognito-identity@3.236.0": - version "3.236.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.236.0.tgz#7936ce9a7ceaeff9045d85b3e69af9865c467bfc" - integrity sha512-PDsUZ7gmSCwraDDYnmoSkmrA1tpmvDBDjNPUVe6E+/8tDw3SWiL2efGR6r8ajFh9m+6jF6B8Wy+YB3u3yjAjWQ== +"@aws-sdk/credential-provider-cognito-identity@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.289.0.tgz#dfcc600d7eab7e38b0c6dc7bcc6e44d83fb82f53" + integrity sha512-RrK15OhL6UR8QKD415hggKfl8wcsMBqafcw/uYDESlvuAQVIi7hLgf5/2Onbhbc+m3huTBHY9e1D1n7u9hf9Bw== dependencies: - "@aws-sdk/client-cognito-identity" "3.236.0" - "@aws-sdk/property-provider" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/client-cognito-identity" "3.289.0" + "@aws-sdk/property-provider" "3.289.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/credential-provider-env@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.226.0.tgz#0bcb89a9abc166b3a48f5c255b9fcabc4cb80daf" - integrity sha512-sd8uK1ojbXxaZXlthzw/VXZwCPUtU3PjObOfr3Evj7MPIM2IH8h29foOlggx939MdLQGboJf9gKvLlvKDWtJRA== +"@aws-sdk/credential-provider-env@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.289.0.tgz#4cbf2a0cf4b8d9c9d4438782c480b7a65918a3c1" + integrity sha512-h4yNEW2ZJATKVxL0Bvz/WWXUmBr+AhsTyjUNge734306lXNG5/FM7zYp2v6dSQWt02WwBXyfkP3lr+A0n4rHyA== dependencies: - "@aws-sdk/property-provider" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/property-provider" "3.289.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/credential-provider-imds@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.226.0.tgz#0a4558449eb261412b0490ea1c3242eb91659759" - integrity sha512-//z/COQm2AjYFI1Lb0wKHTQSrvLFTyuKLFQGPJsKS7DPoxGOCKB7hmYerlbl01IDoCxTdyL//TyyPxbZEOQD5Q== +"@aws-sdk/credential-provider-imds@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.289.0.tgz#8cf6a5c612c8193105d5891ff5afde1fb98cdca2" + integrity sha512-SIl+iLQpDR6HA9CKTebui7NLop5GxnCkufbM3tbSqrQcPcEfYLOwXpu5gpKO2unQzRykCoyRVia1lr7Pc9Hgdg== dependencies: - "@aws-sdk/node-config-provider" "3.226.0" - "@aws-sdk/property-provider" "3.226.0" - "@aws-sdk/types" "3.226.0" - "@aws-sdk/url-parser" "3.226.0" + "@aws-sdk/node-config-provider" "3.289.0" + "@aws-sdk/property-provider" "3.289.0" + "@aws-sdk/types" "3.289.0" + "@aws-sdk/url-parser" "3.289.0" tslib "^2.3.1" -"@aws-sdk/credential-provider-ini@3.236.0": - version "3.236.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.236.0.tgz#10270be0de0cd34b1a82187248ade3779ff02005" - integrity sha512-W5vMEauWgFCzvf4Hks6ToU5dhbN87gyijmwp/l9AkKKvuJ25LkveAhk8xz3bydJThHdgWNEuBMyfmlVWmdybIg== +"@aws-sdk/credential-provider-ini@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.289.0.tgz#99d1a5f3a0b92ff45af450c7240e47e5988c6178" + integrity sha512-kvNUn3v4FTRRiqCOXl46v51VTGOM76j5Szcrhkk9qeFW6zt4iFodp6tQ4ynDtDxYxOvjuEfm3ii1YN5nkI1uKA== dependencies: - "@aws-sdk/credential-provider-env" "3.226.0" - "@aws-sdk/credential-provider-imds" "3.226.0" - "@aws-sdk/credential-provider-process" "3.226.0" - "@aws-sdk/credential-provider-sso" "3.236.0" - "@aws-sdk/credential-provider-web-identity" "3.226.0" - "@aws-sdk/property-provider" "3.226.0" - "@aws-sdk/shared-ini-file-loader" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/credential-provider-env" "3.289.0" + "@aws-sdk/credential-provider-imds" "3.289.0" + "@aws-sdk/credential-provider-process" "3.289.0" + "@aws-sdk/credential-provider-sso" "3.289.0" + "@aws-sdk/credential-provider-web-identity" "3.289.0" + "@aws-sdk/property-provider" "3.289.0" + "@aws-sdk/shared-ini-file-loader" "3.289.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/credential-provider-node@3.236.0": - version "3.236.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.236.0.tgz#288f10f65c8b94d8f20f431e77febbe6c285ab42" - integrity sha512-ktRPwmqw2P4dDzs/nJYTnuesSYqpDUEtqm2KSCKNT/fobzgfsrESLk3a7TY4l6N3muxQtKwguIa9Lulhe82+wg== +"@aws-sdk/credential-provider-node@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.289.0.tgz#bf55caf0ce120f784614c5870f4308ba257ff38c" + integrity sha512-05CYPGnk5cDiOQDIaXNVibNOwQdI34MDiL17YkSfPv779A+uq4vqg/aBfL41BDJjr1gSGgyvVhlcUdBKnlp93Q== dependencies: - "@aws-sdk/credential-provider-env" "3.226.0" - "@aws-sdk/credential-provider-imds" "3.226.0" - "@aws-sdk/credential-provider-ini" "3.236.0" - "@aws-sdk/credential-provider-process" "3.226.0" - "@aws-sdk/credential-provider-sso" "3.236.0" - "@aws-sdk/credential-provider-web-identity" "3.226.0" - "@aws-sdk/property-provider" "3.226.0" - "@aws-sdk/shared-ini-file-loader" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/credential-provider-env" "3.289.0" + "@aws-sdk/credential-provider-imds" "3.289.0" + "@aws-sdk/credential-provider-ini" "3.289.0" + "@aws-sdk/credential-provider-process" "3.289.0" + "@aws-sdk/credential-provider-sso" "3.289.0" + "@aws-sdk/credential-provider-web-identity" "3.289.0" + "@aws-sdk/property-provider" "3.289.0" + "@aws-sdk/shared-ini-file-loader" "3.289.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/credential-provider-process@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.226.0.tgz#bcd73a6d31d1b3181917d56e54aacbee242b077f" - integrity sha512-iUDMdnrTvbvaCFhWwqyXrhvQ9+ojPqPqXhwZtY1X/Qaz+73S9gXBPJHZaZb2Ke0yKE1Ql3bJbKvmmxC/qLQMng== +"@aws-sdk/credential-provider-process@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.289.0.tgz#ef91f39541a607dde73c3df81715d8f2b176991f" + integrity sha512-t39CJHj1/f2DcRbEUSJ1ixwDsgaElDpJPynn59MOdNnrSh5bYuYmkrum/GYXYSsk+HoSK21JvwgvjnrkA9WZKQ== dependencies: - "@aws-sdk/property-provider" "3.226.0" - "@aws-sdk/shared-ini-file-loader" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/property-provider" "3.289.0" + "@aws-sdk/shared-ini-file-loader" "3.289.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/credential-provider-sso@3.236.0": - version "3.236.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.236.0.tgz#98deadb0b689546bd5e93fc73dc6d6c87fe1c562" - integrity sha512-HLeVsFHd8QLQwhjwhdlBhXOFIa33mzqmxOqe2Qr4FVD5IR1/G4zLpSWSwtYjpvWRZs2oWSg6XI7vSyeQttPmHg== +"@aws-sdk/credential-provider-sso@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.289.0.tgz#64bf7e3a2f017f5988174dd6193da6e8f187b1b6" + integrity sha512-8+DjOqj5JCpVdT4EJtdfis6OioAdiDKM1mvgDTG8R43MSThc+RGfzqaDJQdM+8+hzkYhxYfyI9XB0H+X3rDNsA== dependencies: - "@aws-sdk/client-sso" "3.236.0" - "@aws-sdk/property-provider" "3.226.0" - "@aws-sdk/shared-ini-file-loader" "3.226.0" - "@aws-sdk/token-providers" "3.236.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/client-sso" "3.289.0" + "@aws-sdk/property-provider" "3.289.0" + "@aws-sdk/shared-ini-file-loader" "3.289.0" + "@aws-sdk/token-providers" "3.289.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/credential-provider-web-identity@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.226.0.tgz#2b7d20f93a40e2243c7e3857f54b103d19a946fb" - integrity sha512-CCpv847rLB0SFOHz2igvUMFAzeT2fD3YnY4C8jltuJoEkn0ITn1Hlgt13nTJ5BUuvyti2mvyXZHmNzhMIMrIlw== +"@aws-sdk/credential-provider-web-identity@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.289.0.tgz#14d9fa1e5f237abafc04533e34b9750565874b9a" + integrity sha512-jZ9hQvr0I7Z2DekDtZytViYn7zNNJG06N0CinAJzzvreAQ1I61rU7mhaWc05jhBSdeA3f82XoDAgxqY4xIh9pQ== dependencies: - "@aws-sdk/property-provider" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/property-provider" "3.289.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" "@aws-sdk/credential-providers@^3.186.0": - version "3.236.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.236.0.tgz#52c6f0e5baa1f0eab1f39171b47102806809d504" - integrity sha512-z7RU5E9xlk6KX16jJxByn8xa8mv8pPZoqAPkavCsFJS6pOYTtQJYYdjrUK/2EmOmbPpc62P6mqVP7qTVQKgafw== + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.289.0.tgz#e311def8113c68137b45aab424481df2d3a61098" + integrity sha512-kXNhi0s0oZ8k2cv3D5350glKutV4Lgg/hVBAAU/AnjFl5JFiZZKFpTs3N8p0MLCESipL2uCws7R0UU7uy8sKIQ== dependencies: - "@aws-sdk/client-cognito-identity" "3.236.0" - "@aws-sdk/client-sso" "3.236.0" - "@aws-sdk/client-sts" "3.236.0" - "@aws-sdk/credential-provider-cognito-identity" "3.236.0" - "@aws-sdk/credential-provider-env" "3.226.0" - "@aws-sdk/credential-provider-imds" "3.226.0" - "@aws-sdk/credential-provider-ini" "3.236.0" - "@aws-sdk/credential-provider-node" "3.236.0" - "@aws-sdk/credential-provider-process" "3.226.0" - "@aws-sdk/credential-provider-sso" "3.236.0" - "@aws-sdk/credential-provider-web-identity" "3.226.0" - "@aws-sdk/property-provider" "3.226.0" - "@aws-sdk/shared-ini-file-loader" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/client-cognito-identity" "3.289.0" + "@aws-sdk/client-sso" "3.289.0" + "@aws-sdk/client-sts" "3.289.0" + "@aws-sdk/credential-provider-cognito-identity" "3.289.0" + "@aws-sdk/credential-provider-env" "3.289.0" + "@aws-sdk/credential-provider-imds" "3.289.0" + "@aws-sdk/credential-provider-ini" "3.289.0" + "@aws-sdk/credential-provider-node" "3.289.0" + "@aws-sdk/credential-provider-process" "3.289.0" + "@aws-sdk/credential-provider-sso" "3.289.0" + "@aws-sdk/credential-provider-web-identity" "3.289.0" + "@aws-sdk/property-provider" "3.289.0" + "@aws-sdk/shared-ini-file-loader" "3.289.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/fetch-http-handler@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.226.0.tgz#350f78fc18fe9cb0a889ef4870838a8fcfa8855c" - integrity sha512-JewZPMNEBXfi1xVnRa7pVtK/zgZD8/lQ/YnD8pq79WuMa2cwyhDtr8oqCoqsPW+WJT5ScXoMtuHxN78l8eKWgg== +"@aws-sdk/fetch-http-handler@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.289.0.tgz#f09712c82d865423728539e26cbee20b91021e3c" + integrity sha512-tksh2GnDV1JaI+NO9x+pgyB3VNwjnUdtoMcFGmTDm1TrcPNj0FLX2hLiunlVG7fFMfGLXC2aco0sUra5/5US9Q== dependencies: - "@aws-sdk/protocol-http" "3.226.0" - "@aws-sdk/querystring-builder" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/protocol-http" "3.289.0" + "@aws-sdk/querystring-builder" "3.289.0" + "@aws-sdk/types" "3.289.0" "@aws-sdk/util-base64" "3.208.0" tslib "^2.3.1" -"@aws-sdk/hash-node@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/hash-node/-/hash-node-3.226.0.tgz#252d98bcbb1e13c8f26d9d416db03cf8cceac185" - integrity sha512-MdlJhJ9/Espwd0+gUXdZRsHuostB2WxEVAszWxobP0FTT9PnicqnfK7ExmW+DUAc0ywxtEbR3e0UND65rlSTVw== +"@aws-sdk/hash-node@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/hash-node/-/hash-node-3.289.0.tgz#f588be8b67762823d54e7814d174c3ee76127c62" + integrity sha512-fL7Pt4LU+tluHn0+BSIFVD2ZVJ5fuXvd1hQt4aTYrgkna1RR5v55Hdy2rNrp/syrkyE+Wv92S3hgZ7ZTBeXFZA== dependencies: - "@aws-sdk/types" "3.226.0" + "@aws-sdk/types" "3.289.0" "@aws-sdk/util-buffer-from" "3.208.0" + "@aws-sdk/util-utf8" "3.254.0" tslib "^2.3.1" -"@aws-sdk/invalid-dependency@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/invalid-dependency/-/invalid-dependency-3.226.0.tgz#74586f60859ed1813985e3d642066cc46d2e9d40" - integrity sha512-QXOYFmap8g9QzRjumcRCIo2GEZkdCwd7ePQW0OABWPhKHzlJ74vvBxywjU3s39EEBEluWXtZ7Iufg6GxZM4ifw== +"@aws-sdk/invalid-dependency@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/invalid-dependency/-/invalid-dependency-3.289.0.tgz#29abc018752f92485c2aa07c6e4d48f676657726" + integrity sha512-VpXadvpqXFUA8gBH6TAAJzsKfEQ4IvsiD7d9b2B+jw1YtaPFTqEEuDjN6ngpad8PCPCNWl8CI6oBCdMOK+L48A== dependencies: - "@aws-sdk/types" "3.226.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" "@aws-sdk/is-array-buffer@3.201.0": @@ -395,229 +383,230 @@ dependencies: tslib "^2.3.1" -"@aws-sdk/middleware-content-length@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-content-length/-/middleware-content-length-3.226.0.tgz#6cc952049f6e3cdc3a3778c9dce9f2aee942b5fe" - integrity sha512-ksUzlHJN2JMuyavjA46a4sctvnrnITqt2tbGGWWrAuXY1mel2j+VbgnmJUiwHKUO6bTFBBeft5Vd1TSOb4JmiA== +"@aws-sdk/middleware-content-length@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-content-length/-/middleware-content-length-3.289.0.tgz#86a8f77faa6dc228a030bdcc0fd35947be920f8a" + integrity sha512-D7vGeuaAzKiq0aFPwme1Xy4x69Jn4v0YJ3Xa4J+keNep0yZ9LfU5KSngqsxeTefCqS+2tdaArkBN2VdexmPagw== dependencies: - "@aws-sdk/protocol-http" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/protocol-http" "3.289.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/middleware-endpoint@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.226.0.tgz#d776480be4b5a9534c2805b7425be05497f840b7" - integrity sha512-EvLFafjtUxTT0AC9p3aBQu1/fjhWdIeK58jIXaNFONfZ3F8QbEYUPuF/SqZvJM6cWfOO9qwYKkRDbCSTYhprIg== +"@aws-sdk/middleware-endpoint@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.289.0.tgz#99b6c2e064e693c62873dad62c78c9bf551128d6" + integrity sha512-nxaQFOG1IurwCHWP22RxgTFZdILsdBg6wbg4GeFpNBtE3bi0zIUYKrUhpdRr/pZyGAboD1oD9iQtxuGb/M6f+w== dependencies: - "@aws-sdk/middleware-serde" "3.226.0" - "@aws-sdk/protocol-http" "3.226.0" - "@aws-sdk/signature-v4" "3.226.0" - "@aws-sdk/types" "3.226.0" - "@aws-sdk/url-parser" "3.226.0" + "@aws-sdk/middleware-serde" "3.289.0" + "@aws-sdk/protocol-http" "3.289.0" + "@aws-sdk/signature-v4" "3.289.0" + "@aws-sdk/types" "3.289.0" + "@aws-sdk/url-parser" "3.289.0" "@aws-sdk/util-config-provider" "3.208.0" - "@aws-sdk/util-middleware" "3.226.0" + "@aws-sdk/util-middleware" "3.289.0" tslib "^2.3.1" -"@aws-sdk/middleware-host-header@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.226.0.tgz#1e1ecb034929e0dbc532ae501fd93781438f9a24" - integrity sha512-haVkWVh6BUPwKgWwkL6sDvTkcZWvJjv8AgC8jiQuSl8GLZdzHTB8Qhi3IsfFta9HAuoLjxheWBE5Z/L0UrfhLA== +"@aws-sdk/middleware-host-header@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.289.0.tgz#0fe22ed1930d600844666ea80ef2f6717c52bd57" + integrity sha512-yFBOKvKBnITO08JCx+65vXPe9Uo4gZuth/ka9v5swa4wtV8AP+kkOwFrNxSi2iAFLJ4Mg21vGQceeL0bErF6KQ== dependencies: - "@aws-sdk/protocol-http" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/protocol-http" "3.289.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/middleware-logger@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.226.0.tgz#37fd0e62f555befd526b03748c3aab60dcefecf3" - integrity sha512-m9gtLrrYnpN6yckcQ09rV7ExWOLMuq8mMPF/K3DbL/YL0TuILu9i2T1W+JuxSX+K9FMG2HrLAKivE/kMLr55xA== +"@aws-sdk/middleware-logger@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.289.0.tgz#fd6de1ebcef0ff3fffe4f407162542bdfb9d7065" + integrity sha512-c5W7AlOdoyTXRoNl2yOVkhbTjp8tX0z65GDb3+/1yYcv+GRtz67WMZscWMQJwEfdCLdDE2GtBe+t2xyFGnmJvA== dependencies: - "@aws-sdk/types" "3.226.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/middleware-recursion-detection@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.226.0.tgz#e149b9138e94d2fa70e7752ba6b1ccb537009706" - integrity sha512-mwRbdKEUeuNH5TEkyZ5FWxp6bL2UC1WbY+LDv6YjHxmSMKpAoOueEdtU34PqDOLrpXXxIGHDFmjeGeMfktyEcA== +"@aws-sdk/middleware-recursion-detection@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.289.0.tgz#8d185c2bb9f80215b51f3c1700914f04c4c84fe9" + integrity sha512-r2NrfnTG0UZRXeFjoyapAake7b1rUo6SC52/UV4Pdm8cHoYMmljnaGLjiAfzt6vWv6cSVCJq1r28Ne4slAoMAg== dependencies: - "@aws-sdk/protocol-http" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/protocol-http" "3.289.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/middleware-retry@3.235.0": - version "3.235.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-retry/-/middleware-retry-3.235.0.tgz#c0d938db85a771812204ed5e981eaf5eef6b580b" - integrity sha512-50WHbJGpD3SNp9763MAlHqIhXil++JdQbKejNpHg7HsJne/ao3ub+fDOfx//mMBjpzBV25BGd5UlfL6blrClSg== +"@aws-sdk/middleware-retry@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-retry/-/middleware-retry-3.289.0.tgz#68534fbd94c40feb11a22b134285db9089b47336" + integrity sha512-Su+iGv5mrFjVCXJmjohX00o3HzkwnhY0TDhIltgolB6ZfOqy3Dfopjj21OWtqY9VYCUiLGC4KRfeb2feyrz5BA== dependencies: - "@aws-sdk/protocol-http" "3.226.0" - "@aws-sdk/service-error-classification" "3.229.0" - "@aws-sdk/types" "3.226.0" - "@aws-sdk/util-middleware" "3.226.0" - "@aws-sdk/util-retry" "3.229.0" + "@aws-sdk/protocol-http" "3.289.0" + "@aws-sdk/service-error-classification" "3.289.0" + "@aws-sdk/types" "3.289.0" + "@aws-sdk/util-middleware" "3.289.0" + "@aws-sdk/util-retry" "3.289.0" tslib "^2.3.1" uuid "^8.3.2" -"@aws-sdk/middleware-sdk-sts@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.226.0.tgz#e8a8cf42bba8963259546120cde1e408628863f9" - integrity sha512-NN9T/qoSD1kZvAT+VLny3NnlqgylYQcsgV3rvi/8lYzw/G/2s8VS6sm/VTWGGZhx08wZRv20MWzYu3bftcyqUg== +"@aws-sdk/middleware-sdk-sts@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.289.0.tgz#aa5b8a075aea6c1af5bbb292a26d085985373ad6" + integrity sha512-9WzUVPEqJcvggGCk9JHXnwhj7fjuMXE/JM3gx7eMSStJCcK+3BARZ1RZnggUN4vN9iTSzdA+r0OpC1XnUGKB2g== dependencies: - "@aws-sdk/middleware-signing" "3.226.0" - "@aws-sdk/property-provider" "3.226.0" - "@aws-sdk/protocol-http" "3.226.0" - "@aws-sdk/signature-v4" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/middleware-signing" "3.289.0" + "@aws-sdk/property-provider" "3.289.0" + "@aws-sdk/protocol-http" "3.289.0" + "@aws-sdk/signature-v4" "3.289.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/middleware-serde@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-serde/-/middleware-serde-3.226.0.tgz#c837ef33b34bec2af19a1c177a0c02a1ae20da5e" - integrity sha512-nPuOOAkSfx9TxzdKFx0X2bDlinOxGrqD7iof926K/AEflxGD1DBdcaDdjlYlPDW2CVE8LV/rAgbYuLxh/E/1VA== +"@aws-sdk/middleware-serde@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-serde/-/middleware-serde-3.289.0.tgz#095ed906dd0c3ca9afe0bd97aeada2f64ebd30e7" + integrity sha512-pygC+LsEBVAxOzfoxA9jgvqfO1PLivh8s2Yr/aNQOwx49fmTHMvPwRYUGDV38Du6bRYcKI6nxYqkbJFkQkRESQ== dependencies: - "@aws-sdk/types" "3.226.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/middleware-signing@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-signing/-/middleware-signing-3.226.0.tgz#ebb1d142ac2767466f2e464bb7dba9837143b4d1" - integrity sha512-E6HmtPcl+IjYDDzi1xI2HpCbBq2avNWcjvCriMZWuTAtRVpnA6XDDGW5GY85IfS3A8G8vuWqEVPr8JcYUcjfew== +"@aws-sdk/middleware-signing@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-signing/-/middleware-signing-3.289.0.tgz#e262bea9bc1e61d52d7fbcf81c329a07fd60e783" + integrity sha512-9SLATNvibxg4hpr4ldU18LwB6AVzovONWeJLt49FKISz7ZwGF6WVJYUMWeScj4+Z51Gozi7+pUIaFn7i6N3UbA== dependencies: - "@aws-sdk/property-provider" "3.226.0" - "@aws-sdk/protocol-http" "3.226.0" - "@aws-sdk/signature-v4" "3.226.0" - "@aws-sdk/types" "3.226.0" - "@aws-sdk/util-middleware" "3.226.0" + "@aws-sdk/property-provider" "3.289.0" + "@aws-sdk/protocol-http" "3.289.0" + "@aws-sdk/signature-v4" "3.289.0" + "@aws-sdk/types" "3.289.0" + "@aws-sdk/util-middleware" "3.289.0" tslib "^2.3.1" -"@aws-sdk/middleware-stack@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-stack/-/middleware-stack-3.226.0.tgz#b0408370270188103987c457c758f9cf7651754f" - integrity sha512-85wF29LvPvpoed60fZGDYLwv1Zpd/cM0C22WSSFPw1SSJeqO4gtFYyCg2squfT3KI6kF43IIkOCJ+L7GtryPug== +"@aws-sdk/middleware-stack@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-stack/-/middleware-stack-3.289.0.tgz#e08558014f45622783e76c2d7cf85191434101b3" + integrity sha512-3rWx+UkV//dv/cLIrXmzIa+FZcn6n76JevGHYCTReiRpcvv+xECxgXH2crMYtzbu05WdxGYD6P0IP5tMwH0yXA== dependencies: tslib "^2.3.1" -"@aws-sdk/middleware-user-agent@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.226.0.tgz#26653189f3e8da86514f77688a80d0ad445c0799" - integrity sha512-N1WnfzCW1Y5yWhVAphf8OPGTe8Df3vmV7/LdsoQfmpkCZgLZeK2o0xITkUQhRj1mbw7yp8tVFLFV3R2lMurdAQ== +"@aws-sdk/middleware-user-agent@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.289.0.tgz#5650f57906b0fff32f739e47425c603f987aef11" + integrity sha512-XPhB9mgko66BouyxA+7z7SjUaNHyr58Xe/OB8GII5R/JiR3A/lpc8+jm9gEEpjEI/HpF8jLFDnTMbgabVAHOeA== dependencies: - "@aws-sdk/protocol-http" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/protocol-http" "3.289.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/node-config-provider@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/node-config-provider/-/node-config-provider-3.226.0.tgz#a9e21512ef824142bb928a0b2f85b39a75b8964d" - integrity sha512-B8lQDqiRk7X5izFEUMXmi8CZLOKCTWQJU9HQf3ako+sF0gexo4nHN3jhoRWyLtcgC5S3on/2jxpAcqtm7kuY3w== +"@aws-sdk/node-config-provider@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/node-config-provider/-/node-config-provider-3.289.0.tgz#815a760a9ed6c4e5b5cd7e8bf62fa7d7dd2fe6fb" + integrity sha512-rR41c3Y7MYEP8TG9X1whHyrXEXOZzi4blSDqeJflwtNt3r3HvErGZiNBdVv368ycPPuu1YRSqTkgOYNCv02vlw== dependencies: - "@aws-sdk/property-provider" "3.226.0" - "@aws-sdk/shared-ini-file-loader" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/property-provider" "3.289.0" + "@aws-sdk/shared-ini-file-loader" "3.289.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/node-http-handler@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/node-http-handler/-/node-http-handler-3.226.0.tgz#373886e949d214a99a3521bd6c141fa17b0e89fe" - integrity sha512-xQCddnZNMiPmjr3W7HYM+f5ir4VfxgJh37eqZwX6EZmyItFpNNeVzKUgA920ka1VPz/ZUYB+2OFGiX3LCLkkaA== +"@aws-sdk/node-http-handler@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/node-http-handler/-/node-http-handler-3.289.0.tgz#b1a8fc4bce4c257e8a15d7ecdebc25bca2afafb2" + integrity sha512-zKknSaOY2GNmqH/eoZndmQWoEKhYPV0qRZtAMxuS3DVI5fipBipNzbVBaXrHRjxARx7/VLWnvNArchRoHfOlmw== dependencies: - "@aws-sdk/abort-controller" "3.226.0" - "@aws-sdk/protocol-http" "3.226.0" - "@aws-sdk/querystring-builder" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/abort-controller" "3.289.0" + "@aws-sdk/protocol-http" "3.289.0" + "@aws-sdk/querystring-builder" "3.289.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/property-provider@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/property-provider/-/property-provider-3.226.0.tgz#ef0ff37c319dc37a52f08fa7544f861308a3bbd8" - integrity sha512-TsljjG+Sg0LmdgfiAlWohluWKnxB/k8xenjeozZfzOr5bHmNHtdbWv6BtNvD/R83hw7SFXxbJHlD5H4u9p2NFg== +"@aws-sdk/property-provider@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/property-provider/-/property-provider-3.289.0.tgz#ff95153868c94b8def757a7a8d9eeb8603a1c874" + integrity sha512-Raf4lTWPTmEGFV7Lkbfet2n/4Ybz5vQiiU45l56kgIQA88mLUuE4dshgNsM0Zb2rflsTaiN1JR2+RS/8lNtI8A== dependencies: - "@aws-sdk/types" "3.226.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/protocol-http@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/protocol-http/-/protocol-http-3.226.0.tgz#0af7bdc331508e556b722aad0cb78eefa93466e3" - integrity sha512-zWkVqiTA9RXL6y0hhfZc9bcU4DX2NI6Hw9IhQmSPeM59mdbPjJlY4bLlMr5YxywqO3yQ/ylNoAfrEzrDjlOSRg== +"@aws-sdk/protocol-http@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/protocol-http/-/protocol-http-3.289.0.tgz#ebaa84ebd9ac1129459082c0990cd37d5355f2b1" + integrity sha512-/2jOQ3MJZx1xk6BHEOW47ItGo1tgA9cP9a2saYneon05VIV6OuYefO5pG2G0nPnImTbff++N7aioXe5XKrnorw== dependencies: - "@aws-sdk/types" "3.226.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/querystring-builder@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/querystring-builder/-/querystring-builder-3.226.0.tgz#11cd751abeac66f1f9349225454bac3e39808926" - integrity sha512-LVurypuNeotO4lmirKXRC4NYrZRAyMJXuwO0f2a5ZAUJCjauwYrifKue6yCfU7bls7gut7nfcR6B99WBYpHs3g== +"@aws-sdk/querystring-builder@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/querystring-builder/-/querystring-builder-3.289.0.tgz#75ddef075862746cbf6d92f71bb8715cedeef61f" + integrity sha512-llJCS8mAJfBYBjkKeriRmBuDr2jIozrMWhJOkz95SQGFsx1sKBPQMMOV6zunwhQux8bjtjf5wYiR1TM2jNUKqQ== dependencies: - "@aws-sdk/types" "3.226.0" + "@aws-sdk/types" "3.289.0" "@aws-sdk/util-uri-escape" "3.201.0" tslib "^2.3.1" -"@aws-sdk/querystring-parser@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/querystring-parser/-/querystring-parser-3.226.0.tgz#ba6a26727c98d46c95180e6cdc463039c5e4740d" - integrity sha512-FzB+VrQ47KAFxiPt2YXrKZ8AOLZQqGTLCKHzx4bjxGmwgsjV8yIbtJiJhZLMcUQV4LtGeIY9ixIqQhGvnZHE4A== +"@aws-sdk/querystring-parser@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/querystring-parser/-/querystring-parser-3.289.0.tgz#0aa11faa53203a1cfc30d3e0c48d70284f378ec2" + integrity sha512-84zXKXIYtnTCrez/gGZIGuqfUJezzaOMm7BQwnOnq/sN21ou63jF3Q+tIMhLO/EvDcvmxEOlUXN1kfMQcjEjSw== dependencies: - "@aws-sdk/types" "3.226.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/service-error-classification@3.229.0": - version "3.229.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/service-error-classification/-/service-error-classification-3.229.0.tgz#768f1eb92775ca2cc99c6451a2303a0008a28fc1" - integrity sha512-dnzWWQ0/NoWMUZ5C0DW3dPm0wC1O76Y/SpKbuJzWPkx1EYy6r8p32Ly4D9vUzrKDbRGf48YHIF2kOkBmu21CLg== +"@aws-sdk/service-error-classification@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/service-error-classification/-/service-error-classification-3.289.0.tgz#25c513c099126414ed2e8489290b3a4f0e0f2c4b" + integrity sha512-+d1Vlb45Bs2gbTmXpRCGQrX4AQDETjA5sx1zLvq1NZGSnTX6LdroYPtXu3dRWJwDHHQpCMN/XfFN8jTw0IzBOg== -"@aws-sdk/shared-ini-file-loader@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.226.0.tgz#d0ade86834b1803ce4b9dcab459e57e0376fd6cf" - integrity sha512-661VQefsARxVyyV2FX9V61V+nNgImk7aN2hYlFKla6BCwZfMng+dEtD0xVGyg1PfRw0qvEv5LQyxMVgHcUSevA== +"@aws-sdk/shared-ini-file-loader@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.289.0.tgz#ac3eb207374bef778638c75cc65233d9d9a64dae" + integrity sha512-XG9Pfn3itf3Z0p6nY6UuMVMhzZb+oX7L28oyby8REl8BAwfPkcziLxXlZsBHf6KcgYDG1R6z945hvIwZhJbjvA== dependencies: - "@aws-sdk/types" "3.226.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/signature-v4@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/signature-v4/-/signature-v4-3.226.0.tgz#100390b5c5b55a9b0abd05b06fceb36cfa0ecf98" - integrity sha512-/R5q5agdPd7HJB68XMzpxrNPk158EHUvkFkuRu5Qf3kkkHebEzWEBlWoVpUe6ss4rP9Tqcue6xPuaftEmhjpYw== +"@aws-sdk/signature-v4@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/signature-v4/-/signature-v4-3.289.0.tgz#be2f2533a52e13733e7ae88fbf083ec6357cc47a" + integrity sha512-IQyYHx3zp7PHxFA17YDb6WVx8ejXDxrsnKspFXgZQyoZOPfReqWQs32dcJYXff/IdSzxjwOpwBFbmIt2vbdKnQ== dependencies: "@aws-sdk/is-array-buffer" "3.201.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/types" "3.289.0" "@aws-sdk/util-hex-encoding" "3.201.0" - "@aws-sdk/util-middleware" "3.226.0" + "@aws-sdk/util-middleware" "3.289.0" "@aws-sdk/util-uri-escape" "3.201.0" + "@aws-sdk/util-utf8" "3.254.0" tslib "^2.3.1" -"@aws-sdk/smithy-client@3.234.0": - version "3.234.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/smithy-client/-/smithy-client-3.234.0.tgz#8f0021e021f0e52730ed0a8f271f839eb63bc374" - integrity sha512-8AtR/k4vsFvjXeQbIzq/Wy7Nbk48Ou0wUEeVYPHWHPSU8QamFWORkOwmKtKMfHAyZvmqiAPeQqHFkq+UJhWyyQ== +"@aws-sdk/smithy-client@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/smithy-client/-/smithy-client-3.289.0.tgz#d9ff0e50cb311662c8e4029791cfef2220d00b0a" + integrity sha512-miPMdnv4Ivv8RN65LJ9dxzkQNHn9Tp9wzZJXwBcPqGdXyRlkWSuIOIIhhAqQoV9R9ByeshnCWBpwqlITIjNPVw== dependencies: - "@aws-sdk/middleware-stack" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/middleware-stack" "3.289.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/token-providers@3.236.0": - version "3.236.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.236.0.tgz#c98ad2abad2a3686dbe849d680572f11ce965605" - integrity sha512-gmHuWuQgl6+2UfdbOvtsns/byZQnPGjyQ88/SlKgnX2EcDd31ENb8wRa9gfIEwvx6rTB2ve1NAhuliydB9AomQ== +"@aws-sdk/token-providers@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.289.0.tgz#ecfaa3462966c77508a64b3498319e2bfcbc4476" + integrity sha512-fzvGIfJNoLR5g24ok8cRwc9AMLXoEOyfi+eHocAF6eyfe0NWlQtpsmLe7XXx5I9yZ51lclzV49rEz9ynp243RA== dependencies: - "@aws-sdk/client-sso-oidc" "3.236.0" - "@aws-sdk/property-provider" "3.226.0" - "@aws-sdk/shared-ini-file-loader" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/client-sso-oidc" "3.289.0" + "@aws-sdk/property-provider" "3.289.0" + "@aws-sdk/shared-ini-file-loader" "3.289.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/types@3.226.0", "@aws-sdk/types@^3.1.0", "@aws-sdk/types@^3.110.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.226.0.tgz#3dba2ba223fbb8ac1ebc84de0e036ce69a81d469" - integrity sha512-MmmNHrWeO4man7wpOwrAhXlevqtOV9ZLcH4RhnG5LmRce0RFOApx24HoKENfFCcOyCm5LQBlsXCqi0dZWDWU0A== +"@aws-sdk/types@3.289.0", "@aws-sdk/types@^3.222.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.289.0.tgz#c1042bcefa21e90e754ba665094599fa8a7f35f8" + integrity sha512-wwUC+VwoNlEkgDzK/aJG3+zeMcYRcYFQV4mbZaicYdp3v8hmkUkJUhyxuZYl/FmY46WG+DYv+/Y3NilgfsE+Wg== dependencies: tslib "^2.3.1" -"@aws-sdk/url-parser@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/url-parser/-/url-parser-3.226.0.tgz#f53d1f868b27fe74aca091a799f2af56237b15a2" - integrity sha512-p5RLE0QWyP0OcTOLmFcLdVgUcUEzmEfmdrnOxyNzomcYb0p3vUagA5zfa1HVK2azsQJFBv28GfvMnba9bGhObg== +"@aws-sdk/url-parser@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/url-parser/-/url-parser-3.289.0.tgz#d2320e6174cc883abe2f03a27dcf918c40e0c5f0" + integrity sha512-rbtW3O6UBX+eWR/+UiCDNFUVwN8hp82JPy+NGv3NeOvRjBsxkKmcH4UJTHDIeT+suqTDNEdV5nz438u3dHdHrQ== dependencies: - "@aws-sdk/querystring-parser" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/querystring-parser" "3.289.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" "@aws-sdk/util-base64@3.208.0": @@ -657,34 +646,34 @@ dependencies: tslib "^2.3.1" -"@aws-sdk/util-defaults-mode-browser@3.234.0": - version "3.234.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.234.0.tgz#1151f0beabdb46c1aaca42a1ad0714b8e686acaa" - integrity sha512-IHMKXjTbOD8XMz5+2oCOsVP94BYb9YyjXdns0aAXr2NAo7k2+RCzXQ2DebJXppGda1F6opFutoKwyVSN0cmbMw== +"@aws-sdk/util-defaults-mode-browser@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.289.0.tgz#8f1f5e6926e18ba6f8a6c22d237e82649aca650c" + integrity sha512-sYrDwjX3s54cvGq69PJpP2vDpJ5BJXhg2KEHbK92Qr2AUqMUgidwZCw4oBaIqKDXcPIrjmhod31s3tTfYmtTMQ== dependencies: - "@aws-sdk/property-provider" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/property-provider" "3.289.0" + "@aws-sdk/types" "3.289.0" bowser "^2.11.0" tslib "^2.3.1" -"@aws-sdk/util-defaults-mode-node@3.234.0": - version "3.234.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.234.0.tgz#0607f1dc7a4dc896dfcaf377522535ca9ffba7a9" - integrity sha512-UGjQ+OjBYYhxFVtUY+jtr0ZZgzZh6OHtYwRhFt8IHewJXFCfZTyfsbX20szBj5y1S4HRIUJ7cwBLIytTqMbI5w== +"@aws-sdk/util-defaults-mode-node@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.289.0.tgz#1badaf2383f5de055e9a23fce5151b9eb31f94a2" + integrity sha512-PsP40+9peN7kpEmQ2GhEAGwUwD9F/R/BI/1kzjW0nbBsMrTnkUnlZlaitwpBX/OWNV/YZTdVAOvD50j/ACyXlg== dependencies: - "@aws-sdk/config-resolver" "3.234.0" - "@aws-sdk/credential-provider-imds" "3.226.0" - "@aws-sdk/node-config-provider" "3.226.0" - "@aws-sdk/property-provider" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/config-resolver" "3.289.0" + "@aws-sdk/credential-provider-imds" "3.289.0" + "@aws-sdk/node-config-provider" "3.289.0" + "@aws-sdk/property-provider" "3.289.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/util-endpoints@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.226.0.tgz#3728b2e30f6f757ae862a0b7cf3991e75f252c3f" - integrity sha512-iqOkac/zLmyPBUJd7SLN0PeZMkOmlGgD5PHmmekTClOkce2eUjK9SNX1PzL73aXPoPTyhg9QGLH8uEZEQ8YUzg== +"@aws-sdk/util-endpoints@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.289.0.tgz#556add88acaa0e77c2c8c356c876ea215ac60211" + integrity sha512-PmsgqL9jdNTz3p0eW83nZZGcngAdoIWidXCc32G5tIIYvJutdgkiObAaydtXaMgk5CRvjenngFf6Zg9JyVHOLQ== dependencies: - "@aws-sdk/types" "3.226.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" "@aws-sdk/util-hex-encoding@3.201.0": @@ -701,19 +690,19 @@ dependencies: tslib "^2.3.1" -"@aws-sdk/util-middleware@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-middleware/-/util-middleware-3.226.0.tgz#7069ae96e2e00f6bb82c722e073922fb2b051ca2" - integrity sha512-B96CQnwX4gRvQdaQkdUtqvDPkrptV5+va6FVeJOocU/DbSYMAScLxtR3peMS8cnlOT6nL1Eoa42OI9AfZz1VwQ== +"@aws-sdk/util-middleware@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-middleware/-/util-middleware-3.289.0.tgz#b8f2c9a08c23ed064054a19640d5a1c1911cefce" + integrity sha512-hw3WHQU9Wk7a1H3x+JhwMA4ECCleeuNlob3fXSYJmXgvZyuWfpMYZi4iSkqoWGFAXYpAtZZLIu45iIcd7F296g== dependencies: tslib "^2.3.1" -"@aws-sdk/util-retry@3.229.0": - version "3.229.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-retry/-/util-retry-3.229.0.tgz#17aad47b067e81acf644d5c2c0f2325f2d8faf4f" - integrity sha512-0zKTqi0P1inD0LzIMuXRIYYQ/8c1lWMg/cfiqUcIAF1TpatlpZuN7umU0ierpBFud7S+zDgg0oemh+Nj8xliJw== +"@aws-sdk/util-retry@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-retry/-/util-retry-3.289.0.tgz#fb800797cf9908a8346311bc00dbb5c032e702e4" + integrity sha512-noFn++ZKH11ExTBqUU/b9wsOjqxYlDnN/8xq+9oCsyBnEZztVgM/AM3WP5qBPRskk1WzDprID5fb5V87113Uug== dependencies: - "@aws-sdk/service-error-classification" "3.229.0" + "@aws-sdk/service-error-classification" "3.289.0" tslib "^2.3.1" "@aws-sdk/util-uri-escape@3.201.0": @@ -723,45 +712,45 @@ dependencies: tslib "^2.3.1" -"@aws-sdk/util-user-agent-browser@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.226.0.tgz#164bb2da8d6353133784e47f0a0ae463bc9ebb73" - integrity sha512-PhBIu2h6sPJPcv2I7ELfFizdl5pNiL4LfxrasMCYXQkJvVnoXztHA1x+CQbXIdtZOIlpjC+6BjDcE0uhnpvfcA== +"@aws-sdk/util-user-agent-browser@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.289.0.tgz#90dfb622d3f707d8cde9fb25c4bd548930821657" + integrity sha512-BDXYgNzzz2iNPTkl9MQf7pT4G80V6O6ICwJyH93a5EEdljl7oPrt8i4MS5S0BDAWx58LqjWtVw98GOZfy5BYhw== dependencies: - "@aws-sdk/types" "3.226.0" + "@aws-sdk/types" "3.289.0" bowser "^2.11.0" tslib "^2.3.1" -"@aws-sdk/util-user-agent-node@3.226.0": - version "3.226.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.226.0.tgz#7569460b9efc6bbd5295275c51357e480ff469c2" - integrity sha512-othPc5Dz/pkYkxH+nZPhc1Al0HndQT8zHD4e9h+EZ+8lkd8n+IsnLfTS/mSJWrfiC6UlNRVw55cItstmJyMe/A== +"@aws-sdk/util-user-agent-node@3.289.0": + version "3.289.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.289.0.tgz#048f86cf5dd4822f703aaac5f6e5adbf6cf6175f" + integrity sha512-f32g9KS7pwO6FQ9N1CtqQPIS6jhvwv/y0+NHNoo9zLTBH0jol3+C2ELIE3N1wB6xvwhsdPqR3WuOiNiCiv8YAQ== dependencies: - "@aws-sdk/node-config-provider" "3.226.0" - "@aws-sdk/types" "3.226.0" + "@aws-sdk/node-config-provider" "3.289.0" + "@aws-sdk/types" "3.289.0" tslib "^2.3.1" -"@aws-sdk/util-utf8-browser@3.188.0", "@aws-sdk/util-utf8-browser@^3.0.0": - version "3.188.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.188.0.tgz#484762bd600401350e148277731d6744a4a92225" - integrity sha512-jt627x0+jE+Ydr9NwkFstg3cUvgWh56qdaqAMDsqgRlKD21md/6G226z/Qxl7lb1VEW2LlmCx43ai/37Qwcj2Q== +"@aws-sdk/util-utf8-browser@^3.0.0": + version "3.259.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz#3275a6f5eb334f96ca76635b961d3c50259fd9ff" + integrity sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw== dependencies: tslib "^2.3.1" -"@aws-sdk/util-utf8-node@3.208.0": - version "3.208.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-utf8-node/-/util-utf8-node-3.208.0.tgz#eba17de0f92f87b98481c2e2d0ceaa05c7994d67" - integrity sha512-jKY87Acv0yWBdFxx6bveagy5FYjz+dtV8IPT7ay1E2WPWH1czoIdMAkc8tSInK31T6CRnHWkLZ1qYwCbgRfERQ== +"@aws-sdk/util-utf8@3.254.0": + version "3.254.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-utf8/-/util-utf8-3.254.0.tgz#909af9c6549833a9a9bf77004b7484bfc96b2c35" + integrity sha512-14Kso/eIt5/qfIBmhEL9L1IfyUqswjSTqO2mY7KOzUZ9SZbwn3rpxmtkhmATkRjD7XIlLKaxBkI7tU9Zjzj8Kw== dependencies: "@aws-sdk/util-buffer-from" "3.208.0" tslib "^2.3.1" "@babel/cli@^7.16.0": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.20.7.tgz#8fc12e85c744a1a617680eacb488fab1fcd35b7c" - integrity sha512-WylgcELHB66WwQqItxNILsMlaTd8/SO6SgTTjMp4uCI7P4QyH1r3nqgFmO3BfM4AtfniHgFMH3EpYFj/zynBkQ== + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.21.0.tgz#1868eb70e9824b427fc607610cce8e9e7889e7e1" + integrity sha512-xi7CxyS8XjSyiwUGCfwf+brtJxjW1/ZTcBUkP10xawIEXLX5HzLn+3aXkgxozcP2UhRhtKTmQurw9Uaes7jZrA== dependencies: - "@jridgewell/trace-mapping" "^0.3.8" + "@jridgewell/trace-mapping" "^0.3.17" commander "^4.0.1" convert-source-map "^1.1.0" fs-readdir-recursive "^1.1.0" @@ -780,38 +769,39 @@ "@babel/highlight" "^7.18.6" "@babel/compat-data@^7.20.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733" - integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g== + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.0.tgz#c241dc454e5b5917e40d37e525e2f4530c399298" + integrity sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g== "@babel/core@^7.16.5": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.7.tgz#37072f951bd4d28315445f66e0ec9f6ae0c8c35f" - integrity sha512-t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw== + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.0.tgz#1341aefdcc14ccc7553fcc688dd8986a2daffc13" + integrity sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA== dependencies: - "@ampproject/remapping" "^2.1.0" + "@ampproject/remapping" "^2.2.0" "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.20.7" + "@babel/generator" "^7.21.0" "@babel/helper-compilation-targets" "^7.20.7" - "@babel/helper-module-transforms" "^7.20.7" - "@babel/helpers" "^7.20.7" - "@babel/parser" "^7.20.7" + "@babel/helper-module-transforms" "^7.21.0" + "@babel/helpers" "^7.21.0" + "@babel/parser" "^7.21.0" "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.7" - "@babel/types" "^7.20.7" + "@babel/traverse" "^7.21.0" + "@babel/types" "^7.21.0" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" - json5 "^2.2.1" + json5 "^2.2.2" semver "^6.3.0" -"@babel/generator@^7.20.7", "@babel/generator@^7.4.0": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz#f8ef57c8242665c5929fe2e8d82ba75460187b4a" - integrity sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw== +"@babel/generator@^7.21.0", "@babel/generator@^7.21.1", "@babel/generator@^7.4.0": + version "7.21.1" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.1.tgz#951cc626057bc0af2c35cd23e9c64d384dea83dd" + integrity sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA== dependencies: - "@babel/types" "^7.20.7" + "@babel/types" "^7.21.0" "@jridgewell/gen-mapping" "^0.3.2" + "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" "@babel/helper-annotate-as-pure@^7.18.6": @@ -837,13 +827,13 @@ resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== -"@babel/helper-function-name@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" - integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w== +"@babel/helper-function-name@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4" + integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg== dependencies: - "@babel/template" "^7.18.10" - "@babel/types" "^7.19.0" + "@babel/template" "^7.20.7" + "@babel/types" "^7.21.0" "@babel/helper-hoist-variables@^7.18.6": version "7.18.6" @@ -859,10 +849,10 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-module-transforms@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz#7a6c9a1155bef55e914af574153069c9d9470c43" - integrity sha512-FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA== +"@babel/helper-module-transforms@^7.21.0": + version "7.21.2" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2" + integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ== dependencies: "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-module-imports" "^7.18.6" @@ -870,8 +860,8 @@ "@babel/helper-split-export-declaration" "^7.18.6" "@babel/helper-validator-identifier" "^7.19.1" "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.7" - "@babel/types" "^7.20.7" + "@babel/traverse" "^7.21.2" + "@babel/types" "^7.21.2" "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2": version "7.20.2" @@ -903,18 +893,18 @@ integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== "@babel/helper-validator-option@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" - integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180" + integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ== -"@babel/helpers@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.7.tgz#04502ff0feecc9f20ecfaad120a18f011a8e6dce" - integrity sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA== +"@babel/helpers@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.0.tgz#9dd184fb5599862037917cdc9eecb84577dc4e7e" + integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA== dependencies: "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.7" - "@babel/types" "^7.20.7" + "@babel/traverse" "^7.21.0" + "@babel/types" "^7.21.0" "@babel/highlight@^7.18.6": version "7.18.6" @@ -937,10 +927,10 @@ regenerator-runtime "^0.13.11" v8flags "^3.1.1" -"@babel/parser@^7.20.7", "@babel/parser@^7.4.3": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b" - integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg== +"@babel/parser@^7.20.7", "@babel/parser@^7.21.0", "@babel/parser@^7.21.2", "@babel/parser@^7.4.3": + version "7.21.2" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.2.tgz#dacafadfc6d7654c3051a66d6fe55b6cb2f2a0b3" + integrity sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ== "@babel/plugin-syntax-jsx@^7.18.6": version "7.18.6" @@ -950,20 +940,20 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-react-jsx@^7.16.5": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.7.tgz#025d85a1935fd7e19dfdcb1b1d4df34d4da484f7" - integrity sha512-Tfq7qqD+tRj3EoDhY00nn2uP2hsRxgYGi5mLQ5TimKav0a9Lrpd4deE+fcLXU8zFYRjlKPHZhpCvfEA6qnBxqQ== + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.21.0.tgz#656b42c2fdea0a6d8762075d58ef9d4e3c4ab8a2" + integrity sha512-6OAWljMvQrZjR2DaNhVfRz6dkCAVV+ymcLUmaf8bccGOHn2v5rHJK3tTpij0BuhdYWP4LLaqj5lwcdlpAAPuvg== dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" "@babel/helper-module-imports" "^7.18.6" "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-jsx" "^7.18.6" - "@babel/types" "^7.20.7" + "@babel/types" "^7.21.0" "@babel/register@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.18.9.tgz#1888b24bc28d5cc41c412feb015e9ff6b96e439c" - integrity sha512-ZlbnXDcNYHMR25ITwwNKT88JiaukkdVj/nG7r3wnuXkOTHc60Uy05PwMCPre0hSkY68E6zK3xz+vUJSP2jWmcw== + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.21.0.tgz#c97bf56c2472e063774f31d344c592ebdcefa132" + integrity sha512-9nKsPmYDi5DidAqJaQooxIhsLJiNMkGr8ypQ8Uic7cIox7UCDsM7HuUGxdGT7mSDTYbqzIdsOWzfBton/YJrMw== dependencies: clone-deep "^4.0.1" find-cache-dir "^2.0.0" @@ -971,7 +961,7 @@ pirates "^4.0.5" source-map-support "^0.5.16" -"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.4.0": +"@babel/template@^7.20.7", "@babel/template@^7.4.0": version "7.20.7" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== @@ -980,26 +970,26 @@ "@babel/parser" "^7.20.7" "@babel/types" "^7.20.7" -"@babel/traverse@^7.20.7", "@babel/traverse@^7.4.3": - version "7.20.8" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.8.tgz#e3a23eb04af24f8bbe8a8ba3eef6155b77df0b08" - integrity sha512-/RNkaYDeCy4MjyV70+QkSHhxbvj2JO/5Ft2Pa880qJOG8tWrqcT/wXUuCCv43yogfqPzHL77Xu101KQPf4clnQ== +"@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.4.3": + version "7.21.2" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.2.tgz#ac7e1f27658750892e815e60ae90f382a46d8e75" + integrity sha512-ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw== dependencies: "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.20.7" + "@babel/generator" "^7.21.1" "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.19.0" + "@babel/helper-function-name" "^7.21.0" "@babel/helper-hoist-variables" "^7.18.6" "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.20.7" - "@babel/types" "^7.20.7" + "@babel/parser" "^7.21.2" + "@babel/types" "^7.21.2" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.4.0": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f" - integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg== +"@babel/types@^7.18.6", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.4.0": + version "7.21.2" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.2.tgz#92246f6e00f91755893c2876ad653db70c8310d1" + integrity sha512-3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw== dependencies: "@babel/helper-string-parser" "^7.19.4" "@babel/helper-validator-identifier" "^7.19.1" @@ -1108,7 +1098,7 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== -"@jridgewell/trace-mapping@^0.3.8", "@jridgewell/trace-mapping@^0.3.9": +"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": version "0.3.17" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985" integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g== @@ -1140,11 +1130,12 @@ passport-strategy "1.x.x" "@mysql/xdevapi@*": - version "8.0.31" - resolved "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.31.tgz#aa1a41954fa9ee4ca1b3a4dde96ed67aef9bb48b" - integrity sha512-fDjf9/+uARDa4c3E1tfikB3eYSrUSJ4nF+pZZmuGn9HcU8HBVMDV7QMnzIFcopT8jEV5W230MaXZZBmOvC+EjQ== + version "8.0.32" + resolved "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.32.tgz#9191bd6c9d0fbdbd7e94a6526451b7b7bc73f670" + integrity sha512-kE6DFdliYas1ccu1/DSYvN2Zer6gcj7wMLbaq8EFc3Gcm8VimuMoIMixn6npVAbbxTfwECQAq0PjTpoCq9jU/g== dependencies: google-protobuf "3.19.4" + lossless-json "2.0.1" parsimmon "1.18.1" "@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3": @@ -1182,9 +1173,9 @@ lodash "^4.17.21" "@sapphire/snowflake@^3.2.2": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@sapphire/snowflake/-/snowflake-3.3.0.tgz#247413e4d7924a9f508c6a5c8d427e4105ac0fe6" - integrity sha512-Hec5N6zEkZuZFLybVKyLFLlcSgYmR6C1/+9NkIhxPwOf6tgX52ndJCSz8ADejmbrNE0VuNCNkpzhRZzenEC9vA== + version "3.4.0" + resolved "https://registry.yarnpkg.com/@sapphire/snowflake/-/snowflake-3.4.0.tgz#25c012158a9feea2256c718985dbd6c1859a5022" + integrity sha512-zZxymtVO6zeXVMPds+6d7gv/OfnCc25M1Z+7ZLB0oPmeMTPeRWVPQSS16oDJy5ZsyCOLj7M6mbZml5gWXcVRNw== "@sendgrid/client@^7.7.0": version "7.7.0" @@ -1237,20 +1228,25 @@ "@types/node" "*" "@types/node@*": - version "18.11.17" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.17.tgz#5c009e1d9c38f4a2a9d45c0b0c493fe6cdb4bcb5" - integrity sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng== + version "18.15.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.0.tgz#286a65e3fdffd691e170541e6ecb0410b16a38be" + integrity sha512-z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w== "@types/node@^14.14.14": - version "14.18.35" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.35.tgz#879c4659cb7b3fe515844f029c75079c941bb65c" - integrity sha512-2ATO8pfhG1kDvw4Lc4C0GXIMSQFFJBCo/R1fSgTwmUlq5oy95LXyjDQinsRVgQY6gp6ghh3H91wk9ES5/5C+Tw== + version "14.18.37" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.37.tgz#0bfcd173e8e1e328337473a8317e37b3b14fd30d" + integrity sha512-7GgtHCs/QZrBrDzgIJnQtuSvhFSwhyYSI2uafSwZoNt1iOGhEN5fwNrQMjtONyHm9+/LoA4453jH0CMYcr06Pg== "@types/node@^17.0.45": version "17.0.45" resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190" integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw== +"@types/triple-beam@^1.3.2": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.2.tgz#38ecb64f01aa0d02b7c8f4222d7c38af6316fef8" + integrity sha512-txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g== + "@types/webidl-conversions@*": version "7.0.0" resolved "https://registry.yarnpkg.com/@types/webidl-conversions/-/webidl-conversions-7.0.0.tgz#2b8e60e33906459219aa587e9d1a612ae994cfe7" @@ -1265,9 +1261,9 @@ "@types/webidl-conversions" "*" "@types/ws@^8.5.3": - version "8.5.3" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d" - integrity sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w== + version "8.5.4" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.4.tgz#bb10e36116d6e570dd943735f86c933c1587b8a5" + integrity sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg== dependencies: "@types/node" "*" @@ -1743,9 +1739,9 @@ accepts@~1.3.5, accepts@~1.3.8: negotiator "0.6.3" acebase-core@^1.25.0: - version "1.25.0" - resolved "https://registry.yarnpkg.com/acebase-core/-/acebase-core-1.25.0.tgz#afc95a26b9e1521cabc5de871ea9f186805de836" - integrity sha512-d7Bh0tcYYCcdKLYu7lDYPhDOIZQObUwGiMg4mcMfsdWWdlfQyQqQMLkYVRqVH1OdHHXEx/BoqtH1oHkEBqgRZg== + version "1.25.1" + resolved "https://registry.yarnpkg.com/acebase-core/-/acebase-core-1.25.1.tgz#f2de25a330acdf35a183632d69e765894fa02d51" + integrity sha512-U6WY6QwhsXypqZQqt7kNxsLvjucJrcJM8TxOydv95+lJyBkv2UoURhwRjaWA9+0DNRfAOhUuPgjNxBhHShl4hg== optionalDependencies: rxjs ">= 5.x <= 7.x" @@ -1794,9 +1790,9 @@ acorn@^3.0.4, acorn@^3.3.0: integrity sha512-OLUyIIZ7mF5oaAUT1w0TFqQS81q3saT46x8t7ukpPjMNk+nbs4ZHhs7ToV8EWnLYLepjETXd4XaCE4uxkMeqUw== acorn@^8.1.0, acorn@^8.8.1: - version "8.8.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" - integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== + version "8.8.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" + integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== aedes-packet@^1.0.0: version "1.0.0" @@ -1847,12 +1843,12 @@ agent-base@6, agent-base@^6.0.2: debug "4" agentkeepalive@^4.1.3: - version "4.2.1" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717" - integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA== + version "4.3.0" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.3.0.tgz#bb999ff07412653c1803b3ced35e50729830a255" + integrity sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg== dependencies: debug "^4.1.0" - depd "^1.1.2" + depd "^2.0.0" humanize-ms "^1.2.1" aggregate-error@^3.0.0: @@ -2146,7 +2142,7 @@ arrify@^2.0.0: resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa" integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug== -asap@^2.0.0, asap@~2.0.3: +asap@~2.0.3: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA== @@ -2189,9 +2185,9 @@ assign-symbols@^1.0.0: integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw== async-each@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" - integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== + version "1.0.6" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.6.tgz#52f1d9403818c179b7561e11a5d1b77eb2160e77" + integrity sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg== async-limiter@~1.0.0: version "1.0.1" @@ -2232,6 +2228,11 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== +available-typed-arrays@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" + integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== + aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -2243,9 +2244,9 @@ aws-sign@~0.3.0: integrity sha512-pEMJAknifcXqXqYVXzGPIu8mJvxtJxIdpVpAs8HNS+paT+9srRUDMQn+3hULS7WbLmttcmvgMvnDcFujqXJyPw== aws4@^1.8.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" - integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== + version "1.12.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.12.0.tgz#ce1c9d143389679e253b314241ea9aa5cec980d3" + integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg== axios@0.26.1, axios@^0.26.0, axios@^0.26.1: version "0.26.1" @@ -2891,7 +2892,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.20.1, body-parser@^1.19.0: +body-parser@1.20.1: version "1.20.1" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668" integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw== @@ -2909,6 +2910,24 @@ body-parser@1.20.1, body-parser@^1.19.0: type-is "~1.6.18" unpipe "1.0.0" +body-parser@^1.19.0: + version "1.20.2" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" + integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== + dependencies: + bytes "3.1.2" + content-type "~1.0.5" + debug "2.6.9" + depd "2.0.0" + destroy "1.2.0" + http-errors "2.0.0" + iconv-lite "0.4.24" + on-finished "2.4.1" + qs "6.11.0" + raw-body "2.5.2" + type-is "~1.6.18" + unpipe "1.0.0" + boom@0.4.x: version "0.4.2" resolved "https://registry.yarnpkg.com/boom/-/boom-0.4.2.tgz#7a636e9ded4efcefb19cef4947a3c67dfaee911b" @@ -2969,14 +2988,14 @@ braces@^3.0.2, braces@~3.0.2: fill-range "^7.0.1" browserslist@^4.21.3: - version "4.21.4" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987" - integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw== + version "4.21.5" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7" + integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w== dependencies: - caniuse-lite "^1.0.30001400" - electron-to-chromium "^1.4.251" - node-releases "^2.0.6" - update-browserslist-db "^1.0.9" + caniuse-lite "^1.0.30001449" + electron-to-chromium "^1.4.284" + node-releases "^2.0.8" + update-browserslist-db "^1.0.10" bson@^1.1.4: version "1.1.6" @@ -2984,9 +3003,9 @@ bson@^1.1.4: integrity sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg== bson@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/bson/-/bson-4.7.0.tgz#7874a60091ffc7a45c5dd2973b5cad7cded9718a" - integrity sha512-VrlEE4vuiO1WTpfof4VmaVolCVYkYTgB9iWgYNOrVlnifpME/06fhFRmONgBhClD5pFC1t9ZWqFUQEQAzY43bA== + version "4.7.2" + resolved "https://registry.yarnpkg.com/bson/-/bson-4.7.2.tgz#320f4ad0eaf5312dd9b45dc369cc48945e2a5f2e" + integrity sha512-Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ== dependencies: buffer "^5.6.0" @@ -3164,10 +3183,10 @@ camelcase@^5.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -caniuse-lite@^1.0.30001400: - version "1.0.30001441" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz#987437b266260b640a23cd18fbddb509d7f69f3e" - integrity sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg== +caniuse-lite@^1.0.30001449: + version "1.0.30001464" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001464.tgz#888922718df48ce5e33dcfe1a2af7d42676c5eb7" + integrity sha512-oww27MtUmusatpRpCGSOneQk2/l5czXANDSFvsc7VuOQ86s3ANhZetpwXNf1zY/zdfP63Xvjz325DAdAoES13g== caseless@~0.12.0: version "0.12.0" @@ -3635,10 +3654,10 @@ content-disposition@0.5.4: dependencies: safe-buffer "5.2.1" -content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" - integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== +content-type@~1.0.4, content-type@~1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" + integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== convert-source-map@^1.1.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.9.0" @@ -3650,14 +3669,15 @@ cookie-jar@~0.3.0: resolved "https://registry.yarnpkg.com/cookie-jar/-/cookie-jar-0.3.0.tgz#bc9a27d4e2b97e186cd57c9e2063cb99fa68cccc" integrity sha512-dX1400pzPULr+ZovkIsDEqe7XH8xCAYGT5Dege4Eot44Qs2mS2iJmnh45TxTO5MIsCfrV/JGZVloLhm46AHxNw== -cookie-session@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/cookie-session/-/cookie-session-1.4.0.tgz#c325aea685ceb9c8e4fd00b0313a46d547747380" - integrity sha512-0hhwD+BUIwMXQraiZP/J7VP2YFzqo6g4WqZlWHtEHQ22t0MeZZrNBSCxC1zcaLAs8ApT3BzAKizx9gW/AP9vNA== +cookie-session@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/cookie-session/-/cookie-session-2.0.0.tgz#d07aa27822f43619e4342df1342268c849833089" + integrity sha512-hKvgoThbw00zQOleSlUr2qpvuNweoqBtxrmx0UFosx6AGi9lYtLoA+RbsvknrEX8Pr6MDbdWAb2j6SnMn+lPsg== dependencies: cookies "0.8.0" - debug "2.6.9" + debug "3.2.7" on-headers "~1.0.2" + safe-buffer "5.2.1" cookie-signature@1.0.6: version "1.0.6" @@ -3688,9 +3708,9 @@ core-js@^2.0.1, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0: integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-js@^3.26.0: - version "3.26.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.26.1.tgz#7a9816dabd9ee846c1c0fe0e8fcad68f3709134e" - integrity sha512-21491RRQVzUn0GGM9Z1Jrpr6PNPxPi+Za8OM9q4tksTSnlbXXGKK1nXNg/QvwFYettXvSX6zWKCtHHfjN4puyA== + version "3.29.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.29.0.tgz#0273e142b67761058bcde5615c503c7406b572d6" + integrity sha512-VG23vuEisJNkGl6XQmFJd3rEG/so/CNatqeE+7uZAwTSwFeB/qaO0be8xZYUNWprJ/GIwL8aMt9cj1kvbpTZhg== core-util-is@1.0.2: version "1.0.2" @@ -3823,10 +3843,10 @@ data-urls@^3.0.2: whatwg-mimetype "^3.0.0" whatwg-url "^11.0.0" -dateformat@~3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" - integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== +dateformat@~4.6.2: + version "4.6.3" + resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5" + integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA== dayjs@^1.8.29: version "1.11.7" @@ -3861,6 +3881,13 @@ debug@3.1.0: dependencies: ms "2.0.0" +debug@3.2.7: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" @@ -3894,9 +3921,9 @@ deep-is@~0.1.3: integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== deepmerge@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" - integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== + version "4.3.0" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.0.tgz#65491893ec47756d44719ae520e0e2609233b59b" + integrity sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og== default-require-extensions@^2.0.0: version "2.0.0" @@ -3911,9 +3938,9 @@ defer-promise@^1.0.0: integrity sha512-5a0iWJvnon50nLLqHPW83pX45BLb4MmlSa1sIg05NBhZoK5EZGz1s8qoZ3888dVGGOT0Ni01NdETuAgdJUZknA== define-properties@^1.1.3, define-properties@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" - integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== + version "1.2.0" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" + integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== dependencies: has-property-descriptors "^1.0.0" object-keys "^1.1.1" @@ -3965,12 +3992,12 @@ denque@^2.1.0: resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1" integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw== -depd@2.0.0, depd@~2.0.0: +depd@2.0.0, depd@^2.0.0, depd@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== -depd@^1.1.2, depd@~1.1.2: +depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== @@ -4007,9 +4034,9 @@ dir_cache@^1.0.1: utils-igor "^1.0.4" discord-api-types@^0.37.12, discord-api-types@^0.37.20, discord-api-types@^0.37.23: - version "0.37.24" - resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.24.tgz#f3ee0ad6b2b70925b5225f9beac6e24bc4de6e46" - integrity sha512-1+Fb4huJCihdbkJLcq2p7nBmtlmAryNwjefT8wwJnL8c7bc7WA87Oaa5mbLe96QvZyfwnwRCDX40H0HhcVV50g== + version "0.37.35" + resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.35.tgz#d0dad0bce7ce5bffc633030f17464e45148d9f28" + integrity sha512-iyKZ/82k7FX3lcmHiAvvWu5TmyfVo78RtghBV/YsehK6CID83k5SI03DKKopBcln+TiEIYw5MGgq7SJXSpNzMg== discord.js@14.6.0: version "14.6.0" @@ -4113,10 +4140,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -electron-to-chromium@^1.4.251: - version "1.4.284" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" - integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== +electron-to-chromium@^1.4.284: + version "1.4.328" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.328.tgz#b4565ffa502542b561cea16086d6d9b916c7095a" + integrity sha512-DE9tTy2PNmy1v55AZAO542ui+MLC2cvINMK4P2LXGsJdput/ThVG9t+QGecPuAZZSgC8XoI+Jh9M1OG9IoNSCw== emoji-regex@^7.0.1: version "7.0.3" @@ -4180,26 +4207,32 @@ error-ex@^1.2.0, error-ex@^1.3.1: is-arrayish "^0.2.1" es-abstract@^1.19.0, es-abstract@^1.20.4: - version "1.20.5" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.5.tgz#e6dc99177be37cacda5988e692c3fa8b218e95d2" - integrity sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ== + version "1.21.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.1.tgz#e6105a099967c08377830a0c9cb589d570dd86c6" + integrity sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg== dependencies: + available-typed-arrays "^1.0.5" call-bind "^1.0.2" + es-set-tostringtag "^2.0.1" es-to-primitive "^1.2.1" function-bind "^1.1.1" function.prototype.name "^1.1.5" get-intrinsic "^1.1.3" get-symbol-description "^1.0.0" + globalthis "^1.0.3" gopd "^1.0.1" has "^1.0.3" has-property-descriptors "^1.0.0" + has-proto "^1.0.1" has-symbols "^1.0.3" - internal-slot "^1.0.3" + internal-slot "^1.0.4" + is-array-buffer "^3.0.1" is-callable "^1.2.7" is-negative-zero "^2.0.2" is-regex "^1.1.4" is-shared-array-buffer "^1.0.2" is-string "^1.0.7" + is-typed-array "^1.1.10" is-weakref "^1.0.2" object-inspect "^1.12.2" object-keys "^1.1.1" @@ -4208,13 +4241,24 @@ es-abstract@^1.19.0, es-abstract@^1.20.4: safe-regex-test "^1.0.0" string.prototype.trimend "^1.0.6" string.prototype.trimstart "^1.0.6" + typed-array-length "^1.0.4" unbox-primitive "^1.0.2" + which-typed-array "^1.1.9" es-array-method-boxes-properly@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e" integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA== +es-set-tostringtag@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8" + integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg== + dependencies: + get-intrinsic "^1.1.3" + has "^1.0.3" + has-tostringtag "^1.0.0" + es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" @@ -4495,10 +4539,10 @@ fast-text-encoding@^1.0.0: resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz#0aa25f7f638222e3396d72bf936afcf1d42d6867" integrity sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w== -fast-xml-parser@4.0.11: - version "4.0.11" - resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.0.11.tgz#42332a9aca544520631c8919e6ea871c0185a985" - integrity sha512-4aUg3aNRR/WjQAcpceODG1C3x3lFANXRo8+1biqfieHmg9pyMt7qB4lQV/Ta6sJCTbA5vfD8fnA8S54JATiFUA== +fast-xml-parser@4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.1.2.tgz#5a98c18238d28a57bbdfa9fe4cda01211fff8f4a" + integrity sha512-CDYeykkle1LiA/uqQyNwYpFbyF6Axec6YapmpUP+/RHWIoR1zKjocdvNaTsxCxZzQ6v9MLXaSYm9Qq0thv0DHg== dependencies: strnum "^1.0.5" @@ -4576,9 +4620,9 @@ file-set@~0.2.1: glob "^4" file-type@^18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/file-type/-/file-type-18.0.0.tgz#7a39378f8657ddc02807a0c62cb77cb4dc318197" - integrity sha512-jjMwFpnW8PKofLE/4ohlhqwDk5k0NC6iy0UHAJFKoY1fQeGMN0GDdLgHQrvCbSpMwbqzoCZhRI5dETCZna5qVA== + version "18.2.1" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-18.2.1.tgz#6d8f1fa3b079606f6ecf89483346f55fcd2c671b" + integrity sha512-Yw5MtnMv7vgD2/6Bjmmuegc8bQEVA9GmAyaR18bMYWKqsWDG9wgYZ1j4I6gNMF5Y5JBDcUcjRQqNQx7Y8uotcg== dependencies: readable-web-to-node-stream "^3.0.2" strtok3 "^7.0.0" @@ -4684,12 +4728,15 @@ findup-sync@^4.0.0: micromatch "^4.0.2" resolve-dir "^1.0.1" -findup-sync@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.3.0.tgz#37930aa5d816b777c03445e1966cc6790a4c0b16" - integrity sha512-z8Nrwhi6wzxNMIbxlrTzuUW6KWuKkogZ/7OdDVq+0+kxn77KUH1nipx8iU6suqkHqc4y6n7a9A8IpmxY/pTjWg== +findup-sync@~5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-5.0.0.tgz#54380ad965a7edca00cc8f63113559aadc541bd2" + integrity sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ== dependencies: - glob "~5.0.0" + detect-file "^1.0.0" + is-glob "^4.0.3" + micromatch "^4.0.4" + resolve-dir "^1.0.1" fined@^1.2.0: version "1.2.0" @@ -4717,6 +4764,13 @@ follow-redirects@^1.14.0, follow-redirects@^1.14.8, follow-redirects@^1.14.9: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== +for-each@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" + integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== + dependencies: + is-callable "^1.1.3" + for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -4898,9 +4952,9 @@ gauge@^4.0.3: wide-align "^1.1.5" gaxios@^5.0.0, gaxios@^5.0.1: - version "5.0.2" - resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-5.0.2.tgz#ca3a40e851c728d31d7001c2357062d46bf966d1" - integrity sha512-TjtV2AJOZoMQqRYoy5eM8cCQogYwazWNYLQ72QB0kwa6vHHruYkGmhhyrlzbmgNHK1dNnuP2WSH81urfzyN2Og== + version "5.1.0" + resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-5.1.0.tgz#133b77b45532be71eec72012b7e97c2320b6140a" + integrity sha512-aezGIjb+/VfsJtIcHGcBSerNEDdfdHeMros+RbYbGpmonKWQCOVOes0LVZhn1lDtIgq55qq0HaxymIoae3Fl/A== dependencies: extend "^3.0.2" https-proxy-agent "^5.0.0" @@ -4908,9 +4962,9 @@ gaxios@^5.0.0, gaxios@^5.0.1: node-fetch "^2.6.7" gcp-metadata@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-5.1.0.tgz#105768fd493ab6ff9606e0d77cdf0a4d9c1a0180" - integrity sha512-QVjouEXvNVG/nde6VZDXXFTB02xQdztaumkWCHUff58qsdCS05/8OPh68fQ2QnArfAzZTwfEc979FHSHsU8EWg== + version "5.2.0" + resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-5.2.0.tgz#b4772e9c5976241f5d3e69c4f446c906d25506ec" + integrity sha512-aFhhvvNycky2QyhG+dcfEdHBF0FRbYcf39s6WNHUDysKSrbJ5vuFbjydxBcmewtXeV248GP8dWT3ByPNxsyHCw== dependencies: gaxios "^5.0.0" json-bigint "^1.0.0" @@ -4930,10 +4984,10 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" - integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== +get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" + integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== dependencies: function-bind "^1.1.1" has "^1.0.3" @@ -5008,17 +5062,6 @@ glob@^7.1.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.2.0: once "^1.3.0" path-is-absolute "^1.0.0" -glob@~5.0.0: - version "5.0.15" - resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" - integrity sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA== - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@~7.1.6: version "7.1.7" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" @@ -5061,6 +5104,13 @@ globals@^9.18.0: resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== +globalthis@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" + integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== + dependencies: + define-properties "^1.1.3" + google-auth-library@^8.0.2: version "8.7.0" resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-8.7.0.tgz#e36e255baba4755ce38dded4c50f896cf8515e51" @@ -5101,9 +5151,9 @@ googleapis-common@^6.0.0: uuid "^9.0.0" googleapis@*: - version "110.0.0" - resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-110.0.0.tgz#73e59ff0c64658924c71229ef8884da60ac9aeec" - integrity sha512-k6de3PGsdFEBULMiFwPYCKOBljDTDvHD3YGe/OFqe8Ot0lYQPL8QV1qjxjrPWiE/Ftf0Ar2v4DNES66jLfSO7w== + version "112.0.0" + resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-112.0.0.tgz#e957811a1df3c408f934c0047e091d5d8f14b7ef" + integrity sha512-WPfXhYZVrbbJRxB+ZZDksjuelmt49Mcl/1mo7w05kvLS1EbynvTELsNTJwh+hNrjsFKdh4izWLAcjTDo0Boycg== dependencies: google-auth-library "^8.0.2" googleapis-common "^6.0.0" @@ -5175,25 +5225,23 @@ grunt-legacy-util@~2.0.1: which "~2.0.2" grunt@^1.0.1: - version "1.5.3" - resolved "https://registry.yarnpkg.com/grunt/-/grunt-1.5.3.tgz#3214101d11257b7e83cf2b38ea173b824deab76a" - integrity sha512-mKwmo4X2d8/4c/BmcOETHek675uOqw0RuA/zy12jaspWqvTp4+ZeQF1W+OTpcbncnaBsfbQJ6l0l4j+Sn/GmaQ== + version "1.6.1" + resolved "https://registry.yarnpkg.com/grunt/-/grunt-1.6.1.tgz#0b4dd1524f26676dcf45d8f636b8d9061a8ede16" + integrity sha512-/ABUy3gYWu5iBmrUSRBP97JLpQUm0GgVveDCp6t3yRNIoltIYw7rEj3g5y1o2PGPR2vfTRGa7WC/LZHLTXnEzA== dependencies: - dateformat "~3.0.3" + dateformat "~4.6.2" eventemitter2 "~0.4.13" exit "~0.1.2" - findup-sync "~0.3.0" + findup-sync "~5.0.0" glob "~7.1.6" grunt-cli "~1.4.3" grunt-known-options "~2.0.0" grunt-legacy-log "~3.0.0" grunt-legacy-util "~2.0.1" - iconv-lite "~0.4.13" + iconv-lite "~0.6.3" js-yaml "~3.14.0" minimatch "~3.0.4" - mkdirp "~1.0.4" nopt "~3.0.6" - rimraf "~3.0.2" gtoken@^6.1.0: version "6.1.2" @@ -5300,6 +5348,11 @@ has-property-descriptors@^1.0.0: dependencies: get-intrinsic "^1.1.1" +has-proto@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" + integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== + has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" @@ -5469,9 +5522,9 @@ htmlparser2@^6.1.0: entities "^2.0.0" http-cache-semantics@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" - integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== + version "4.1.1" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" + integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== http-errors@2.0.0: version "2.0.0" @@ -5563,14 +5616,14 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" -iconv-lite@0.4.24, iconv-lite@~0.4.13: +iconv-lite@0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@0.6.3, iconv-lite@^0.6.2, iconv-lite@^0.6.3: +iconv-lite@0.6.3, iconv-lite@^0.6.2, iconv-lite@^0.6.3, iconv-lite@~0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== @@ -5656,12 +5709,12 @@ inquirer@^0.12.0: strip-ansi "^3.0.0" through "^2.3.6" -internal-slot@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.4.tgz#8551e7baf74a7a6ba5f749cfb16aa60722f0d6f3" - integrity sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ== +internal-slot@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986" + integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ== dependencies: - get-intrinsic "^1.1.3" + get-intrinsic "^1.2.0" has "^1.0.3" side-channel "^1.0.4" @@ -5727,6 +5780,15 @@ is-accessor-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" +is-array-buffer@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe" + integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.2.0" + is-typed-array "^1.1.10" + is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -5771,7 +5833,7 @@ 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-callable@^1.1.4, is-callable@^1.2.7: +is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== @@ -5885,7 +5947,7 @@ is-glob@^2.0.0, is-glob@^2.0.1: dependencies: is-extglob "^1.0.0" -is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== @@ -6001,6 +6063,17 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.2" +is-typed-array@^1.1.10, is-typed-array@^1.1.9: + version "1.1.10" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f" + integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A== + dependencies: + available-typed-arrays "^1.0.5" + call-bind "^1.0.2" + for-each "^0.3.3" + gopd "^1.0.1" + has-tostringtag "^1.0.0" + is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" @@ -6118,9 +6191,9 @@ istanbul-reports@^2.2.4: html-escaper "^2.0.0" jose@^4.10.0: - version "4.11.1" - resolved "https://registry.yarnpkg.com/jose/-/jose-4.11.1.tgz#8f7443549befe5bddcf4bae664a9cbc1a62da4fa" - integrity sha512-YRv4Tk/Wlug8qicwqFNFVEZSdbROCHRAC6qu/i0dyNKr5JQdoa2pIGoS04lLO/jXQX7Z9omoNewYIVIxqZBd9Q== + version "4.13.1" + resolved "https://registry.yarnpkg.com/jose/-/jose-4.13.1.tgz#449111bb5ab171db85c03f1bd2cb1647ca06db1c" + integrity sha512-MSJQC5vXco5Br38mzaQKiq9mwt7lwj2eXpgpRyQYNHYt2lq1PjkWa7DLXX0WVcQLE9HhMh3jPiufS7fhJf+CLQ== "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" @@ -6233,9 +6306,9 @@ jsdoc2md-stats@^1.0.3: feature-detect-es6 "^1.3.1" jsdom@*: - version "20.0.3" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db" - integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ== + version "21.1.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-21.1.0.tgz#d56ba4a84ed478260d83bd53dc181775f2d8e6ef" + integrity sha512-m0lzlP7qOtthD918nenK3hdItSd2I+V3W9IrBcB36sqDwG+KnUs66IF5GY7laGWUnlM9vTsD0W1QwSEBYWWcJg== dependencies: abab "^2.0.6" acorn "^8.8.1" @@ -6311,26 +6384,20 @@ json5@^0.5.1: resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" integrity sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw== -json5@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab" - integrity sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ== +json5@^2.2.2: + version "2.2.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" + integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== -jsonwebtoken@^8.5.1: - version "8.5.1" - resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d" - integrity sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w== +jsonwebtoken@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d" + integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw== dependencies: jws "^3.2.2" - lodash.includes "^4.3.0" - lodash.isboolean "^3.0.3" - lodash.isinteger "^4.0.4" - lodash.isnumber "^3.0.3" - lodash.isplainobject "^4.0.6" - lodash.isstring "^4.0.1" - lodash.once "^4.0.0" + lodash "^4.17.21" ms "^2.1.1" - semver "^5.6.0" + semver "^7.3.8" jsprim@^1.2.2: version "1.4.2" @@ -6581,41 +6648,11 @@ lodash.flattendeep@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" integrity sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ== -lodash.includes@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f" - integrity sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w== - -lodash.isboolean@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" - integrity sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg== - -lodash.isinteger@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343" - integrity sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA== - -lodash.isnumber@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc" - integrity sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw== - lodash.isplainobject@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA== -lodash.isstring@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" - integrity sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw== - -lodash.once@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" - integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg== - lodash.pick@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" @@ -6637,11 +6674,12 @@ lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.3.0 integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== logform@^2.3.2, logform@^2.4.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/logform/-/logform-2.4.2.tgz#a617983ac0334d0c3b942c34945380062795b47c" - integrity sha512-W4c9himeAwXEdZ05dQNerhFz2XG80P9Oj0loPUMV23VC2it0orMHQhJm4hdnnor3rd1HsGf6a2lPwBM1zeXHGw== + version "2.5.1" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.5.1.tgz#44c77c34becd71b3a42a3970c77929e52c6ed48b" + integrity sha512-9FyqAm9o9NKKfiAKfZoYo9bGXXuwMkxQiQttkT4YjjVtQVIQtK6LmVtlxmCaFswo6N4AfEkHqZTV0taDtPotNg== dependencies: "@colors/colors" "1.5.0" + "@types/triple-beam" "^1.3.2" fecha "^4.2.0" ms "^2.1.1" safe-stable-stringify "^2.3.1" @@ -6659,6 +6697,11 @@ loose-envify@^1.0.0: dependencies: js-tokens "^3.0.0 || ^4.0.0" +lossless-json@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/lossless-json/-/lossless-json-2.0.1.tgz#03f2deb5c1a828feac19d88c16e93d6388971d52" + integrity sha512-KW/FSL426qblKVvf4ImeMVGr0Je6J9aXvAMUOIU8AzelDj06q47mn6QJ+56lBBd+A8kjrncrxdKQs6ZssAXTmw== + lower-case@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" @@ -6687,9 +6730,9 @@ lru-cache@^6.0.0: yallist "^4.0.0" lru-cache@^7.10.1, lru-cache@^7.14.0: - version "7.14.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.1.tgz#8da8d2f5f59827edb388e63e459ac23d6d408fea" - integrity sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA== + version "7.18.3" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89" + integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== ltx@^2.8.1: version "2.10.0" @@ -6760,16 +6803,15 @@ map-visit@^1.0.0: object-visit "^1.0.0" mariadb@*: - version "3.0.2" - resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-3.0.2.tgz#427ae286b8fb35f4046b3457f4df729a5019d6c3" - integrity sha512-dVjiQZ6RW0IXFnX+T/ZEmnqs724DgkQsXqfCyInXn0XxVfO2Px6KbS4M3Ny6UiBg0zJ93SHHvfVBgYO4ZnFvvw== + version "3.1.0" + resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-3.1.0.tgz#7d683dabd83d2521303257a14062df25f9a88fbc" + integrity sha512-OyWbm90bX6gsEuJjD8rLrkBXYt3BR/xc6mQfFibZmmzSw938S5EZzullW5gbVZKRZwbZGxihfszxjCETWid45Q== dependencies: "@types/geojson" "^7946.0.10" "@types/node" "^17.0.45" denque "^2.1.0" iconv-lite "^0.6.3" lru-cache "^7.14.0" - moment-timezone "^0.5.38" marked@~0.3.6: version "0.3.19" @@ -6864,7 +6906,7 @@ micromatch@^3.1.10: snapdragon "^0.8.1" to-regex "^3.0.2" -micromatch@^4.0.2: +micromatch@^4.0.2, micromatch@^4.0.4: version "4.0.5" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== @@ -6926,13 +6968,6 @@ minimalistic-assert@^1.0.0: resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== -"minimatch@2 || 3", minimatch@^3.0.4, minimatch@^3.1.1: - version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== - dependencies: - brace-expansion "^1.1.7" - minimatch@^2.0.1: version "2.0.10" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7" @@ -6940,10 +6975,17 @@ minimatch@^2.0.1: dependencies: brace-expansion "^1.0.0" +minimatch@^3.0.4, minimatch@^3.1.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + minimatch@^5.1.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.2.tgz#0939d7d6f0898acbd1508abe534d1929368a8fff" - integrity sha512-bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg== + version "5.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== dependencies: brace-expansion "^2.0.1" @@ -6955,9 +6997,9 @@ minimatch@~3.0.4: brace-expansion "^1.1.7" minimist@^1.2.5, minimist@^1.2.6: - version "1.2.7" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" - integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== + version "1.2.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== minimist@~0.0.1: version "0.0.10" @@ -7011,11 +7053,9 @@ minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: yallist "^4.0.0" minipass@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.0.0.tgz#7cebb0f9fa7d56f0c5b17853cbe28838a8dbbd3b" - integrity sha512-g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw== - dependencies: - yallist "^4.0.0" + version "4.2.5" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.5.tgz#9e0e5256f1e3513f8c34691dd68549e85b2c8ceb" + integrity sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q== minizlib@^2.0.0, minizlib@^2.1.1: version "2.1.2" @@ -7045,7 +7085,7 @@ mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1: dependencies: minimist "^1.2.6" -mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4: +mkdirp@^1.0.3, mkdirp@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== @@ -7057,18 +7097,6 @@ modern-syslog@*: dependencies: nan "^2.13.2" -moment-timezone@^0.5.38: - version "0.5.40" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.40.tgz#c148f5149fd91dd3e29bf481abc8830ecba16b89" - integrity sha512-tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg== - dependencies: - moment ">= 2.9.0" - -"moment@>= 2.9.0": - version "2.29.4" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" - integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== - mongodb-connection-string-url@^2.5.4: version "2.6.0" resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz#57901bf352372abdde812c81be47b75c6b2ec5cf" @@ -7077,10 +7105,10 @@ mongodb-connection-string-url@^2.5.4: "@types/whatwg-url" "^8.2.1" whatwg-url "^11.0.0" -mongodb@4.12.1: - version "4.12.1" - resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-4.12.1.tgz#224eb39b8784af835b515aa687c6010cecaabb1a" - integrity sha512-koT87tecZmxPKtxRQD8hCKfn+ockEL2xBiUvx3isQGI6mFmagWt4f4AyCE9J4sKepnLhMacoCTQQA6SLAI2L6w== +mongodb@4.13.0: + version "4.13.0" + resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-4.13.0.tgz#2aa832b827e2891eb2e52e8235c201cbb4701ed2" + integrity sha512-+taZ/bV8d1pYuHL4U+gSwkhmDrwkWbH1l4aah4YpmpscMwgFBkufIKxgP/G7m87/NUuQzc2Z75ZTI7ZOyqZLbw== dependencies: bson "^4.7.0" mongodb-connection-string-url "^2.5.4" @@ -7255,9 +7283,9 @@ node-environment-flags@^1.0.5: semver "^5.7.0" node-fetch@^2.3.0, node-fetch@^2.6.1, node-fetch@^2.6.6, node-fetch@^2.6.7: - version "2.6.7" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" - integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== + version "2.6.9" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6" + integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg== dependencies: whatwg-url "^5.0.0" @@ -7267,9 +7295,9 @@ node-forge@^1.0.0, node-forge@^1.3.0, node-forge@^1.3.1: integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== node-gyp-build@^4.3.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz#7a64eefa0b21112f89f58379da128ac177f20e40" - integrity sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg== + version "4.6.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055" + integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ== node-gyp@8.x: version "8.4.1" @@ -7301,10 +7329,10 @@ node-pushover@*: dependencies: httpreq "*" -node-releases@^2.0.6: - version "2.0.8" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.8.tgz#0f349cdc8fcfa39a92ac0be9bc48b7706292b9ae" - integrity sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A== +node-releases@^2.0.8: + version "2.0.10" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f" + integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w== node-sspi@*: version "0.2.10" @@ -7346,9 +7374,9 @@ node-xcs@0.1.7: "@xmpp/debug" "^0.9.2" nodemailer@*: - version "6.8.0" - resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.8.0.tgz#804bcc5256ee5523bc914506ee59f8de8f0b1cd5" - integrity sha512-EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ== + version "6.9.1" + resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.9.1.tgz#8249d928a43ed85fec17b13d2870c8f758a126ed" + integrity sha512-qHw7dOiU5UKNnQpXktdgQ1d3OFgRAekuvbJLcdG5dnEo/GtcTHRYM7+UfJARdOFU9WUQO8OiIamgWPmiSFHYAA== nofilter@^1.0.4: version "1.0.4" @@ -7500,9 +7528,9 @@ object-hash@^2.0.1: integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw== object-inspect@^1.12.2, object-inspect@^1.9.0: - version "1.12.2" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" - integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== + version "1.12.3" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" + integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== object-keys@^1.1.1: version "1.1.1" @@ -7630,9 +7658,9 @@ onetime@^1.0.0: integrity sha512-GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A== openid-client@*: - version "5.3.1" - resolved "https://registry.yarnpkg.com/openid-client/-/openid-client-5.3.1.tgz#69a5fa7d2b5ad479032f576852d40b4d4435488a" - integrity sha512-RLfehQiHch9N6tRWNx68cicf3b1WR0x74bJWHRc25uYIbSRwjxYcTFaRnzbbpls5jroLAaB/bFIodTgA5LJMvw== + version "5.4.0" + resolved "https://registry.yarnpkg.com/openid-client/-/openid-client-5.4.0.tgz#77f1cda14e2911446f16ea3f455fc7c405103eac" + integrity sha512-hgJa2aQKcM2hn3eyVtN12tEA45ECjTJPXCgUh5YzTzy9qwapCvmDTVPWOcWVL0d34zeQoQ/hbG9lJhl3AYxJlQ== dependencies: jose "^4.10.0" lru-cache "^6.0.0" @@ -7862,18 +7890,18 @@ passport-google-oauth20@*: passport-oauth2 "1.x.x" passport-oauth1@1.x.x: - version "1.2.0" - resolved "https://registry.yarnpkg.com/passport-oauth1/-/passport-oauth1-1.2.0.tgz#5229d431781bf5b265bec86ce9a9cce58a756cf9" - integrity sha512-Sv2YWodC6jN12M/OXwmR4BIXeeIHjjbwYTQw4kS6tHK4zYzSEpxBgSJJnknBjICA5cj0ju3FSnG1XmHgIhYnLg== + version "1.3.0" + resolved "https://registry.yarnpkg.com/passport-oauth1/-/passport-oauth1-1.3.0.tgz#5d57f1415c8e28e46b461a12ec1b492934f7c354" + integrity sha512-8T/nX4gwKTw0PjxP1xfD0QhrydQNakzeOpZ6M5Uqdgz9/a/Ag62RmJxnZQ4LkbdXGrRehQHIAHNAu11rCP46Sw== dependencies: oauth "0.9.x" passport-strategy "1.x.x" utils-merge "1.x.x" passport-oauth2@1.x.x, passport-oauth2@^1.6: - version "1.6.1" - resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.1.tgz#c5aee8f849ce8bd436c7f81d904a3cd1666f181b" - integrity sha512-ZbV43Hq9d/SBSYQ22GOiglFsjsD1YY/qdiptA+8ej+9C1dL1TVB+mBE5kDH/D4AJo50+2i8f4bx0vg4/yDDZCQ== + version "1.7.0" + resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.7.0.tgz#5c4766c8531ac45ffe9ec2c09de9809e2c841fc4" + integrity sha512-j2gf34szdTF2Onw3+76alNnaAExlUmHvkc7cL+cmaS5NzHzDP/BvFHJruueQ9XAeNOdpI+CH+PWid8RA7KCwAQ== dependencies: base64url "3.x.x" oauth "0.9.x" @@ -8025,15 +8053,15 @@ 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, pg-pool@^3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.5.2.tgz#ed1bed1fb8d79f1c6fd5fb1c99e990fbf9ddf178" - integrity sha512-His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w== +pg-pool@^3.4.1, pg-pool@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.6.0.tgz#3190df3e4747a0d23e5e9e8045bcd99bda0a712e" + integrity sha512-clFRf2ksqd+F497kWFyM21tMjeikn60oGDmqMT8UBrynEwVEX/5R5xd2sdvdo1cZCFlguORNpVuqxIj+aK4cfQ== -pg-protocol@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.5.0.tgz#b5dd452257314565e2d54ab3c132adc46565a6a0" - integrity sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ== +pg-protocol@^1.5.0, pg-protocol@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.6.0.tgz#4c91613c0315349363af2084608db843502f8833" + integrity sha512-M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q== pg-types@^2.1.0: version "2.2.0" @@ -8060,15 +8088,15 @@ pg@8.7.1: pgpass "1.x" pg@^8.4.0: - version "8.8.0" - resolved "https://registry.yarnpkg.com/pg/-/pg-8.8.0.tgz#a77f41f9d9ede7009abfca54667c775a240da686" - integrity sha512-UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw== + version "8.10.0" + resolved "https://registry.yarnpkg.com/pg/-/pg-8.10.0.tgz#5b8379c9b4a36451d110fc8cd98fc325fe62ad24" + integrity sha512-ke7o7qSTMb47iwzOSaZMfeR7xToFdkE71ifIipOAAaLIM0DYzfOAXlgFFmYUIE2BcJtvnVlGCID84ZzCegE8CQ== dependencies: buffer-writer "2.0.0" packet-reader "1.0.0" pg-connection-string "^2.5.0" - pg-pool "^3.5.2" - pg-protocol "^1.5.0" + pg-pool "^3.6.0" + pg-protocol "^1.6.0" pg-types "^2.1.0" pgpass "1.x" @@ -8139,9 +8167,9 @@ pkg-dir@^3.0.0: find-up "^3.0.0" plivo@*: - version "4.36.0" - resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.36.0.tgz#d6e3fa06bc5c42a04a74d71e8e989b8f2dab5309" - integrity sha512-jhd61SkiMXkWDZc+NFNqD5yheyQSl2dpdcLzpOx2u/ddUV1PX+nGwZ+gEp1wZ2B4V/l/qwVk8QHcXRN+VtT+Gg== + version "4.42.0" + resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.42.0.tgz#c5dcb2ace11c05d178b8759c92dbf8ccb44b82a5" + integrity sha512-jQa07ttI/wCzGGoZEurVSkPlD09qa62VbHWbLxPIbwh4QG4wErk6uIpbXnKEfM2/91QcF7cS0LgS1Ydw+JPo3g== dependencies: "@types/node" "^14.14.14" axios "^0.21.1" @@ -8149,7 +8177,7 @@ plivo@*: build-url "^1.0.10" form-data "^4.0.0" https-proxy-agent "^5.0.0" - jsonwebtoken "^8.5.1" + jsonwebtoken "^9.0.0" lodash "^4.17.4" querystring "^0.2.0" uri-parser "^1.0.0" @@ -8157,11 +8185,6 @@ plivo@*: xml2js "^0.4.19" xmlbuilder "^9.0.1" -pop-iterate@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/pop-iterate/-/pop-iterate-1.0.1.tgz#ceacfdab4abf353d7a0f2aaa2c1fc7b3f9413ba3" - integrity sha512-HRCx4+KJE30JhX84wBN4+vja9bNfysxg1y28l0DuJmkoaICiv2ZSilKddbS48pq50P8d2erAhqDLbp47yv3MbQ== - posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" @@ -8271,31 +8294,29 @@ punycode@^1.4.1: integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ== punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== - -q@2.0.x: - version "2.0.3" - resolved "https://registry.yarnpkg.com/q/-/q-2.0.3.tgz#75b8db0255a1a5af82f58c3f3aaa1efec7d0d134" - integrity sha512-gv6vLGcmAOg96/fgo3d9tvA4dJNZL3fMyBqVRrGxQ+Q/o4k9QzbJ3NQF9cOO/71wRodoXhaPgphvMFU68qVAJQ== - dependencies: - asap "^2.0.0" - pop-iterate "^1.0.1" - weak-map "^1.0.5" + version "2.3.0" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" + integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== qlobber@^3.0.2, qlobber@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/qlobber/-/qlobber-3.1.0.tgz#b8c8e067496de17bdbf3cd843cf53ece09c8d211" integrity sha512-B7EU6Hv9g4BeJiB7qtOjn9wwgqVpcWE5c4/86O0Yoj7fmAvgwXrdG1E+QF13S/+TX5XGUl7toizP0gzXR2Saug== -qs@6.11.0, qs@^6.6.0, qs@^6.7.0, qs@^6.9.4: +qs@6.11.0: version "6.11.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== dependencies: side-channel "^1.0.4" +qs@^6.6.0, qs@^6.7.0, qs@^6.9.4: + version "6.11.1" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.1.tgz#6c29dff97f0c0060765911ba65cbc9764186109f" + integrity sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ== + dependencies: + side-channel "^1.0.4" + qs@~0.6.0: version "0.6.6" resolved "https://registry.yarnpkg.com/qs/-/qs-0.6.6.tgz#6e015098ff51968b8a3c819001d5f2c89bc4b107" @@ -8359,6 +8380,16 @@ raw-body@2.5.1: iconv-lite "0.4.24" unpipe "1.0.0" +raw-body@2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" + integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== + dependencies: + bytes "3.1.2" + http-errors "2.0.0" + iconv-lite "0.4.24" + unpipe "1.0.0" + read-pkg-up@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" @@ -8394,15 +8425,15 @@ read-pkg@^3.0.0: path-type "^3.0.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== + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== dependencies: inherits "^2.0.3" string_decoder "^1.1.1" util-deprecate "^1.0.1" -readable-stream@2.3.7, readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.3.5: +readable-stream@2.3.7: 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== @@ -8415,6 +8446,19 @@ readable-stream@2.3.7, readable-stream@^2.0.0, readable-stream@^2.0.2, readable- string_decoder "~1.1.1" util-deprecate "~1.0.1" +readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.3.5: + version "2.3.8" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" + integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + readable-web-to-node-stream@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz#5d52bb5df7b54861fd48d015e93a2cb87b3ee0bb" @@ -8455,9 +8499,9 @@ readline2@^1.0.1: mute-stream "0.0.5" real-cancellable-promise@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/real-cancellable-promise/-/real-cancellable-promise-1.1.1.tgz#be793502f7ed8067936d95dc040a2d2a2a1944a7" - integrity sha512-vxanUX4Aff5sRX6Rb1CSeCDWhO20L0hKQXWTLOYbtRo9WYFMjlhEBX0E75iz3+7ucrmFdPpDolwLC7L65P7hag== + version "1.1.2" + resolved "https://registry.yarnpkg.com/real-cancellable-promise/-/real-cancellable-promise-1.1.2.tgz#af9f7b68ae6828f71af5346132cf427eb859745a" + integrity sha512-eq/nAAVW+hj29x292W6yOkeEJ2F/pABnYC5cUfivOsIvSvF/Z0V2tWiyPK73+ay9DZ27CKp7Q+JkCwzmbwE75Q== rechoir@^0.7.0: version "0.7.1" @@ -8796,7 +8840,7 @@ rimraf@^2.6.2, rimraf@^2.6.3: dependencies: glob "^7.1.3" -rimraf@^3.0.2, rimraf@~3.0.2: +rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -8811,11 +8855,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" -rootpath@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/rootpath/-/rootpath-0.1.2.tgz#5b379a87dca906e9b91d690a599439bef267ea6b" - integrity sha512-R3wLbuAYejpxQjL/SjXo1Cjv4wcJECnMRT/FlcCfTwCBhaji9rWaRCoVEQ1SPiTJ4kKK+yh+bZLAV7SCafoDDw== - run-async@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389" @@ -8862,9 +8901,9 @@ safe-regex@^1.1.0: ret "~0.1.10" safe-stable-stringify@^2.3.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.1.tgz#34694bd8a30575b7f94792aa51527551bd733d61" - integrity sha512-dVHE6bMtS/bnL2mwualjc6IxEv1F+OCUpA46pKUj6F8uDbUM0jCCulPqRNPSnWwGNKx5etqMjZYdXtrm5KJZGA== + version "2.4.2" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.2.tgz#ec7b037768098bf65310d1d64370de0dc02353aa" + integrity sha512-gMxvPJYhP0O9n2pvcfYfIuYgbledAOJFcqRThtPRmjscaipiwcwPPKLytpVzMkG2HAN87Qmo2d4PtGiri1dSLA== "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" @@ -8920,7 +8959,7 @@ scmp@^2.1.0: resolved "https://registry.yarnpkg.com/scmp/-/scmp-2.1.0.tgz#37b8e197c425bdeb570ab91cc356b311a11f9c9a" integrity sha512-o/mRQGk9Rcer/jEEw/yw4mwo3EU/NvYvp577/Btqrym9Qy5/MdWGBqipbALgd2lrdWTJ5/gqDusxfnQBxOxT2Q== -semver@*, semver@^7.3.5: +semver@*, semver@^7.3.5, semver@^7.3.8: version "7.3.8" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== @@ -9180,9 +9219,9 @@ spawn-wrap@^1.4.2: which "^1.3.0" spdx-correct@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" - integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== + version "3.2.0" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c" + integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA== dependencies: spdx-expression-parse "^3.0.0" spdx-license-ids "^3.0.0" @@ -9201,9 +9240,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.12" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz#69077835abe2710b65f03969898b6637b505a779" - integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA== + version "3.0.13" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5" + integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w== split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" @@ -9548,9 +9587,9 @@ tar@^6.0.2, tar@^6.1.11, tar@^6.1.2: yallist "^4.0.0" telegram@*: - version "2.15.2" - resolved "https://registry.yarnpkg.com/telegram/-/telegram-2.15.2.tgz#e716af7a23f0acd203c03e00c7d8051df642b4f2" - integrity sha512-+/vmEImjDtkOEiiPyGThIyzBVgpCfDNz2suwXtl5z/b0xK6SWqV4edX3c1BZgK4/JrIyydrCAxLQpKlG61/uzw== + version "2.15.10" + resolved "https://registry.yarnpkg.com/telegram/-/telegram-2.15.10.tgz#e4db9d663fa6856af39cc1b63ecff87ffdceab5d" + integrity sha512-U5GiyxGsidbG2JUHXA+cfTdBmHeJdY+W5Qp15r6HHIQiOswhUk3NaZnDdnmxljycC50OBDnJhUakBMa0kYR9IA== dependencies: "@cryptography/aes" "^0.1.1" async-mutex "^0.3.0" @@ -9766,9 +9805,9 @@ ts-custom-error@^3.2.0: integrity sha512-5OX1tzOjxWEgsr/YEUWSuPrQ00deKLh6D7OTWcvNHm12/7QPyRh8SYpyWvA4IZv8H/+GQWQEh/kwo95Q9OVW1A== ts-mixer@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/ts-mixer/-/ts-mixer-6.0.2.tgz#3e4e4bb8daffb24435f6980b15204cb5b287e016" - integrity sha512-zvHx3VM83m2WYCE8XL99uaM7mFwYSkjR2OZti98fabHrwkjsCvgwChda5xctein3xGOyaQhtTeDq/1H/GNvF3A== + version "6.0.3" + resolved "https://registry.yarnpkg.com/ts-mixer/-/ts-mixer-6.0.3.tgz#69bd50f406ff39daa369885b16c77a6194c7cae6" + integrity sha512-k43M7uCG1AkTyxgnmI5MPwKoUvS/bRvLvUb7+Pgpdlmok8AoqmUaZxUUw8zKM5B1lqZrt41GjYgnvAi0fppqgQ== tslib@^1.11.1: version "1.14.1" @@ -9776,9 +9815,9 @@ tslib@^1.11.1: integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e" - integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA== + version "2.5.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" + integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== tsscmp@1.0.6: version "1.0.6" @@ -9813,18 +9852,15 @@ tweetnacl@^1.0.1: integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw== twilio@*: - version "3.84.0" - resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.84.0.tgz#57e035a7034e4c278cdd03d3e88c05f507b9d84e" - integrity sha512-XL+RR1SdfGExC51cE22unM/r7lEFzfDYUA3FecHEe5cLF+LzxmZGB9O9BXfqZu/sZ5YlGeltJfMA5j3TRLzhLw== + version "4.8.0" + resolved "https://registry.yarnpkg.com/twilio/-/twilio-4.8.0.tgz#1ad333b8a3abfc813c69101a827f23ddc52cef68" + integrity sha512-jJaEyFGIiIAIfAWyq94g3uo2odTyo2opRN8hzpDHpbA4SYDfhxmm4E+Z0c7AP41HEdxzDyCwMkLNXh6fBpWRiw== dependencies: axios "^0.26.1" dayjs "^1.8.29" https-proxy-agent "^5.0.0" - jsonwebtoken "^8.5.1" - lodash "^4.17.21" - q "2.0.x" + jsonwebtoken "^9.0.0" qs "^6.9.4" - rootpath "^0.1.2" scmp "^2.1.0" url-parse "^1.5.9" xmlbuilder "^13.0.2" @@ -9854,6 +9890,15 @@ type@^2.7.2: resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0" integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw== +typed-array-length@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb" + integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng== + dependencies: + call-bind "^1.0.2" + for-each "^0.3.3" + is-typed-array "^1.1.9" + typedarray-to-buffer@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" @@ -9932,9 +9977,9 @@ underscore@~1.8.3: integrity sha512-5WsVTFcH1ut/kkhAaHf4PVgI8c7++GiVcpCGxPouI6ZVjsqPnSDf8h/8HtVqc0t4fzRXwnMK70EcZeAs3PIddg== undici@^5.11.0, undici@^5.13.0: - version "5.14.0" - resolved "https://registry.yarnpkg.com/undici/-/undici-5.14.0.tgz#1169d0cdee06a4ffdd30810f6228d57998884d00" - integrity sha512-yJlHYw6yXPPsuOH0x2Ib1Km61vu4hLiRRQoafs+WUgX1vO64vgnxiCEN9dpIrhZyHFsai3F0AEj4P9zy19enEQ== + version "5.20.0" + resolved "https://registry.yarnpkg.com/undici/-/undici-5.20.0.tgz#6327462f5ce1d3646bcdac99da7317f455bcc263" + integrity sha512-J3j60dYzuo6Eevbawwp1sdg16k5Tf768bxYK4TUJRH7cBM4kFCbf3mOnM/0E3vQYXvpxITbbWmBafaDbxLDz3g== dependencies: busboy "^1.6.0" @@ -9985,7 +10030,7 @@ unset-value@^1.0.0: has-value "^0.3.1" isobject "^3.0.0" -update-browserslist-db@^1.0.9: +update-browserslist-db@^1.0.10: version "1.0.10" resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== @@ -10181,11 +10226,6 @@ weak-daemon@1.0.3: resolved "https://registry.yarnpkg.com/weak-daemon/-/weak-daemon-1.0.3.tgz#d922b7c0dfb8f6bf027c463ea875584d2b085f19" integrity sha512-9OLYp5qQSxpnTIyuA1zJ7at3DV2DSBcbdXduC/3QFPeYjF30Lh1nfBrG+VLf4QUvZPz2lXFPu08oIRzWQfucVQ== -weak-map@^1.0.5: - version "1.0.8" - resolved "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.8.tgz#394c18a9e8262e790544ed8b55c6a4ddad1cb1a3" - integrity sha512-lNR9aAefbGPpHO7AEnY0hCFjz1eTkWCXYvkTRrTHs9qv8zJp+SkVYpzfLIFXQQiG3tVvbNFQgVg2bQS8YGgxyw== - web-push@*: version "3.5.0" resolved "https://registry.yarnpkg.com/web-push/-/web-push-3.5.0.tgz#4576533746052eda3bd50414b54a1b0a21eeaeae" @@ -10293,6 +10333,18 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q== +which-typed-array@^1.1.9: + version "1.1.9" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6" + integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA== + dependencies: + available-typed-arrays "^1.0.5" + call-bind "^1.0.2" + for-each "^0.3.3" + gopd "^1.0.1" + has-tostringtag "^1.0.0" + is-typed-array "^1.1.10" + which@^1.2.14, which@^1.2.9, which@^1.3.0: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -10448,9 +10500,9 @@ ws@^7.0.0: integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== ws@^8.11.0, ws@^8.4.0, ws@^8.9.0: - version "8.11.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" - integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== + version "8.13.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" + integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== xml-crypto@^2.1.3: version "2.1.5" diff --git a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.nix b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.nix index a259fc9e39..f11d3545f2 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.nix @@ -10,195 +10,187 @@ }; } { - name = "_aws_crypto_ie11_detection___ie11_detection_2.0.2.tgz"; + name = "_aws_crypto_ie11_detection___ie11_detection_3.0.0.tgz"; path = fetchurl { - name = "_aws_crypto_ie11_detection___ie11_detection_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@aws-crypto/ie11-detection/-/ie11-detection-2.0.2.tgz"; - sha512 = "5XDMQY98gMAf/WRTic5G++jfmS/VLM0rwpiOpaainKi4L0nqWMSB1SzsrEG5rjFZGYN6ZAefO+/Yta2dFM0kMw=="; + name = "_aws_crypto_ie11_detection___ie11_detection_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz"; + sha512 = "341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q=="; }; } { - name = "_aws_crypto_sha256_browser___sha256_browser_2.0.0.tgz"; + name = "_aws_crypto_sha256_browser___sha256_browser_3.0.0.tgz"; path = fetchurl { - name = "_aws_crypto_sha256_browser___sha256_browser_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-crypto/sha256-browser/-/sha256-browser-2.0.0.tgz"; - sha512 = "rYXOQ8BFOaqMEHJrLHul/25ckWH6GTJtdLSajhlqGMx0PmSueAuvboCuZCTqEKlxR8CQOwRarxYMZZSYlhRA1A=="; + name = "_aws_crypto_sha256_browser___sha256_browser_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz"; + sha512 = "8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ=="; }; } { - name = "_aws_crypto_sha256_js___sha256_js_2.0.0.tgz"; + name = "_aws_crypto_sha256_js___sha256_js_3.0.0.tgz"; path = fetchurl { - name = "_aws_crypto_sha256_js___sha256_js_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-2.0.0.tgz"; - sha512 = "VZY+mCY4Nmrs5WGfitmNqXzaE873fcIZDu54cbaDaaamsaTOP1DBImV9F4pICc3EHjQXujyE8jig+PFCaew9ig=="; + name = "_aws_crypto_sha256_js___sha256_js_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz"; + sha512 = "PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ=="; }; } { - name = "_aws_crypto_sha256_js___sha256_js_2.0.2.tgz"; + name = "_aws_crypto_supports_web_crypto___supports_web_crypto_3.0.0.tgz"; path = fetchurl { - name = "_aws_crypto_sha256_js___sha256_js_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-2.0.2.tgz"; - sha512 = "iXLdKH19qPmIC73fVCrHWCSYjN/sxaAvZ3jNNyw6FclmHyjLKg0f69WlC9KTnyElxCR5MO9SKaG00VwlJwyAkQ=="; + name = "_aws_crypto_supports_web_crypto___supports_web_crypto_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz"; + sha512 = "06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg=="; }; } { - name = "_aws_crypto_supports_web_crypto___supports_web_crypto_2.0.2.tgz"; + name = "_aws_crypto_util___util_3.0.0.tgz"; path = fetchurl { - name = "_aws_crypto_supports_web_crypto___supports_web_crypto_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-2.0.2.tgz"; - sha512 = "6mbSsLHwZ99CTOOswvCRP3C+VCWnzBf+1SnbWxzzJ9lR0mA0JnY2JEAhp8rqmTE0GPFy88rrM27ffgp62oErMQ=="; + name = "_aws_crypto_util___util_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-crypto/util/-/util-3.0.0.tgz"; + sha512 = "2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w=="; }; } { - name = "_aws_crypto_util___util_2.0.2.tgz"; + name = "_aws_sdk_abort_controller___abort_controller_3.289.0.tgz"; path = fetchurl { - name = "_aws_crypto_util___util_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@aws-crypto/util/-/util-2.0.2.tgz"; - sha512 = "Lgu5v/0e/BcrZ5m/IWqzPUf3UYFTy/PpeED+uc9SWUR1iZQL8XXbGQg10UfllwwBryO3hFF5dizK+78aoXC1eA=="; + name = "_aws_sdk_abort_controller___abort_controller_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/abort-controller/-/abort-controller-3.289.0.tgz"; + sha512 = "Xakz8EeTl0Q3KaWRdCaRQrrYxBAkQGj6eeT+DVmMLMz4gzTcSHwvfR5tVBIPHk4+IjboJJKM5l1xAZ90AGFPAQ=="; }; } { - name = "_aws_sdk_abort_controller___abort_controller_3.226.0.tgz"; + name = "_aws_sdk_client_cognito_identity___client_cognito_identity_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_abort_controller___abort_controller_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/abort-controller/-/abort-controller-3.226.0.tgz"; - sha512 = "cJVzr1xxPBd08voknXvR0RLgtZKGKt6WyDpH/BaPCu3rfSqWCDZKzwqe940eqosjmKrxC6pUZNKASIqHOQ8xxQ=="; + name = "_aws_sdk_client_cognito_identity___client_cognito_identity_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.289.0.tgz"; + sha512 = "rerSVZadAQu34Dxhsx+tpUdhru8Dpu/oW/ABJnVBZMbs5kXtl3wgWw8vRPiE0jFfjeA+dPZRXfuBzDulzsMcsg=="; }; } { - name = "_aws_sdk_client_cognito_identity___client_cognito_identity_3.236.0.tgz"; + name = "_aws_sdk_client_sso_oidc___client_sso_oidc_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_client_cognito_identity___client_cognito_identity_3.236.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.236.0.tgz"; - sha512 = "lWGuTVA+q3h1KS3nxTWeRGOfsuQ+GNwq5IxFJ8ko441mpwo5A2t6u25Z+G6t5Eh+q4EcoxMX64HYA+cu91lr7g=="; + name = "_aws_sdk_client_sso_oidc___client_sso_oidc_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.289.0.tgz"; + sha512 = "+09EK4aWdNjF+5+nK6Dmlwx3es8NTkyABTOj9H4eKB90rXQVX8PjoaFhK/b+NcNKDxgb1E6k6evZEpAb8dYQHg=="; }; } { - name = "_aws_sdk_client_sso_oidc___client_sso_oidc_3.236.0.tgz"; + name = "_aws_sdk_client_sso___client_sso_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_client_sso_oidc___client_sso_oidc_3.236.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.236.0.tgz"; - sha512 = "9TuigSXGafVto+GjKsVkhNLlnSgNWzRL5/ClZ5lY3dWrcDEJGZjFwwRB3ICerFQJBdDfsYwjNjJPhYEHzdyBfQ=="; + name = "_aws_sdk_client_sso___client_sso_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.289.0.tgz"; + sha512 = "GIpxPaEwqXC+P8wH+G4mIDnxYFJ+2SyYTrnoxb4OUH+gAkU6tybgvsv0fy+jsVD6GAWPdfU1AYk2ZjofdFiHeA=="; }; } { - name = "_aws_sdk_client_sso___client_sso_3.236.0.tgz"; + name = "_aws_sdk_client_sts___client_sts_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_client_sso___client_sso_3.236.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.236.0.tgz"; - sha512 = "2E/XHiVSRI+L2SlVscmV/+z4A2iWF6BTUjVBFBGMmsailvGDV6XKPFocTBsHI64G25/SYkhMdELvjn5jHLKBGQ=="; + name = "_aws_sdk_client_sts___client_sts_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.289.0.tgz"; + sha512 = "n+8zDCzk0NvCIXX3MGS8RV/+/MkJso0jkqkPOgPcS8Kf7Zbjlx8FyeGQ5LS7HjhCDk+jExH/s9h1kd3sL1pHQA=="; }; } { - name = "_aws_sdk_client_sts___client_sts_3.236.0.tgz"; + name = "_aws_sdk_config_resolver___config_resolver_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_client_sts___client_sts_3.236.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.236.0.tgz"; - sha512 = "ruEALU0oPwsA8xZ/HBCoUO9rsyhPyalj20GMGpzVaNcf1dr1jMTThDQvQvvjAHjY3W56mI7ApxjK+D+gok55aw=="; + name = "_aws_sdk_config_resolver___config_resolver_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/config-resolver/-/config-resolver-3.289.0.tgz"; + sha512 = "QYrBJeFJwx9wL73xMJgSTS6zY5SQh0tbZXpVlSZcNDuOufsu5zdcZZCOp0I20yGf8zxKX59u7O73OUlppkk+Wg=="; }; } { - name = "_aws_sdk_config_resolver___config_resolver_3.234.0.tgz"; + name = "_aws_sdk_credential_provider_cognito_identity___credential_provider_cognito_identity_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_config_resolver___config_resolver_3.234.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/config-resolver/-/config-resolver-3.234.0.tgz"; - sha512 = "uZxy4wzllfvgCQxVc+Iqhde0NGAnfmV2hWR6ejadJaAFTuYNvQiRg9IqJy3pkyDPqXySiJ8Bom5PoJfgn55J/A=="; + name = "_aws_sdk_credential_provider_cognito_identity___credential_provider_cognito_identity_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.289.0.tgz"; + sha512 = "RrK15OhL6UR8QKD415hggKfl8wcsMBqafcw/uYDESlvuAQVIi7hLgf5/2Onbhbc+m3huTBHY9e1D1n7u9hf9Bw=="; }; } { - name = "_aws_sdk_credential_provider_cognito_identity___credential_provider_cognito_identity_3.236.0.tgz"; + name = "_aws_sdk_credential_provider_env___credential_provider_env_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_credential_provider_cognito_identity___credential_provider_cognito_identity_3.236.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.236.0.tgz"; - sha512 = "PDsUZ7gmSCwraDDYnmoSkmrA1tpmvDBDjNPUVe6E+/8tDw3SWiL2efGR6r8ajFh9m+6jF6B8Wy+YB3u3yjAjWQ=="; + name = "_aws_sdk_credential_provider_env___credential_provider_env_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.289.0.tgz"; + sha512 = "h4yNEW2ZJATKVxL0Bvz/WWXUmBr+AhsTyjUNge734306lXNG5/FM7zYp2v6dSQWt02WwBXyfkP3lr+A0n4rHyA=="; }; } { - name = "_aws_sdk_credential_provider_env___credential_provider_env_3.226.0.tgz"; + name = "_aws_sdk_credential_provider_imds___credential_provider_imds_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_credential_provider_env___credential_provider_env_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.226.0.tgz"; - sha512 = "sd8uK1ojbXxaZXlthzw/VXZwCPUtU3PjObOfr3Evj7MPIM2IH8h29foOlggx939MdLQGboJf9gKvLlvKDWtJRA=="; + name = "_aws_sdk_credential_provider_imds___credential_provider_imds_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.289.0.tgz"; + sha512 = "SIl+iLQpDR6HA9CKTebui7NLop5GxnCkufbM3tbSqrQcPcEfYLOwXpu5gpKO2unQzRykCoyRVia1lr7Pc9Hgdg=="; }; } { - name = "_aws_sdk_credential_provider_imds___credential_provider_imds_3.226.0.tgz"; + name = "_aws_sdk_credential_provider_ini___credential_provider_ini_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_credential_provider_imds___credential_provider_imds_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.226.0.tgz"; - sha512 = "//z/COQm2AjYFI1Lb0wKHTQSrvLFTyuKLFQGPJsKS7DPoxGOCKB7hmYerlbl01IDoCxTdyL//TyyPxbZEOQD5Q=="; + name = "_aws_sdk_credential_provider_ini___credential_provider_ini_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.289.0.tgz"; + sha512 = "kvNUn3v4FTRRiqCOXl46v51VTGOM76j5Szcrhkk9qeFW6zt4iFodp6tQ4ynDtDxYxOvjuEfm3ii1YN5nkI1uKA=="; }; } { - name = "_aws_sdk_credential_provider_ini___credential_provider_ini_3.236.0.tgz"; + name = "_aws_sdk_credential_provider_node___credential_provider_node_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_credential_provider_ini___credential_provider_ini_3.236.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.236.0.tgz"; - sha512 = "W5vMEauWgFCzvf4Hks6ToU5dhbN87gyijmwp/l9AkKKvuJ25LkveAhk8xz3bydJThHdgWNEuBMyfmlVWmdybIg=="; + name = "_aws_sdk_credential_provider_node___credential_provider_node_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.289.0.tgz"; + sha512 = "05CYPGnk5cDiOQDIaXNVibNOwQdI34MDiL17YkSfPv779A+uq4vqg/aBfL41BDJjr1gSGgyvVhlcUdBKnlp93Q=="; }; } { - name = "_aws_sdk_credential_provider_node___credential_provider_node_3.236.0.tgz"; + name = "_aws_sdk_credential_provider_process___credential_provider_process_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_credential_provider_node___credential_provider_node_3.236.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.236.0.tgz"; - sha512 = "ktRPwmqw2P4dDzs/nJYTnuesSYqpDUEtqm2KSCKNT/fobzgfsrESLk3a7TY4l6N3muxQtKwguIa9Lulhe82+wg=="; + name = "_aws_sdk_credential_provider_process___credential_provider_process_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.289.0.tgz"; + sha512 = "t39CJHj1/f2DcRbEUSJ1ixwDsgaElDpJPynn59MOdNnrSh5bYuYmkrum/GYXYSsk+HoSK21JvwgvjnrkA9WZKQ=="; }; } { - name = "_aws_sdk_credential_provider_process___credential_provider_process_3.226.0.tgz"; + name = "_aws_sdk_credential_provider_sso___credential_provider_sso_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_credential_provider_process___credential_provider_process_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.226.0.tgz"; - sha512 = "iUDMdnrTvbvaCFhWwqyXrhvQ9+ojPqPqXhwZtY1X/Qaz+73S9gXBPJHZaZb2Ke0yKE1Ql3bJbKvmmxC/qLQMng=="; + name = "_aws_sdk_credential_provider_sso___credential_provider_sso_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.289.0.tgz"; + sha512 = "8+DjOqj5JCpVdT4EJtdfis6OioAdiDKM1mvgDTG8R43MSThc+RGfzqaDJQdM+8+hzkYhxYfyI9XB0H+X3rDNsA=="; }; } { - name = "_aws_sdk_credential_provider_sso___credential_provider_sso_3.236.0.tgz"; + name = "_aws_sdk_credential_provider_web_identity___credential_provider_web_identity_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_credential_provider_sso___credential_provider_sso_3.236.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.236.0.tgz"; - sha512 = "HLeVsFHd8QLQwhjwhdlBhXOFIa33mzqmxOqe2Qr4FVD5IR1/G4zLpSWSwtYjpvWRZs2oWSg6XI7vSyeQttPmHg=="; + name = "_aws_sdk_credential_provider_web_identity___credential_provider_web_identity_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.289.0.tgz"; + sha512 = "jZ9hQvr0I7Z2DekDtZytViYn7zNNJG06N0CinAJzzvreAQ1I61rU7mhaWc05jhBSdeA3f82XoDAgxqY4xIh9pQ=="; }; } { - name = "_aws_sdk_credential_provider_web_identity___credential_provider_web_identity_3.226.0.tgz"; + name = "_aws_sdk_credential_providers___credential_providers_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_credential_provider_web_identity___credential_provider_web_identity_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.226.0.tgz"; - sha512 = "CCpv847rLB0SFOHz2igvUMFAzeT2fD3YnY4C8jltuJoEkn0ITn1Hlgt13nTJ5BUuvyti2mvyXZHmNzhMIMrIlw=="; + name = "_aws_sdk_credential_providers___credential_providers_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.289.0.tgz"; + sha512 = "kXNhi0s0oZ8k2cv3D5350glKutV4Lgg/hVBAAU/AnjFl5JFiZZKFpTs3N8p0MLCESipL2uCws7R0UU7uy8sKIQ=="; }; } { - name = "_aws_sdk_credential_providers___credential_providers_3.236.0.tgz"; + name = "_aws_sdk_fetch_http_handler___fetch_http_handler_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_credential_providers___credential_providers_3.236.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.236.0.tgz"; - sha512 = "z7RU5E9xlk6KX16jJxByn8xa8mv8pPZoqAPkavCsFJS6pOYTtQJYYdjrUK/2EmOmbPpc62P6mqVP7qTVQKgafw=="; + name = "_aws_sdk_fetch_http_handler___fetch_http_handler_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.289.0.tgz"; + sha512 = "tksh2GnDV1JaI+NO9x+pgyB3VNwjnUdtoMcFGmTDm1TrcPNj0FLX2hLiunlVG7fFMfGLXC2aco0sUra5/5US9Q=="; }; } { - name = "_aws_sdk_fetch_http_handler___fetch_http_handler_3.226.0.tgz"; + name = "_aws_sdk_hash_node___hash_node_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_fetch_http_handler___fetch_http_handler_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.226.0.tgz"; - sha512 = "JewZPMNEBXfi1xVnRa7pVtK/zgZD8/lQ/YnD8pq79WuMa2cwyhDtr8oqCoqsPW+WJT5ScXoMtuHxN78l8eKWgg=="; + name = "_aws_sdk_hash_node___hash_node_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/hash-node/-/hash-node-3.289.0.tgz"; + sha512 = "fL7Pt4LU+tluHn0+BSIFVD2ZVJ5fuXvd1hQt4aTYrgkna1RR5v55Hdy2rNrp/syrkyE+Wv92S3hgZ7ZTBeXFZA=="; }; } { - name = "_aws_sdk_hash_node___hash_node_3.226.0.tgz"; + name = "_aws_sdk_invalid_dependency___invalid_dependency_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_hash_node___hash_node_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/hash-node/-/hash-node-3.226.0.tgz"; - sha512 = "MdlJhJ9/Espwd0+gUXdZRsHuostB2WxEVAszWxobP0FTT9PnicqnfK7ExmW+DUAc0ywxtEbR3e0UND65rlSTVw=="; - }; - } - { - name = "_aws_sdk_invalid_dependency___invalid_dependency_3.226.0.tgz"; - path = fetchurl { - name = "_aws_sdk_invalid_dependency___invalid_dependency_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/invalid-dependency/-/invalid-dependency-3.226.0.tgz"; - sha512 = "QXOYFmap8g9QzRjumcRCIo2GEZkdCwd7ePQW0OABWPhKHzlJ74vvBxywjU3s39EEBEluWXtZ7Iufg6GxZM4ifw=="; + name = "_aws_sdk_invalid_dependency___invalid_dependency_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/invalid-dependency/-/invalid-dependency-3.289.0.tgz"; + sha512 = "VpXadvpqXFUA8gBH6TAAJzsKfEQ4IvsiD7d9b2B+jw1YtaPFTqEEuDjN6ngpad8PCPCNWl8CI6oBCdMOK+L48A=="; }; } { @@ -210,195 +202,195 @@ }; } { - name = "_aws_sdk_middleware_content_length___middleware_content_length_3.226.0.tgz"; + name = "_aws_sdk_middleware_content_length___middleware_content_length_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_middleware_content_length___middleware_content_length_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/middleware-content-length/-/middleware-content-length-3.226.0.tgz"; - sha512 = "ksUzlHJN2JMuyavjA46a4sctvnrnITqt2tbGGWWrAuXY1mel2j+VbgnmJUiwHKUO6bTFBBeft5Vd1TSOb4JmiA=="; + name = "_aws_sdk_middleware_content_length___middleware_content_length_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-content-length/-/middleware-content-length-3.289.0.tgz"; + sha512 = "D7vGeuaAzKiq0aFPwme1Xy4x69Jn4v0YJ3Xa4J+keNep0yZ9LfU5KSngqsxeTefCqS+2tdaArkBN2VdexmPagw=="; }; } { - name = "_aws_sdk_middleware_endpoint___middleware_endpoint_3.226.0.tgz"; + name = "_aws_sdk_middleware_endpoint___middleware_endpoint_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_middleware_endpoint___middleware_endpoint_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.226.0.tgz"; - sha512 = "EvLFafjtUxTT0AC9p3aBQu1/fjhWdIeK58jIXaNFONfZ3F8QbEYUPuF/SqZvJM6cWfOO9qwYKkRDbCSTYhprIg=="; + name = "_aws_sdk_middleware_endpoint___middleware_endpoint_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.289.0.tgz"; + sha512 = "nxaQFOG1IurwCHWP22RxgTFZdILsdBg6wbg4GeFpNBtE3bi0zIUYKrUhpdRr/pZyGAboD1oD9iQtxuGb/M6f+w=="; }; } { - name = "_aws_sdk_middleware_host_header___middleware_host_header_3.226.0.tgz"; + name = "_aws_sdk_middleware_host_header___middleware_host_header_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_middleware_host_header___middleware_host_header_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.226.0.tgz"; - sha512 = "haVkWVh6BUPwKgWwkL6sDvTkcZWvJjv8AgC8jiQuSl8GLZdzHTB8Qhi3IsfFta9HAuoLjxheWBE5Z/L0UrfhLA=="; + name = "_aws_sdk_middleware_host_header___middleware_host_header_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.289.0.tgz"; + sha512 = "yFBOKvKBnITO08JCx+65vXPe9Uo4gZuth/ka9v5swa4wtV8AP+kkOwFrNxSi2iAFLJ4Mg21vGQceeL0bErF6KQ=="; }; } { - name = "_aws_sdk_middleware_logger___middleware_logger_3.226.0.tgz"; + name = "_aws_sdk_middleware_logger___middleware_logger_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_middleware_logger___middleware_logger_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.226.0.tgz"; - sha512 = "m9gtLrrYnpN6yckcQ09rV7ExWOLMuq8mMPF/K3DbL/YL0TuILu9i2T1W+JuxSX+K9FMG2HrLAKivE/kMLr55xA=="; + name = "_aws_sdk_middleware_logger___middleware_logger_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.289.0.tgz"; + sha512 = "c5W7AlOdoyTXRoNl2yOVkhbTjp8tX0z65GDb3+/1yYcv+GRtz67WMZscWMQJwEfdCLdDE2GtBe+t2xyFGnmJvA=="; }; } { - name = "_aws_sdk_middleware_recursion_detection___middleware_recursion_detection_3.226.0.tgz"; + name = "_aws_sdk_middleware_recursion_detection___middleware_recursion_detection_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_middleware_recursion_detection___middleware_recursion_detection_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.226.0.tgz"; - sha512 = "mwRbdKEUeuNH5TEkyZ5FWxp6bL2UC1WbY+LDv6YjHxmSMKpAoOueEdtU34PqDOLrpXXxIGHDFmjeGeMfktyEcA=="; + name = "_aws_sdk_middleware_recursion_detection___middleware_recursion_detection_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.289.0.tgz"; + sha512 = "r2NrfnTG0UZRXeFjoyapAake7b1rUo6SC52/UV4Pdm8cHoYMmljnaGLjiAfzt6vWv6cSVCJq1r28Ne4slAoMAg=="; }; } { - name = "_aws_sdk_middleware_retry___middleware_retry_3.235.0.tgz"; + name = "_aws_sdk_middleware_retry___middleware_retry_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_middleware_retry___middleware_retry_3.235.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/middleware-retry/-/middleware-retry-3.235.0.tgz"; - sha512 = "50WHbJGpD3SNp9763MAlHqIhXil++JdQbKejNpHg7HsJne/ao3ub+fDOfx//mMBjpzBV25BGd5UlfL6blrClSg=="; + name = "_aws_sdk_middleware_retry___middleware_retry_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-retry/-/middleware-retry-3.289.0.tgz"; + sha512 = "Su+iGv5mrFjVCXJmjohX00o3HzkwnhY0TDhIltgolB6ZfOqy3Dfopjj21OWtqY9VYCUiLGC4KRfeb2feyrz5BA=="; }; } { - name = "_aws_sdk_middleware_sdk_sts___middleware_sdk_sts_3.226.0.tgz"; + name = "_aws_sdk_middleware_sdk_sts___middleware_sdk_sts_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_middleware_sdk_sts___middleware_sdk_sts_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.226.0.tgz"; - sha512 = "NN9T/qoSD1kZvAT+VLny3NnlqgylYQcsgV3rvi/8lYzw/G/2s8VS6sm/VTWGGZhx08wZRv20MWzYu3bftcyqUg=="; + name = "_aws_sdk_middleware_sdk_sts___middleware_sdk_sts_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.289.0.tgz"; + sha512 = "9WzUVPEqJcvggGCk9JHXnwhj7fjuMXE/JM3gx7eMSStJCcK+3BARZ1RZnggUN4vN9iTSzdA+r0OpC1XnUGKB2g=="; }; } { - name = "_aws_sdk_middleware_serde___middleware_serde_3.226.0.tgz"; + name = "_aws_sdk_middleware_serde___middleware_serde_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_middleware_serde___middleware_serde_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/middleware-serde/-/middleware-serde-3.226.0.tgz"; - sha512 = "nPuOOAkSfx9TxzdKFx0X2bDlinOxGrqD7iof926K/AEflxGD1DBdcaDdjlYlPDW2CVE8LV/rAgbYuLxh/E/1VA=="; + name = "_aws_sdk_middleware_serde___middleware_serde_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-serde/-/middleware-serde-3.289.0.tgz"; + sha512 = "pygC+LsEBVAxOzfoxA9jgvqfO1PLivh8s2Yr/aNQOwx49fmTHMvPwRYUGDV38Du6bRYcKI6nxYqkbJFkQkRESQ=="; }; } { - name = "_aws_sdk_middleware_signing___middleware_signing_3.226.0.tgz"; + name = "_aws_sdk_middleware_signing___middleware_signing_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_middleware_signing___middleware_signing_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/middleware-signing/-/middleware-signing-3.226.0.tgz"; - sha512 = "E6HmtPcl+IjYDDzi1xI2HpCbBq2avNWcjvCriMZWuTAtRVpnA6XDDGW5GY85IfS3A8G8vuWqEVPr8JcYUcjfew=="; + name = "_aws_sdk_middleware_signing___middleware_signing_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-signing/-/middleware-signing-3.289.0.tgz"; + sha512 = "9SLATNvibxg4hpr4ldU18LwB6AVzovONWeJLt49FKISz7ZwGF6WVJYUMWeScj4+Z51Gozi7+pUIaFn7i6N3UbA=="; }; } { - name = "_aws_sdk_middleware_stack___middleware_stack_3.226.0.tgz"; + name = "_aws_sdk_middleware_stack___middleware_stack_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_middleware_stack___middleware_stack_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/middleware-stack/-/middleware-stack-3.226.0.tgz"; - sha512 = "85wF29LvPvpoed60fZGDYLwv1Zpd/cM0C22WSSFPw1SSJeqO4gtFYyCg2squfT3KI6kF43IIkOCJ+L7GtryPug=="; + name = "_aws_sdk_middleware_stack___middleware_stack_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-stack/-/middleware-stack-3.289.0.tgz"; + sha512 = "3rWx+UkV//dv/cLIrXmzIa+FZcn6n76JevGHYCTReiRpcvv+xECxgXH2crMYtzbu05WdxGYD6P0IP5tMwH0yXA=="; }; } { - name = "_aws_sdk_middleware_user_agent___middleware_user_agent_3.226.0.tgz"; + name = "_aws_sdk_middleware_user_agent___middleware_user_agent_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_middleware_user_agent___middleware_user_agent_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.226.0.tgz"; - sha512 = "N1WnfzCW1Y5yWhVAphf8OPGTe8Df3vmV7/LdsoQfmpkCZgLZeK2o0xITkUQhRj1mbw7yp8tVFLFV3R2lMurdAQ=="; + name = "_aws_sdk_middleware_user_agent___middleware_user_agent_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.289.0.tgz"; + sha512 = "XPhB9mgko66BouyxA+7z7SjUaNHyr58Xe/OB8GII5R/JiR3A/lpc8+jm9gEEpjEI/HpF8jLFDnTMbgabVAHOeA=="; }; } { - name = "_aws_sdk_node_config_provider___node_config_provider_3.226.0.tgz"; + name = "_aws_sdk_node_config_provider___node_config_provider_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_node_config_provider___node_config_provider_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/node-config-provider/-/node-config-provider-3.226.0.tgz"; - sha512 = "B8lQDqiRk7X5izFEUMXmi8CZLOKCTWQJU9HQf3ako+sF0gexo4nHN3jhoRWyLtcgC5S3on/2jxpAcqtm7kuY3w=="; + name = "_aws_sdk_node_config_provider___node_config_provider_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/node-config-provider/-/node-config-provider-3.289.0.tgz"; + sha512 = "rR41c3Y7MYEP8TG9X1whHyrXEXOZzi4blSDqeJflwtNt3r3HvErGZiNBdVv368ycPPuu1YRSqTkgOYNCv02vlw=="; }; } { - name = "_aws_sdk_node_http_handler___node_http_handler_3.226.0.tgz"; + name = "_aws_sdk_node_http_handler___node_http_handler_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_node_http_handler___node_http_handler_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/node-http-handler/-/node-http-handler-3.226.0.tgz"; - sha512 = "xQCddnZNMiPmjr3W7HYM+f5ir4VfxgJh37eqZwX6EZmyItFpNNeVzKUgA920ka1VPz/ZUYB+2OFGiX3LCLkkaA=="; + name = "_aws_sdk_node_http_handler___node_http_handler_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/node-http-handler/-/node-http-handler-3.289.0.tgz"; + sha512 = "zKknSaOY2GNmqH/eoZndmQWoEKhYPV0qRZtAMxuS3DVI5fipBipNzbVBaXrHRjxARx7/VLWnvNArchRoHfOlmw=="; }; } { - name = "_aws_sdk_property_provider___property_provider_3.226.0.tgz"; + name = "_aws_sdk_property_provider___property_provider_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_property_provider___property_provider_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/property-provider/-/property-provider-3.226.0.tgz"; - sha512 = "TsljjG+Sg0LmdgfiAlWohluWKnxB/k8xenjeozZfzOr5bHmNHtdbWv6BtNvD/R83hw7SFXxbJHlD5H4u9p2NFg=="; + name = "_aws_sdk_property_provider___property_provider_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/property-provider/-/property-provider-3.289.0.tgz"; + sha512 = "Raf4lTWPTmEGFV7Lkbfet2n/4Ybz5vQiiU45l56kgIQA88mLUuE4dshgNsM0Zb2rflsTaiN1JR2+RS/8lNtI8A=="; }; } { - name = "_aws_sdk_protocol_http___protocol_http_3.226.0.tgz"; + name = "_aws_sdk_protocol_http___protocol_http_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_protocol_http___protocol_http_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/protocol-http/-/protocol-http-3.226.0.tgz"; - sha512 = "zWkVqiTA9RXL6y0hhfZc9bcU4DX2NI6Hw9IhQmSPeM59mdbPjJlY4bLlMr5YxywqO3yQ/ylNoAfrEzrDjlOSRg=="; + name = "_aws_sdk_protocol_http___protocol_http_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/protocol-http/-/protocol-http-3.289.0.tgz"; + sha512 = "/2jOQ3MJZx1xk6BHEOW47ItGo1tgA9cP9a2saYneon05VIV6OuYefO5pG2G0nPnImTbff++N7aioXe5XKrnorw=="; }; } { - name = "_aws_sdk_querystring_builder___querystring_builder_3.226.0.tgz"; + name = "_aws_sdk_querystring_builder___querystring_builder_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_querystring_builder___querystring_builder_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/querystring-builder/-/querystring-builder-3.226.0.tgz"; - sha512 = "LVurypuNeotO4lmirKXRC4NYrZRAyMJXuwO0f2a5ZAUJCjauwYrifKue6yCfU7bls7gut7nfcR6B99WBYpHs3g=="; + name = "_aws_sdk_querystring_builder___querystring_builder_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/querystring-builder/-/querystring-builder-3.289.0.tgz"; + sha512 = "llJCS8mAJfBYBjkKeriRmBuDr2jIozrMWhJOkz95SQGFsx1sKBPQMMOV6zunwhQux8bjtjf5wYiR1TM2jNUKqQ=="; }; } { - name = "_aws_sdk_querystring_parser___querystring_parser_3.226.0.tgz"; + name = "_aws_sdk_querystring_parser___querystring_parser_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_querystring_parser___querystring_parser_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/querystring-parser/-/querystring-parser-3.226.0.tgz"; - sha512 = "FzB+VrQ47KAFxiPt2YXrKZ8AOLZQqGTLCKHzx4bjxGmwgsjV8yIbtJiJhZLMcUQV4LtGeIY9ixIqQhGvnZHE4A=="; + name = "_aws_sdk_querystring_parser___querystring_parser_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/querystring-parser/-/querystring-parser-3.289.0.tgz"; + sha512 = "84zXKXIYtnTCrez/gGZIGuqfUJezzaOMm7BQwnOnq/sN21ou63jF3Q+tIMhLO/EvDcvmxEOlUXN1kfMQcjEjSw=="; }; } { - name = "_aws_sdk_service_error_classification___service_error_classification_3.229.0.tgz"; + name = "_aws_sdk_service_error_classification___service_error_classification_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_service_error_classification___service_error_classification_3.229.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/service-error-classification/-/service-error-classification-3.229.0.tgz"; - sha512 = "dnzWWQ0/NoWMUZ5C0DW3dPm0wC1O76Y/SpKbuJzWPkx1EYy6r8p32Ly4D9vUzrKDbRGf48YHIF2kOkBmu21CLg=="; + name = "_aws_sdk_service_error_classification___service_error_classification_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/service-error-classification/-/service-error-classification-3.289.0.tgz"; + sha512 = "+d1Vlb45Bs2gbTmXpRCGQrX4AQDETjA5sx1zLvq1NZGSnTX6LdroYPtXu3dRWJwDHHQpCMN/XfFN8jTw0IzBOg=="; }; } { - name = "_aws_sdk_shared_ini_file_loader___shared_ini_file_loader_3.226.0.tgz"; + name = "_aws_sdk_shared_ini_file_loader___shared_ini_file_loader_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_shared_ini_file_loader___shared_ini_file_loader_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.226.0.tgz"; - sha512 = "661VQefsARxVyyV2FX9V61V+nNgImk7aN2hYlFKla6BCwZfMng+dEtD0xVGyg1PfRw0qvEv5LQyxMVgHcUSevA=="; + name = "_aws_sdk_shared_ini_file_loader___shared_ini_file_loader_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.289.0.tgz"; + sha512 = "XG9Pfn3itf3Z0p6nY6UuMVMhzZb+oX7L28oyby8REl8BAwfPkcziLxXlZsBHf6KcgYDG1R6z945hvIwZhJbjvA=="; }; } { - name = "_aws_sdk_signature_v4___signature_v4_3.226.0.tgz"; + name = "_aws_sdk_signature_v4___signature_v4_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_signature_v4___signature_v4_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/signature-v4/-/signature-v4-3.226.0.tgz"; - sha512 = "/R5q5agdPd7HJB68XMzpxrNPk158EHUvkFkuRu5Qf3kkkHebEzWEBlWoVpUe6ss4rP9Tqcue6xPuaftEmhjpYw=="; + name = "_aws_sdk_signature_v4___signature_v4_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/signature-v4/-/signature-v4-3.289.0.tgz"; + sha512 = "IQyYHx3zp7PHxFA17YDb6WVx8ejXDxrsnKspFXgZQyoZOPfReqWQs32dcJYXff/IdSzxjwOpwBFbmIt2vbdKnQ=="; }; } { - name = "_aws_sdk_smithy_client___smithy_client_3.234.0.tgz"; + name = "_aws_sdk_smithy_client___smithy_client_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_smithy_client___smithy_client_3.234.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/smithy-client/-/smithy-client-3.234.0.tgz"; - sha512 = "8AtR/k4vsFvjXeQbIzq/Wy7Nbk48Ou0wUEeVYPHWHPSU8QamFWORkOwmKtKMfHAyZvmqiAPeQqHFkq+UJhWyyQ=="; + name = "_aws_sdk_smithy_client___smithy_client_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/smithy-client/-/smithy-client-3.289.0.tgz"; + sha512 = "miPMdnv4Ivv8RN65LJ9dxzkQNHn9Tp9wzZJXwBcPqGdXyRlkWSuIOIIhhAqQoV9R9ByeshnCWBpwqlITIjNPVw=="; }; } { - name = "_aws_sdk_token_providers___token_providers_3.236.0.tgz"; + name = "_aws_sdk_token_providers___token_providers_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_token_providers___token_providers_3.236.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.236.0.tgz"; - sha512 = "gmHuWuQgl6+2UfdbOvtsns/byZQnPGjyQ88/SlKgnX2EcDd31ENb8wRa9gfIEwvx6rTB2ve1NAhuliydB9AomQ=="; + name = "_aws_sdk_token_providers___token_providers_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.289.0.tgz"; + sha512 = "fzvGIfJNoLR5g24ok8cRwc9AMLXoEOyfi+eHocAF6eyfe0NWlQtpsmLe7XXx5I9yZ51lclzV49rEz9ynp243RA=="; }; } { - name = "_aws_sdk_types___types_3.226.0.tgz"; + name = "_aws_sdk_types___types_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_types___types_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.226.0.tgz"; - sha512 = "MmmNHrWeO4man7wpOwrAhXlevqtOV9ZLcH4RhnG5LmRce0RFOApx24HoKENfFCcOyCm5LQBlsXCqi0dZWDWU0A=="; + name = "_aws_sdk_types___types_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.289.0.tgz"; + sha512 = "wwUC+VwoNlEkgDzK/aJG3+zeMcYRcYFQV4mbZaicYdp3v8hmkUkJUhyxuZYl/FmY46WG+DYv+/Y3NilgfsE+Wg=="; }; } { - name = "_aws_sdk_url_parser___url_parser_3.226.0.tgz"; + name = "_aws_sdk_url_parser___url_parser_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_url_parser___url_parser_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/url-parser/-/url-parser-3.226.0.tgz"; - sha512 = "p5RLE0QWyP0OcTOLmFcLdVgUcUEzmEfmdrnOxyNzomcYb0p3vUagA5zfa1HVK2azsQJFBv28GfvMnba9bGhObg=="; + name = "_aws_sdk_url_parser___url_parser_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/url-parser/-/url-parser-3.289.0.tgz"; + sha512 = "rbtW3O6UBX+eWR/+UiCDNFUVwN8hp82JPy+NGv3NeOvRjBsxkKmcH4UJTHDIeT+suqTDNEdV5nz438u3dHdHrQ=="; }; } { @@ -442,27 +434,27 @@ }; } { - name = "_aws_sdk_util_defaults_mode_browser___util_defaults_mode_browser_3.234.0.tgz"; + name = "_aws_sdk_util_defaults_mode_browser___util_defaults_mode_browser_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_util_defaults_mode_browser___util_defaults_mode_browser_3.234.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.234.0.tgz"; - sha512 = "IHMKXjTbOD8XMz5+2oCOsVP94BYb9YyjXdns0aAXr2NAo7k2+RCzXQ2DebJXppGda1F6opFutoKwyVSN0cmbMw=="; + name = "_aws_sdk_util_defaults_mode_browser___util_defaults_mode_browser_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.289.0.tgz"; + sha512 = "sYrDwjX3s54cvGq69PJpP2vDpJ5BJXhg2KEHbK92Qr2AUqMUgidwZCw4oBaIqKDXcPIrjmhod31s3tTfYmtTMQ=="; }; } { - name = "_aws_sdk_util_defaults_mode_node___util_defaults_mode_node_3.234.0.tgz"; + name = "_aws_sdk_util_defaults_mode_node___util_defaults_mode_node_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_util_defaults_mode_node___util_defaults_mode_node_3.234.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.234.0.tgz"; - sha512 = "UGjQ+OjBYYhxFVtUY+jtr0ZZgzZh6OHtYwRhFt8IHewJXFCfZTyfsbX20szBj5y1S4HRIUJ7cwBLIytTqMbI5w=="; + name = "_aws_sdk_util_defaults_mode_node___util_defaults_mode_node_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.289.0.tgz"; + sha512 = "PsP40+9peN7kpEmQ2GhEAGwUwD9F/R/BI/1kzjW0nbBsMrTnkUnlZlaitwpBX/OWNV/YZTdVAOvD50j/ACyXlg=="; }; } { - name = "_aws_sdk_util_endpoints___util_endpoints_3.226.0.tgz"; + name = "_aws_sdk_util_endpoints___util_endpoints_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_util_endpoints___util_endpoints_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.226.0.tgz"; - sha512 = "iqOkac/zLmyPBUJd7SLN0PeZMkOmlGgD5PHmmekTClOkce2eUjK9SNX1PzL73aXPoPTyhg9QGLH8uEZEQ8YUzg=="; + name = "_aws_sdk_util_endpoints___util_endpoints_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.289.0.tgz"; + sha512 = "PmsgqL9jdNTz3p0eW83nZZGcngAdoIWidXCc32G5tIIYvJutdgkiObAaydtXaMgk5CRvjenngFf6Zg9JyVHOLQ=="; }; } { @@ -482,19 +474,19 @@ }; } { - name = "_aws_sdk_util_middleware___util_middleware_3.226.0.tgz"; + name = "_aws_sdk_util_middleware___util_middleware_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_util_middleware___util_middleware_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/util-middleware/-/util-middleware-3.226.0.tgz"; - sha512 = "B96CQnwX4gRvQdaQkdUtqvDPkrptV5+va6FVeJOocU/DbSYMAScLxtR3peMS8cnlOT6nL1Eoa42OI9AfZz1VwQ=="; + name = "_aws_sdk_util_middleware___util_middleware_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-middleware/-/util-middleware-3.289.0.tgz"; + sha512 = "hw3WHQU9Wk7a1H3x+JhwMA4ECCleeuNlob3fXSYJmXgvZyuWfpMYZi4iSkqoWGFAXYpAtZZLIu45iIcd7F296g=="; }; } { - name = "_aws_sdk_util_retry___util_retry_3.229.0.tgz"; + name = "_aws_sdk_util_retry___util_retry_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_util_retry___util_retry_3.229.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/util-retry/-/util-retry-3.229.0.tgz"; - sha512 = "0zKTqi0P1inD0LzIMuXRIYYQ/8c1lWMg/cfiqUcIAF1TpatlpZuN7umU0ierpBFud7S+zDgg0oemh+Nj8xliJw=="; + name = "_aws_sdk_util_retry___util_retry_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-retry/-/util-retry-3.289.0.tgz"; + sha512 = "noFn++ZKH11ExTBqUU/b9wsOjqxYlDnN/8xq+9oCsyBnEZztVgM/AM3WP5qBPRskk1WzDprID5fb5V87113Uug=="; }; } { @@ -506,43 +498,43 @@ }; } { - name = "_aws_sdk_util_user_agent_browser___util_user_agent_browser_3.226.0.tgz"; + name = "_aws_sdk_util_user_agent_browser___util_user_agent_browser_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_util_user_agent_browser___util_user_agent_browser_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.226.0.tgz"; - sha512 = "PhBIu2h6sPJPcv2I7ELfFizdl5pNiL4LfxrasMCYXQkJvVnoXztHA1x+CQbXIdtZOIlpjC+6BjDcE0uhnpvfcA=="; + name = "_aws_sdk_util_user_agent_browser___util_user_agent_browser_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.289.0.tgz"; + sha512 = "BDXYgNzzz2iNPTkl9MQf7pT4G80V6O6ICwJyH93a5EEdljl7oPrt8i4MS5S0BDAWx58LqjWtVw98GOZfy5BYhw=="; }; } { - name = "_aws_sdk_util_user_agent_node___util_user_agent_node_3.226.0.tgz"; + name = "_aws_sdk_util_user_agent_node___util_user_agent_node_3.289.0.tgz"; path = fetchurl { - name = "_aws_sdk_util_user_agent_node___util_user_agent_node_3.226.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.226.0.tgz"; - sha512 = "othPc5Dz/pkYkxH+nZPhc1Al0HndQT8zHD4e9h+EZ+8lkd8n+IsnLfTS/mSJWrfiC6UlNRVw55cItstmJyMe/A=="; + name = "_aws_sdk_util_user_agent_node___util_user_agent_node_3.289.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.289.0.tgz"; + sha512 = "f32g9KS7pwO6FQ9N1CtqQPIS6jhvwv/y0+NHNoo9zLTBH0jol3+C2ELIE3N1wB6xvwhsdPqR3WuOiNiCiv8YAQ=="; }; } { - name = "_aws_sdk_util_utf8_browser___util_utf8_browser_3.188.0.tgz"; + name = "_aws_sdk_util_utf8_browser___util_utf8_browser_3.259.0.tgz"; path = fetchurl { - name = "_aws_sdk_util_utf8_browser___util_utf8_browser_3.188.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.188.0.tgz"; - sha512 = "jt627x0+jE+Ydr9NwkFstg3cUvgWh56qdaqAMDsqgRlKD21md/6G226z/Qxl7lb1VEW2LlmCx43ai/37Qwcj2Q=="; + name = "_aws_sdk_util_utf8_browser___util_utf8_browser_3.259.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz"; + sha512 = "UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw=="; }; } { - name = "_aws_sdk_util_utf8_node___util_utf8_node_3.208.0.tgz"; + name = "_aws_sdk_util_utf8___util_utf8_3.254.0.tgz"; path = fetchurl { - name = "_aws_sdk_util_utf8_node___util_utf8_node_3.208.0.tgz"; - url = "https://registry.yarnpkg.com/@aws-sdk/util-utf8-node/-/util-utf8-node-3.208.0.tgz"; - sha512 = "jKY87Acv0yWBdFxx6bveagy5FYjz+dtV8IPT7ay1E2WPWH1czoIdMAkc8tSInK31T6CRnHWkLZ1qYwCbgRfERQ=="; + name = "_aws_sdk_util_utf8___util_utf8_3.254.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-utf8/-/util-utf8-3.254.0.tgz"; + sha512 = "14Kso/eIt5/qfIBmhEL9L1IfyUqswjSTqO2mY7KOzUZ9SZbwn3rpxmtkhmATkRjD7XIlLKaxBkI7tU9Zjzj8Kw=="; }; } { - name = "_babel_cli___cli_7.20.7.tgz"; + name = "_babel_cli___cli_7.21.0.tgz"; path = fetchurl { - name = "_babel_cli___cli_7.20.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/cli/-/cli-7.20.7.tgz"; - sha512 = "WylgcELHB66WwQqItxNILsMlaTd8/SO6SgTTjMp4uCI7P4QyH1r3nqgFmO3BfM4AtfniHgFMH3EpYFj/zynBkQ=="; + name = "_babel_cli___cli_7.21.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/cli/-/cli-7.21.0.tgz"; + sha512 = "xi7CxyS8XjSyiwUGCfwf+brtJxjW1/ZTcBUkP10xawIEXLX5HzLn+3aXkgxozcP2UhRhtKTmQurw9Uaes7jZrA=="; }; } { @@ -554,27 +546,27 @@ }; } { - name = "_babel_compat_data___compat_data_7.20.5.tgz"; + name = "_babel_compat_data___compat_data_7.21.0.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.20.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz"; - sha512 = "KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g=="; + name = "_babel_compat_data___compat_data_7.21.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.0.tgz"; + sha512 = "gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g=="; }; } { - name = "_babel_core___core_7.20.7.tgz"; + name = "_babel_core___core_7.21.0.tgz"; path = fetchurl { - name = "_babel_core___core_7.20.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.20.7.tgz"; - sha512 = "t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw=="; + name = "_babel_core___core_7.21.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.21.0.tgz"; + sha512 = "PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA=="; }; } { - name = "_babel_generator___generator_7.20.7.tgz"; + name = "_babel_generator___generator_7.21.1.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.20.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz"; - sha512 = "7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw=="; + name = "_babel_generator___generator_7.21.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.1.tgz"; + sha512 = "1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA=="; }; } { @@ -602,11 +594,11 @@ }; } { - name = "_babel_helper_function_name___helper_function_name_7.19.0.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.21.0.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.19.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz"; - sha512 = "WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w=="; + name = "_babel_helper_function_name___helper_function_name_7.21.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz"; + sha512 = "HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg=="; }; } { @@ -626,11 +618,11 @@ }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.20.7.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.21.2.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.20.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz"; - sha512 = "FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA=="; + name = "_babel_helper_module_transforms___helper_module_transforms_7.21.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz"; + sha512 = "79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ=="; }; } { @@ -674,19 +666,19 @@ }; } { - name = "_babel_helper_validator_option___helper_validator_option_7.18.6.tgz"; + name = "_babel_helper_validator_option___helper_validator_option_7.21.0.tgz"; path = fetchurl { - name = "_babel_helper_validator_option___helper_validator_option_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"; - sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; + name = "_babel_helper_validator_option___helper_validator_option_7.21.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz"; + sha512 = "rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ=="; }; } { - name = "_babel_helpers___helpers_7.20.7.tgz"; + name = "_babel_helpers___helpers_7.21.0.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.20.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.7.tgz"; - sha512 = "PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA=="; + name = "_babel_helpers___helpers_7.21.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.0.tgz"; + sha512 = "XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA=="; }; } { @@ -706,11 +698,11 @@ }; } { - name = "_babel_parser___parser_7.20.7.tgz"; + name = "_babel_parser___parser_7.21.2.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.20.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz"; - sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg=="; + name = "_babel_parser___parser_7.21.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.2.tgz"; + sha512 = "URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ=="; }; } { @@ -722,19 +714,19 @@ }; } { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.20.7.tgz"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.21.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.20.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.7.tgz"; - sha512 = "Tfq7qqD+tRj3EoDhY00nn2uP2hsRxgYGi5mLQ5TimKav0a9Lrpd4deE+fcLXU8zFYRjlKPHZhpCvfEA6qnBxqQ=="; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.21.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.21.0.tgz"; + sha512 = "6OAWljMvQrZjR2DaNhVfRz6dkCAVV+ymcLUmaf8bccGOHn2v5rHJK3tTpij0BuhdYWP4LLaqj5lwcdlpAAPuvg=="; }; } { - name = "_babel_register___register_7.18.9.tgz"; + name = "_babel_register___register_7.21.0.tgz"; path = fetchurl { - name = "_babel_register___register_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/register/-/register-7.18.9.tgz"; - sha512 = "ZlbnXDcNYHMR25ITwwNKT88JiaukkdVj/nG7r3wnuXkOTHc60Uy05PwMCPre0hSkY68E6zK3xz+vUJSP2jWmcw=="; + name = "_babel_register___register_7.21.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/register/-/register-7.21.0.tgz"; + sha512 = "9nKsPmYDi5DidAqJaQooxIhsLJiNMkGr8ypQ8Uic7cIox7UCDsM7HuUGxdGT7mSDTYbqzIdsOWzfBton/YJrMw=="; }; } { @@ -746,19 +738,19 @@ }; } { - name = "_babel_traverse___traverse_7.20.8.tgz"; + name = "_babel_traverse___traverse_7.21.2.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.20.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.8.tgz"; - sha512 = "/RNkaYDeCy4MjyV70+QkSHhxbvj2JO/5Ft2Pa880qJOG8tWrqcT/wXUuCCv43yogfqPzHL77Xu101KQPf4clnQ=="; + name = "_babel_traverse___traverse_7.21.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.2.tgz"; + sha512 = "ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw=="; }; } { - name = "_babel_types___types_7.20.7.tgz"; + name = "_babel_types___types_7.21.2.tgz"; path = fetchurl { - name = "_babel_types___types_7.20.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz"; - sha512 = "69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg=="; + name = "_babel_types___types_7.21.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.21.2.tgz"; + sha512 = "3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw=="; }; } { @@ -898,11 +890,11 @@ }; } { - name = "_mysql_xdevapi___xdevapi_8.0.31.tgz"; + name = "_mysql_xdevapi___xdevapi_8.0.32.tgz"; path = fetchurl { - name = "_mysql_xdevapi___xdevapi_8.0.31.tgz"; - url = "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.31.tgz"; - sha512 = "fDjf9/+uARDa4c3E1tfikB3eYSrUSJ4nF+pZZmuGn9HcU8HBVMDV7QMnzIFcopT8jEV5W230MaXZZBmOvC+EjQ=="; + name = "_mysql_xdevapi___xdevapi_8.0.32.tgz"; + url = "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.32.tgz"; + sha512 = "kE6DFdliYas1ccu1/DSYvN2Zer6gcj7wMLbaq8EFc3Gcm8VimuMoIMixn6npVAbbxTfwECQAq0PjTpoCq9jU/g=="; }; } { @@ -946,11 +938,11 @@ }; } { - name = "_sapphire_snowflake___snowflake_3.3.0.tgz"; + name = "_sapphire_snowflake___snowflake_3.4.0.tgz"; path = fetchurl { - name = "_sapphire_snowflake___snowflake_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/@sapphire/snowflake/-/snowflake-3.3.0.tgz"; - sha512 = "Hec5N6zEkZuZFLybVKyLFLlcSgYmR6C1/+9NkIhxPwOf6tgX52ndJCSz8ADejmbrNE0VuNCNkpzhRZzenEC9vA=="; + name = "_sapphire_snowflake___snowflake_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/@sapphire/snowflake/-/snowflake-3.4.0.tgz"; + sha512 = "zZxymtVO6zeXVMPds+6d7gv/OfnCc25M1Z+7ZLB0oPmeMTPeRWVPQSS16oDJy5ZsyCOLj7M6mbZml5gWXcVRNw=="; }; } { @@ -1018,19 +1010,19 @@ }; } { - name = "_types_node___node_18.11.17.tgz"; + name = "_types_node___node_18.15.0.tgz"; path = fetchurl { - name = "_types_node___node_18.11.17.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.17.tgz"; - sha512 = "HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng=="; + name = "_types_node___node_18.15.0.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-18.15.0.tgz"; + sha512 = "z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w=="; }; } { - name = "_types_node___node_14.18.35.tgz"; + name = "_types_node___node_14.18.37.tgz"; path = fetchurl { - name = "_types_node___node_14.18.35.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.35.tgz"; - sha512 = "2ATO8pfhG1kDvw4Lc4C0GXIMSQFFJBCo/R1fSgTwmUlq5oy95LXyjDQinsRVgQY6gp6ghh3H91wk9ES5/5C+Tw=="; + name = "_types_node___node_14.18.37.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.37.tgz"; + sha512 = "7GgtHCs/QZrBrDzgIJnQtuSvhFSwhyYSI2uafSwZoNt1iOGhEN5fwNrQMjtONyHm9+/LoA4453jH0CMYcr06Pg=="; }; } { @@ -1041,6 +1033,14 @@ sha512 = "w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw=="; }; } + { + name = "_types_triple_beam___triple_beam_1.3.2.tgz"; + path = fetchurl { + name = "_types_triple_beam___triple_beam_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.2.tgz"; + sha512 = "txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g=="; + }; + } { name = "_types_webidl_conversions___webidl_conversions_7.0.0.tgz"; path = fetchurl { @@ -1058,11 +1058,11 @@ }; } { - name = "_types_ws___ws_8.5.3.tgz"; + name = "_types_ws___ws_8.5.4.tgz"; path = fetchurl { - name = "_types_ws___ws_8.5.3.tgz"; - url = "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz"; - sha512 = "6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w=="; + name = "_types_ws___ws_8.5.4.tgz"; + url = "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.4.tgz"; + sha512 = "zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg=="; }; } { @@ -1538,11 +1538,11 @@ }; } { - name = "acebase_core___acebase_core_1.25.0.tgz"; + name = "acebase_core___acebase_core_1.25.1.tgz"; path = fetchurl { - name = "acebase_core___acebase_core_1.25.0.tgz"; - url = "https://registry.yarnpkg.com/acebase-core/-/acebase-core-1.25.0.tgz"; - sha512 = "d7Bh0tcYYCcdKLYu7lDYPhDOIZQObUwGiMg4mcMfsdWWdlfQyQqQMLkYVRqVH1OdHHXEx/BoqtH1oHkEBqgRZg=="; + name = "acebase_core___acebase_core_1.25.1.tgz"; + url = "https://registry.yarnpkg.com/acebase-core/-/acebase-core-1.25.1.tgz"; + sha512 = "U6WY6QwhsXypqZQqt7kNxsLvjucJrcJM8TxOydv95+lJyBkv2UoURhwRjaWA9+0DNRfAOhUuPgjNxBhHShl4hg=="; }; } { @@ -1594,11 +1594,11 @@ }; } { - name = "acorn___acorn_8.8.1.tgz"; + name = "acorn___acorn_8.8.2.tgz"; path = fetchurl { - name = "acorn___acorn_8.8.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz"; - sha512 = "7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA=="; + name = "acorn___acorn_8.8.2.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz"; + sha512 = "xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw=="; }; } { @@ -1642,11 +1642,11 @@ }; } { - name = "agentkeepalive___agentkeepalive_4.2.1.tgz"; + name = "agentkeepalive___agentkeepalive_4.3.0.tgz"; path = fetchurl { - name = "agentkeepalive___agentkeepalive_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz"; - sha512 = "Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA=="; + name = "agentkeepalive___agentkeepalive_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.3.0.tgz"; + sha512 = "7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg=="; }; } { @@ -2018,11 +2018,11 @@ }; } { - name = "async_each___async_each_1.0.3.tgz"; + name = "async_each___async_each_1.0.6.tgz"; path = fetchurl { - name = "async_each___async_each_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz"; - sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; + name = "async_each___async_each_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.6.tgz"; + sha512 = "c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg=="; }; } { @@ -2081,6 +2081,14 @@ sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; }; } + { + name = "available_typed_arrays___available_typed_arrays_1.0.5.tgz"; + path = fetchurl { + name = "available_typed_arrays___available_typed_arrays_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"; + sha512 = "DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="; + }; + } { name = "aws_sign2___aws_sign2_0.7.0.tgz"; path = fetchurl { @@ -2098,11 +2106,11 @@ }; } { - name = "aws4___aws4_1.11.0.tgz"; + name = "aws4___aws4_1.12.0.tgz"; path = fetchurl { - name = "aws4___aws4_1.11.0.tgz"; - url = "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz"; - sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; + name = "aws4___aws4_1.12.0.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.12.0.tgz"; + sha512 = "NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="; }; } { @@ -2713,6 +2721,14 @@ sha512 = "jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw=="; }; } + { + name = "body_parser___body_parser_1.20.2.tgz"; + path = fetchurl { + name = "body_parser___body_parser_1.20.2.tgz"; + url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz"; + sha512 = "ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA=="; + }; + } { name = "boom___boom_0.4.2.tgz"; path = fetchurl { @@ -2770,11 +2786,11 @@ }; } { - name = "browserslist___browserslist_4.21.4.tgz"; + name = "browserslist___browserslist_4.21.5.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.21.4.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz"; - sha512 = "CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw=="; + name = "browserslist___browserslist_4.21.5.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz"; + sha512 = "tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w=="; }; } { @@ -2786,11 +2802,11 @@ }; } { - name = "bson___bson_4.7.0.tgz"; + name = "bson___bson_4.7.2.tgz"; path = fetchurl { - name = "bson___bson_4.7.0.tgz"; - url = "https://registry.yarnpkg.com/bson/-/bson-4.7.0.tgz"; - sha512 = "VrlEE4vuiO1WTpfof4VmaVolCVYkYTgB9iWgYNOrVlnifpME/06fhFRmONgBhClD5pFC1t9ZWqFUQEQAzY43bA=="; + name = "bson___bson_4.7.2.tgz"; + url = "https://registry.yarnpkg.com/bson/-/bson-4.7.2.tgz"; + sha512 = "Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ=="; }; } { @@ -2978,11 +2994,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001441.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001464.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001441.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz"; - sha512 = "OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg=="; + name = "caniuse_lite___caniuse_lite_1.0.30001464.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001464.tgz"; + sha512 = "oww27MtUmusatpRpCGSOneQk2/l5czXANDSFvsc7VuOQ86s3ANhZetpwXNf1zY/zdfP63Xvjz325DAdAoES13g=="; }; } { @@ -3450,11 +3466,11 @@ }; } { - name = "content_type___content_type_1.0.4.tgz"; + name = "content_type___content_type_1.0.5.tgz"; path = fetchurl { - name = "content_type___content_type_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz"; - sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; + name = "content_type___content_type_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz"; + sha512 = "nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="; }; } { @@ -3474,11 +3490,11 @@ }; } { - name = "cookie_session___cookie_session_1.4.0.tgz"; + name = "cookie_session___cookie_session_2.0.0.tgz"; path = fetchurl { - name = "cookie_session___cookie_session_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/cookie-session/-/cookie-session-1.4.0.tgz"; - sha512 = "0hhwD+BUIwMXQraiZP/J7VP2YFzqo6g4WqZlWHtEHQ22t0MeZZrNBSCxC1zcaLAs8ApT3BzAKizx9gW/AP9vNA=="; + name = "cookie_session___cookie_session_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/cookie-session/-/cookie-session-2.0.0.tgz"; + sha512 = "hKvgoThbw00zQOleSlUr2qpvuNweoqBtxrmx0UFosx6AGi9lYtLoA+RbsvknrEX8Pr6MDbdWAb2j6SnMn+lPsg=="; }; } { @@ -3522,11 +3538,11 @@ }; } { - name = "core_js___core_js_3.26.1.tgz"; + name = "core_js___core_js_3.29.0.tgz"; path = fetchurl { - name = "core_js___core_js_3.26.1.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.26.1.tgz"; - sha512 = "21491RRQVzUn0GGM9Z1Jrpr6PNPxPi+Za8OM9q4tksTSnlbXXGKK1nXNg/QvwFYettXvSX6zWKCtHHfjN4puyA=="; + name = "core_js___core_js_3.29.0.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.29.0.tgz"; + sha512 = "VG23vuEisJNkGl6XQmFJd3rEG/so/CNatqeE+7uZAwTSwFeB/qaO0be8xZYUNWprJ/GIwL8aMt9cj1kvbpTZhg=="; }; } { @@ -3674,11 +3690,11 @@ }; } { - name = "dateformat___dateformat_3.0.3.tgz"; + name = "dateformat___dateformat_4.6.3.tgz"; path = fetchurl { - name = "dateformat___dateformat_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz"; - sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; + name = "dateformat___dateformat_4.6.3.tgz"; + url = "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz"; + sha512 = "2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA=="; }; } { @@ -3713,6 +3729,14 @@ sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; }; } + { + name = "debug___debug_3.2.7.tgz"; + path = fetchurl { + name = "debug___debug_3.2.7.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz"; + sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; + }; + } { name = "debug___debug_4.3.4.tgz"; path = fetchurl { @@ -3762,11 +3786,11 @@ }; } { - name = "deepmerge___deepmerge_4.2.2.tgz"; + name = "deepmerge___deepmerge_4.3.0.tgz"; path = fetchurl { - name = "deepmerge___deepmerge_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz"; - sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; + name = "deepmerge___deepmerge_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.0.tgz"; + sha512 = "z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og=="; }; } { @@ -3786,11 +3810,11 @@ }; } { - name = "define_properties___define_properties_1.1.4.tgz"; + name = "define_properties___define_properties_1.2.0.tgz"; path = fetchurl { - name = "define_properties___define_properties_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz"; - sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; + name = "define_properties___define_properties_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz"; + sha512 = "xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA=="; }; } { @@ -3914,11 +3938,11 @@ }; } { - name = "discord_api_types___discord_api_types_0.37.24.tgz"; + name = "discord_api_types___discord_api_types_0.37.35.tgz"; path = fetchurl { - name = "discord_api_types___discord_api_types_0.37.24.tgz"; - url = "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.24.tgz"; - sha512 = "1+Fb4huJCihdbkJLcq2p7nBmtlmAryNwjefT8wwJnL8c7bc7WA87Oaa5mbLe96QvZyfwnwRCDX40H0HhcVV50g=="; + name = "discord_api_types___discord_api_types_0.37.35.tgz"; + url = "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.35.tgz"; + sha512 = "iyKZ/82k7FX3lcmHiAvvWu5TmyfVo78RtghBV/YsehK6CID83k5SI03DKKopBcln+TiEIYw5MGgq7SJXSpNzMg=="; }; } { @@ -4010,11 +4034,11 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.4.284.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.4.328.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.4.284.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz"; - sha512 = "M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="; + name = "electron_to_chromium___electron_to_chromium_1.4.328.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.328.tgz"; + sha512 = "DE9tTy2PNmy1v55AZAO542ui+MLC2cvINMK4P2LXGsJdput/ThVG9t+QGecPuAZZSgC8XoI+Jh9M1OG9IoNSCw=="; }; } { @@ -4106,11 +4130,11 @@ }; } { - name = "es_abstract___es_abstract_1.20.5.tgz"; + name = "es_abstract___es_abstract_1.21.1.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.20.5.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.5.tgz"; - sha512 = "7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ=="; + name = "es_abstract___es_abstract_1.21.1.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.1.tgz"; + sha512 = "QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg=="; }; } { @@ -4121,6 +4145,14 @@ sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; }; } + { + name = "es_set_tostringtag___es_set_tostringtag_2.0.1.tgz"; + path = fetchurl { + name = "es_set_tostringtag___es_set_tostringtag_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz"; + sha512 = "g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg=="; + }; + } { name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; path = fetchurl { @@ -4418,11 +4450,11 @@ }; } { - name = "fast_xml_parser___fast_xml_parser_4.0.11.tgz"; + name = "fast_xml_parser___fast_xml_parser_4.1.2.tgz"; path = fetchurl { - name = "fast_xml_parser___fast_xml_parser_4.0.11.tgz"; - url = "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.0.11.tgz"; - sha512 = "4aUg3aNRR/WjQAcpceODG1C3x3lFANXRo8+1biqfieHmg9pyMt7qB4lQV/Ta6sJCTbA5vfD8fnA8S54JATiFUA=="; + name = "fast_xml_parser___fast_xml_parser_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.1.2.tgz"; + sha512 = "CDYeykkle1LiA/uqQyNwYpFbyF6Axec6YapmpUP+/RHWIoR1zKjocdvNaTsxCxZzQ6v9MLXaSYm9Qq0thv0DHg=="; }; } { @@ -4506,11 +4538,11 @@ }; } { - name = "file_type___file_type_18.0.0.tgz"; + name = "file_type___file_type_18.2.1.tgz"; path = fetchurl { - name = "file_type___file_type_18.0.0.tgz"; - url = "https://registry.yarnpkg.com/file-type/-/file-type-18.0.0.tgz"; - sha512 = "jjMwFpnW8PKofLE/4ohlhqwDk5k0NC6iy0UHAJFKoY1fQeGMN0GDdLgHQrvCbSpMwbqzoCZhRI5dETCZna5qVA=="; + name = "file_type___file_type_18.2.1.tgz"; + url = "https://registry.yarnpkg.com/file-type/-/file-type-18.2.1.tgz"; + sha512 = "Yw5MtnMv7vgD2/6Bjmmuegc8bQEVA9GmAyaR18bMYWKqsWDG9wgYZ1j4I6gNMF5Y5JBDcUcjRQqNQx7Y8uotcg=="; }; } { @@ -4610,11 +4642,11 @@ }; } { - name = "findup_sync___findup_sync_0.3.0.tgz"; + name = "findup_sync___findup_sync_5.0.0.tgz"; path = fetchurl { - name = "findup_sync___findup_sync_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.3.0.tgz"; - sha512 = "z8Nrwhi6wzxNMIbxlrTzuUW6KWuKkogZ/7OdDVq+0+kxn77KUH1nipx8iU6suqkHqc4y6n7a9A8IpmxY/pTjWg=="; + name = "findup_sync___findup_sync_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/findup-sync/-/findup-sync-5.0.0.tgz"; + sha512 = "MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ=="; }; } { @@ -4649,6 +4681,14 @@ sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; }; } + { + name = "for_each___for_each_0.3.3.tgz"; + path = fetchurl { + name = "for_each___for_each_0.3.3.tgz"; + url = "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz"; + sha512 = "jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw=="; + }; + } { name = "for_in___for_in_1.0.2.tgz"; path = fetchurl { @@ -4850,19 +4890,19 @@ }; } { - name = "gaxios___gaxios_5.0.2.tgz"; + name = "gaxios___gaxios_5.1.0.tgz"; path = fetchurl { - name = "gaxios___gaxios_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/gaxios/-/gaxios-5.0.2.tgz"; - sha512 = "TjtV2AJOZoMQqRYoy5eM8cCQogYwazWNYLQ72QB0kwa6vHHruYkGmhhyrlzbmgNHK1dNnuP2WSH81urfzyN2Og=="; + name = "gaxios___gaxios_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/gaxios/-/gaxios-5.1.0.tgz"; + sha512 = "aezGIjb+/VfsJtIcHGcBSerNEDdfdHeMros+RbYbGpmonKWQCOVOes0LVZhn1lDtIgq55qq0HaxymIoae3Fl/A=="; }; } { - name = "gcp_metadata___gcp_metadata_5.1.0.tgz"; + name = "gcp_metadata___gcp_metadata_5.2.0.tgz"; path = fetchurl { - name = "gcp_metadata___gcp_metadata_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-5.1.0.tgz"; - sha512 = "QVjouEXvNVG/nde6VZDXXFTB02xQdztaumkWCHUff58qsdCS05/8OPh68fQ2QnArfAzZTwfEc979FHSHsU8EWg=="; + name = "gcp_metadata___gcp_metadata_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-5.2.0.tgz"; + sha512 = "aFhhvvNycky2QyhG+dcfEdHBF0FRbYcf39s6WNHUDysKSrbJ5vuFbjydxBcmewtXeV248GP8dWT3ByPNxsyHCw=="; }; } { @@ -4890,11 +4930,11 @@ }; } { - name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; + name = "get_intrinsic___get_intrinsic_1.2.0.tgz"; path = fetchurl { - name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; - sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; + name = "get_intrinsic___get_intrinsic_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz"; + sha512 = "L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q=="; }; } { @@ -4969,14 +5009,6 @@ sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; }; } - { - name = "glob___glob_5.0.15.tgz"; - path = fetchurl { - name = "glob___glob_5.0.15.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz"; - sha512 = "c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA=="; - }; - } { name = "glob___glob_7.1.7.tgz"; path = fetchurl { @@ -5017,6 +5049,14 @@ sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="; }; } + { + name = "globalthis___globalthis_1.0.3.tgz"; + path = fetchurl { + name = "globalthis___globalthis_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz"; + sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; + }; + } { name = "google_auth_library___google_auth_library_8.7.0.tgz"; path = fetchurl { @@ -5050,11 +5090,11 @@ }; } { - name = "googleapis___googleapis_110.0.0.tgz"; + name = "googleapis___googleapis_112.0.0.tgz"; path = fetchurl { - name = "googleapis___googleapis_110.0.0.tgz"; - url = "https://registry.yarnpkg.com/googleapis/-/googleapis-110.0.0.tgz"; - sha512 = "k6de3PGsdFEBULMiFwPYCKOBljDTDvHD3YGe/OFqe8Ot0lYQPL8QV1qjxjrPWiE/Ftf0Ar2v4DNES66jLfSO7w=="; + name = "googleapis___googleapis_112.0.0.tgz"; + url = "https://registry.yarnpkg.com/googleapis/-/googleapis-112.0.0.tgz"; + sha512 = "WPfXhYZVrbbJRxB+ZZDksjuelmt49Mcl/1mo7w05kvLS1EbynvTELsNTJwh+hNrjsFKdh4izWLAcjTDo0Boycg=="; }; } { @@ -5122,11 +5162,11 @@ }; } { - name = "grunt___grunt_1.5.3.tgz"; + name = "grunt___grunt_1.6.1.tgz"; path = fetchurl { - name = "grunt___grunt_1.5.3.tgz"; - url = "https://registry.yarnpkg.com/grunt/-/grunt-1.5.3.tgz"; - sha512 = "mKwmo4X2d8/4c/BmcOETHek675uOqw0RuA/zy12jaspWqvTp4+ZeQF1W+OTpcbncnaBsfbQJ6l0l4j+Sn/GmaQ=="; + name = "grunt___grunt_1.6.1.tgz"; + url = "https://registry.yarnpkg.com/grunt/-/grunt-1.6.1.tgz"; + sha512 = "/ABUy3gYWu5iBmrUSRBP97JLpQUm0GgVveDCp6t3yRNIoltIYw7rEj3g5y1o2PGPR2vfTRGa7WC/LZHLTXnEzA=="; }; } { @@ -5249,6 +5289,14 @@ sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; }; } + { + name = "has_proto___has_proto_1.0.1.tgz"; + path = fetchurl { + name = "has_proto___has_proto_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz"; + sha512 = "7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="; + }; + } { name = "has_symbols___has_symbols_1.0.3.tgz"; path = fetchurl { @@ -5442,11 +5490,11 @@ }; } { - name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; + name = "http_cache_semantics___http_cache_semantics_4.1.1.tgz"; 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"; - sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; + name = "http_cache_semantics___http_cache_semantics_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz"; + sha512 = "er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="; }; } { @@ -5642,11 +5690,11 @@ }; } { - name = "internal_slot___internal_slot_1.0.4.tgz"; + name = "internal_slot___internal_slot_1.0.5.tgz"; path = fetchurl { - name = "internal_slot___internal_slot_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.4.tgz"; - sha512 = "tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ=="; + name = "internal_slot___internal_slot_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz"; + sha512 = "Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ=="; }; } { @@ -5729,6 +5777,14 @@ sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; }; } + { + name = "is_array_buffer___is_array_buffer_3.0.2.tgz"; + path = fetchurl { + name = "is_array_buffer___is_array_buffer_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz"; + sha512 = "y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w=="; + }; + } { name = "is_arrayish___is_arrayish_0.2.1.tgz"; path = fetchurl { @@ -6081,6 +6137,14 @@ sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; }; } + { + name = "is_typed_array___is_typed_array_1.1.10.tgz"; + path = fetchurl { + name = "is_typed_array___is_typed_array_1.1.10.tgz"; + url = "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz"; + sha512 = "PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A=="; + }; + } { name = "is_typedarray___is_typedarray_1.0.0.tgz"; path = fetchurl { @@ -6218,11 +6282,11 @@ }; } { - name = "jose___jose_4.11.1.tgz"; + name = "jose___jose_4.13.1.tgz"; path = fetchurl { - name = "jose___jose_4.11.1.tgz"; - url = "https://registry.yarnpkg.com/jose/-/jose-4.11.1.tgz"; - sha512 = "YRv4Tk/Wlug8qicwqFNFVEZSdbROCHRAC6qu/i0dyNKr5JQdoa2pIGoS04lLO/jXQX7Z9omoNewYIVIxqZBd9Q=="; + name = "jose___jose_4.13.1.tgz"; + url = "https://registry.yarnpkg.com/jose/-/jose-4.13.1.tgz"; + sha512 = "MSJQC5vXco5Br38mzaQKiq9mwt7lwj2eXpgpRyQYNHYt2lq1PjkWa7DLXX0WVcQLE9HhMh3jPiufS7fhJf+CLQ=="; }; } { @@ -6314,11 +6378,11 @@ }; } { - name = "jsdom___jsdom_20.0.3.tgz"; + name = "jsdom___jsdom_21.1.0.tgz"; path = fetchurl { - name = "jsdom___jsdom_20.0.3.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz"; - sha512 = "SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ=="; + name = "jsdom___jsdom_21.1.0.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-21.1.0.tgz"; + sha512 = "m0lzlP7qOtthD918nenK3hdItSd2I+V3W9IrBcB36sqDwG+KnUs66IF5GY7laGWUnlM9vTsD0W1QwSEBYWWcJg=="; }; } { @@ -6394,19 +6458,19 @@ }; } { - name = "json5___json5_2.2.2.tgz"; + name = "json5___json5_2.2.3.tgz"; path = fetchurl { - name = "json5___json5_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz"; - sha512 = "46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ=="; + name = "json5___json5_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz"; + sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; }; } { - name = "jsonwebtoken___jsonwebtoken_8.5.1.tgz"; + name = "jsonwebtoken___jsonwebtoken_9.0.0.tgz"; path = fetchurl { - name = "jsonwebtoken___jsonwebtoken_8.5.1.tgz"; - url = "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz"; - sha512 = "XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w=="; + name = "jsonwebtoken___jsonwebtoken_9.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz"; + sha512 = "tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw=="; }; } { @@ -6681,38 +6745,6 @@ sha512 = "uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ=="; }; } - { - name = "lodash.includes___lodash.includes_4.3.0.tgz"; - path = fetchurl { - name = "lodash.includes___lodash.includes_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz"; - sha512 = "W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="; - }; - } - { - name = "lodash.isboolean___lodash.isboolean_3.0.3.tgz"; - path = fetchurl { - name = "lodash.isboolean___lodash.isboolean_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz"; - sha512 = "Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="; - }; - } - { - name = "lodash.isinteger___lodash.isinteger_4.0.4.tgz"; - path = fetchurl { - name = "lodash.isinteger___lodash.isinteger_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz"; - sha512 = "DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA=="; - }; - } - { - name = "lodash.isnumber___lodash.isnumber_3.0.3.tgz"; - path = fetchurl { - name = "lodash.isnumber___lodash.isnumber_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz"; - sha512 = "QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="; - }; - } { name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; path = fetchurl { @@ -6721,22 +6753,6 @@ sha512 = "oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="; }; } - { - name = "lodash.isstring___lodash.isstring_4.0.1.tgz"; - path = fetchurl { - name = "lodash.isstring___lodash.isstring_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; - sha512 = "0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="; - }; - } - { - name = "lodash.once___lodash.once_4.1.1.tgz"; - path = fetchurl { - name = "lodash.once___lodash.once_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz"; - sha512 = "Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="; - }; - } { name = "lodash.pick___lodash.pick_4.4.0.tgz"; path = fetchurl { @@ -6770,11 +6786,11 @@ }; } { - name = "logform___logform_2.4.2.tgz"; + name = "logform___logform_2.5.1.tgz"; path = fetchurl { - name = "logform___logform_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/logform/-/logform-2.4.2.tgz"; - sha512 = "W4c9himeAwXEdZ05dQNerhFz2XG80P9Oj0loPUMV23VC2it0orMHQhJm4hdnnor3rd1HsGf6a2lPwBM1zeXHGw=="; + name = "logform___logform_2.5.1.tgz"; + url = "https://registry.yarnpkg.com/logform/-/logform-2.5.1.tgz"; + sha512 = "9FyqAm9o9NKKfiAKfZoYo9bGXXuwMkxQiQttkT4YjjVtQVIQtK6LmVtlxmCaFswo6N4AfEkHqZTV0taDtPotNg=="; }; } { @@ -6793,6 +6809,14 @@ sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; }; } + { + name = "lossless_json___lossless_json_2.0.1.tgz"; + path = fetchurl { + name = "lossless_json___lossless_json_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/lossless-json/-/lossless-json-2.0.1.tgz"; + sha512 = "KW/FSL426qblKVvf4ImeMVGr0Je6J9aXvAMUOIU8AzelDj06q47mn6QJ+56lBBd+A8kjrncrxdKQs6ZssAXTmw=="; + }; + } { name = "lower_case___lower_case_1.1.4.tgz"; path = fetchurl { @@ -6826,11 +6850,11 @@ }; } { - name = "lru_cache___lru_cache_7.14.1.tgz"; + name = "lru_cache___lru_cache_7.18.3.tgz"; path = fetchurl { - name = "lru_cache___lru_cache_7.14.1.tgz"; - url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.1.tgz"; - sha512 = "ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA=="; + name = "lru_cache___lru_cache_7.18.3.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz"; + sha512 = "jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="; }; } { @@ -6898,11 +6922,11 @@ }; } { - name = "mariadb___mariadb_3.0.2.tgz"; + name = "mariadb___mariadb_3.1.0.tgz"; path = fetchurl { - name = "mariadb___mariadb_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/mariadb/-/mariadb-3.0.2.tgz"; - sha512 = "dVjiQZ6RW0IXFnX+T/ZEmnqs724DgkQsXqfCyInXn0XxVfO2Px6KbS4M3Ny6UiBg0zJ93SHHvfVBgYO4ZnFvvw=="; + name = "mariadb___mariadb_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/mariadb/-/mariadb-3.1.0.tgz"; + sha512 = "OyWbm90bX6gsEuJjD8rLrkBXYt3BR/xc6mQfFibZmmzSw938S5EZzullW5gbVZKRZwbZGxihfszxjCETWid45Q=="; }; } { @@ -7065,14 +7089,6 @@ sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; }; } - { - name = "minimatch___minimatch_3.1.2.tgz"; - path = fetchurl { - name = "minimatch___minimatch_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz"; - sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; - }; - } { name = "minimatch___minimatch_2.0.10.tgz"; path = fetchurl { @@ -7082,11 +7098,19 @@ }; } { - name = "minimatch___minimatch_5.1.2.tgz"; + name = "minimatch___minimatch_3.1.2.tgz"; path = fetchurl { - name = "minimatch___minimatch_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.2.tgz"; - sha512 = "bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg=="; + name = "minimatch___minimatch_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz"; + sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; + }; + } + { + name = "minimatch___minimatch_5.1.6.tgz"; + path = fetchurl { + name = "minimatch___minimatch_5.1.6.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz"; + sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; } { @@ -7098,11 +7122,11 @@ }; } { - name = "minimist___minimist_1.2.7.tgz"; + name = "minimist___minimist_1.2.8.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.7.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz"; - sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; + name = "minimist___minimist_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz"; + sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="; }; } { @@ -7162,11 +7186,11 @@ }; } { - name = "minipass___minipass_4.0.0.tgz"; + name = "minipass___minipass_4.2.5.tgz"; path = fetchurl { - name = "minipass___minipass_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-4.0.0.tgz"; - sha512 = "g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw=="; + name = "minipass___minipass_4.2.5.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-4.2.5.tgz"; + sha512 = "+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q=="; }; } { @@ -7217,22 +7241,6 @@ sha512 = "dmFE23qpyZJf8MOdzuNKliW4j1PCqxaRtSzyNnv6QDUWjf1z8T4ZoQ7Qf0t6It2ewNv9/XJZSJoUgwpq3D0X7A=="; }; } - { - name = "moment_timezone___moment_timezone_0.5.40.tgz"; - path = fetchurl { - name = "moment_timezone___moment_timezone_0.5.40.tgz"; - url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.40.tgz"; - sha512 = "tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg=="; - }; - } - { - name = "moment___moment_2.29.4.tgz"; - path = fetchurl { - name = "moment___moment_2.29.4.tgz"; - url = "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz"; - sha512 = "5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="; - }; - } { name = "mongodb_connection_string_url___mongodb_connection_string_url_2.6.0.tgz"; path = fetchurl { @@ -7242,11 +7250,11 @@ }; } { - name = "mongodb___mongodb_4.12.1.tgz"; + name = "mongodb___mongodb_4.13.0.tgz"; path = fetchurl { - name = "mongodb___mongodb_4.12.1.tgz"; - url = "https://registry.yarnpkg.com/mongodb/-/mongodb-4.12.1.tgz"; - sha512 = "koT87tecZmxPKtxRQD8hCKfn+ockEL2xBiUvx3isQGI6mFmagWt4f4AyCE9J4sKepnLhMacoCTQQA6SLAI2L6w=="; + name = "mongodb___mongodb_4.13.0.tgz"; + url = "https://registry.yarnpkg.com/mongodb/-/mongodb-4.13.0.tgz"; + sha512 = "+taZ/bV8d1pYuHL4U+gSwkhmDrwkWbH1l4aah4YpmpscMwgFBkufIKxgP/G7m87/NUuQzc2Z75ZTI7ZOyqZLbw=="; }; } { @@ -7434,11 +7442,11 @@ }; } { - name = "node_fetch___node_fetch_2.6.7.tgz"; + name = "node_fetch___node_fetch_2.6.9.tgz"; path = fetchurl { - name = "node_fetch___node_fetch_2.6.7.tgz"; - url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz"; - sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; + name = "node_fetch___node_fetch_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz"; + sha512 = "DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg=="; }; } { @@ -7450,11 +7458,11 @@ }; } { - name = "node_gyp_build___node_gyp_build_4.5.0.tgz"; + name = "node_gyp_build___node_gyp_build_4.6.0.tgz"; path = fetchurl { - name = "node_gyp_build___node_gyp_build_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz"; - sha512 = "2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg=="; + name = "node_gyp_build___node_gyp_build_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz"; + sha512 = "NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ=="; }; } { @@ -7482,11 +7490,11 @@ }; } { - name = "node_releases___node_releases_2.0.8.tgz"; + name = "node_releases___node_releases_2.0.10.tgz"; path = fetchurl { - name = "node_releases___node_releases_2.0.8.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.8.tgz"; - sha512 = "dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="; + name = "node_releases___node_releases_2.0.10.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz"; + sha512 = "5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w=="; }; } { @@ -7530,11 +7538,11 @@ }; } { - name = "nodemailer___nodemailer_6.8.0.tgz"; + name = "nodemailer___nodemailer_6.9.1.tgz"; path = fetchurl { - name = "nodemailer___nodemailer_6.8.0.tgz"; - url = "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.8.0.tgz"; - sha512 = "EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ=="; + name = "nodemailer___nodemailer_6.9.1.tgz"; + url = "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.9.1.tgz"; + sha512 = "qHw7dOiU5UKNnQpXktdgQ1d3OFgRAekuvbJLcdG5dnEo/GtcTHRYM7+UfJARdOFU9WUQO8OiIamgWPmiSFHYAA=="; }; } { @@ -7690,11 +7698,11 @@ }; } { - name = "object_inspect___object_inspect_1.12.2.tgz"; + name = "object_inspect___object_inspect_1.12.3.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.12.2.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz"; - sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="; + name = "object_inspect___object_inspect_1.12.3.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz"; + sha512 = "geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="; }; } { @@ -7834,11 +7842,11 @@ }; } { - name = "openid_client___openid_client_5.3.1.tgz"; + name = "openid_client___openid_client_5.4.0.tgz"; path = fetchurl { - name = "openid_client___openid_client_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/openid-client/-/openid-client-5.3.1.tgz"; - sha512 = "RLfehQiHch9N6tRWNx68cicf3b1WR0x74bJWHRc25uYIbSRwjxYcTFaRnzbbpls5jroLAaB/bFIodTgA5LJMvw=="; + name = "openid_client___openid_client_5.4.0.tgz"; + url = "https://registry.yarnpkg.com/openid-client/-/openid-client-5.4.0.tgz"; + sha512 = "hgJa2aQKcM2hn3eyVtN12tEA45ECjTJPXCgUh5YzTzy9qwapCvmDTVPWOcWVL0d34zeQoQ/hbG9lJhl3AYxJlQ=="; }; } { @@ -8098,19 +8106,19 @@ }; } { - name = "passport_oauth1___passport_oauth1_1.2.0.tgz"; + name = "passport_oauth1___passport_oauth1_1.3.0.tgz"; path = fetchurl { - name = "passport_oauth1___passport_oauth1_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/passport-oauth1/-/passport-oauth1-1.2.0.tgz"; - sha512 = "Sv2YWodC6jN12M/OXwmR4BIXeeIHjjbwYTQw4kS6tHK4zYzSEpxBgSJJnknBjICA5cj0ju3FSnG1XmHgIhYnLg=="; + name = "passport_oauth1___passport_oauth1_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/passport-oauth1/-/passport-oauth1-1.3.0.tgz"; + sha512 = "8T/nX4gwKTw0PjxP1xfD0QhrydQNakzeOpZ6M5Uqdgz9/a/Ag62RmJxnZQ4LkbdXGrRehQHIAHNAu11rCP46Sw=="; }; } { - name = "passport_oauth2___passport_oauth2_1.6.1.tgz"; + name = "passport_oauth2___passport_oauth2_1.7.0.tgz"; path = fetchurl { - name = "passport_oauth2___passport_oauth2_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.1.tgz"; - sha512 = "ZbV43Hq9d/SBSYQ22GOiglFsjsD1YY/qdiptA+8ej+9C1dL1TVB+mBE5kDH/D4AJo50+2i8f4bx0vg4/yDDZCQ=="; + name = "passport_oauth2___passport_oauth2_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.7.0.tgz"; + sha512 = "j2gf34szdTF2Onw3+76alNnaAExlUmHvkc7cL+cmaS5NzHzDP/BvFHJruueQ9XAeNOdpI+CH+PWid8RA7KCwAQ=="; }; } { @@ -8298,19 +8306,19 @@ }; } { - name = "pg_pool___pg_pool_3.5.2.tgz"; + name = "pg_pool___pg_pool_3.6.0.tgz"; path = fetchurl { - name = "pg_pool___pg_pool_3.5.2.tgz"; - url = "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.5.2.tgz"; - sha512 = "His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w=="; + name = "pg_pool___pg_pool_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.6.0.tgz"; + sha512 = "clFRf2ksqd+F497kWFyM21tMjeikn60oGDmqMT8UBrynEwVEX/5R5xd2sdvdo1cZCFlguORNpVuqxIj+aK4cfQ=="; }; } { - name = "pg_protocol___pg_protocol_1.5.0.tgz"; + name = "pg_protocol___pg_protocol_1.6.0.tgz"; path = fetchurl { - name = "pg_protocol___pg_protocol_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.5.0.tgz"; - sha512 = "muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="; + name = "pg_protocol___pg_protocol_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.6.0.tgz"; + sha512 = "M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q=="; }; } { @@ -8330,11 +8338,11 @@ }; } { - name = "pg___pg_8.8.0.tgz"; + name = "pg___pg_8.10.0.tgz"; path = fetchurl { - name = "pg___pg_8.8.0.tgz"; - url = "https://registry.yarnpkg.com/pg/-/pg-8.8.0.tgz"; - sha512 = "UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw=="; + name = "pg___pg_8.10.0.tgz"; + url = "https://registry.yarnpkg.com/pg/-/pg-8.10.0.tgz"; + sha512 = "ke7o7qSTMb47iwzOSaZMfeR7xToFdkE71ifIipOAAaLIM0DYzfOAXlgFFmYUIE2BcJtvnVlGCID84ZzCegE8CQ=="; }; } { @@ -8426,19 +8434,11 @@ }; } { - name = "plivo___plivo_4.36.0.tgz"; + name = "plivo___plivo_4.42.0.tgz"; path = fetchurl { - name = "plivo___plivo_4.36.0.tgz"; - url = "https://registry.yarnpkg.com/plivo/-/plivo-4.36.0.tgz"; - sha512 = "jhd61SkiMXkWDZc+NFNqD5yheyQSl2dpdcLzpOx2u/ddUV1PX+nGwZ+gEp1wZ2B4V/l/qwVk8QHcXRN+VtT+Gg=="; - }; - } - { - name = "pop_iterate___pop_iterate_1.0.1.tgz"; - path = fetchurl { - name = "pop_iterate___pop_iterate_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/pop-iterate/-/pop-iterate-1.0.1.tgz"; - sha512 = "HRCx4+KJE30JhX84wBN4+vja9bNfysxg1y28l0DuJmkoaICiv2ZSilKddbS48pq50P8d2erAhqDLbp47yv3MbQ=="; + name = "plivo___plivo_4.42.0.tgz"; + url = "https://registry.yarnpkg.com/plivo/-/plivo-4.42.0.tgz"; + sha512 = "jQa07ttI/wCzGGoZEurVSkPlD09qa62VbHWbLxPIbwh4QG4wErk6uIpbXnKEfM2/91QcF7cS0LgS1Ydw+JPo3g=="; }; } { @@ -8594,19 +8594,11 @@ }; } { - name = "punycode___punycode_2.1.1.tgz"; + name = "punycode___punycode_2.3.0.tgz"; path = fetchurl { - name = "punycode___punycode_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; - sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; - }; - } - { - name = "q___q_2.0.3.tgz"; - path = fetchurl { - name = "q___q_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/q/-/q-2.0.3.tgz"; - sha512 = "gv6vLGcmAOg96/fgo3d9tvA4dJNZL3fMyBqVRrGxQ+Q/o4k9QzbJ3NQF9cOO/71wRodoXhaPgphvMFU68qVAJQ=="; + name = "punycode___punycode_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz"; + sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="; }; } { @@ -8625,6 +8617,14 @@ sha512 = "MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="; }; } + { + name = "qs___qs_6.11.1.tgz"; + path = fetchurl { + name = "qs___qs_6.11.1.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.11.1.tgz"; + sha512 = "0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ=="; + }; + } { name = "qs___qs_0.6.6.tgz"; path = fetchurl { @@ -8705,6 +8705,14 @@ sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; }; } + { + name = "raw_body___raw_body_2.5.2.tgz"; + path = fetchurl { + name = "raw_body___raw_body_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz"; + sha512 = "8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA=="; + }; + } { name = "read_pkg_up___read_pkg_up_1.0.1.tgz"; path = fetchurl { @@ -8738,11 +8746,11 @@ }; } { - name = "readable_stream___readable_stream_3.6.0.tgz"; + name = "readable_stream___readable_stream_3.6.2.tgz"; path = fetchurl { - name = "readable_stream___readable_stream_3.6.0.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; - sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + name = "readable_stream___readable_stream_3.6.2.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz"; + sha512 = "9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="; }; } { @@ -8753,6 +8761,14 @@ sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; } + { + name = "readable_stream___readable_stream_2.3.8.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.8.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz"; + sha512 = "8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="; + }; + } { name = "readable_web_to_node_stream___readable_web_to_node_stream_3.0.2.tgz"; path = fetchurl { @@ -8794,11 +8810,11 @@ }; } { - name = "real_cancellable_promise___real_cancellable_promise_1.1.1.tgz"; + name = "real_cancellable_promise___real_cancellable_promise_1.1.2.tgz"; path = fetchurl { - name = "real_cancellable_promise___real_cancellable_promise_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/real-cancellable-promise/-/real-cancellable-promise-1.1.1.tgz"; - sha512 = "vxanUX4Aff5sRX6Rb1CSeCDWhO20L0hKQXWTLOYbtRo9WYFMjlhEBX0E75iz3+7ucrmFdPpDolwLC7L65P7hag=="; + name = "real_cancellable_promise___real_cancellable_promise_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/real-cancellable-promise/-/real-cancellable-promise-1.1.2.tgz"; + sha512 = "eq/nAAVW+hj29x292W6yOkeEJ2F/pABnYC5cUfivOsIvSvF/Z0V2tWiyPK73+ay9DZ27CKp7Q+JkCwzmbwE75Q=="; }; } { @@ -9177,14 +9193,6 @@ sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="; }; } - { - name = "rootpath___rootpath_0.1.2.tgz"; - path = fetchurl { - name = "rootpath___rootpath_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/rootpath/-/rootpath-0.1.2.tgz"; - sha512 = "R3wLbuAYejpxQjL/SjXo1Cjv4wcJECnMRT/FlcCfTwCBhaji9rWaRCoVEQ1SPiTJ4kKK+yh+bZLAV7SCafoDDw=="; - }; - } { name = "run_async___run_async_0.1.0.tgz"; path = fetchurl { @@ -9242,11 +9250,11 @@ }; } { - name = "safe_stable_stringify___safe_stable_stringify_2.4.1.tgz"; + name = "safe_stable_stringify___safe_stable_stringify_2.4.2.tgz"; path = fetchurl { - name = "safe_stable_stringify___safe_stable_stringify_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.1.tgz"; - sha512 = "dVHE6bMtS/bnL2mwualjc6IxEv1F+OCUpA46pKUj6F8uDbUM0jCCulPqRNPSnWwGNKx5etqMjZYdXtrm5KJZGA=="; + name = "safe_stable_stringify___safe_stable_stringify_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.2.tgz"; + sha512 = "gMxvPJYhP0O9n2pvcfYfIuYgbledAOJFcqRThtPRmjscaipiwcwPPKLytpVzMkG2HAN87Qmo2d4PtGiri1dSLA=="; }; } { @@ -9594,11 +9602,11 @@ }; } { - name = "spdx_correct___spdx_correct_3.1.1.tgz"; + name = "spdx_correct___spdx_correct_3.2.0.tgz"; path = fetchurl { - name = "spdx_correct___spdx_correct_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz"; - sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w=="; + name = "spdx_correct___spdx_correct_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz"; + sha512 = "kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA=="; }; } { @@ -9618,11 +9626,11 @@ }; } { - name = "spdx_license_ids___spdx_license_ids_3.0.12.tgz"; + name = "spdx_license_ids___spdx_license_ids_3.0.13.tgz"; path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.12.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz"; - sha512 = "rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA=="; + name = "spdx_license_ids___spdx_license_ids_3.0.13.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz"; + sha512 = "XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w=="; }; } { @@ -10018,11 +10026,11 @@ }; } { - name = "telegram___telegram_2.15.2.tgz"; + name = "telegram___telegram_2.15.10.tgz"; path = fetchurl { - name = "telegram___telegram_2.15.2.tgz"; - url = "https://registry.yarnpkg.com/telegram/-/telegram-2.15.2.tgz"; - sha512 = "+/vmEImjDtkOEiiPyGThIyzBVgpCfDNz2suwXtl5z/b0xK6SWqV4edX3c1BZgK4/JrIyydrCAxLQpKlG61/uzw=="; + name = "telegram___telegram_2.15.10.tgz"; + url = "https://registry.yarnpkg.com/telegram/-/telegram-2.15.10.tgz"; + sha512 = "U5GiyxGsidbG2JUHXA+cfTdBmHeJdY+W5Qp15r6HHIQiOswhUk3NaZnDdnmxljycC50OBDnJhUakBMa0kYR9IA=="; }; } { @@ -10258,11 +10266,11 @@ }; } { - name = "ts_mixer___ts_mixer_6.0.2.tgz"; + name = "ts_mixer___ts_mixer_6.0.3.tgz"; path = fetchurl { - name = "ts_mixer___ts_mixer_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/ts-mixer/-/ts-mixer-6.0.2.tgz"; - sha512 = "zvHx3VM83m2WYCE8XL99uaM7mFwYSkjR2OZti98fabHrwkjsCvgwChda5xctein3xGOyaQhtTeDq/1H/GNvF3A=="; + name = "ts_mixer___ts_mixer_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/ts-mixer/-/ts-mixer-6.0.3.tgz"; + sha512 = "k43M7uCG1AkTyxgnmI5MPwKoUvS/bRvLvUb7+Pgpdlmok8AoqmUaZxUUw8zKM5B1lqZrt41GjYgnvAi0fppqgQ=="; }; } { @@ -10274,11 +10282,11 @@ }; } { - name = "tslib___tslib_2.4.1.tgz"; + name = "tslib___tslib_2.5.0.tgz"; path = fetchurl { - name = "tslib___tslib_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz"; - sha512 = "tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="; + name = "tslib___tslib_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz"; + sha512 = "336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="; }; } { @@ -10330,11 +10338,11 @@ }; } { - name = "twilio___twilio_3.84.0.tgz"; + name = "twilio___twilio_4.8.0.tgz"; path = fetchurl { - name = "twilio___twilio_3.84.0.tgz"; - url = "https://registry.yarnpkg.com/twilio/-/twilio-3.84.0.tgz"; - sha512 = "XL+RR1SdfGExC51cE22unM/r7lEFzfDYUA3FecHEe5cLF+LzxmZGB9O9BXfqZu/sZ5YlGeltJfMA5j3TRLzhLw=="; + name = "twilio___twilio_4.8.0.tgz"; + url = "https://registry.yarnpkg.com/twilio/-/twilio-4.8.0.tgz"; + sha512 = "jJaEyFGIiIAIfAWyq94g3uo2odTyo2opRN8hzpDHpbA4SYDfhxmm4E+Z0c7AP41HEdxzDyCwMkLNXh6fBpWRiw=="; }; } { @@ -10369,6 +10377,14 @@ sha512 = "dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="; }; } + { + name = "typed_array_length___typed_array_length_1.0.4.tgz"; + path = fetchurl { + name = "typed_array_length___typed_array_length_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz"; + sha512 = "KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng=="; + }; + } { name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; path = fetchurl { @@ -10466,11 +10482,11 @@ }; } { - name = "undici___undici_5.14.0.tgz"; + name = "undici___undici_5.20.0.tgz"; path = fetchurl { - name = "undici___undici_5.14.0.tgz"; - url = "https://registry.yarnpkg.com/undici/-/undici-5.14.0.tgz"; - sha512 = "yJlHYw6yXPPsuOH0x2Ib1Km61vu4hLiRRQoafs+WUgX1vO64vgnxiCEN9dpIrhZyHFsai3F0AEj4P9zy19enEQ=="; + name = "undici___undici_5.20.0.tgz"; + url = "https://registry.yarnpkg.com/undici/-/undici-5.20.0.tgz"; + sha512 = "J3j60dYzuo6Eevbawwp1sdg16k5Tf768bxYK4TUJRH7cBM4kFCbf3mOnM/0E3vQYXvpxITbbWmBafaDbxLDz3g=="; }; } { @@ -10777,14 +10793,6 @@ sha512 = "9OLYp5qQSxpnTIyuA1zJ7at3DV2DSBcbdXduC/3QFPeYjF30Lh1nfBrG+VLf4QUvZPz2lXFPu08oIRzWQfucVQ=="; }; } - { - name = "weak_map___weak_map_1.0.8.tgz"; - path = fetchurl { - name = "weak_map___weak_map_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.8.tgz"; - sha512 = "lNR9aAefbGPpHO7AEnY0hCFjz1eTkWCXYvkTRrTHs9qv8zJp+SkVYpzfLIFXQQiG3tVvbNFQgVg2bQS8YGgxyw=="; - }; - } { name = "web_push___web_push_3.5.0.tgz"; path = fetchurl { @@ -10889,6 +10897,14 @@ sha512 = "B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="; }; } + { + name = "which_typed_array___which_typed_array_1.1.9.tgz"; + path = fetchurl { + name = "which_typed_array___which_typed_array_1.1.9.tgz"; + url = "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz"; + sha512 = "w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA=="; + }; + } { name = "which___which_1.3.1.tgz"; path = fetchurl { @@ -11058,11 +11074,11 @@ }; } { - name = "ws___ws_8.11.0.tgz"; + name = "ws___ws_8.13.0.tgz"; path = fetchurl { - name = "ws___ws_8.11.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz"; - sha512 = "HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg=="; + name = "ws___ws_8.13.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz"; + sha512 = "x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA=="; }; } { diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix index 2025b4290d..f016207de0 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix @@ -3,10 +3,8 @@ , fetchurl , zlib , mkYarnModules -, sphinx , nixosTests , pkgs -, fetchPypi , postgresqlTestHook , postgresql , server-mode ? true @@ -18,7 +16,7 @@ let src = fetchurl { url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz"; - sha256 = "sha256-6aQvg98LymZGAgAcNX5Xhw/aRdE5h4HOCPS+kQnkstU="; + hash = "sha256-6aQvg98LymZGAgAcNX5Xhw/aRdE5h4HOCPS+kQnkstU="; }; yarnDeps = mkYarnModules { @@ -36,21 +34,32 @@ let # flask-security-too 4.1.5 is incompatible with flask-babel 3.x flask-babel = prev.flask-babel.overridePythonAttrs (oldAttrs: rec { version = "2.0.0"; - src = fetchPypi { + src = prev.fetchPypi { inherit pname version; - sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; + hash = "sha256-+fr0XNsuGjLqLsFEA1h9QpUQjzUBenghorGsuM/ZJX0="; }; nativeBuildInputs = [ ]; format = "setuptools"; outputs = [ "out" ]; + patches = [ ]; }); - # flask 2.2 is incompatible with pgadmin 6.18 + # flask-babel 2.0.0 is incompatible with babel > 2.11.0 + babel = prev.babel.overridePythonAttrs (oldAttrs: rec { + version = "2.11.0"; + src = prev.fetchPypi { + pname = "Babel"; + inherit version; + hash = "sha256-XvSzImsBgN7d7UIpZRyLDho6aig31FoHMnLzE+TPl/Y="; + }; + propagatedBuildInputs = [ prev.pytz ]; + }); + # pgadmin 6.20 is incompatible with flask 2.2 # https://redmine.postgresql.org/issues/7651 flask = prev.flask.overridePythonAttrs (oldAttrs: rec { version = "2.1.3"; src = oldAttrs.src.override { inherit version; - sha256 = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss="; + hash = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss="; }; }); # flask 2.1.3 is incompatible with flask-sqlalchemy > 3 @@ -62,7 +71,23 @@ let hash = "sha256-K9pEtD58rLFdTgX/PMH4vJeTbMRkYjQkECv8LDXpWRI="; }; }); - # pgadmin 6.19 is incompatible with the major flask-security-too update to 5.0.x + # flask-sqlalchemy 2.5.1 is incompatible with sqlalchemy > 1.4.45 + sqlalchemy = prev.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "1.4.45"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-/WmFCGAJOj9p/v4KtW0EHt/f4YUQtT2aLq7LovFfp5U="; + }; + }); + # flask-security-too 4.1.5 is incompatible with flask-wtf > 1.0.1 + flask-wtf = prev.flask-wtf.overridePythonAttrs (oldAttrs: rec { + version = "1.0.1"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-NP5cb+4PabUOMPgaO36haqFJKncf6a0JdNFkYQwJpsk="; + }; + }); + # pgadmin 6.20 is incompatible with the major flask-security-too update to 5.0.x flask-security-too = prev.flask-security-too.overridePythonAttrs (oldAttrs: rec { version = "4.1.5"; src = oldAttrs.src.override { @@ -106,6 +131,8 @@ pythonPackages.buildPythonApplication rec { # relax dependencies sed 's|==|>=|g' -i requirements.txt + # fix extra_require error with "*" in match + sed 's|*|0|g' -i requirements.txt substituteInPlace pkg/pip/setup_pip.py \ --replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" ${lib.optionalString (!server-mode) '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix index 4e3c3b187b..4df33fa2d8 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,44 +1,44 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.55.0"; + version = "3.56.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.55.0-linux-x64.tar.gz"; - sha256 = "078mvn8aj94z9vbnxzl6q2kgncbna4z72l6q8j06dmx63m7gqs9m"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.56.0-linux-x64.tar.gz"; + sha256 = "0ahjypk9sj0aqan85g24s1rrkw16nmfwa0ga3dka7jnxkd1lv0qk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-linux-amd64.tar.gz"; sha256 = "0c5rw7nk9sw2mcccq0a9apy0rfsd14jkg6wqivf0vc0c5frwhgqi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.2.0-linux-amd64.tar.gz"; - sha256 = "11f8lha7cqqcp2kfw3mlagsislwn78kl26cw3dcliy82x64wkrm6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.3.0-linux-amd64.tar.gz"; + sha256 = "0n01d1n5xnxz9z4djcl32lv2szz7jsr3hjdfl7ajnmss0zmc5jwk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.31.0-linux-amd64.tar.gz"; - sha256 = "17h8iiq50jlwdihjm3x8x4sncyjpgdsrymzz8wjjw6lcyd8mzad9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.33.0-linux-amd64.tar.gz"; + sha256 = "1jhbshkwhwc83b6212q6av72p82z5jcip0rlhjl2fs9x5glp1x1j"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.12.0-linux-amd64.tar.gz"; sha256 = "0jv6gwjpdjhla4dgi6cfcz6c4h38fsc8c5ak168k40d4ixin8g5v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.16.0-linux-amd64.tar.gz"; - sha256 = "1whpm1l1x1mk32npdsdc4fji1z8yyrcma4xfvjsm7cg5mc01c3a2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.17.0-linux-amd64.tar.gz"; + sha256 = "0d62h8y2qnj3qlq35id0nn0fxi5nzznmvffd8v6aqax2bxwdpasa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.0-linux-amd64.tar.gz"; - sha256 = "1vpwvpmkj8ca7cjb9b4mcrxwdwyzljrzgqrkfak8vs95a895752f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.1-linux-amd64.tar.gz"; + sha256 = "0gj02hshlbspjdgvlr56223ydz69d3bazqwzs4bl44bp5wcsw4x0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.35.0-linux-amd64.tar.gz"; - sha256 = "0d8a66iv03b8wsfx8jidgmvq126ypw5i6dnyd3hz6kd1vbyvvp4d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.36.0-linux-amd64.tar.gz"; + sha256 = "1xk53cz55pwx96is5lvxhgwx9zcddnddvypd7kgbn137j85qsdq3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.35.0-linux-amd64.tar.gz"; - sha256 = "0pddkbqldlrz9xz0bmv6i0hm0m5gxv7ms8p5p710ww5jbyj6gni6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.36.0-linux-amd64.tar.gz"; + sha256 = "193yv9ygxw7zr9j1q5h9p9pp992kf251kplgd1n1frb08pzxikvw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-linux-amd64.tar.gz"; @@ -49,8 +49,8 @@ sha256 = "0rx4324vibzklg5gldphfdkc42fafshqkw9ifxr5qf0yxlfffj62"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.7.0-linux-amd64.tar.gz"; - sha256 = "1nk8aprac0bcw5lx75plwg07hlx1jmbbscima0j5g36gkw6lhln2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.8.0-linux-amd64.tar.gz"; + sha256 = "1ld9zss8qfj3a3v75a09b3py266ba5ghdrj1d7vj9rdgid8xlxlq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.14.0-linux-amd64.tar.gz"; @@ -61,20 +61,20 @@ sha256 = "09k4ni7dl3jndf85ypg00xlxij0ik6j1ndvw1yi4w8shikvy18rx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.6.1-linux-amd64.tar.gz"; - sha256 = "1zbjvvza1ikh5ag50r2m08nqnzmylanwfrgxw75nm7r9phpi1i9n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.0.0-linux-amd64.tar.gz"; + sha256 = "0kacd5rqr7pc0dwrrlxpv3adzlp3jhyckayzhbjqlq8qgcd7qysq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz"; sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v6.0.0-linux-amd64.tar.gz"; - sha256 = "15mygp5kbj3z868dfz3w00srm88qn6i38dgfsclhs2flj9h989wh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v6.1.0-linux-amd64.tar.gz"; + sha256 = "0flp57d6w0yz3m55ni4zy44802fnvx8xhvhsphbkgzc33c16z3h3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.50.0-linux-amd64.tar.gz"; - sha256 = "1dql09k9dgz4d91i893xcli4wq1c0i4fmxjcm2ss4cvnkipzhdxv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.51.0-linux-amd64.tar.gz"; + sha256 = "0iqfb5qffk070nwn16a5wg1ljx5mjq51bbhi7kddgwzcnz2881yi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.5.0-linux-amd64.tar.gz"; @@ -109,28 +109,28 @@ sha256 = "0lj01hyjyq3qazkryvvxkx6nwai3bac9shqxb6hcqv4pfdjzzxhr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.9.0-linux-amd64.tar.gz"; - sha256 = "1yva7q0xbgz03807cmk0p7glzw6amsr259r230hhkx1iyx4mdj1m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.11.0-linux-amd64.tar.gz"; + sha256 = "0lr9829wwv02946l8fm9mmrw8zlr54b1ghg30lha4i495vwvhdm4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.6.0-linux-amd64.tar.gz"; sha256 = "1cdz32s7bfri7n81gviyg3gh1l6pz95fp6alwrsn797adl3qq3s7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.2-linux-amd64.tar.gz"; - sha256 = "0p9kfy12334lzdj3c283fc572rfqav4xvf041z2as28hvbdi5jnc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.3-linux-amd64.tar.gz"; + sha256 = "0niv0a4yrkp1msf7ah31vdpgzna5nq8kk96f0s0mnbbb0arghs3i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.2-linux-amd64.tar.gz"; - sha256 = "0ddy78rh7m9ikgsl317ibsf4xdyny9034aa6f6dp64bif4mn0mz2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.18.0-linux-amd64.tar.gz"; + sha256 = "1bqb1bah5r66qgyybca9758c8lzpsbjk5ls2cgs3vyi0mmpvdigj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.25.0-linux-amd64.tar.gz"; - sha256 = "04bx4hnha1jnbzn0s5rpixqw7xniqih0g3fi4pjmgzbgjcgjgl7q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.26.0-linux-amd64.tar.gz"; + sha256 = "10zl82n0wisf8xmqfd7bf4rqbvblh2mlmsb1zfg6p5qvpgf4nmji"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-linux-amd64.tar.gz"; - sha256 = "08ydgbcssw7v58j24a2km15ww2hdkvmz27013iabig22c88is0w1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.12.0-linux-amd64.tar.gz"; + sha256 = "0jbn298h032fsvpn2wd2y4jh0alr7alszi0npari000s97d7b756"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.0-linux-amd64.tar.gz"; @@ -163,40 +163,40 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.55.0-darwin-x64.tar.gz"; - sha256 = "12yzj1ibdvki61q2vq9vygj6sl0s1x783v111q7wl328s3383pgj"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.56.0-darwin-x64.tar.gz"; + sha256 = "0p1sz23v8srx79i5axm2hpaj1gjj4582l7bnfh1p08xj6xqvfwpq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-darwin-amd64.tar.gz"; sha256 = "1l26w106lrhy3gn3x1x3hc8gackxzm7ipvx37vqxmb2xhraq952z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.2.0-darwin-amd64.tar.gz"; - sha256 = "01w2hh6vf3smjn7dqlfxhfnl1k6fm7mdrafk1ngzyaqg76ggn52j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.3.0-darwin-amd64.tar.gz"; + sha256 = "1i07ysdy09ps0l40qz7acj69b6l30q3y4l4cabg3wbrzwxzsa0ki"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.31.0-darwin-amd64.tar.gz"; - sha256 = "0iyyfx84wn1q2k51llhajlv1vm4yhs6i8654ic00pxp0nrv6gnk5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.33.0-darwin-amd64.tar.gz"; + sha256 = "0w0n881qi6ln1b18cv55y7g75nk6yn0xmi3mwjpkz9l4j5jq3r8v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.12.0-darwin-amd64.tar.gz"; sha256 = "0a6hvi15z2viyv97xdq2s1kgrhz45f21rh4zcx4y7kqbv0v4a9aa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.16.0-darwin-amd64.tar.gz"; - sha256 = "0fmv68gr11gap5gczfw51fwwyasxamxd24zwn0gp0rzc4600qd2b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.17.0-darwin-amd64.tar.gz"; + sha256 = "0w996ncrn92gwpym54zgsyqkq6msb67dw0iisi9rngrrdd965pfj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.0-darwin-amd64.tar.gz"; - sha256 = "181q2hdj6wxj9c3jyndcnkgrz8rh6sqzzqjl6r4g681ci5j4nqrd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.1-darwin-amd64.tar.gz"; + sha256 = "13qh9av3mfaw44sjrg4lay7kldbcfn6wrj06jpzb1483gjq8gxlx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.35.0-darwin-amd64.tar.gz"; - sha256 = "1xgxqx62116g4i17m4lpzgpcgwqhjisbfc4cvs49n31h0g2xlfl9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.36.0-darwin-amd64.tar.gz"; + sha256 = "1q763v6m6dwhanwcdryxdz0yg90ayznaxd07d16vwl9fqpr3ibwv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.35.0-darwin-amd64.tar.gz"; - sha256 = "1bjhnaqdclz0ajjvgiqal0k1x6ri0fz4z4ww25hbwjqlvyd4n7ww"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.36.0-darwin-amd64.tar.gz"; + sha256 = "0xfkqn9x4dgaj4z94v31jdncqqdg46iw64y0g1sm2bm8g57a8zxv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-darwin-amd64.tar.gz"; @@ -207,8 +207,8 @@ sha256 = "0kn3hzaycks3w2b1sbc0yzw4xis3gh6pgzmarc8zmdnlnlhzw7my"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.7.0-darwin-amd64.tar.gz"; - sha256 = "0jh6v9skyxf4ljiqc5070c1r8gkgaic6wy7w7264c1xfrnwsy31g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.8.0-darwin-amd64.tar.gz"; + sha256 = "0v5h4jd1yyinchq332svcvcr1rw22xz6qv8c2660p0i50hhakv1p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.14.0-darwin-amd64.tar.gz"; @@ -219,20 +219,20 @@ sha256 = "1a70h0apgxk5d70rki612s71wd6p0lg1g4v2w564q1f94fpqp9vb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.6.1-darwin-amd64.tar.gz"; - sha256 = "0jj56yy8sywkszsbznjbbydxdqra63n6igffd6c1nknrh7161pcd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.0.0-darwin-amd64.tar.gz"; + sha256 = "04ka754bdcrlg36ml5ksk45xarpql9dclm3ldsg0hqv5a02j9xn0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz"; sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v6.0.0-darwin-amd64.tar.gz"; - sha256 = "0dzxv7qkk68bxw9p5xbmb40sqqnbf8dckpk352f5802x78wxhaf5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v6.1.0-darwin-amd64.tar.gz"; + sha256 = "0rh79kw8p75yraf5q0b4xihwfggh1fbnvqk0f2hkrz3l8rn87d2z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.50.0-darwin-amd64.tar.gz"; - sha256 = "17madjffjskjbgg2ab942d1dqpq74ff618a4yjkz679l490z14mi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.51.0-darwin-amd64.tar.gz"; + sha256 = "0rc8k02pcd52q28zlrb6f5piq3b5kandw13ggm1hlxd4gd8b0ssz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.5.0-darwin-amd64.tar.gz"; @@ -267,28 +267,28 @@ sha256 = "0fhhc2k0g8mpxzcgci4jl3m59q3n8w3nka94l0n7r9cvs81099n6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.9.0-darwin-amd64.tar.gz"; - sha256 = "0a42rdjzircqkmhmw1m7qbs30vn1if48j4440daw5sr1r8gamcmf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.11.0-darwin-amd64.tar.gz"; + sha256 = "1g0d3a2ghfdr3sdfqai3z6wdjjb41s0xz8rsvrv9qqc8sj97l296"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.6.0-darwin-amd64.tar.gz"; sha256 = "1p79wp1sk5ka9xisjmmrv9s7aw6dghp22lkiz15vzrqwifm6nxmb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.2-darwin-amd64.tar.gz"; - sha256 = "02vp3lar6nj9ssy7cr194vni6vqg2v8rnvwxixbc5ijq5azz5ipi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.3-darwin-amd64.tar.gz"; + sha256 = "03wclzppq8npb5cavi4sjv838v83vzqiqwxjyjaqabl1ihf5c1y9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.2-darwin-amd64.tar.gz"; - sha256 = "071x2z4kb2m5cvlgpmk7ha7857c85fhqb56jas5r8c2vn70spqpv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.18.0-darwin-amd64.tar.gz"; + sha256 = "02hn3a47a1hbyx6lhbvqpxiy5xi8p9zz5c80wzbkcf17yk6q03hi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.25.0-darwin-amd64.tar.gz"; - sha256 = "143802ikmgjgk1w7rkkl4q9hb2skvx4pf5wxi6h5rziav03w97p3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.26.0-darwin-amd64.tar.gz"; + sha256 = "17x0knh48hff9sb9hwnkrrzbc624w4wg63pgq34x1m2akwly0d82"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-darwin-amd64.tar.gz"; - sha256 = "01qxkbfqyyqmqcz7h4vn779ncc9p72q6b77lyyijrav1s9jbd54s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.12.0-darwin-amd64.tar.gz"; + sha256 = "07wpbqk2l8dqjx5lv40xh9633jaimvsj86isn7cixj10qh5njvcd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.0-darwin-amd64.tar.gz"; @@ -321,40 +321,40 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.55.0-linux-arm64.tar.gz"; - sha256 = "0q8bb5mh2zqrf45g1sbwbxlhwvn4j467czbi0zy0iwy3wp7gpp8s"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.56.0-linux-arm64.tar.gz"; + sha256 = "1245dcw69fwj5jp5fkzh731gh5hh1dbci7n3g2ynhr7nz57j6yjs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-linux-arm64.tar.gz"; sha256 = "0a0gy3im1ymjqn1pfc1ds8rikp0zsn3msc7g3zrvqlqkypih5fmy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.2.0-linux-arm64.tar.gz"; - sha256 = "1dhhsdxcg3jhf9yjhjpgsdz92vwj52v45d34paa0qy5xmdw89g23"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.3.0-linux-arm64.tar.gz"; + sha256 = "1h92d4n9n4ia7y8lnah9fpfkz6yzyxa6dh69kv2cjk17m57x6h0v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.31.0-linux-arm64.tar.gz"; - sha256 = "1cg68j7nn0jx3zdfhkxmgbms27xk7mllwll6pwmp1rljh04p48ap"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.33.0-linux-arm64.tar.gz"; + sha256 = "1g8ggbn5xrjgpbh8q2lxc7szl9lw6jfi9zz2bb898lanlzbfhn8x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.12.0-linux-arm64.tar.gz"; sha256 = "0hgnwzslhcxf1xp3dza9adf1dlc1v3fsgb22n0dqq65hyixkdlar"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.16.0-linux-arm64.tar.gz"; - sha256 = "0sl8af8arqjg70p9ndw72adfpv8rybw4nb3n120cnwrz3bw0sfqy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.17.0-linux-arm64.tar.gz"; + sha256 = "0gfyxgw4pmbll8yyb86fdry0rf3ygq7r63q6r1lk5mlg8m4wq67f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.0-linux-arm64.tar.gz"; - sha256 = "0bcv46ib2pbsp41rxqb60mvj7f9b2rab6r342rr27azxvf6jzc8i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.1-linux-arm64.tar.gz"; + sha256 = "08ys4jkl59wn4m4sg0adwi9i9nfjga8apaz5llbns5d8g39xfpff"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.35.0-linux-arm64.tar.gz"; - sha256 = "1z5x90z92q34ibfzm98ir308b7yw9ryw0whdrfrbxd97qdzq226b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.36.0-linux-arm64.tar.gz"; + sha256 = "0j3imycra6f5yjqsxflz8m5x12znq5x6f955jwgbxnzimi7s252s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.35.0-linux-arm64.tar.gz"; - sha256 = "064fbh583gfpilb7rn7rwazmf79q8m361nh9jcqxs6r7mihb0ch4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.36.0-linux-arm64.tar.gz"; + sha256 = "1pppk7i4hr1r1wsig2hrda5rjn6z07fw95k6fmihsynk8q8v7nj1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-linux-arm64.tar.gz"; @@ -365,8 +365,8 @@ sha256 = "1rvpvdf7mcxqc0srp2dkca1nmwnbjvzmpfg6lbg0yxpk6ajxmjll"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.7.0-linux-arm64.tar.gz"; - sha256 = "1hd08gd2v3wl81amvcf821vzmmh7agw8cspnl6fqc7g69agn1l12"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.8.0-linux-arm64.tar.gz"; + sha256 = "09m1444wy8y6qjbp9pzki3gvi9mrs88cpc7001m8xnb0iyhjj0sx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.14.0-linux-arm64.tar.gz"; @@ -377,20 +377,20 @@ sha256 = "0n8vimvn4p7mcrgnd0v8l1q21pswhlxs1mph4928lnpk8h68hz51"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.6.1-linux-arm64.tar.gz"; - sha256 = "1c53lw2hh2ppvz9nkhg1fdblnfbd5vbas6zm92iqz859gi6a23z1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.0.0-linux-arm64.tar.gz"; + sha256 = "0hh75m08zmk5cmp0pmgbsccbvri4302pns831wvj0vcdr441p2rx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz"; sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v6.0.0-linux-arm64.tar.gz"; - sha256 = "1ad76i2avaaxfhq5bvhdmp3wy2c0zs959i3i1hsda2qdw5c91rjr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v6.1.0-linux-arm64.tar.gz"; + sha256 = "12gb1q2cgbd0k9ngq3kncqyy4vx7hkqf8sz64sv308s8zg3z3764"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.50.0-linux-arm64.tar.gz"; - sha256 = "1biq7rjw49d8vpfsb9ab0ixr2a42y404nxa9v8ndkyhqskmjgz68"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.51.0-linux-arm64.tar.gz"; + sha256 = "07npiwm2z8dkf7b5f866alxpk4p9vhi3fg9kvpp3vb8zmgx8kvpf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.5.0-linux-arm64.tar.gz"; @@ -425,28 +425,28 @@ sha256 = "17iaf72dzy108v1njan21n72a5gzxbycq396hjh293a141kppn1m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.9.0-linux-arm64.tar.gz"; - sha256 = "1kqwb8i0gra5as5bd9r1swp1fwrfrr7x3vyag5xb0lmyljlcm4cb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.11.0-linux-arm64.tar.gz"; + sha256 = "1mp3q0yb666hv61pv2szrw67wbd5kfjzfw4c2c014ld3m19mn11j"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.6.0-linux-arm64.tar.gz"; sha256 = "1knyj2djz077c38kls5gyjn0v83qif8qddgji488mr8k8nf4k6lg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.2-linux-arm64.tar.gz"; - sha256 = "07agbpg8v32zq27395zzjpvpi5sr8ryzi16hj4jk1144g0bi7gxd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.3-linux-arm64.tar.gz"; + sha256 = "1312x0rwcy1cff4hfds387gwik94qdscm5jb6csmi18al369i3by"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.2-linux-arm64.tar.gz"; - sha256 = "0sr7hxxczs90sqhaz3asp1bd3bcld0nw00gah0m36rdr3kb8d2zl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.18.0-linux-arm64.tar.gz"; + sha256 = "0byndp1nvlms43v0c40sk9k1hawyxs34q88j04ykmnxszb36qy5n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.25.0-linux-arm64.tar.gz"; - sha256 = "1w5l6m13113lak1yv4kfhh07adqz3pci9zyzx57llic4mccczpan"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.26.0-linux-arm64.tar.gz"; + sha256 = "08rcj6gn4s4yc4f3r2yp4ykci02prx3nbmcfm4xm9ir766grjq3f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-linux-arm64.tar.gz"; - sha256 = "0bj92iyhsc62dlr6nx93h3wqf0d2rb7bqlwy52lyrmww2cv4wvw6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.12.0-linux-arm64.tar.gz"; + sha256 = "040vg2lz0q19jfns4ig6lv658rpjfbv36yhmhly5h9ld37yqwlw6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.0-linux-arm64.tar.gz"; @@ -479,40 +479,40 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.55.0-darwin-arm64.tar.gz"; - sha256 = "1c5vivch4ddj63pbiq61890lpnf1jdn3xlv127njmp5syb6ankzl"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.56.0-darwin-arm64.tar.gz"; + sha256 = "18igp1n7dy09sd12q94y36462bxamgacjqin186xpm7m5s4gwp3j"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-darwin-arm64.tar.gz"; sha256 = "1g8adp2q0r4fvaahyx0jqgqvp972h1kjzxrvlfw5012z76qnar47"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.2.0-darwin-arm64.tar.gz"; - sha256 = "0454pqi4qrb9iv30ghj4jqjhxi32b5yrsp0vi7x23m8c474y676m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.3.0-darwin-arm64.tar.gz"; + sha256 = "0da555h07fzmrg25sw33744cwh678rb231i0w7arpws2r3qdjjwv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.31.0-darwin-arm64.tar.gz"; - sha256 = "0fndz76l1h6isspr60ng0dr3rv0v1rs8kp8w5ssx9ixi9r6nvqc5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.33.0-darwin-arm64.tar.gz"; + sha256 = "0qplcglax98l9yhz242kyx763xfhr7byz4r176m7zf5zknk65mzi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.12.0-darwin-arm64.tar.gz"; sha256 = "1nh9hsv9sc0l9vfamhv8ixbra9xnldai0h3dfgrmy0zl3v1njmh1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.16.0-darwin-arm64.tar.gz"; - sha256 = "0jhr9h8m54kc9yqmxmd8di78yk1r6l6p2v621123vbj407l1san4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.17.0-darwin-arm64.tar.gz"; + sha256 = "0jxrb3q5rgvvdw62ri796sbh9fv0zvh70wd9iyiynxmhsj9ganf4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.0-darwin-arm64.tar.gz"; - sha256 = "0jq26kj5v6fj2sw3yyygk0gnawbx85fj4vfn68a9lsfm10xl624p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.1-darwin-arm64.tar.gz"; + sha256 = "0x2z4xf4nq2ynhdz9pmjk8b1znz8y7b2j2lmi8y4r0xj58pghkp4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.35.0-darwin-arm64.tar.gz"; - sha256 = "1s0bk2bbwpqw1qng4mq8kcbz0jnizdvv3xfnhzr30b79qndg22yg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.36.0-darwin-arm64.tar.gz"; + sha256 = "0hfmpc9q8nb19ayap12d86l6cpy607w1zjsjmicx0i6nvyksz2w9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.35.0-darwin-arm64.tar.gz"; - sha256 = "1zz4j434ngckir5nk8cbnvac8vxfrf92qw3gcrhrnj65bpv8703i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.36.0-darwin-arm64.tar.gz"; + sha256 = "17pzqyiw8gxqi5rjyqk74cjywpna8x1y0hbfzbd5547myxqc0949"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-darwin-arm64.tar.gz"; @@ -523,8 +523,8 @@ sha256 = "1z12mpwsls2h8662wnvg4npnqmh643cwa57z24n6y1i0wlzimq58"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.7.0-darwin-arm64.tar.gz"; - sha256 = "1ss8dak6lk03s391914wxs1y20h4k0khqab7k15lajvl6jm13809"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.8.0-darwin-arm64.tar.gz"; + sha256 = "0301sm5d28yjw15k214rskq1w19a5b5l218y2qfzvv89z5qgh84r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.14.0-darwin-arm64.tar.gz"; @@ -535,20 +535,20 @@ sha256 = "0jghq2bl0p7wwdipdqqvrpfdj1n1cl9q53ssjhmaj2f9vmikhdsi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.6.1-darwin-arm64.tar.gz"; - sha256 = "0wkipvz6w8x3acn36kh871c5f4sfi5yb2x6hhwwls7vfbm402n5j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.0.0-darwin-arm64.tar.gz"; + sha256 = "0c66gq9q1bv18frarscbdpx7hfgv8ma1i3xp367yb5gi1hl850fp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz"; sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v6.0.0-darwin-arm64.tar.gz"; - sha256 = "0ssvm9dwpiisk1n93a522bcc5ijfqz2c25b1qgjsmlgd93phias4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v6.1.0-darwin-arm64.tar.gz"; + sha256 = "16a4fdzggrrmaw22lp8l7lfk98p9s1ijnf27sp7pffpq7b1hk53l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.50.0-darwin-arm64.tar.gz"; - sha256 = "156yw48m0aglrk3b6ajz29x3cs9c9fdka4k91h8bss2r0badn9lf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.51.0-darwin-arm64.tar.gz"; + sha256 = "0fyqi82h4hpzgdkmp7k0pjm3ffik2i7gk93lazqghk2h6xfxv95c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.5.0-darwin-arm64.tar.gz"; @@ -583,28 +583,28 @@ sha256 = "0kym9f36h8b7s1smlmgazbzv8jjfpwxk6wv036bhx2xm3ysc7rgp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.9.0-darwin-arm64.tar.gz"; - sha256 = "0kgakfslwy4pz5k74d9ciywapdw7a2zq9y9cs8rigyq97m4vphwf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.11.0-darwin-arm64.tar.gz"; + sha256 = "0wilkgmgihk0bp8w69dsjji4ijrwrxjd596whx7lxb8h5bdi8y58"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.6.0-darwin-arm64.tar.gz"; sha256 = "1cl9qj041z8fgc95vgsx7y0f5jxyjr8cjb5ain4gl501v4s88hn9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.2-darwin-arm64.tar.gz"; - sha256 = "0aav8v0hk9r647yxy2a4mxj45iqbjab26q3xm093z43sdq05rm0a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.3-darwin-arm64.tar.gz"; + sha256 = "0ihygsdlp71760wndj626mka631937dnd61823il0w9pipfs1k12"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.2-darwin-arm64.tar.gz"; - sha256 = "0m4385fndkwrag12w0yclbw0krhij27wa49wckwpvhn80syj80nr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.18.0-darwin-arm64.tar.gz"; + sha256 = "1yg9b0bs6arz85j9wsaynrl1qzhrq6743i0mlrjzs876waff5fi6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.25.0-darwin-arm64.tar.gz"; - sha256 = "02882h0sgrcxdjsddmqld4k4637h3dmblkb42kjrdq6d518gfivn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.26.0-darwin-arm64.tar.gz"; + sha256 = "1ch8w3g29mw8cxmbklpaq468ibn7sn8qv7m5zwhlbfawpmcd0qv6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-darwin-arm64.tar.gz"; - sha256 = "07p28832jrndwcmmp1whky2dp218jhc070cm12frypn06ipy0n9q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.12.0-darwin-arm64.tar.gz"; + sha256 = "17dfk0019jzk0kwxp8vypk3bkhs6mcgszpp2g29cs9f5fnnskhpm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.0-darwin-arm64.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix index 0f1cbb65f9..2787358fdf 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { pname = "pulumi"; - version = "3.56.0"; + version = "3.57.1"; # Used in pulumi-language packages, which inherit this prop sdkVendorHash = "sha256-oXsU4h4CwukJHttYLT7JiW2He8Yq5qAwnxL8+G5FIpc="; @@ -23,12 +23,12 @@ buildGoModule rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-cXNYg5zNfZTTuv+EaSGuaA9mbMPq7vKTKcsxfnM3NbQ="; + hash = "sha256-F5mrk0Qb5Hxjx49KEXEUBN6wB52ztTuV+L37/I0tF48="; # Some tests rely on checkout directory name name = "pulumi"; }; - vendorHash = "sha256-TWpH3y+7kLknPy+CExhnjfEvaIWWs1d5JCVF3FA1Z7I="; + vendorHash = "sha256-G+5UuiIMWQSp5I8EnlWo32jUkg0ini/UhQYA/MTYB0Y="; sourceRoot = "${src.name}/pkg"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix index fa31ac964f..5fa1ceb9e5 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.50.3"; + version = "0.51.1"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "v${version}"; - hash = "sha256-kvIY6BBkyV5TmpT8bhrn+OIP3/rbCy0EKxsFLIIFp8U="; + hash = "sha256-TgbFNtN0FLhW7BqRq8tAs7WtMWdJpQN9fRCzTlE0XoU="; }; - vendorHash = "sha256-595Z6/jt+d81QMIKcbg7Y5UMtF8hnZipiBkt1LQt2AI="; + vendorHash = "sha256-V7yPXSN+3H8NkD384MkvKbymNQ/O2Q9HoMO4M8mzVto="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix index 918cd6bdf6..273d22a198 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.11.1"; + version = "2.12.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-tE2r2d3dagMvfPq/2G61KMPZyz6YQG3jAD+MjQ3uYbg="; + sha256 = "sha256-4BIw+vk0LJL6/AWtZDtOP88UqUg1EiDASMaEP3/7Bx0="; }; - vendorHash = "sha256-eqVAX6l7wsHqFjzwLiTSwryLHxl0aJqQOmjyGeM+1co="; + vendorHash = "sha256-Wdbh7rFKvWdDULMwYxvTrWim6iO6kQaYseSkq2PBfUM="; ldflags = [ "-w" diff --git a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix index 8cd06a6fc1..87c31cf736 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "trivy"; - version = "0.38.1"; + version = "0.38.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b5HKYZOitn8opqlrgULEYU6fsmQjWKEHRyM0GwLH9jk="; + sha256 = "sha256-mQXXS3Hg7bnspdznvThRKaY7aoCB8UsBP6J1tVZKTj4="; }; # hash missmatch on across linux and darwin proxyVendor = true; - vendorHash = "sha256-HBmQOd6uihGJULnHYU+biXRUYJkpL2Dw7S9EswqsbNs="; + vendorHash = "sha256-PTPhfgI7wheK1brr/YvDh1T01vCu7YoJX8UB+SGV3Zg="; excludedPackages = "misc"; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/dumpnar/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/dumpnar/default.nix new file mode 100644 index 0000000000..e2285574a9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/archivers/dumpnar/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "dumpnar"; + version = "unstable-2023-01-01"; + + src = fetchFromGitHub { + owner = "stephank"; + repo = "dumpnar"; + rev = "7b05e204264183532e8592ad132f74ddf05bc428"; + hash = "sha256-762vgCn2d6QoXRBjpe/SyHKgyQJAV0sEl1prcyf/ClE="; + }; + + installPhase = '' + mkdir -p $out/bin + cp dumpnar $out/bin/ + ''; + + meta = with lib; { + homepage = "https://github.com/stephank/dumpnar"; + description = "Minimal tool to produce a Nix NAR archive."; + license = licenses.lgpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.stephank ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/archivers/p7zip/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/p7zip/default.nix index 43be673ca2..23ffdcc41a 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/p7zip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/p7zip/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, fetchpatch, lib, enableUnfree ? false }: +{ lib, stdenv, fetchFromGitHub, enableUnfree ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "p7zip"; - version = "17.04"; + version = "17.05"; src = fetchFromGitHub { - owner = "jinfeihan57"; - repo = pname; - rev = "v${version}"; + owner = "p7zip-project"; + repo = "p7zip"; + rev = "v${finalAttrs.version}"; sha256 = { - free = "sha256-DrBuf2VPdcprHI6pMSmL7psm2ofOrUf0Oj0qwMjXzkk="; - unfree = "sha256-19F4hPV0nKVuFZNbOcXrcA1uW6Y3HQolaHVIYXGmh18="; + free = "sha256-5r7M9BVcAryZNTkqJ/BfHnSSWov1PwoZhUnLBwEbJoA="; + unfree = "sha256-z3qXgv/TkNRbb85Ew1OcJNxoyssfzHShc0b0/4NZOb0="; }.${if enableUnfree then "unfree" else "free"}; # remove the unRAR related code from the src drv # > the license requires that you agree to these use restrictions, @@ -38,8 +38,6 @@ stdenv.mkDerivation rec { --replace 'CXX=g++' 'CXX=${stdenv.cc.targetPrefix}g++' ''; - makeFlags = [ "DEST_HOME=${placeholder "out"}" ]; - preConfigure = '' buildFlags=all3 '' + lib.optionalString stdenv.isDarwin '' @@ -47,15 +45,22 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - - setupHook = ./setup-hook.sh; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + makeFlags = [ + "DEST_BIN=${placeholder "out"}/bin" + "DEST_SHARE=${placeholder "lib"}/lib/p7zip" + "DEST_MAN=${placeholder "man"}/share/man" + "DEST_SHARE_DOC=${placeholder "doc"}/share/doc/p7zip" + ]; + + outputs = [ "out" "lib" "doc" "man" ]; + + setupHook = ./setup-hook.sh; passthru.updateScript = ./update.sh; meta = with lib; { - homepage = "https://github.com/jinfeihan57/p7zip"; + homepage = "https://github.com/p7zip-project/p7zip"; description = "A new p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/)"; license = with licenses; # p7zip code is largely lgpl2Plus @@ -68,4 +73,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; mainProgram = "7z"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/archivers/p7zip/update.sh b/third_party/nixpkgs/pkgs/tools/archivers/p7zip/update.sh index 0d4b91e56e..9ba67894b8 100755 --- a/third_party/nixpkgs/pkgs/tools/archivers/p7zip/update.sh +++ b/third_party/nixpkgs/pkgs/tools/archivers/p7zip/update.sh @@ -7,7 +7,7 @@ DRV_DIR="$PWD" OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" -NEW_VERSION="$(curl https://api.github.com/repos/jinfeihan57/p7zip/releases/latest | jq .tag_name -r | tr -d 'v')" +NEW_VERSION="$(curl https://api.github.com/repos/p7zip-project/p7zip/releases/latest | jq .tag_name -r | tr -d 'v')" echo "comparing versions $OLD_VERSION => $NEW_VERSION" if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then diff --git a/third_party/nixpkgs/pkgs/tools/archivers/payload-dumper-go/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/payload-dumper-go/default.nix new file mode 100755 index 0000000000..bb1572e1ce --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/archivers/payload-dumper-go/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, xz +}: + +buildGoModule rec { + pname = "payload-dumper-go"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "ssut"; + repo = "payload-dumper-go"; + rev = "refs/tags/${version}"; + hash = "sha256-P20/Nd2YOW9A9/OkpavVRBAi/ueYp812zZvVLnwX67Y="; + }; + + vendorHash = "sha256-CqIZFMDN/kK9bT7b/32yQ9NJAQnkI8gZUMKa6MJCaec="; + + buildInputs = [ xz ]; + + meta = with lib; { + description = "An android OTA payload dumper written in Go"; + homepage = "https://github.com/ssut/payload-dumper-go"; + changelog = "https://github.com/ssut/payload-dumper-go/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ aleksana ]; + mainProgram = "payload-dumper-go"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/common.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/common.nix index 4cfef4657e..b3eefbf9cb 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/beets/common.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/common.nix @@ -61,7 +61,6 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ confuse - gobject-introspection gst-python jellyfish mediafile @@ -74,7 +73,6 @@ python3Packages.buildPythonApplication rec { unidecode ] ++ (concatMap (p: p.propagatedBuildInputs) (attrValues enabledPlugins)); - # see: https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-1131643663 nativeBuildInputs = [ gobject-introspection sphinxHook diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpdris2/default.nix b/third_party/nixpkgs/pkgs/tools/audio/mpdris2/default.nix index a367da9828..fd8618d624 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/mpdris2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/mpdris2/default.nix @@ -13,7 +13,6 @@ python3.pkgs.buildPythonApplication rec { pname = "mpDris2"; version = "0.9.1"; format = "other"; - strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchFromGitHub { owner = "eonpatapon"; diff --git a/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix b/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix index 2398b5483e..17aa6c5444 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "whisper-cpp"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; rev = "refs/tags/v${version}" ; - hash = "sha256-7/10t1yE7Gbs+cyj8I9vJoDeaxEz9Azc2j3f6QCjDGM="; + hash = "sha256-gcw+tcrwCt2CynNXQZxb+WxN/0chIQIJnwUAw9JGkYA="; }; # The upstream download script tries to download the models to the diff --git a/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix b/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix index 8096fc22a2..b588c7821a 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix @@ -17,6 +17,21 @@ let inherit version; hash = "sha256-xT0F52iuSj5VOuIcLlAVKT5e+/1cEtSX8RBMtRnMprM="; }; + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ (with super; [ + resampy + ]); + doCheck = false; + }); + + numpy = super.numpy.overridePythonAttrs (oldAttrs: rec { + version = "1.23.5"; + src = super.fetchPypi { + pname = "numpy"; + inherit version; + extension = "tar.gz"; + hash = "sha256-Gxdm1vOXwYFT1AAV3fx53bcVyrrcBNLSKNTlqLxN7Ro="; + }; + doCheck = false; }); }; }; @@ -43,6 +58,7 @@ python.pkgs.buildPythonApplication rec { "numba" "numpy" "unidic-lite" + "trainer" ]; in '' sed -r -i \ @@ -170,6 +186,10 @@ python.pkgs.buildPythonApplication rec { "tests/vocoder_tests/test_wavernn_train.py" ]; + passthru = { + inherit python; + }; + meta = with lib; { homepage = "https://github.com/coqui-ai/TTS"; changelog = "https://github.com/coqui-ai/TTS/releases/tag/v${version}"; diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix b/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix index 9de97fe52f..753934672f 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , substituteAll , pkgsi686Linux -, fetchpatch , dbus , meson , ninja @@ -18,7 +17,7 @@ let asio = fetchFromGitHub { owner = "chriskohlhoff"; repo = "asio"; - rev = "asio-1-22-1"; + rev = "refs/tags/asio-1-22-1"; sha256 = "sha256-UDLhx2yI6Txg0wP5H4oNIhgKIB2eMxUGCyT2x/7GgVg="; }; @@ -26,7 +25,7 @@ let bitsery = fetchFromGitHub { owner = "fraillt"; repo = "bitsery"; - rev = "v5.2.2"; + rev = "refs/tags/v5.2.2"; sha256 = "sha256-VwzVtxt+E/SVcxqIJw8BKPO2q7bu/hkhY+nB7FHrZpY="; }; @@ -34,15 +33,15 @@ let clap = fetchFromGitHub { owner = "free-audio"; repo = "clap"; - rev = "1.1.4"; - sha256 = "sha256-3zDvzC3Hs4OmT2qvaDa69rmBkHoQ8qY9TZlsPxsJA40="; + rev = "refs/tags/1.1.7"; + sha256 = "sha256-WcMTxE+QCzlp4lhFdghZI8UI/5mdVeRvrl24Xynd0qk="; }; # Derived from subprojects/function2.wrap function2 = fetchFromGitHub { owner = "Naios"; repo = "function2"; - rev = "4.2.0"; + rev = "refs/tags/4.2.0"; sha256 = "sha256-wrt+fCcM6YD4ZRZYvqqB+fNakCNmltdPZKlNkPLtgMs="; }; @@ -50,7 +49,7 @@ let ghc_filesystem = fetchFromGitHub { owner = "gulrak"; repo = "filesystem"; - rev = "v1.5.12"; + rev = "refs/tags/v1.5.12"; sha256 = "sha256-j4RE5Ach7C7Kef4+H9AHSXa2L8OVyJljDwBduKcC4eE="; }; @@ -58,28 +57,29 @@ let tomlplusplus = fetchFromGitHub { owner = "marzer"; repo = "tomlplusplus"; - rev = "v3.0.1"; - sha256 = "sha256-l8ckbCqjz3GUfwStcl3H2C+un5dZfT2uLtayvdu93D4="; + rev = "refs/tags/v3.3.0"; + sha256 = "sha256-INX8TOEumz4B5coSxhiV7opc3rYJuQXT2k1BJ3Aje1M="; }; # Derived from vst3.wrap vst3 = fetchFromGitHub { owner = "robbert-vdh"; repo = "vst3sdk"; - rev = "v3.7.7_build_19-patched"; + rev = "refs/tags/v3.7.7_build_19-patched"; fetchSubmodules = true; sha256 = "sha256-LsPHPoAL21XOKmF1Wl/tvLJGzjaCLjaDAcUtDvXdXSU="; }; -in multiStdenv.mkDerivation rec { +in +multiStdenv.mkDerivation (finalAttrs: { pname = "yabridge"; - version = "5.0.3"; + version = "5.0.4"; # NOTE: Also update yabridgectl's cargoHash when this is updated src = fetchFromGitHub { owner = "robbert-vdh"; - repo = pname; - rev = version; - sha256 = "sha256-T3BU77BbVr6vlVoijUQy86eF0lCgM4S4d5VSnLE4pas="; + repo = "yabridge"; + rev = "refs/tags/${finalAttrs.version}"; + sha256 = "sha256-15WTCXMvghoU5TkE8yuQJrxj9cwVjczDKGKWjoUS6SI="; }; # Unpack subproject sources @@ -104,14 +104,6 @@ in multiStdenv.mkDerivation rec { # Patch the chainloader to search for libyabridge through NIX_PROFILES ./libyabridge-from-nix-profiles.patch - - # Remove with next yabridge update - (fetchpatch { - name = "fix-for-wine-8.0.patch"; - url = "https://github.com/robbert-vdh/yabridge/commit/29acd40a9add635e2cb40ecc54c88d65604a7a2a.patch"; - sha256 = "sha256-hVxa/FqH7d938Z/VjHdhmYLCLPZoa9C4xKSKRKiVPSU="; - includes = [ "meson.build" ]; - }) ]; postPatch = '' @@ -166,9 +158,9 @@ in multiStdenv.mkDerivation rec { meta = with lib; { description = "A modern and transparent way to use Windows VST2 and VST3 plugins on Linux"; - homepage = src.meta.homepage; + homepage = "https://github.com/robbert-vdh/yabridge"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau ]; platforms = [ "x86_64-linux" ]; }; -} +}) 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 54c4460967..6dd23d7f37 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 bfab6361..9085db0f 100644 +index f76f5acf..045e9d40 100644 --- a/meson.build +++ b/meson.build -@@ -187,7 +187,7 @@ if is_64bit_system +@@ -221,7 +221,7 @@ if is_64bit_system xcb_64bit_dep = dependency('xcb') endif if with_32bit_libraries or with_bitbridge @@ -12,7 +12,7 @@ index bfab6361..9085db0f 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 acd431bc..8566281c 100644 +index 8d6236ad..ea5c1396 100644 --- a/src/plugin/utils.cpp +++ b/src/plugin/utils.cpp @@ -93,7 +93,7 @@ std::string PluginInfo::wine_version() const { diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch b/third_party/nixpkgs/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch index 4d714d38fa..54125551e3 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch @@ -1,5 +1,5 @@ diff --git a/src/chainloader/utils.cpp b/src/chainloader/utils.cpp -index ccd65d33..c7136b37 100644 +index c43e5693..b8352adf 100644 --- a/src/chainloader/utils.cpp +++ b/src/chainloader/utils.cpp @@ -29,8 +29,10 @@ diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch index 12db2ccc05..066b854cac 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch @@ -1,5 +1,5 @@ diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs -index 76075938..4f69642f 100644 +index 53200bd5..ef8a781d 100644 --- a/tools/yabridgectl/src/config.rs +++ b/tools/yabridgectl/src/config.rs @@ -22,6 +22,7 @@ use serde_derive::{Deserialize, Serialize}; @@ -58,7 +58,7 @@ index 76075938..4f69642f 100644 )); } diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs -index e5618575..72b730f1 100644 +index 8dcd7dc8..bddca534 100644 --- a/tools/yabridgectl/src/main.rs +++ b/tools/yabridgectl/src/main.rs @@ -135,7 +135,7 @@ fn main() -> Result<()> { diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix index 5977274a4c..b1daba9482 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix @@ -5,13 +5,13 @@ , wine }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "yabridgectl"; version = yabridge.version; src = yabridge.src; sourceRoot = "source/tools/yabridgectl"; - cargoSha256 = "sha256-X7YcIjKLzuts7d9VD6hLFCiEBrY4opi8nInjPs9jAh0="; + cargoSha256 = "sha256-qr6obmabcO3n+DxMxkj3mbpzR/Wn6eOg2J99/FarMVs="; patches = [ # Patch yabridgectl to search for the chainloader through NIX_PROFILES @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A small, optional utility to help set up and update yabridge for several directories at once"; - homepage = "${src.meta.homepage}/tree/${version}/tools/yabridgectl"; + homepage = "${yabridge.src.meta.homepage}/tree/${yabridge.version}/tools/yabridgectl"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau ]; platforms = yabridge.meta.platforms; diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch index 2fad3db87c..b39aaeaa81 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch @@ -1,5 +1,5 @@ diff --git a/tools/yabridgectl/src/actions.rs b/tools/yabridgectl/src/actions.rs -index 03617c4d..19ade93e 100644 +index 25857753..59590e38 100644 --- a/tools/yabridgectl/src/actions.rs +++ b/tools/yabridgectl/src/actions.rs @@ -835,14 +835,6 @@ pub fn do_sync(config: &mut Config, options: &SyncOptions) -> Result<()> { diff --git a/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix b/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix index e1aaafa3d1..34bd7c5617 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; passthru.tests = { - inherit (nixosTests) btrbk btrbk-no-timer btrbk-section-order; + inherit (nixosTests) btrbk btrbk-no-timer btrbk-section-order btrbk-doas; }; passthru.updateScript = genericUpdater { diff --git a/third_party/nixpkgs/pkgs/tools/backup/grab-site/default.nix b/third_party/nixpkgs/pkgs/tools/backup/grab-site/default.nix index c904a49cd4..f4e65ddbcd 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/grab-site/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/grab-site/default.nix @@ -40,7 +40,7 @@ with python.pkgs; buildPythonApplication rec { autobahn fb-re2 websockets - cchardet + faust-cchardet ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/ventoy-bin/default.nix index 5bf4ef2df5..0bfb1456fc 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/ventoy-bin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/ventoy-bin/default.nix @@ -51,13 +51,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ventoy-bin"; - version = "1.0.88"; + version = "1.0.89"; src = let inherit (finalAttrs) version; in fetchurl { url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz"; - hash = "sha256-mg1dzXREIhO9LsoCEauuBR9ESGHM3RvoFN+5vHU0HDA="; + hash = "sha256-dPBMABzmITUenOe57BD5EmofZeXC9v6IpW7m+OhhYdA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/compression/unzrip/default.nix b/third_party/nixpkgs/pkgs/tools/compression/unzrip/default.nix new file mode 100644 index 0000000000..e3acb987b5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/compression/unzrip/default.nix @@ -0,0 +1,35 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, zstd +}: + +rustPlatform.buildRustPackage rec { + pname = "unzrip"; + version = "unstable-2023-03-13"; + + src = fetchFromGitHub { + owner = "quininer"; + repo = "unzrip"; + rev = "bd2dffd43c3235857500190571602f3ce58c5f70"; + hash = "sha256-Ih47xF4JYQf10RuTnfJJGUAJwyxDxCAdTTCdwGf4i/U="; + }; + + cargoHash = "sha256-11UESSKvTcr6Wa0cASRSQ55kBbRL5AelI6thv3oi0sI="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + zstd + ]; + + meta = with lib; { + description = "Unzip implementation, support for parallel decompression, automatic detection encoding"; + homepage = "https://github.com/quininer/unzrip"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix index 8c04f5d233..e4bd7c2619 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.1.3"; + version = "6.2.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-03/J7E+ld4sgqnVI/nBus6MAM4wUczGCca5UAk2scWc="; + sha256 = "sha256-r1XjEEz15SJSu5QKKR7TSFKRYiSlAgZgDJQTRmQnMpk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index a42d7cce67..15e5071f96 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -105,7 +105,25 @@ let }; # Boost 1.75 is not compatible with Python 3.10 - python = python39; + python = python39.override { + packageOverrides = self: super: { + sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "1.4.46"; + src = super.fetchPypi { + pname = "SQLAlchemy"; + inherit version; + hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; + }; + nativeCheckInputs = oldAttrs.nativeCheckInputs ++ (with super; [ + pytest-xdist + ]); + disabledTestPaths = (oldAttrs.disabledTestPaths or []) ++ [ + "test/aaa_profiling" + "test/ext/mypy" + ]; + }); + }; + }; boost = boost175.override { enablePython = true; @@ -121,7 +139,7 @@ let ps.setuptools ps.virtualenv # Libraries needed by the python tools - ps.Mako + ps.mako ceph-common ps.cherrypy ps.cmd2 diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix index 2287221452..a1a2b812a8 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "e2fsprogs"; - version = "1.46.5"; + version = "1.46.6"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1fgvwbj9ihz5svzrd2l0s18k16r4qg3wimrniv71fn3vdcg0shxp"; + hash = "sha256-vy/MfuUXj+c6MFf34qo/5S6Yt7tGFQnGewIboA+Uxvc="; }; # fuse2fs adds 14mb of dependencies @@ -23,11 +23,6 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ fuse ]; patches = [ - (fetchpatch { - name = "CVE-2022-1304.patch"; - url = "https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/patch/?id=ab51d587bb9b229b1fade1afd02e1574c1ba5c76"; - sha256 = "sha256-YEEow34/81NBOc6F6FS6i505FCQ7GHeIz0a0qWNs7Fg="; - }) (fetchpatch { # avoid using missing __GNUC_PREREQ(X,Y) url = "https://raw.githubusercontent.com/void-linux/void-packages/9583597eb3e6e6b33f61dbc615d511ce030bc443/srcpkgs/e2fsprogs/patches/fix-glibcism.patch"; sha256 = "1gfcsr0i3q8q2f0lqza8na0iy4l4p3cbii51ds6zmj0y4hz2dwhb"; @@ -36,14 +31,6 @@ stdenv.mkDerivation rec { }) ]; - postPatch = '' - # Remove six failing tests - # https://github.com/NixOS/nixpkgs/issues/65471 - for test in m_image_mmp m_mmp m_mmp_bad_csum m_mmp_bad_magic t_mmp_1on t_mmp_2off; do - rm -r "tests/$test" - done - ''; - configureFlags = if stdenv.isLinux then [ # It seems that the e2fsprogs is one of the few packages that cannot be diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix index f41ad499dc..4eb488b2d0 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, rustPlatform, fetchFromGitea, openssl, pkg-config, protobuf -, testers, Security, garage, nixosTests }: +, cacert, testers, Security, garage, nixosTests }: let generic = { version, sha256, cargoSha256, eol ? false, broken ? false }: rustPlatform.buildRustPackage { pname = "garage"; @@ -21,14 +21,18 @@ let openssl ] ++ lib.optional stdenv.isDarwin Security; + checkInputs = [ + cacert + ]; + OPENSSL_NO_VENDOR = true; - # See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v0.7.2/default.nix#L84-L98 + # See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v0.8.2/nix/compile.nix#L192-L198 # on version changes for checking if changes are required here buildFeatures = [ "kubernetes-discovery" ] ++ - (lib.optional (lib.versionAtLeast version "0.8") [ + (lib.optionals (lib.versionAtLeast version "0.8") [ "bundled-libs" "sled" "metrics" @@ -36,20 +40,19 @@ let "telemetry-otlp" "lmdb" "sqlite" + "consul-discovery" ]); # To make integration tests pass, we include the optional k2v feature here, - # but not in buildFeatures. See: - # https://garagehq.deuxfleurs.fr/documentation/reference-manual/k2v/ + # but in buildFeatures only for version 0.8+, where it's enabled by default. + # See: https://garagehq.deuxfleurs.fr/documentation/reference-manual/k2v/ checkFeatures = [ "k2v" "kubernetes-discovery" ] ++ - (lib.optional (lib.versionAtLeast version "0.8") [ + (lib.optionals (lib.versionAtLeast version "0.8") [ "bundled-libs" "sled" - "metrics" - "telemetry-otlp" "lmdb" "sqlite" ]); @@ -80,15 +83,13 @@ in garage_0_7 = garage_0_7_3; - garage_0_8_0 = generic { - version = "0.8.0"; - sha256 = "sha256-c2RhHfg0+YV2E9Ckl1YSc+0nfzbHPIt0JgtT0DND9lA="; - cargoSha256 = "sha256-vITXckNOiJbMuQW6/8p7dsZThkjxg/zUy3AZBbn33no="; - # On x86_64-darwin, tests are failing. - broken = stdenv.isDarwin && stdenv.isx86_64; + garage_0_8_2 = generic { + version = "0.8.2"; + sha256 = "sha256-IlDWbNWI1yXvPPF3HIqQvo79M2FQCtoX1wRLJrDbd9k="; + cargoSha256 = "sha256-6l4tDBMcOvckTkEO05rman4hHlmVbBt1nCeX5/dETKk="; }; - garage_0_8 = garage_0_8_0; + garage_0_8 = garage_0_8_2; garage = garage_0_8; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/httm/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/httm/default.nix index 81aa263050..9d74dbf38c 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/httm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.23.2"; + version = "0.23.3"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - hash = "sha256-lNB7fZwIOXA4bryftHFZlAa6kJldouxCf00h7J7qQM0="; + hash = "sha256-yia7GEPemFVHzTkhrL7HejQsFO1zwpdUtq4DLdm4s2g="; }; - cargoHash = "sha256-NQqipHJXvbDMO8kUMKnzEdz7atPYcjj7/uf3PSXZy0A="; + cargoHash = "sha256-NfuLLKt4dObggqFw8bjHMYdJPz2Rx8eXBrz5/BB7UxM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/games/minecraft/fabric-installer/default.nix b/third_party/nixpkgs/pkgs/tools/games/minecraft/fabric-installer/default.nix index 74b822a974..9d9bc65746 100644 --- a/third_party/nixpkgs/pkgs/tools/games/minecraft/fabric-installer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/minecraft/fabric-installer/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "fabric-installer"; - version = "0.11.1"; + version = "0.11.2"; src = fetchurl { url = "https://maven.fabricmc.net/net/fabricmc/fabric-installer/${version}/fabric-installer-${version}.jar"; - sha256 = "sha256-eRf5+hS+babvPNt/5r87Y6WToOuHO9Yn6YGn45iM1zo="; + sha256 = "sha256-xq1b7xuxK1pyJ74+5UDCyQav30rIEUt44KygsUYAXCc="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/tools/games/scarab/default.nix b/third_party/nixpkgs/pkgs/tools/games/scarab/default.nix index 56e94807fe..7cdac9e511 100644 --- a/third_party/nixpkgs/pkgs/tools/games/scarab/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/scarab/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "scarab"; - version = "1.20.0.0"; + version = "1.31.0.0"; src = fetchFromGitHub { owner = "fifty-six"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VfXIxir4SaELuF2QpqbVzTvlkYxwERa0ddGEn1OAh04="; + sha256 = "sha256-oReU0kL0wPR6oqhq/uzO7nD1qo74h36w/gyvgffwzns="; }; nugetDeps = ./deps.nix; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/directx-shader-compiler/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/directx-shader-compiler/default.nix index 192dd7e88f..6549c0bbad 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/directx-shader-compiler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/directx-shader-compiler/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "directx-shader-compiler"; - version = "1.7.2212"; + version = "1.7.2212.1"; # Put headers in dev, there are lot of them which aren't necessary for # using the compiler binary. @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "microsoft"; repo = "DirectXShaderCompiler"; rev = "v${version}"; - hash = "sha256-/FuG6ThvA3XMlHhnshRJpKC+vf4LM8/hurUoPagpTqA="; + hash = "sha256-old/vGNoj0mimuvd/RkwNeynBp+gBrkwQ7ah2oUZll0="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/glmark2/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/glmark2/default.nix index 5503e9eb38..bfcaa7154c 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/glmark2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/glmark2/default.nix @@ -3,6 +3,9 @@ , fetchFromGitHub , pkg-config , makeWrapper +, meson +, ninja +, wayland-scanner , libjpeg , libpng , xorg @@ -10,11 +13,9 @@ , libGL , libdrm , udev -, python3 , wayland , wayland-protocols , mesa -, wafHook }: stdenv.mkDerivation rec { @@ -28,21 +29,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-WCvc5GqrAdpIKQ4LVqwO6ZGbzBgLCl49NxiGJynIjSQ="; }; - nativeBuildInputs = [ pkg-config wafHook makeWrapper ]; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ pkg-config makeWrapper meson ninja wayland-scanner ]; buildInputs = [ libjpeg libpng - xorg.libxcb libX11 libdrm - python3 udev wayland wayland-protocols mesa ]; - wafConfigureFlags = [ "--with-flavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2" ]; + mesonFlags = [ "-Dflavors=drm-gl,drm-glesv2,gbm-gl,gbm-glesv2,wayland-gl,wayland-glesv2,x11-gl,x11-gl-egl,x11-glesv2" ]; postInstall = '' for binary in $out/bin/glmark2*; do diff --git a/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix index 98d2c63d1b..ee7350fbc9 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation rec { pname = "graphviz"; - version = "7.0.2"; + version = "7.1.0"; src = fetchFromGitLab { owner = "graphviz"; repo = "graphviz"; rev = version; - hash = "sha256-iCpIKTGXZ1R3mbpbwv5ztdtjY7p9/NsJlA6u5lfpgdY="; + hash = "sha256-y91YiBJT45slK266UGfow7MFdrdMXZQm3FYBWs1YuuE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/mangohud/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/mangohud/default.nix index 9639a7881f..8bdf4938ed 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/mangohud/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/mangohud/default.nix @@ -17,7 +17,7 @@ , appstream , glslang , makeWrapper -, Mako +, mako , meson , ninja , pkg-config @@ -142,7 +142,7 @@ in stdenv.mkDerivation rec { appstream glslang makeWrapper - Mako + mako meson ninja pkg-config diff --git a/third_party/nixpkgs/pkgs/tools/graphics/piglit/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/piglit/default.nix index 0a4dfc4baf..561268b3f4 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/piglit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/piglit/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { libxcb libxkbcommon (python3.withPackages (ps: with ps; [ - Mako + mako numpy ])) waffle diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vkbasalt/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vkbasalt/default.nix index 8673d6f6d0..af267e6688 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vkbasalt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vkbasalt/default.nix @@ -11,15 +11,15 @@ , vkbasalt32 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vkbasalt"; - version = "0.3.2.8"; + version = "0.3.2.9"; src = fetchFromGitHub { owner = "DadSchoorse"; - repo = pname; - rev = "v${version}"; - hash = "sha256-/ynJ6zOVj6Si23Jsq6IHlw36KqBtMvjj41fos6irm9o="; + repo = "vkBasalt"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-IVlZ6o+1EEEh547rFPN7z+W+EY7MrIM/yUh6+PPkNeI="; }; nativeBuildInputs = [ glslang meson ninja pkg-config ]; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ kira-bruneau ]; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix index 21fed14fbd..c363752467 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.0.21"; + version = "5.0.22"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-O2ozMSNo07TWw7Se4CCo95OM/paG7TSVVG6SqHoYiBE="; + sha256 = "sha256-9/5I/ZOJvqAx4UpXOeDrU9SKPV68HdRrWI9IzBZEctk="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix index 6cb31172ff..eefedd6a84 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fcitx5-anthy"; - version = "5.0.13"; + version = "5.0.14"; src = fetchurl { url = "https://download.fcitx-im.org/fcitx5/fcitx5-anthy/${pname}-${version}.tar.xz"; - sha256 = "sha256-EGpyYiNalm4En3Oa++hyOSPLhjbkVcDyZt3LqamfSOI="; + sha256 = "sha256-CodNcN9O8i8euGjCfq9m4zVOFgnbje05JUT49rxUp7c="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix index 984d56eb43..b4109e8467 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-chewing"; - version = "5.0.13"; + version = "5.0.14"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-bYkIf2TFwRzfl0tYeq6rZUETz3lbT1LEaUAuG7d35yU="; + sha256 = "sha256-zfaq5pkHcB12iFvXWvvzmX9mpcXAZSri9lVlzfePLAQ="; }; nativeBuildInputs = [ 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 7ba7d15984..780fb60aa3 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.16"; + version = "5.0.17"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-P3SXiuxKwA+vrlp/dp13xxOQrf8/DMgdGCPwjbbZpU4="; + sha256 = "sha256-Licj/sZ2rZablsk/ytCZlkdjSHszr31JURrQkXs1BXE="; }; 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 e5e4fe245f..bd98019cf2 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.0.16"; + version = "5.0.17"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-jTvYzLRXiaoJWgPnFV+N28tId/7uuYtbD4x2+Hy/SdA="; + sha256 = "sha256-nYHrJBcbaYxZ61OEFfnwTTsZFEBtDJkR0kuYPyTcjio="; }; 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 0f17a1bbba..cd9f75cc8a 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.21"; + version = "5.0.22"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-LGTAKFeiCoUsjVFUcIG7U7riYyb/AfhiYkmNu3aO56M="; + sha256 = "sha256-x7KPhXiKy+KQsukIYJWg3k2Wj8tXfUu9jkkwa8vM1WA="; }; 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 index aea8e6151e..bf97cab6ef 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-hangul"; - version = "5.0.10"; + version = "5.0.11"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-Hjnt9E24u1ycKreZf6Nb8cH7S3JKRlLSYAxhA11DMjs="; + sha256 = "sha256-VA9LDGMJRJDDCxIsx7wpDgdc2V9cuWlydAq5yiIvpxA="; }; 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 7b8d61bbc6..9c63e1877c 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "fcitx5-qt"; - version = "5.0.16"; + version = "5.0.17"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-KmvlMct/XZgJJiQ9FDol1vO6jUekYaoEhLqJimwci6w="; + sha256 = "sha256-Pi5Xb7H/h89OcTzYX7X3Xw8FQIczkWd6rMrbwnHr/L4="; }; 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 867b0bcda4..03150b43c4 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.15"; + version = "5.0.16"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-gSot+jxZn2m/RQP9ELN/S5sh5uQfhA1s45+N5svN5fg="; + sha256 = "sha256-YAunuxdMlv1KOj2/xXstb/Uhm97G9D9rxb35AbNgMaE="; }; 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 b08311a926..1c3a15d85b 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.12"; + version = "5.0.13"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-BEekvRDXYv9TyhiaZVt6ne7H0MCRkpe82j6nLiFQb5Y="; + sha256 = "sha256-/YIZMSCKJlnPL+pmUWfVf8tINKjXKkGAK7rWQ98RRjQ="; }; 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 115af7e100..061c140655 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.10"; + version = "5.0.11"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-jdc1W8aLkR2VcpjiEOJNApxNGgNqWreEBkW1pjuy1WU="; + sha256 = "sha256-Km0c6so+Ed/lbK9t54stWjlkK70aEcf7EbQm7msPDKM="; }; 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 81124bb926..1f14fb2eeb 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-unikey"; - version = "5.0.12"; + version = "5.0.13"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-unikey"; rev = version; - sha256 = "sha256-LaCDDwM5idq4JEs5F0ysMZfWIEaRqMBNgIyNf9DhmhY="; + sha256 = "sha256-UpCXcgVUGe5/yunLqRNx2H2aLOnD1wJNA8y3q8R4+sY="; }; nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/input-remapper/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/input-remapper/default.nix index c694160768..092901e08c 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/input-remapper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/input-remapper/default.nix @@ -45,11 +45,6 @@ in hash = "sha256-KPQLgXSonuOgphagYN2JN+CMIpmjTIPUTCqOPDk0UYU="; }; - # Fixes error - # Couldn’t recognize the image file format for file "*.svg" - # at startup, see https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - postPatch = '' # fix FHS paths substituteInPlace inputremapper/configs/data.py \ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/default.nix index d36f205116..dde07fc971 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { pname = "libinput-gestures"; - version = "2.73"; + version = "2.74"; src = fetchFromGitHub { owner = "bulletmark"; repo = "libinput-gestures"; rev = version; - sha256 = "sha256-dtCe3//BMC+FG50qyxVz0ni6nmAPYMPOv13VQTxhls4="; + sha256 = "sha256-uBABs2FPvF+HO+VSNvz2F0Bc9Ja8ek1ULiu89/wvTv4="; }; patches = [ ./0001-hardcode-name.patch diff --git a/third_party/nixpkgs/pkgs/tools/misc/boxxy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/boxxy/default.nix index 6e50eebe72..117efce550 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/boxxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/boxxy/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "boxxy"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "queer"; repo = "boxxy"; rev = "v${version}"; - hash = "sha256-BTVbx6Fk10A2SayXAH4hRRcUqI6+3VEW25vj3sdApqI="; + hash = "sha256-Iy4PDtqjAqZ8MKPAnPqLqsd+d37PB57fJE8C1fOdfQ4="; }; - cargoHash = "sha256-eCi8dcaeNjuU7a7W4IJqz9bRbde6PLy/WJCipgancRE="; + cargoHash = "sha256-wBSgdVNoGksvMFcRRAvYXrIw12BlW40zSPOmboGuVhQ="; meta = with lib; { description = "Puts bad Linux applications in a box with only their files"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index c6a5f9aafe..834110a6aa 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.31.1"; + version = "2.32.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-zSr4lvrrGM+BgPWtq/J7vnB1lWHI8PmqP/N5csFL9kU="; + hash = "sha256-ljzcB48AeYMbo3GjsegJS7eyIRnd+prHBtK4dAICOCY="; }; - vendorHash = "sha256-/CGdz6wIpEZrhZe6IYa43Z3bpN1byeSi9h4dTxCMxog="; + vendorHash = "sha256-Ugp3jvtV12Ss7HdhLkBSdENyOTSb573iho1u2UX5Img="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/codevis/default.nix b/third_party/nixpkgs/pkgs/tools/misc/codevis/default.nix index d160c21445..96e982e03b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/codevis/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/codevis/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "codevis"; - version = "0.6.1"; + version = "0.8.1"; src = fetchFromGitHub { owner = "sloganking"; repo = "codevis"; rev = "v${version}"; - hash = "sha256-iw5ULK67AHLoffveZghk57lPQwE2oX+iwlO0dmdpE4E="; + hash = "sha256-37It/9e/H/ZxDIAeKIcFNrbMs7GJdo1kDx7gPt+pup4="; }; - cargoHash = "sha256-IxQ8rnB+2xTBiFvxy2yo27HtBu0zLvbQzyoxH/4waxQ="; + cargoHash = "sha256-pWf9qIEzuddcwMLtXzzlU+nL8iD0Ey5yj3e7GUzVzSw="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix index 5bca03075b..0ef1424879 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, makeWrapper, gnugrep, gnused, file, buildEnv }: +{ lib, stdenv, fetchurl, pkg-config, zlib, pciutils, openssl, coreutils, acpica-tools, makeWrapper, gnugrep, gnused, file, buildEnv }: let - version = "4.14"; + version = "4.19"; commonMeta = with lib; { description = "Various coreboot-related tools"; @@ -16,7 +16,7 @@ let src = fetchurl { url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; - sha256 = "0viw2x4ckjwiylb92w85k06b0g9pmamjy2yqs7fxfqbmfadkf1yr"; + sha256 = "sha256-Zcyy9GU1uZbgBmobdvgcjPH/PiffhLP5fYrXs+fPCkM="; }; enableParallelBuilding = true; @@ -32,7 +32,7 @@ let ]; meta = commonMeta // args.meta; - } // (removeAttrs args ["meta"])); + } // (removeAttrs args [ "meta" ])); utils = { msrtool = generic { @@ -84,6 +84,8 @@ let amdfwtool = generic { pname = "amdfwtool"; meta.description = "Create AMD firmware combination"; + buildInputs = [ openssl ]; + nativeBuildInputs = [ pkg-config ]; installPhase = '' runHook preInstall @@ -105,13 +107,15 @@ let runHook postInstall ''; - postFixup = let - binPath = [ coreutils acpica-tools gnugrep gnused file ]; - in "wrapProgram $out/bin/acpidump-all --set PATH ${lib.makeBinPath binPath}"; + postFixup = '' + wrapProgram $out/bin/acpidump-all \ + --set PATH ${lib.makeBinPath [ coreutils acpica-tools gnugrep gnused file ]} + ''; }; }; -in utils // { +in +utils // { coreboot-utils = (buildEnv { name = "coreboot-utils-${version}"; paths = lib.attrValues utils; diff --git a/third_party/nixpkgs/pkgs/tools/misc/csvs-to-sqlite/default.nix b/third_party/nixpkgs/pkgs/tools/misc/csvs-to-sqlite/default.nix index d0f891fe54..60168b2e44 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/csvs-to-sqlite/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/csvs-to-sqlite/default.nix @@ -12,7 +12,7 @@ let version = "7.1.2"; src = old.src.override { inherit version; - sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; }; }); }; @@ -20,13 +20,15 @@ let in with python.pkgs; buildPythonApplication rec { pname = "csvs-to-sqlite"; version = "1.2"; + format = "setuptools"; + disabled = !isPy3k; src = fetchFromGitHub { owner = "simonw"; repo = pname; rev = version; - sha256 = "0p99cg76d3s7jxvigh5ad04dzhmr6g62qzzh4i6h7x9aiyvdhvk4"; + hash = "sha256-ZG7Yto8q9QNNJPB/LMwzucLfCGiqwBd3l0ePZs5jKV0"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/evhz/default.nix b/third_party/nixpkgs/pkgs/tools/misc/evhz/default.nix new file mode 100644 index 0000000000..703dcae083 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/evhz/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromSourcehut +}: + +stdenv.mkDerivation { + pname = "evhz"; + version = "unstable-2021-09-20"; + + src = fetchFromSourcehut { + owner = "~iank"; + repo = "evhz"; + rev = "35b7526e0655522bbdf92f6384f4e9dff74f38a0"; + hash = "sha256-lC0CeN9YVhkSiooC59Dbom811jHvPDQcYl+KADUwVdQ="; + }; + + buildPhase = "gcc -o evhz evhz.c"; + + installPhase = '' + mkdir -p $out/bin + mv evhz $out/bin + ''; + + meta = with lib; { + description = "Show mouse refresh rate under linux + evdev"; + homepage = "https://git.sr.ht/~iank/evhz"; + license = licenses.gpl3; + maintainers = with maintainers; [ Tungsten842 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix index 6309483dd8..4a22def16c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix @@ -1,27 +1,25 @@ { lib -, stdenv -, fetchFromGitHub -, libiconv , rustPlatform -, AppKit +, fetchFromGitHub +, stdenv +, darwin }: rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.29.3"; + version = "0.30.0"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dz7Mxi5KIZYw0oLic50hNT6rWbQpfiBE4hlZsxNfKsA="; + sha256 = "sha256-eFWFXUARXy3VA53VPSZkJdw6ZvI+FtFnCCGHmCAdTto="; }; - cargoHash = "sha256-I9pd+Q3b++ujynfpZq88lqPSUOc/SXWpNzR/CwtNEPA="; + cargoHash = "sha256-C7DKwEMYdypfItflMOL7rjbAdXDRsXDNoPlc9j6aBRA="; buildInputs = lib.optionals stdenv.isDarwin [ - AppKit - libiconv + darwin.apple_sdk_11_0.frameworks.AppKit ]; # device::test_physical_device_name test fails on Darwin diff --git a/third_party/nixpkgs/pkgs/tools/misc/gaphor/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gaphor/default.nix index 95d9f91127..a97b887f1c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gaphor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gaphor/default.nix @@ -37,11 +37,7 @@ buildPythonApplication rec { wrapGAppsHook ]; - # Setting gobject-introspection on booth nativeBuildInputs and - # buildInputs because of #56943. This recognizes pango, avoiding - # a "ValueError: Namespace PangoCairo not available". buildInputs = [ - gobject-introspection gtksourceview4 pango ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/geekbench/4.nix b/third_party/nixpkgs/pkgs/tools/misc/geekbench/4.nix index d7b6152e07..789f92babf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/geekbench/4.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/geekbench/4.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, makeWrapper, ocl-icd, vulkan-loader, linuxPackages }: +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, addOpenGLRunpath +, makeWrapper +, ocl-icd +, vulkan-loader +}: stdenv.mkDerivation rec { pname = "geekbench"; @@ -12,23 +20,25 @@ stdenv.mkDerivation rec { dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + buildInputs = [ stdenv.cc.cc ]; installPhase = '' - mkdir -p $out/bin $out/lib + runHook preInstall + + mkdir -p $out/bin cp -r geekbench.plar geekbench4 geekbench_x86_64 $out/bin - # needed for compute benchmark - ln -s ${linuxPackages.nvidia_x11}/lib/libcuda.so $out/lib/ - ln -s ${ocl-icd}/lib/libOpenCL.so $out/lib/ - ln -s ${ocl-icd}/lib/libOpenCL.so.1 $out/lib/ - ln -s ${vulkan-loader}/lib/libvulkan.so $out/lib/ - ln -s ${vulkan-loader}/lib/libvulkan.so.1 $out/lib/ - for f in geekbench4 geekbench_x86_64 ; do - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $out/bin/$f - wrapProgram $out/bin/$f --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$out/lib/" + wrapProgram $out/bin/$f \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ + addOpenGLRunpath.driverLink + ocl-icd + vulkan-loader + ]}" done + + runHook postInstall ''; meta = with lib; { @@ -38,5 +48,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = [ maintainers.michalrus ]; platforms = [ "x86_64-linux" ]; + mainProgram = "geekbench4"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/geekbench/5.nix b/third_party/nixpkgs/pkgs/tools/misc/geekbench/5.nix new file mode 100644 index 0000000000..1fc28f8c02 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/geekbench/5.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, addOpenGLRunpath +, makeWrapper +, ocl-icd +, vulkan-loader +}: + +stdenv.mkDerivation rec { + pname = "geekbench"; + version = "5.5.1"; + + src = fetchurl { + url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; + sha256 = "sha256-MgN+VcPcjzYP4Wt/uxiNMTh+p1mA5I2M8CgzDjI5xAQ="; + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r geekbench.plar geekbench5 geekbench_x86_64 $out/bin + + for f in geekbench5 geekbench_x86_64 ; do + wrapProgram $out/bin/$f \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ + addOpenGLRunpath.driverLink + ocl-icd + vulkan-loader + ]}" + done + + runHook postInstall + ''; + + meta = with lib; { + description = "Cross-platform benchmark"; + homepage = "https://geekbench.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = [ maintainers.michalrus ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "geekbench5"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/geekbench/6.nix b/third_party/nixpkgs/pkgs/tools/misc/geekbench/6.nix new file mode 100644 index 0000000000..46b1cbe719 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/geekbench/6.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, addOpenGLRunpath +, makeWrapper +, ocl-icd +, vulkan-loader +}: + +stdenv.mkDerivation rec { + pname = "geekbench"; + version = "6.0.1"; + + src = fetchurl { + url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; + hash = "sha256-RrfyB7RvYWkVCbjblLIPOFcZjUR/fJHk1Em1HP74kmY="; + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r geekbench.plar geekbench-workload.plar geekbench6 geekbench_x86_64 geekbench_avx2 $out/bin + + for f in geekbench6 geekbench_x86_64 geekbench_avx2 ; do + wrapProgram $out/bin/$f \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ + addOpenGLRunpath.driverLink + ocl-icd + vulkan-loader + ]}" + done + + runHook postInstall + ''; + + meta = with lib; { + description = "Cross-platform benchmark"; + homepage = "https://geekbench.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = [ maintainers.michalrus ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "geekbench6"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/geekbench/default.nix b/third_party/nixpkgs/pkgs/tools/misc/geekbench/default.nix deleted file mode 100644 index 77be76f2d2..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/geekbench/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, ocl-icd, vulkan-loader, linuxPackages }: - -stdenv.mkDerivation rec { - pname = "geekbench"; - version = "5.4.6"; - - src = fetchurl { - url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "sha256-fCS6cSD3w2EbLL1yNfH+NKxswRUY4zyCR07gKGXW4Yc="; - }; - - dontConfigure = true; - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/bin $out/lib - cp -r geekbench.plar geekbench5 geekbench_x86_64 $out/bin - - # needed for compute benchmark - ln -s ${linuxPackages.nvidia_x11}/lib/libcuda.so $out/lib/ - ln -s ${ocl-icd}/lib/libOpenCL.so $out/lib/ - ln -s ${ocl-icd}/lib/libOpenCL.so.1 $out/lib/ - ln -s ${vulkan-loader}/lib/libvulkan.so $out/lib/ - ln -s ${vulkan-loader}/lib/libvulkan.so.1 $out/lib/ - - for f in geekbench5 geekbench_x86_64 ; do - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $out/bin/$f - wrapProgram $out/bin/$f --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$out/lib/" - done - ''; - - meta = with lib; { - description = "Cross-platform benchmark"; - homepage = "https://geekbench.com/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = [ maintainers.michalrus ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix index f4c2a0d06c..b54f01c4b0 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.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-S59okcm5VUhURf5UrHh7y7NfdmSHWWloBlc/kCUp3Mc="; + sha256 = "sha256-Cj6VjD0TKAfyLPMJBknOgn/KAVD0BhC0ylDyfRYt5z8="; }; - vendorSha256 = "sha256-eVuEyQCO2/gufMJp8eUpC82wdJbbJsMKR1ZGv96C9mI="; + vendorHash = "sha256-eVuEyQCO2/gufMJp8eUpC82wdJbbJsMKR1ZGv96C9mI="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/misc/halp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/halp/default.nix new file mode 100644 index 0000000000..ad08c0b83a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/halp/default.nix @@ -0,0 +1,80 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +, stdenv +, darwin +, unixtools +, rust +}: + +rustPlatform.buildRustPackage rec { + pname = "halp"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = "halp"; + rev = "v${version}"; + hash = "sha256-gcWE2PRDBnZ+ijbuu85S4xCuNvNrYVWtfXQyiajJVKQ="; + }; + + cargoHash = "sha256-Y21w+UlsQA/lDbnQTiD5EsbIKuh0REZrsWm+JHIeoKg="; + + patches = [ + # patch tests to point to the correct target directory + ./fix-target-dir.patch + ]; + + nativeBuildInputs = [ + installShellFiles + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + nativeCheckInputs = [ + unixtools.script + ]; + + # tests are failing on darwin + doCheck = !stdenv.isDarwin; + + checkFlags = [ + # requires internet access + "--skip=helper::docs::cheat::tests::test_fetch_cheat_sheet" + ]; + + postPatch = '' + substituteInPlace src/helper/args/mod.rs \ + --subst-var-by releaseDir target/${rust.toRustTargetSpec stdenv.hostPlatform}/$cargoCheckType + ''; + + preCheck = '' + export NO_COLOR=1 + export OUT_DIR=target + ''; + + postInstall = '' + mkdir -p man completions + + OUT_DIR=man $out/bin/halp-mangen + OUT_DIR=completions $out/bin/halp-completions + + installManPage man/halp.1 + installShellCompletion \ + completions/halp.{bash,fish} \ + --zsh completions/_halp + + rm $out/bin/halp-{completions,mangen,test} + ''; + + meta = with lib; { + description = "A CLI tool to get help with CLI tools"; + homepage = "https://github.com/orhun/halp"; + changelog = "https://github.com/orhun/halp/blob/${src.rev}/CHANGELOG.md"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/halp/fix-target-dir.patch b/third_party/nixpkgs/pkgs/tools/misc/halp/fix-target-dir.patch new file mode 100644 index 0000000000..0bc1c8e3b5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/halp/fix-target-dir.patch @@ -0,0 +1,13 @@ +--- a/src/helper/args/mod.rs ++++ b/src/helper/args/mod.rs +@@ -129,9 +129,7 @@ mod tests { + + /// Returns the path of the test binary. + fn get_test_bin() -> String { +- PathBuf::from(env!("CARGO_MANIFEST_DIR")) +- .join("target") +- .join("debug") ++ PathBuf::from("@releaseDir@") + .join(format!("{}-test", env!("CARGO_PKG_NAME"))) + .to_string_lossy() + .to_string() diff --git a/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix index cd5fb46d84..9a13b249b6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "hyperfine"; - version = "1.15.0"; + version = "1.16.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-JJ4sEwe2fXOGlofJ9SkXEllMCMhn7MSJ+H3aAF0F0zk="; + sha256 = "sha256-cbox7TAgeb0ZPt0i3SphWClAz/mUUgRlFKCOS/E0MT4="; }; - cargoSha256 = "sha256-3xOh51rUnQcUfQ+asurbfNYTb5dWQO5YY/AbGRV+26w="; + cargoSha256 = "sha256-Bc3twE42iB7NNkI5cPcniEb+JcR1wjc9nx80p6HCDVc="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix b/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix index 5bb1559af2..c79a9f33af 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.17"; + version = "0.10.18"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-lAHZ6G7DnK2Pu3If5qZ12UF/NYNgd9utiz/dgkgJcjk="; + sha256 = "sha256-mvy/GFEzldRpzChF79wyfGd00K0tA6BAlRrAAAbt7Pc="; }; - vendorHash = "sha256-hfJY0yKr0OsgMKtVkfkbQ6nLGPnyS+PT23qQwuXiuqs="; + vendorHash = "sha256-BplhgUIRZbMxYh2DWuGLpuNFmQuwen/u5oOs08fdXXY="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix b/third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix index 2bdd49f672..398984b8c5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "man-db"; - version = "2.11.1"; + version = "2.11.2"; src = fetchurl { url = "mirror://savannah/man-db/man-db-${version}.tar.xz"; - sha256 = "sha256-LquqUlE0mEfenJ5DxjTZhsvMb4dkLR2cuGCOwYSHtsw="; + sha256 = "sha256-z/oe5Ol0vnhkbEZQjm3S8358WJqqspOMwQZPBY/vn40="; }; outputs = [ "out" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix index 3e10f18173..fcf45ae493 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, python +, python39 , fetchFromGitHub , fetchpatch , withXmpp ? !stdenv.isDarwin @@ -12,7 +12,21 @@ }: let - ntfy-webpush = python.pkgs.callPackage ./webpush.nix { }; + python = python39.override { + packageOverrides = self: super: { + ntfy-webpush = self.callPackage ./webpush.nix { }; + + # databases, on which slack-sdk depends, is incompatible with SQLAlchemy 2.0 + sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec { + version = "1.4.46"; + src = self.fetchPypi { + pname = "SQLAlchemy"; + inherit version; + hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; + }; + }); + }; + }; in python.pkgs.buildPythonApplication rec { pname = "ntfy"; version = "2.7.0"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix index 4a6cb10b60..77f7c53a70 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "nurl"; - version = "0.3.7"; + version = "0.3.9"; src = fetchFromGitHub { owner = "nix-community"; repo = "nurl"; rev = "v${version}"; - hash = "sha256-TtH0sfWFWe3oYK/8jJslqjrEY5rR7HGAVDD5iQ2+spY="; + hash = "sha256-zImzwNBqNl1Ts3x3EDTfkMYe34j09u3xZDcLMv1DdcM="; }; - cargoSha256 = "sha256-vwLlqRjiJU3ecLURAZabmIBivYW1zAfMLUhaJzh57ig="; + cargoSha256 = "sha256-avG/mXs3buWeaPqtjvVPrSeua4DqdiF1P6aCmdW0CUY="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/misc/ocs-url/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ocs-url/default.nix index c5748d6ee4..0544bb6829 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ocs-url/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ocs-url/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchgit, libsForQt5 }: stdenv.mkDerivation rec { - name = "ocs-url"; + pname = "ocs-url"; version = "3.1.0"; srcs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/online-judge-template-generator/default.nix b/third_party/nixpkgs/pkgs/tools/misc/online-judge-template-generator/default.nix index cf1ab7b707..e867059eff 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/online-judge-template-generator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/online-judge-template-generator/default.nix @@ -4,7 +4,7 @@ , beautifulsoup4 , colorlog , fetchFromGitHub -, Mako +, mako , online-judge-api-client , online-judge-tools , ply @@ -29,7 +29,7 @@ buildPythonApplication rec { appdirs beautifulsoup4 colorlog - Mako + mako online-judge-api-client online-judge-tools ply diff --git a/third_party/nixpkgs/pkgs/tools/misc/open-pdf-sign/default.nix b/third_party/nixpkgs/pkgs/tools/misc/open-pdf-sign/default.nix index b791c53b90..43e35e10eb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/open-pdf-sign/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/open-pdf-sign/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, nix-update-script }: stdenv.mkDerivation rec { - version = "0.1.3"; + version = "0.1.4"; pname = "open-pdf-sign"; src = fetchurl { url = "https://github.com/open-pdf-sign/open-pdf-sign/releases/download/v${version}/open-pdf-sign.jar"; - sha256 = "sha256-LW+H4LzXxip2XXZtQs0mBKHpb/Byi5v7QIWdF+X5ulk="; + sha256 = "sha256-tGpjVgG8UcOC0ZFhQ201HvPUyoWso58uM52Vsdwb2lM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix index ca7b47efad..f4ed291890 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20221222"; + version = "20230222"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - sha256 = "sha256-TakMe+wYqUQxtOPbSd1WP2XPIM6v0kX3zHtC74v4WX8="; + sha256 = "sha256-bTal6gl2aN23gOdOL/ACUtoWOZWkselu9jOpmyCcmA4="; }; outputs = [ "out" "man" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix index f51fcf254f..7ea5b8e7ae 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix @@ -1,28 +1,32 @@ { lib -, python3Packages , fetchFromGitHub - # tests +, python3Packages +, libiconv , cargo +, coursier , dotnet-sdk , git +, glibcLocales , go -, libiconv , nodejs +, perl +, testers +, pre-commit }: with python3Packages; -buildPythonPackage rec { +buildPythonApplication rec { pname = "pre-commit"; - version = "2.20.0"; + version = "3.1.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pre-commit"; repo = "pre-commit"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-+JrnJz+wFbzVw9ysPX85DDE6suF3VU7gQZdp66x5TKY="; + rev = "v${version}"; + hash = "sha256-riAXvpJmuQHOfruwebijiAgN2AvqpUUI07p758qO+4k="; }; patches = [ @@ -37,18 +41,18 @@ buildPythonPackage rec { pyyaml toml virtualenv - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ] ++ lib.optionals (pythonOlder "3.7") [ - importlib-resources ]; nativeCheckInputs = [ cargo + coursier dotnet-sdk git + glibcLocales go + libiconv # For rust tests on Darwin nodejs + perl pytest-env pytest-forked pytest-xdist @@ -56,11 +60,6 @@ buildPythonPackage rec { re-assert ]; - buildInputs = [ - # Required for rust test on x86_64-darwin - libiconv - ]; - # i686-linux: dotnet-sdk not available doCheck = stdenv.buildPlatform.system != "i686-linux"; @@ -79,19 +78,23 @@ buildPythonPackage rec { "--forked" ]; - preCheck = '' + preCheck = lib.optionalString (!(stdenv.isLinux && stdenv.isAarch64)) '' + # Disable outline atomics for rust tests on aarch64-linux. + export RUSTFLAGS="-Ctarget-feature=-outline-atomics" + '' + '' export GIT_AUTHOR_NAME=test GIT_COMMITTER_NAME=test \ GIT_AUTHOR_EMAIL=test@example.com GIT_COMMITTER_EMAIL=test@example.com \ VIRTUALENV_NO_DOWNLOAD=1 PRE_COMMIT_NO_CONCURRENCY=1 LANG=en_US.UTF-8 - git init -b master + # Resolve `.NET location: Not found` errors for dotnet tests + export DOTNET_ROOT="${dotnet-sdk}" export HOME=$(mktemp -d) + git init -b master + python -m venv --system-site-packages venv source "$PWD/venv/bin/activate" - #$out/bin/pre-commit install - python setup.py develop ''; postCheck = '' @@ -106,7 +109,7 @@ buildPythonPackage rec { # /build/pytest-of-nixbld/pytest-0/test_install_ruby_with_version0/rbenv-2.7.2/libexec/rbenv-init: # /usr/bin/env: bad interpreter: No such file or directory - "ruby" + "test_ruby_" # network "test_additional_dependencies_roll_forward" @@ -114,60 +117,59 @@ buildPythonPackage rec { "test_additional_node_dependencies_installed" "test_additional_rust_cli_dependencies_installed" "test_additional_rust_lib_dependencies_installed" - "test_dart_hook" - "test_dotnet_hook" + "test_coursier_hook" + "test_coursier_hook_additional_dependencies" + "test_dart" + "test_dart_additional_deps" + "test_dart_additional_deps_versioned" + "test_docker_hook" + "test_docker_image_hook_via_args" + "test_docker_image_hook_via_entrypoint" + "test_golang_default_version" "test_golang_hook" "test_golang_hook_still_works_when_gobin_is_set" + "test_golang_infer_go_version_default" + "test_golang_system" + "test_golang_versioned" + "test_language_version_with_rustup" + "test_installs_rust_missing_rustup" "test_installs_without_links_outside_env" - "test_local_dart_additional_dependencies" - "test_local_golang_additional_dependencies" - "test_local_lua_additional_dependencies" - "test_local_perl_additional_dependencies" - "test_local_rust_additional_dependencies" - "test_lua_hook" - "test_perl_hook" + "test_local_golang_additional_deps" + "test_lua" + "test_lua_additional_dependencies" + "test_node_additional_deps" + "test_node_hook_versions" + "test_perl_additional_dependencies" "test_r_hook" + "test_r_inline" "test_r_inline_hook" "test_r_local_with_additional_dependencies_hook" "test_r_with_additional_dependencies_hook" "test_run_a_node_hook_default_version" + "test_run_lib_additional_dependencies" "test_run_versioned_node_hook" - - # python2, no explanation needed - "python2" - "test_switch_language_versions_doesnt_clobber" - - # docker - "test_run_a_docker_hook" + "test_rust_cli_additional_dependencies" + "test_swift_language" # i don't know why these fail "test_install_existing_hooks_no_overwrite" "test_installed_from_venv" "test_uninstall_restores_legacy_hooks" + "test_dotnet_" # Expects `git commit` to fail when `pre-commit` is not in the `$PATH`, # but we use an absolute path so it's not an issue. "test_environment_not_sourced" - - # broken with Git 2.38.1, upstream issue filed at https://github.com/pre-commit/pre-commit/issues/2579 - "test_golang_with_recursive_submodule" - "test_install_in_submodule_and_run" - "test_is_in_merge_conflict_submodule" - "test_get_conflicted_files_in_submodule" - "test_sub_nothing_unstaged" - "test_sub_something_unstaged" - "test_sub_staged" - "test_submodule_does_not_discard_changes" - "test_submodule_does_not_discard_changes_recurse" - ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ - # requires gcc bump - "test_rust_hook" ]; pythonImportsCheck = [ "pre_commit" ]; + passthru.tests.version = testers.testVersion { + package = pre-commit; + }; + meta = with lib; { description = "A framework for managing and maintaining multi-language pre-commit hooks"; homepage = "https://pre-commit.com/"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch b/third_party/nixpkgs/pkgs/tools/misc/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch index 6d274aae3c..c3469c95b2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch +++ b/third_party/nixpkgs/pkgs/tools/misc/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch @@ -1,24 +1,24 @@ diff --git a/pre_commit/languages/node.py b/pre_commit/languages/node.py -index 26f4919..4885ec1 100644 +index 66d6136..e3f1bac 100644 --- a/pre_commit/languages/node.py +++ b/pre_commit/languages/node.py -@@ -82,7 +82,7 @@ def install_environment( +@@ -83,7 +83,7 @@ def install_environment( + # https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx?f=255&MSPPError=-2147217396#maxpath + if sys.platform == 'win32': # pragma: no cover envdir = fr'\\?\{os.path.normpath(envdir)}' - with clean_path_on_failure(envdir): - cmd = [ -- sys.executable, '-mnodeenv', '--prebuilt', '--clean-src', envdir, -+ '@nodeenv@/bin/nodeenv', '--prebuilt', '--clean-src', envdir, - ] - if version != C.DEFAULT: - cmd.extend(['-n', version]) +- cmd = [sys.executable, '-mnodeenv', '--prebuilt', '--clean-src', envdir] ++ cmd = ['@nodeenv@/bin/nodeenv', '--prebuilt', '--clean-src', envdir] + if version != C.DEFAULT: + cmd.extend(['-n', version]) + cmd_output_b(*cmd) diff --git a/pre_commit/languages/python.py b/pre_commit/languages/python.py -index 43b7280..f0f2338 100644 +index 976674e..485fe2d 100644 --- a/pre_commit/languages/python.py +++ b/pre_commit/languages/python.py -@@ -192,7 +192,7 @@ def install_environment( +@@ -203,7 +203,7 @@ def install_environment( additional_dependencies: Sequence[str], ) -> None: - envdir = prefix.path(helpers.environment_dir(ENVIRONMENT_DIR, version)) + envdir = lang_base.environment_dir(prefix, ENVIRONMENT_DIR, version) - venv_cmd = [sys.executable, '-mvirtualenv', envdir] + venv_cmd = ['@virtualenv@/bin/virtualenv', envdir] python = norm_version(version) diff --git a/third_party/nixpkgs/pkgs/tools/misc/psql2csv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/psql2csv/default.nix new file mode 100644 index 0000000000..21b58583bc --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/psql2csv/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, coreutils +, gnused +, postgresql +, makeWrapper +}: + +stdenvNoCC.mkDerivation rec { + pname = "psql2csv"; + version = "0.12"; + + src = fetchFromGitHub { + owner = "fphilipe"; + repo = "psql2csv"; + rev = "v${version}"; + hash = "sha256-XIdZ2+Jlw2JLn4KXD9h3+xXymu4FhibAfp5uGGkVwLQ="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -Dm755 -t $out/bin psql2csv + wrapProgram $out/bin/psql2csv \ + --prefix PATH : ${lib.makeBinPath [ coreutils gnused postgresql ]} + + runHook postInstall + ''; + + meta = with lib; { + description = "Tool to run a PostreSQL query and output the result as CSV"; + homepage = "https://github.com/fphilipe/psql2csv"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + inherit (postgresql.meta) platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/rauc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rauc/default.nix index 7bc613ac3f..3548ba6975 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rauc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rauc/default.nix @@ -1,7 +1,7 @@ -{ autoreconfHook -, curl +{ curl , dbus , fetchFromGitHub +, fetchpatch , glib , json-glib , lib @@ -9,6 +9,11 @@ , openssl , pkg-config , stdenv +, meson +, ninja +, util-linux +, libnl +, systemd }: stdenv.mkDerivation rec { @@ -22,21 +27,29 @@ stdenv.mkDerivation rec { sha256 = "sha256-VpHcJUTRZ5aJyfYypjVsYyRNrK0+9ci42mmlZQSkWAk="; }; + patches = [ + (fetchpatch { + # Patch to install the man page when using meson, remove on package bump + url = "https://github.com/rauc/rauc/commit/756c677d031c435070a6900e6778d06961822261.patch"; + hash = "sha256-QgIUagioRo61PeC0JyKjZtnauFiYP1Fz9wrxGEikBGI="; + }) + ]; passthru = { updateScript = nix-update-script { }; }; enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + nativeBuildInputs = [ pkg-config meson ninja ]; - buildInputs = [ curl dbus glib json-glib openssl ]; + buildInputs = [ curl dbus glib json-glib openssl util-linux libnl systemd ]; - configureFlags = [ - "--with-systemdunitdir=${placeholder "out"}/lib/systemd/system" - "--with-dbusinterfacesdir=${placeholder "out"}/share/dbus-1/interfaces" - "--with-dbuspolicydir=${placeholder "out"}/share/dbus-1/system.d" - "--with-dbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services" + mesonFlags = [ + "--buildtype=release" + (lib.mesonOption "systemdunitdir" "${placeholder "out"}/lib/systemd/system") + (lib.mesonOption "dbusinterfacesdir" "${placeholder "out"}/share/dbus-1/interfaces") + (lib.mesonOption "dbuspolicydir" "${placeholder "out"}/share/dbus-1/system.d") + (lib.mesonOption "dbussystemservicedir" "${placeholder "out"}/share/dbus-1/system-services") ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/ripdrag/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ripdrag/default.nix index d9eca0f1b6..dea4349c14 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ripdrag/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ripdrag/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "ripdrag"; - version = "0.2.1"; + version = "0.3.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-/TF9dWZQVEVM3lHp4ubxYkDW+ZDL9puT6mUT6Q3hUsw="; + sha256 = "sha256-D4WB1RdMPJfSLbJ96h3OuFhokfyY8Gamctm0XY694YM="; }; - cargoSha256 = "sha256-mIsT93XRU0mR5s5w3Sng2DTW2LyO9HT1w/1932vptIE="; + cargoSha256 = "sha256-C2I26E/dd18A4DDgOYGR8aS1RBrrNUwaXI4ZJHcrKy0="; nativeBuildInputs = [ pkg-config ]; 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 3c3b02dd3f..240084ed39 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 = "2023.1"; + version = "2023.2"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-JNLp1IHbIRpe3Au2iUsx7x065rirQlzT9bg7CoqHCyg="; + hash = "sha256-/C5la0b1plfqnsfSnfoSkSROIlAcvAfeg4m/PYV2UnY="; }; nativeBuildInputs = [ @@ -114,9 +114,6 @@ stdenv.mkDerivation rec { env NOCONFIGURE=1 ./autogen.sh ''; - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; - meta = with lib; { description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model"; homepage = "https://coreos.github.io/rpm-ostree/"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/sfeed/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sfeed/default.nix index 36ef0fdc96..80ff757362 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.6"; + version = "1.7"; src = fetchgit { url = "git://git.codemadness.org/sfeed"; rev = version; - sha256 = "sha256-GfRy/kzlFonje2Z/g7qNkbrDHBBIReN+fHVz1vsApqs="; + sha256 = "sha256-W9AQc3Y3do1M2GM7LQVM5SN07LoWaZL7GTQD+SmQRwQ="; }; buildInputs = [ ncurses ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/skim/default.nix b/third_party/nixpkgs/pkgs/tools/misc/skim/default.nix index 331d307c13..b6a77485d1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/skim/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/skim/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.10.3"; + version = "0.10.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-d0gzeyOc9UudgTrTFt5OhUAsTy/SYMvRMyph2yAD9H8="; + sha256 = "sha256-C2yK+SO8Tpw3BxXXu1jeDzYJ2548RZa7NFWaE0SdNJ0="; }; nativeBuildInputs = [ installShellFiles ]; outputs = [ "out" "vim" ]; - cargoHash = "sha256-ZLA1ZE/VLZyzQzIECcabxKup409YBZRpHdhR2k/+4lY="; + cargoHash = "sha256-jBcgoWbmBOgU7M71lr4OXOe2S6NAXl+I8D+ZtT45Vos="; postPatch = '' sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim diff --git a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix index 8679a655df..a9d5aa4e58 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "10.3.1"; + version = "10.3.2"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; rev = "v${version}"; - hash = "sha256-sOXp/oo29oVdmn3qEb7HCSlYYOvbTpD21dX4JSYaqps="; + hash = "sha256-yYRKNiX8JvCP44+mdLIOSjpxaVDz1YUNrj/IZ0bC72Y="; }; - cargoHash = "sha256-fZjMTVn4gx1hvtiD5NRkXY2f9HNSv7Vx3HdHypne5U0="; + cargoHash = "sha256-2b6TOkjoycPA8rwca3nT212Yxl6q2Hmvv0f4Ic9hnWM="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/misc/trackma/default.nix b/third_party/nixpkgs/pkgs/tools/misc/trackma/default.nix index e3d6322b85..855585dde3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/trackma/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/trackma/default.nix @@ -35,10 +35,10 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ copyDesktopItems ] - ++ lib.optionals withGTK [ wrapGAppsHook ] + ++ lib.optionals withGTK [ wrapGAppsHook gobject-introspection ] ++ lib.optionals withQT [ qt5.wrapQtAppsHook ]; - buildInputs = lib.optionals withGTK [ glib gobject-introspection gtk3 ]; + buildInputs = lib.optionals withGTK [ glib gtk3 ]; propagatedBuildInputs = with python3.pkgs; ([ urllib3 ] ++ lib.optionals withQT [ pyqt5 ] @@ -47,9 +47,6 @@ python3.pkgs.buildPythonApplication rec { ++ lib.optionals stdenv.isLinux [ dbus-python pygobject3 pyinotify ] ++ lib.optionals (withGTK || withQT) [ pillow ]); - # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - dontWrapQtApps = true; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/turbo/default.nix b/third_party/nixpkgs/pkgs/tools/misc/turbo/default.nix index 5aca983252..38b9b997b6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/turbo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/turbo/default.nix @@ -12,14 +12,16 @@ , extra-cmake-modules , fontconfig , go +, testers +, turbo }: let - version = "1.7.0"; + version = "1.8.3"; src = fetchFromGitHub { owner = "vercel"; repo = "turbo"; rev = "v${version}"; - sha256 = "YTuEv2S3jNV2o7HJML+P6OMazgwgRhUPnd/zaTWfDWs="; + sha256 = "sha256-aqe9ze6xZ5RUJJGT19nABhorrL9+ctSTS+ov97hG30o="; }; go-turbo = buildGoModule rec { @@ -27,7 +29,7 @@ let pname = "go-turbo"; modRoot = "cli"; - vendorSha256 = "Kx/CLFv23h2TmGe8Jwu+S3QcONfqeHk2fCW1na75c0s="; + vendorSha256 = "sha256-lqumN+xqJXEPI+nVnWSNfAyvQQ6fS9ao8uhwA1EbWWM="; nativeBuildInputs = [ git @@ -64,7 +66,7 @@ rustPlatform.buildRustPackage rec { ]; RELEASE_TURBO_CLI = "true"; - cargoSha256 = "ENw6NU3Fedd+OJEEWgL8A54aowNqjn3iv7rxlr+/4ZE="; + cargoSha256 = "sha256-zUz/u89VtiK0bFpyoQMMXUoXQpqPNOLR+PN3EbXSAC0="; RUSTC_BOOTSTRAP = 1; nativeBuildInputs = [ pkg-config @@ -82,6 +84,8 @@ rustPlatform.buildRustPackage rec { # Browser tests time out with chromium and google-chrome doCheck = false; + passthru.tests.version = testers.testVersion { package = turbo; }; + meta = with lib; { description = "High-performance build system for JavaScript and TypeScript codebases"; homepage = "https://turbo.build/"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/vivid/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vivid/default.nix index 71d67ed748..01c432cd6a 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.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-83ff0T2P5aRQ6cM9z7IEuoi7syvJldIuzzdiTrygckA="; + hash = "sha256-zNsNEXj/SaJaYsYvoOGPopLhJDfLIXSs7eeZDdJrHiQ="; }; - cargoSha256 = "sha256-W1tLQTTMOKB/BR9P3y3goPIdOe12Qdkf4wYPlhbQjzY="; + cargoHash = "sha256-gtqdQuf3Ybt0PDCQw3gGAzIROq39NJKPIat0lyIPGgg="; meta = with lib; { description = "A generator for LS_COLORS with support for multiple color themes"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wakapi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wakapi/default.nix index c04c98e053..1300b2df90 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wakapi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wakapi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wakapi"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "muety"; repo = pname; rev = version; - sha256 = "1bhd96la2ipwna9lic50pd5klcc3xj9yqd5rd1cgzznbm4ylpjqb"; + sha256 = "sha256-yMxcePwBUteqrdfvDjZSRInOXMFmwaFoVBihcMQFTME="; }; - vendorHash = "sha256-fkSXaP9hHCCyO8mFB5CKPExifuNjTvDnXupjCVllG9I"; + vendorHash = "sha256-sfx8qlmJrS0hkD6DSvKqfnBDbxj8eNA3hnprSwA2fSI="; # Not a go module required by the project, contains development utilities excludedPackages = [ "scripts" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wakatime/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wakatime/default.nix index ed0a8cba8d..45d7e95103 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wakatime/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wakatime/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wakatime"; - version = "1.68.1"; + version = "1.68.3"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; rev = "v${version}"; - hash = "sha256-Q9LmQEcw3oehGE4DXIzQERNEZgwRzb1o8/qGOC1JGZc="; + hash = "sha256-LifMxov7j2yRDtwh74RjjwfcHfFc/zWrzX96vb2hI9o="; }; - vendorHash = "sha256-KY4niegPSLOILZgC7H7TFK6r5v3mjN9sUA5c8AuaOys="; + vendorHash = "sha256-SlYYrlRDBvhNm2BxemK9HzzsqM/RGH/sDQXpoGEY8rw="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/misc/wasm-tools/Cargo.lock b/third_party/nixpkgs/pkgs/tools/misc/wasm-tools/Cargo.lock new file mode 100644 index 0000000000..07b7895a6a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/wasm-tools/Cargo.lock @@ -0,0 +1,2162 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +dependencies = [ + "gimli", +] + +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "anyhow" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" + +[[package]] +name = "arbitrary" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e90af4de65aa7b293ef2d09daff88501eb254f58edde2e1ac02c82d873eadad" +dependencies = [ + "derive_arbitrary", +] + +[[package]] +name = "arrayref" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" + +[[package]] +name = "arrayvec" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "blake3" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", + "digest", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "bitflags", + "textwrap", + "unicode-width", +] + +[[package]] +name = "clap" +version = "4.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5" +dependencies = [ + "bitflags", + "clap_derive", + "clap_lex", + "is-terminal", + "once_cell", + "strsim", + "termcolor", +] + +[[package]] +name = "clap_derive" +version = "4.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "constant_time_eq" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" + +[[package]] +name = "cpp_demangle" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "cpp_demangle" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b446fd40bcc17eddd6a4a78f24315eb90afdb3334999ddfd4909985c47722442" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "cranelift-bforest" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62c772976416112fa4484cbd688cb6fb35fd430005c1c586224fc014018abad" +dependencies = [ + "cranelift-entity", +] + +[[package]] +name = "cranelift-codegen" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b40ed2dd13c2ac7e24f88a3090c68ad3414eb1d066a95f8f1f7b3b819cb4e46" +dependencies = [ + "arrayvec", + "bumpalo", + "cranelift-bforest", + "cranelift-codegen-meta", + "cranelift-codegen-shared", + "cranelift-egraph", + "cranelift-entity", + "cranelift-isle", + "gimli", + "log", + "regalloc2", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-codegen-meta" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb927a8f1c27c34ee3759b6b0ffa528d2330405d5cc4511f0cab33fe2279f4b5" +dependencies = [ + "cranelift-codegen-shared", +] + +[[package]] +name = "cranelift-codegen-shared" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43dfa417b884a9ab488d95fd6b93b25e959321fe7bfd7a0a960ba5d7fb7ab927" + +[[package]] +name = "cranelift-egraph" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a66b39785efd8513d2cca967ede56d6cc57c8d7986a595c7c47d0c78de8dce" +dependencies = [ + "cranelift-entity", + "fxhash", + "hashbrown", + "indexmap", + "log", + "smallvec", +] + +[[package]] +name = "cranelift-entity" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0637ffde963cb5d759bc4d454cfa364b6509e6c74cdaa21298add0ed9276f346" +dependencies = [ + "serde", +] + +[[package]] +name = "cranelift-frontend" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb72b8342685e850cb037350418f62cc4fc55d6c2eb9c7ca01b82f9f1a6f3d56" +dependencies = [ + "cranelift-codegen", + "log", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-isle" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "850579cb9e4b448f7c301f1e6e6cbad99abe3f1f1d878a4994cb66e33c6db8cd" + +[[package]] +name = "cranelift-native" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d0a279e5bcba3e0466c734d8d8eb6bfc1ad29e95c37f3e4955b492b5616335e" +dependencies = [ + "cranelift-codegen", + "libc", + "target-lexicon", +] + +[[package]] +name = "cranelift-wasm" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6b8c5e7ffb754093fb89ec4bd4f9dbb9f1c955427299e334917d284745835c2" +dependencies = [ + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", + "itertools", + "log", + "smallvec", + "wasmparser 0.93.0", + "wasmtime-types", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "criterion" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" +dependencies = [ + "atty", + "cast", + "clap 2.34.0", + "criterion-plot", + "csv", + "itertools", + "lazy_static", + "num-traits", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_cbor", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" +dependencies = [ + "cast", + "itertools", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset 0.8.0", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "csv" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +dependencies = [ + "memchr", +] + +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "derive_arbitrary" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8beee4701e2e229e8098bbdecdca12449bc3e322f137d269182fa1291e20bd00" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "digest" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "egg" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05a6c0bbc92278f84e742f08c0ab9cb16a987376cd2bc39d228ef9c74d98d6f7" +dependencies = [ + "indexmap", + "instant", + "log", + "once_cell", + "smallvec", + "symbolic_expressions", +] + +[[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "env_logger" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flagset" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda653ca797810c02f7ca4b804b40b8b95ae046eb989d356bce17919a8c25499" +dependencies = [ + "serde", +] + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fuzz-stats" +version = "0.1.0" +dependencies = [ + "anyhow", + "arbitrary", + "num_cpus", + "rand", + "wasm-smith", + "wasmtime", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +dependencies = [ + "fallible-iterator", + "indexmap", + "stable_deref_trait", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "id-arena" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", + "serde", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" + +[[package]] +name = "io-lifetimes" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes 1.0.6", + "rustix 0.36.9", + "windows-sys 0.45.0", +] + +[[package]] +name = "is_executable" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8" +dependencies = [ + "winapi", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" + +[[package]] +name = "jobserver" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "leb128" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + +[[package]] +name = "libc" +version = "0.2.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" + +[[package]] +name = "libfuzzer-sys" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "beb09950ae85a0a94b27676cccf37da5ff13f27076aa1adbc6545dd0d0e1bd4e" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.0.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "mach" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi 0.2.6", + "libc", +] + +[[package]] +name = "object" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +dependencies = [ + "crc32fast", + "hashbrown", + "indexmap", + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "output_vt100" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" +dependencies = [ + "winapi", +] + +[[package]] +name = "paste" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "petgraph" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[package]] +name = "plotters" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" + +[[package]] +name = "plotters-svg" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "pretty_assertions" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +dependencies = [ + "ctor", + "diff", + "output_vt100", + "yansi", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[package]] +name = "pulldown-cmark" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" +dependencies = [ + "bitflags", + "memchr", + "unicase", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regalloc2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91b2eab54204ea0117fe9a060537e0b07a4e72f7c7d182361ecc346cab2240e5" +dependencies = [ + "fxhash", + "log", + "slice-group-by", + "smallvec", +] + +[[package]] +name = "regex" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "rustc-demangle" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" + +[[package]] +name = "rustix" +version = "0.35.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes 0.7.5", + "libc", + "linux-raw-sys 0.0.46", + "windows-sys 0.42.0", +] + +[[package]] +name = "rustix" +version = "0.36.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes 1.0.6", + "libc", + "linux-raw-sys 0.1.4", + "windows-sys 0.45.0", +] + +[[package]] +name = "ryu" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "serde" +version = "1.0.154" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cdd151213925e7f1ab45a9bbfb129316bd00799784b174b7cc7bcd16961c49e" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_cbor" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half", + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.154" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fc80d722935453bcafdc2c9a73cd6fac4dc1938f0346035d84bf99fa9e33217" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +dependencies = [ + "indexmap", + "ryu", + "serde", + "yaml-rust", +] + +[[package]] +name = "slice-group-by" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "symbolic_expressions" +version = "5.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c68d531d83ec6c531150584c42a4290911964d5f0d79132b193b67252a23b71" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "target-lexicon" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" + +[[package]] +name = "tempfile" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall", + "rustix 0.36.9", + "windows-sys 0.42.0", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c" + +[[package]] +name = "unicode-ident" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" + +[[package]] +name = "wasm-compose" +version = "0.2.10" +dependencies = [ + "anyhow", + "clap 4.1.8", + "glob", + "heck", + "indexmap", + "log", + "petgraph", + "pretty_assertions", + "serde", + "serde_yaml", + "smallvec", + "wasm-encoder", + "wasmparser 0.102.0", + "wasmprinter", + "wat", +] + +[[package]] +name = "wasm-encoder" +version = "0.25.0" +dependencies = [ + "anyhow", + "leb128", + "tempfile", + "wasmparser 0.102.0", +] + +[[package]] +name = "wasm-metadata" +version = "0.3.1" +dependencies = [ + "anyhow", + "clap 4.1.8", + "indexmap", + "serde", + "wasm-encoder", + "wasmparser 0.102.0", + "wat", +] + +[[package]] +name = "wasm-mutate" +version = "0.2.21" +dependencies = [ + "anyhow", + "clap 4.1.8", + "egg", + "env_logger", + "log", + "rand", + "thiserror", + "wasm-encoder", + "wasmparser 0.102.0", + "wasmprinter", + "wat", +] + +[[package]] +name = "wasm-mutate-stats" +version = "0.1.0" +dependencies = [ + "anyhow", + "arbitrary", + "clap 4.1.8", + "env_logger", + "itertools", + "log", + "num_cpus", + "rand", + "wasm-mutate", + "wasmparser 0.102.0", + "wasmprinter", + "wasmtime", +] + +[[package]] +name = "wasm-shrink" +version = "0.1.22" +dependencies = [ + "anyhow", + "blake3", + "clap 4.1.8", + "env_logger", + "log", + "rand", + "wasm-mutate", + "wasmparser 0.102.0", + "wasmprinter", + "wat", +] + +[[package]] +name = "wasm-smith" +version = "0.12.5" +dependencies = [ + "arbitrary", + "criterion", + "flagset", + "indexmap", + "leb128", + "libfuzzer-sys", + "rand", + "serde", + "wasm-encoder", + "wasmparser 0.102.0", + "wasmprinter", + "wat", +] + +[[package]] +name = "wasm-tools" +version = "1.0.27" +dependencies = [ + "anyhow", + "arbitrary", + "atty", + "clap 4.1.8", + "cpp_demangle 0.4.0", + "diff", + "env_logger", + "is_executable", + "log", + "pretty_assertions", + "rayon", + "regex", + "rustc-demangle", + "serde", + "serde_json", + "tempfile", + "wasm-compose", + "wasm-encoder", + "wasm-metadata", + "wasm-mutate", + "wasm-shrink", + "wasm-smith", + "wasmparser 0.102.0", + "wasmprinter", + "wast", + "wat", + "wit-component", + "wit-parser", +] + +[[package]] +name = "wasm-tools-c-api" +version = "0.1.1" +dependencies = [ + "arbitrary", + "wasm-mutate", + "wasm-shrink", + "wasm-smith", + "wasmparser 0.102.0", + "wasmprinter", + "wast", + "wat", +] + +[[package]] +name = "wasm-tools-fuzz" +version = "0.0.1" +dependencies = [ + "anyhow", + "arbitrary", + "env_logger", + "libfuzzer-sys", + "log", + "tempfile", + "wasm-encoder", + "wasm-mutate", + "wasm-smith", + "wasmparser 0.102.0", + "wasmprinter", + "wasmtime", + "wast", + "wat", + "wit-component", + "wit-parser", +] + +[[package]] +name = "wasmparser" +version = "0.93.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5a4460aa3e271fa180b6a5d003e728f3963fb30e3ba0fa7c9634caa06049328" +dependencies = [ + "indexmap", +] + +[[package]] +name = "wasmparser" +version = "0.102.0" +dependencies = [ + "anyhow", + "criterion", + "indexmap", + "once_cell", + "rayon", + "url", + "wasm-encoder", + "wast", + "wat", +] + +[[package]] +name = "wasmprinter" +version = "0.2.53" +dependencies = [ + "anyhow", + "diff", + "rayon", + "tempfile", + "wasmparser 0.102.0", + "wast", + "wat", +] + +[[package]] +name = "wasmtime" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d18265705b1c49218776577d9f301d79ab06888c7f4a32e2ed24e68a55738ce7" +dependencies = [ + "anyhow", + "bincode", + "cfg-if", + "indexmap", + "libc", + "log", + "object", + "once_cell", + "paste", + "psm", + "serde", + "target-lexicon", + "wasmparser 0.93.0", + "wasmtime-cranelift", + "wasmtime-environ", + "wasmtime-jit", + "wasmtime-runtime", + "windows-sys 0.36.1", +] + +[[package]] +name = "wasmtime-asm-macros" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a201583f6c79b96e74dcce748fa44fb2958f474ef13c93f880ea4d3bed31ae4f" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "wasmtime-cranelift" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe208297e045ea0ee6702be88772ea40f918d55fbd4163981a4699aff034b634" +dependencies = [ + "anyhow", + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", + "cranelift-native", + "cranelift-wasm", + "gimli", + "log", + "object", + "target-lexicon", + "thiserror", + "wasmparser 0.93.0", + "wasmtime-environ", +] + +[[package]] +name = "wasmtime-environ" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "754b97f7441ac780a7fa738db5b9c23c1b70ef4abccd8ad205ada5669d196ba2" +dependencies = [ + "anyhow", + "cranelift-entity", + "gimli", + "indexmap", + "log", + "object", + "serde", + "target-lexicon", + "thiserror", + "wasmparser 0.93.0", + "wasmtime-types", +] + +[[package]] +name = "wasmtime-jit" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32800cb6e29faabab7056593f70a4c00c65c75c365aaf05406933f2169d0c22f" +dependencies = [ + "addr2line", + "anyhow", + "bincode", + "cfg-if", + "cpp_demangle 0.3.5", + "gimli", + "log", + "object", + "rustc-demangle", + "serde", + "target-lexicon", + "thiserror", + "wasmtime-environ", + "wasmtime-jit-icache-coherence", + "wasmtime-runtime", + "windows-sys 0.36.1", +] + +[[package]] +name = "wasmtime-jit-debug" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe057012a0ba6cee3685af1e923d6e0a6cb9baf15fb3ffa4be3d7f712c7dec42" +dependencies = [ + "once_cell", +] + +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6bbabb309c06cc238ee91b1455b748c45f0bdcab0dda2c2db85b0a1e69fcb66" +dependencies = [ + "cfg-if", + "libc", + "windows-sys 0.36.1", +] + +[[package]] +name = "wasmtime-runtime" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09a23b6e138e89594c0189162e524a29e217aec8f9a4e1959a34f74c64e8d17d" +dependencies = [ + "anyhow", + "cc", + "cfg-if", + "indexmap", + "libc", + "log", + "mach", + "memoffset 0.6.5", + "paste", + "rand", + "rustix 0.35.13", + "thiserror", + "wasmtime-asm-macros", + "wasmtime-environ", + "wasmtime-jit-debug", + "windows-sys 0.36.1", +] + +[[package]] +name = "wasmtime-types" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68ec7615fde8c79737f1345d81f0b18da83b3db929a87b4604f27c932246d1e2" +dependencies = [ + "cranelift-entity", + "serde", + "thiserror", + "wasmparser 0.93.0", +] + +[[package]] +name = "wast" +version = "55.0.0" +dependencies = [ + "anyhow", + "leb128", + "memchr", + "rayon", + "unicode-width", + "wasm-encoder", + "wasmparser 0.102.0", + "wat", +] + +[[package]] +name = "wat" +version = "1.0.61" +dependencies = [ + "wast", +] + +[[package]] +name = "web-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" + +[[package]] +name = "wit-component" +version = "0.7.3" +dependencies = [ + "anyhow", + "bitflags", + "env_logger", + "glob", + "indexmap", + "log", + "pretty_assertions", + "url", + "wasm-encoder", + "wasm-metadata", + "wasmparser 0.102.0", + "wasmprinter", + "wat", + "wit-parser", +] + +[[package]] +name = "wit-parser" +version = "0.6.4" +dependencies = [ + "anyhow", + "env_logger", + "id-arena", + "indexmap", + "log", + "pretty_assertions", + "pulldown-cmark", + "rayon", + "unicode-xid", + "url", +] + +[[package]] +name = "wit-parser-fuzz" +version = "0.0.1" +dependencies = [ + "arbitrary", + "env_logger", + "libfuzzer-sys", + "log", + "wasmprinter", + "wit-parser", +] + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" diff --git a/third_party/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix new file mode 100644 index 0000000000..302f3e99c2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix @@ -0,0 +1,33 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "wasm-tools"; + version = "1.0.27"; + + src = fetchFromGitHub { + owner = "bytecodealliance"; + repo = pname; + rev = "${pname}-${version}"; + hash = "sha256-kuTcxZLtQyDcj8SFfpJRNwto1e5iuXjxqZ46CnLOVIc="; + fetchSubmodules = true; + }; + + cargoLock.lockFile = ./Cargo.lock; + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + cargoBuildFlags = [ "--package" "wasm-tools" ]; + + cargoTestFlags = [ "--all" ]; + + meta = with lib; { + description = "Low level tooling for WebAssembly in Rust"; + homepage = "https://github.com/bytecodealliance/wasm-tools"; + license = licenses.asl20; + maintainers = with maintainers; [ ereslibre ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/xcp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/xcp/default.nix index 532475702e..7bf9860e7e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/xcp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/xcp/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "xcp"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "tarka"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Gn6qTfQjHuQUcfaZN48qCI7u8E7PtJAZlyrPqyjop5U="; + sha256 = "sha256-MvtMgdlMVMp2qWN+EbAKZwBwW0TA8aivlJY8KZm+7jM="; }; # no such file or directory errors doCheck = false; - cargoHash = "sha256-3vz92fHjLUMWVBpq71hxqqU0WiHdLbOst9vr8zbo6/U="; + cargoHash = "sha256-vxfoJnyG0wWgkcZpQYiKkQaHl01VDuQ0kA26MXVCgY8="; meta = with lib; { description = "An extended cp(1)"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix b/third_party/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix index 11875e73f9..7b58b9c2d9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix @@ -14,7 +14,7 @@ , xterm }: stdenvNoCC.mkDerivation rec { - name = "xvfb-run"; + pname = "xvfb-run"; version = "1+g87f6705"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/tools/misc/ytmdl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ytmdl/default.nix index c2a2a2adf2..4a117e89f3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ytmdl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ytmdl/default.nix @@ -19,6 +19,7 @@ python3Packages.buildPythonApplication rec { --replace "bs4" "beautifulsoup4" \ --replace "/etc/bash_completion.d" "share/bash-completion/completions" \ --replace "/usr/share/zsh/functions/Completion/Unix" "share/zsh/site-functions" + sed -i '/python_requires=/d' setup.py ''; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix index 3cddd9a0c2..9d190c3325 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.35.1"; + version = "0.35.2"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-ntLEZDUCnEliehq2/NN7cLO2E7bh1RxXVTdzMt8jee4="; + sha256 = "sha256-2wgv84Qm/X5mcEcM5ch7tFHZVg/xassUOtssSzbr0fs="; }; - cargoSha256 = "sha256-TlXrpAaeJQqm7xnXzeJ/IsAlFDFYe3TuM2PWcos8kSc="; + cargoSha256 = "sha256-GAPzWmFUtLWlcDAGHhEowvjM/OKRUuuD/0aa1tbmKuI="; nativeBuildInputs = [ mandown diff --git a/third_party/nixpkgs/pkgs/tools/networking/airgeddon/default.nix b/third_party/nixpkgs/pkgs/tools/networking/airgeddon/default.nix index 2b72e3fee0..6ef64222fb 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/airgeddon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/airgeddon/default.nix @@ -111,13 +111,13 @@ let in stdenv.mkDerivation rec { pname = "airgeddon"; - version = "11.10"; + version = "11.11"; src = fetchFromGitHub { owner = "v1s1t0r1sh3r3"; repo = "airgeddon"; - rev = "v${version}"; - hash = "sha256-0x13QmT61lcPc7b3OYs13g6AISWRipvxbSFb7XyQA5U="; + rev = "refs/tags/v${version}"; + hash = "sha256-3Rx1tMRIpSk+IEJGOs+t+kDlvGHYOx1IOSi+663uzrw="; }; strictDeps = true; @@ -159,8 +159,9 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Multi-use TUI to audit wireless networks. "; + description = "Multi-use TUI to audit wireless networks"; homepage = "https://github.com/v1s1t0r1sh3r3/airgeddon"; + changelog = "https://github.com/v1s1t0r1sh3r3/airgeddon/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ pedrohlc ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix b/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix index 6106ae16c4..4666cdf97b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.21.2"; + version = "3.22.1"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - hash = "sha256-s5+l5LBDUPhKkP1+m0R2UXywBX0y+4FWtyYP5F7ccaQ="; + hash = "sha256-hkYN28M2t8SXmIrSEQEWM5ndCx1xgpHThNg0UFzQqLU="; }; - vendorHash = "sha256-Syi+znSXxjxfD9gqAyqhksWmxuNkwialWaem1NE5MKQ="; + vendorHash = "sha256-fZd++VsLcs3MzcM23zE3AVaDPXf+cuLdJp8hsCeEZ1Y="; outputs = [ "out" diff --git a/third_party/nixpkgs/pkgs/tools/networking/chaos/default.nix b/third_party/nixpkgs/pkgs/tools/networking/chaos/default.nix index defcd2da92..877fde905f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/chaos/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/chaos/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "chaos"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "chaos-client"; rev = "refs/tags/v${version}"; - hash = "sha256-NA78zMge9AsfqO1px1FWCDKmWy1a0h8dtTotpgLazh4="; + hash = "sha256-3snVQKmtIhyWNBbSLnBQIvz0bEFs8ur5FhTne3gb/h4="; }; - vendorHash = "sha256-KkT/mgU1BOwJcjxOBMCMq0hyxZAyoh25bi+s3ka6TOg="; + vendorHash = "sha256-tyH3gqD5HpEvIoki0XnGDKD08iW8tENkCPuLC9GUDQk="; subPackages = [ "cmd/chaos/" diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl/7.88.0-http2-breakage.patch b/third_party/nixpkgs/pkgs/tools/networking/curl/7.88.0-http2-breakage.patch deleted file mode 100644 index fd22299a76..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/curl/7.88.0-http2-breakage.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 3103de2053ca8cacf9cdbe78764ba6814481709f Mon Sep 17 00:00:00 2001 -Date: Wed, 15 Feb 2023 22:11:13 +0100 -Subject: [PATCH] http2: buffer/pausedata and output flush fix. - - * do not process pending input data when copying pausedata to the - caller - * return CURLE_AGAIN if the output buffer could not be completely - written out. - -Ref: #10525 -Closes #10529 ---- - lib/http2.c | 15 +++------------ - 1 file changed, 3 insertions(+), 12 deletions(-) - -diff --git a/lib/http2.c b/lib/http2.c -index 46fc746457726..1ef5d3949218f 100644 ---- a/lib/http2.c -+++ b/lib/http2.c -@@ -467,6 +467,7 @@ static CURLcode flush_output(struct Curl_cfilter *cf, - } - if((size_t)written < buflen) { - Curl_dyn_tail(&ctx->outbuf, buflen - (size_t)written); -+ return CURLE_AGAIN; - } - else { - Curl_dyn_reset(&ctx->outbuf); -@@ -1790,6 +1791,7 @@ static ssize_t cf_h2_recv(struct Curl_cfilter *cf, struct Curl_easy *data, - - stream->pausedata += nread; - stream->pauselen -= nread; -+ drain_this(cf, data); - - if(stream->pauselen == 0) { - DEBUGF(LOG_CF(data, cf, "[h2sid=%u] Unpaused", stream->stream_id)); -@@ -1798,18 +1800,6 @@ static ssize_t cf_h2_recv(struct Curl_cfilter *cf, struct Curl_easy *data, - - stream->pausedata = NULL; - stream->pauselen = 0; -- -- /* When NGHTTP2_ERR_PAUSE is returned from -- data_source_read_callback, we might not process DATA frame -- fully. Calling nghttp2_session_mem_recv() again will -- continue to process DATA frame, but if there is no incoming -- frames, then we have to call it again with 0-length data. -- Without this, on_stream_close callback will not be called, -- and stream could be hanged. */ -- if(h2_process_pending_input(cf, data, err) != 0) { -- nread = -1; -- goto out; -- } - } - DEBUGF(LOG_CF(data, cf, "[h2sid=%u] recv: returns unpaused %zd bytes", - stream->stream_id, nread)); -@@ -1933,6 +1923,7 @@ static ssize_t cf_h2_recv(struct Curl_cfilter *cf, struct Curl_easy *data, - drained_transfer(cf, data); - } - -+ *err = CURLE_OK; - nread = retlen; - DEBUGF(LOG_CF(data, cf, "[h2sid=%u] cf_h2_recv -> %zd", - stream->stream_id, nread)); - - -From 87ed650d04dc1a6f7944a5d952f7d5b0934a19ac Mon Sep 17 00:00:00 2001 -From: Harry Sintonen -Date: Thu, 16 Feb 2023 06:26:26 +0200 -Subject: [PATCH] http2: set drain on stream end - -Ensure that on_frame_recv() stream end will trigger a read if there is -pending data. Without this it could happen that the pending data is -never consumed. - -This combined with https://github.com/curl/curl/pull/10529 should fix -https://github.com/curl/curl/issues/10525 - -Ref: https://github.com/curl/curl/issues/10525 -Closes #10530 ---- - lib/http2.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/lib/http2.c b/lib/http2.c -index 1ef5d3949218f..bdb5e7378e9cb 100644 ---- a/lib/http2.c -+++ b/lib/http2.c -@@ -868,6 +868,14 @@ static int on_frame_recv(nghttp2_session *session, const nghttp2_frame *frame, - return NGHTTP2_ERR_CALLBACK_FAILURE; - } - } -+ if(frame->hd.flags & NGHTTP2_FLAG_END_STREAM) { -+ /* Stream has ended. If there is pending data, ensure that read -+ will occur to consume it. */ -+ if(!data->state.drain && stream->memlen) { -+ drain_this(cf, data_s); -+ Curl_expire(data, 0, EXPIRE_RUN_NOW); -+ } -+ } - break; - case NGHTTP2_HEADERS: - DEBUGF(LOG_CF(data_s, cf, "[h2sid=%u] recv frame HEADERS", stream_id)); diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix index 21173d4d07..fca190bde4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix @@ -48,19 +48,18 @@ assert !(opensslSupport && wolfsslSupport); stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "7.88.0"; + version = "7.88.1"; src = fetchurl { urls = [ "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.bz2" "https://github.com/curl/curl/releases/download/curl-${finalAttrs.version}/curl-${finalAttrs.version}.tar.bz2" ]; - hash = "sha256-yB9DntAkQvapuVg237OpjgxHdhDKey9NWqH8MpVD0z8="; + hash = "sha256-giS0XM4Sq94DnBLcBxG36oWxBLmtU01uTFtOGIphyQc="; }; patches = [ ./7.79.1-darwin-no-systemconfiguration.patch - ./7.88.0-http2-breakage.patch ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -185,6 +184,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { + changelog = "https://curl.se/changes.html#${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; description = "A command line tool for transferring files with URL syntax"; homepage = "https://curl.se/"; license = licenses.curl; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix index f4d6dcdb99..d7b1dd365a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "dnsperf"; - version = "2.11.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = "DNS-OARC"; repo = "dnsperf"; rev = "v${version}"; - sha256 = "sha256-HLh+Z+ik7F52MBqQEMf1PuqTB32JOrpS8sHrqqln5kU="; + sha256 = "sha256-dgPpuX8Geo20BV8g0uhjSdsZUOoC+Dnz4Y2vdMW6KjY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnstwist/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnstwist/default.nix index bab81c2069..3c70713bed 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnstwist/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnstwist/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ dnspython - GeoIP + geoip ppdeep requests tld diff --git a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix index 030de9840f..6b09adea63 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.47.0"; + version = "0.48.0"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-S2qccDzS+Kj1tEAUR4a0G/4Eu3DAF7lY7ffxU6aykVU="; + sha256 = "sha256-e9Qof+HxSJHzAUbLb+w5oWPTOslTPxnC8BVAmtMQGlE="; }; - vendorHash = "sha256-ffkXNE3LkgdCGfO6K9lGxEMxT/9Q1o0m3BMtu6tDHdk="; + vendorHash = "sha256-DhzirX+AGe8dE62M0hiE5SlWK8HqhNN0MMk9i2Ntrs8="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/gvproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gvproxy/default.nix index 59ba36c5d7..cec1007dde 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gvproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gvproxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gvproxy"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "containers"; repo = "gvisor-tap-vsock"; rev = "v${version}"; - sha256 = "sha256-UtOOBXl063Ur28h/DT00paulZ8JzHLZ6nyxhyq4+goM="; + hash = "sha256-FycYBNFHo8lYI5jX5Fogu+bsJ63z40zUJTC+dIKESkA="; }; - vendorSha256 = null; + vendorHash = null; buildPhase = '' runHook preBuild @@ -26,6 +26,7 @@ buildGoModule rec { ''; meta = with lib; { + changelog = "https://github.com/containers/gvisor-tap-vsock/releases/tag/${src.rev}"; description = "Network stack based on gVisor"; homepage = "https://github.com/containers/gvisor-tap-vsock"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ipcalc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ipcalc/default.nix index fa3070eb31..15357471c0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ipcalc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ipcalc/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ipcalc"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitLab { owner = "ipcalc"; repo = "ipcalc"; rev = version; - hash = "sha256-UQq5TqK83I44ANU0yXD8YUTQWvBFLiAxmLSRtKUJ5WE="; + hash = "sha256-HlAGAjNUjfr/Ysjiml54vph/S5pS6fTMWYJwLFr1NSI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix index e3d51912c7..493738559c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "mubeng"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "kitabisa"; repo = pname; rev = "v${version}"; - hash = "sha256-EIglOoHL1ZmkFUn2MTU+ISQmaX96kCxelwk5ylHlMHk="; + hash = "sha256-Z1MwI76jOJft68+/yX4QEO7zYkUyQY7+DdZlejtNA8k="; }; vendorHash = "sha256-1RJAmz3Tw6c2Y7lXlXvq/aEkVLO+smkwuNJbi7aBUNo="; diff --git a/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix b/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix index 3549d8f26f..80cc4f097a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.14.1"; + version = "0.14.4"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H4jqpy1ELRfTUhLO8Ylv6a/uKkvapdVhIGM0e3WPdlo="; + sha256 = "sha256-AzWYJGYlUsgR5ihXwY9ZyN/pL5avionql/jwqhYKsxc="; }; - vendorHash = "sha256-2/kk4qTO85fYnNO5vXIFxxFR55xZ5wenogJTMsLfYsg="; + vendorHash = "sha256-8cVEujVKwKvO81H+ukVxQouVVH7uZm/FwK9RAKJLN2c="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; diff --git a/third_party/nixpkgs/pkgs/tools/networking/netboot/default.nix b/third_party/nixpkgs/pkgs/tools/networking/netboot/default.nix index 995c7ff726..30dc544fe2 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/netboot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/netboot/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mini PXE server"; maintainers = [ maintainers.raskin ]; - platforms = ["x86_64-linux"]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; license = lib.licenses.free; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkd-dispatcher/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkd-dispatcher/default.nix index b8812cb678..161772ed48 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkd-dispatcher/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkd-dispatcher/default.nix @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { hash = "sha256-yO9/HlUkaQmW/n9N3vboHw//YMzBjxIHA2zAxgZNEv0="; }; + patches = [ + # Support rule files in NixOS store paths. Required for the networkd-dispatcher + # module to work + ./support_nix_store_path.patch + ]; + postPatch = '' # Fix paths in systemd unit file substituteInPlace networkd-dispatcher.service \ diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkd-dispatcher/support_nix_store_path.patch b/third_party/nixpkgs/pkgs/tools/networking/networkd-dispatcher/support_nix_store_path.patch new file mode 100644 index 0000000000..6d32548f18 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/networkd-dispatcher/support_nix_store_path.patch @@ -0,0 +1,13 @@ +diff --git a/networkd-dispatcher b/networkd-dispatcher +index ef877ce..8c341f2 100755 +--- a/networkd-dispatcher ++++ b/networkd-dispatcher +@@ -171,6 +171,8 @@ def check_perms(path, mode=0o755, uid=0, gid=0): + + if not os.path.exists(path): + raise FileNotFoundError ++ if re.search('^/nix/store/.*', str(path)): ++ return True + st = os.stat(path, follow_symlinks=False) + st_mode = st.st_mode & 0x00FFF + if st.st_uid == uid and st.st_gid == gid and st_mode == mode: diff --git a/third_party/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix b/third_party/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix index 94a4c0661c..3390776a17 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix @@ -11,6 +11,8 @@ , iptables , makeWrapper , protoc-gen-go-grpc +, testers +, opensnitch }: buildGoModule rec { @@ -70,6 +72,11 @@ buildGoModule rec { --prefix PATH : ${lib.makeBinPath [ iptables ]} ''; + passthru.tests.version = testers.testVersion { + package = opensnitch; + command = "opensnitchd -version"; + }; + meta = with lib; { description = "An application firewall"; homepage = "https://github.com/evilsocket/opensnitch/wiki"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix b/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix index 8cd0f7935e..ff8ecc385c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix @@ -3,11 +3,12 @@ , httpServer ? false # build web interface for the daemon , client ? false # build amule remote gui , fetchFromGitHub +, fetchpatch , stdenv , lib , cmake , zlib -, wxGTK30 # WxGTK 3.0 must be used because aMule does not yet work well with 3.1 +, wxGTK32 , perl , cryptopp , libupnp @@ -37,11 +38,18 @@ stdenv.mkDerivation rec { sha256 = "1nm4vxgmisn1b6l3drmz0q04x067j2i8lw5rnf0acaapwlp8qwvi"; }; + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/a/amule/1%3A2.3.3-3/debian/patches/wx3.2.patch"; + hash = "sha256-OX5Ef80bL+dQqHo2OBLZvzMUrU6aOHfsF7AtoE1r7rs="; + }) + ]; + nativeBuildInputs = [ cmake gettext makeWrapper pkg-config ]; buildInputs = [ zlib - wxGTK30 + wxGTK32 perl cryptopp.dev libupnp @@ -90,6 +98,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = platforms.unix; + # Undefined symbols for architecture arm64: "_FSFindFolder" broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/privoxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/privoxy/default.nix index 33c7584dbd..276bc133df 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/privoxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/privoxy/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "privoxy"; - version = "3.0.33"; + version = "3.0.34"; src = fetchurl { url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz"; - sha256 = "sha256-BLEE5w2sYVYbndEQaEslD6/IwT2+Q3pg+uGN3ZqIH64="; + sha256 = "sha256-5sy8oWVvTmFrRlf4UU4zpw9ml+nXKUNWV3g5Mio8XSw="; }; hardeningEnable = [ "pie" ]; 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 0330e1cb7b..e16a359c12 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.15.2"; + version = "1.15.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - hash = "sha256-CvAOvtC5U2njQuUjFxjnGeqhuxrCw4XI6goo1TxIhIU="; + hash = "sha256-HU+9y4btWbYrkHazOudY2j9RceieBK3BS2jgLbwcEdk="; }; - cargoHash = "sha256-ctZlYo82M7GKVvrEkw/7+aH9R0MeEsyv3IKl9k4SbiA="; + cargoHash = "sha256-YORQHX4RPPHDErgo4c3SxvxklJ9mxHeP/1GiwhuL+J0="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix index 1642bb2944..24aaebe9d0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix @@ -3,6 +3,10 @@ buildGoModule rec { pname = "shadowsocks-v2ray-plugin"; version = "1.3.1"; + # Version 1.3.2 has runtime failures with Go 1.19 + # https://github.com/NixOS/nixpkgs/issues/219343 + # https://github.com/shadowsocks/v2ray-plugin/issues/292 + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "shadowsocks"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix index d02a1ccac1..25054fc194 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smartdns"; - version = "40"; + version = "41"; src = fetchFromGitHub { owner = "pymumu"; repo = pname; rev = "Release${version}"; - sha256 = "sha256-Un4LUBWVwbWYK4rZY2+gdk6Zi+n36Xawma8Dok2Sa0U="; + sha256 = "sha256-FVHOjW5SEShxTPPd4IuEfPV6vvqr0RepV976eJmxqwM="; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/speedtest-go/default.nix b/third_party/nixpkgs/pkgs/tools/networking/speedtest-go/default.nix new file mode 100644 index 0000000000..c2ebe70775 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/speedtest-go/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "speedtest-go"; + version = "1.5.2"; + + src = fetchFromGitHub { + owner = "showwin"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-9jLreb3tEw5bCVka6/BzGbsd5V3+9OHNzENe/IxL1YM="; + }; + + vendorHash = "sha256-A54G3fvs1bXSwPHVUNFC9VJqydqYR5t4I2fIBvrVoRE="; + + subPackages = [ "speedtest.go" ]; + + # test suite requires network + doCheck = false; + + meta = with lib; { + description = "CLI and Go API to Test Internet Speed using speedtest.net"; + homepage = "https://github.com/showwin/speedtest-go"; + changelog = "https://github.com/showwin/speedtest-go/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ aleksana ]; + mainProgram = "speedtest"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix b/third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix index f3beaf20dc..eca2d62600 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix @@ -79,9 +79,6 @@ replace-with = "vendored-sources"' >> ./zeroidc/.cargo/config.toml outputs = [ "out" "man" ]; - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; - meta = with lib; { description = "Create flat virtual Ethernet networks of almost unlimited size"; homepage = "https://www.zerotier.com"; diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/default.nix index 065404f36c..d2b8f1a061 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/default.nix @@ -12,27 +12,16 @@ let python = ((if stdenv.isDarwin then python3 else python3Minimal).override { self = python; includeSiteCustomize = true; - }); - - # TODO add our own small test suite, maybe add tests for these deps to channels? - markdown-it-py-no-tests = python.pkgs.markdown-it-py.override { - disableTests = true; + }).override { + packageOverrides = final: prev: { + markdown-it-py = prev.markdown-it-py.overridePythonAttrs (_: { + doCheck = false; + }); + mdit-py-plugins = prev.mdit-py-plugins.overridePythonAttrs (_: { + doCheck = false; + }); + }; }; - mdit-py-plugins-no-tests = python.pkgs.mdit-py-plugins.override { - markdown-it-py = markdown-it-py-no-tests; - disableTests = true; - }; - - makeDeps = pkgs: small: - if small - then [ - markdown-it-py-no-tests - mdit-py-plugins-no-tests - ] - else [ - pkgs.markdown-it-py - pkgs.mdit-py-plugins - ]; in python.pkgs.buildPythonApplication rec { @@ -54,12 +43,15 @@ python.pkgs.buildPythonApplication rec { src = ./src; }; - nativeBuildInputs = [ - python.pkgs.setuptools - python.pkgs.pytestCheckHook + nativeBuildInputs = with python.pkgs; [ + setuptools + pytestCheckHook ]; - propagatedBuildInputs = makeDeps python.pkgs true; + propagatedBuildInputs = with python.pkgs; [ + markdown-it-py + mdit-py-plugins + ]; pytestFlagsArray = [ "-vvrP" "tests/" ]; @@ -67,7 +59,7 @@ python.pkgs.buildPythonApplication rec { # build closures small. mypy has an unreasonably large build closure for docs builds. passthru.tests.typing = runCommand "${pname}-mypy" { nativeBuildInputs = [ - (python3.withPackages (p: [ p.mypy p.pytest ] ++ makeDeps p false)) + (python3.withPackages (ps: with ps; [ mypy pytest markdown-it-py mdit-py-plugins ])) ]; } '' mypy --strict ${src} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/apkg/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/apkg/default.nix index 121f06ba89..ebd1e15909 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/apkg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/apkg/default.nix @@ -14,6 +14,17 @@ python3Packages.buildPythonApplication rec { sha256 = "duZz2Kwjgek5pMJTDH8gMZAZ13uFwaIYT5E1brW7I7U="; }; + # TODO: solve this properly. Detection won't work anymore. + postPatch = '' + patch <<-EOF + --- a/setup.py + +++ b/setup.py + @@ -25,1 +25,1 @@ + - version=version, + + version='${version}', + EOF + ''; + propagatedBuildInputs = with python3Packages; [ # copy&pasted requirements.txt (almost exactly) beautifulsoup4 # upstream version detection diff --git a/third_party/nixpkgs/pkgs/tools/package-management/appimage-run/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/appimage-run/default.nix index 98a04dff8f..0595f2ea99 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/appimage-run/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/appimage-run/default.nix @@ -1,13 +1,29 @@ -{ appimageTools, buildFHSUserEnv, extraPkgs ? pkgs: [], appimage-run-tests ? null }: +{ appimageTools, buildFHSUserEnv, makeDesktopItem, extraPkgs ? pkgs: [], appimage-run-tests ? null }: let - fhsArgs = appimageTools.defaultFhsEnvArgs; -in buildFHSUserEnv (fhsArgs // { name = "appimage-run"; + fhsArgs = appimageTools.defaultFhsEnvArgs; + + desktopItem = makeDesktopItem { + inherit name; + exec = name; + desktopName = name; + genericName = "AppImage runner"; + noDisplay = true; + mimeTypes = ["application/vnd.appimage" "application/x-iso9660-appimage"]; + categories = ["PackageManager" "Utility"]; + }; +in buildFHSUserEnv (fhsArgs // { + inherit name; + targetPkgs = pkgs: [ appimageTools.appimage-exec ] ++ fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs; runScript = "appimage-exec.sh"; + extraInstallCommands = '' + cp --recursive "${desktopItem}/share" "$out/" + ''; + passthru.tests.appimage-run = appimage-run-tests; }) diff --git a/third_party/nixpkgs/pkgs/tools/package-management/appimage-run/test.nix b/third_party/nixpkgs/pkgs/tools/package-management/appimage-run/test.nix index 34c5ab7772..8a6e270951 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/appimage-run/test.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/appimage-run/test.nix @@ -1,4 +1,4 @@ -{ runCommand, fetchurl, appimage-run, glibcLocales, file }: +{ runCommand, fetchurl, appimage-run, glibcLocales, file, xdg-utils }: let # any AppImage usable on cli, really sample-appImage = fetchurl { @@ -11,21 +11,27 @@ let }; in runCommand "appimage-run-tests" { - buildInputs = [ appimage-run glibcLocales file ]; + buildInputs = [ appimage-run glibcLocales file xdg-utils ]; meta.platforms = [ "x86_64-linux" ]; } '' export HOME=$(mktemp -d) set -x + # regression test for #101137, must come first LANG=fr_FR appimage-run ${sample-appImage} --list ${sample-appImage} + # regression test for #108426 cp ${sample-appImage} foo.appImage LANG=fr_FR appimage-run ${sample-appImage} --list foo.appImage cp ${owdtest} owdtest.AppImage.gz gunzip owdtest.AppImage.gz appimage-run owdtest.AppImage + + # Verify desktop entry + XDG_DATA_DIRS="${appimage-run}/share" + [[ "$(xdg-mime query default application/vnd.appimage)" == '${appimage-run.name}.desktop' ]] + set +x touch $out '' - diff --git a/third_party/nixpkgs/pkgs/tools/package-management/comma/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/comma/default.nix index d980143281..3007a02c3d 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/comma/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/comma/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "comma"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "comma"; rev = "v${version}"; - hash = "sha256-5M2VVrYH+IAa1P7Qz9gUPS3YNdqeVOoa1riV8eTtoYE="; + hash = "sha256-OonKO7D6xuNf9S6SvxWYzZXNOfoUw5ZEymfC5UmZT7Y="; }; - cargoHash = "sha256-kdhzoExiUAevid5NCCDTkK5CO+esa/SRGOcrITlr2fo="; + cargoHash = "sha256-q6MbaKrGkwvKWSfL7bQjf9+RdcgKpKj3iXJtSz3FnMc="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-eval-jobs/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-eval-jobs/default.nix index 3d42d4907e..0ec3f8603d 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -11,12 +11,12 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256-O0Ro9vwf2kDhGFs32puQIeW/rSSduC9sD5zV8e/GtvA="; + hash = "sha256-fpksS7lbaYwjf7NuPFE44wvyGcT5d+ERBCJmZoKXaWA="; }; buildInputs = [ boost diff --git a/third_party/nixpkgs/pkgs/tools/package-management/pkg/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/pkg/default.nix index a2bac43e59..232e3e5add 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/pkg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/pkg/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, m4, pkg-config, tcl -, bzip2, libarchive, libbsd, lzma, openssl, zlib +, bzip2, libarchive, libbsd, xz, openssl, zlib }: stdenv.mkDerivation (finalAttrs: { @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; nativeBuildInputs = [ m4 pkg-config tcl ]; - buildInputs = [ bzip2 libarchive lzma openssl zlib ] + buildInputs = [ bzip2 libarchive xz openssl zlib ] ++ lib.optional stdenv.isLinux libbsd; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/poetry/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/poetry/default.nix index eaaa2dc57d..590639db36 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/poetry/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/poetry/default.nix @@ -1,5 +1,6 @@ { lib , python3 +, fetchFromGitHub }: let @@ -8,13 +9,15 @@ let poetry = self.callPackage ./unwrapped.nix { }; # version overrides required by poetry and its plugins - dulwich = super.dulwich.overridePythonAttrs (old: rec { - version = "0.20.50"; - src = self.fetchPypi { - inherit (old) pname; - inherit version; - hash = "sha256-UKlBeWssZ1vjm+co1UDBa1t853654bP4VWUOzmgy0r4="; + platformdirs = super.platformdirs.overridePythonAttrs (old: rec { + version = "2.6.2"; + src = fetchFromGitHub { + owner = "platformdirs"; + repo = "platformdirs"; + rev = "refs/tags/${version}"; + hash = "sha256-yGpDAwn8Kt6vF2K2zbAs8+fowhYQmvsm/87WJofuhME="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; }); }; }; @@ -41,7 +44,7 @@ let ''; passthru = rec { - inherit plugins withPlugins; + inherit plugins withPlugins python; }; })); in withPlugins (ps: [ ]) diff --git a/third_party/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix b/third_party/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix index e98c571ddb..56958df7e8 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix @@ -4,30 +4,34 @@ , pythonOlder , fetchFromGitHub , installShellFiles +, build , cachecontrol , cleo , crashtest , dulwich , filelock , html5lib +, installer , jsonschema , keyring +, lockfile , packaging , pexpect , pkginfo , platformdirs , poetry-core , poetry-plugin-export +, pyproject-hooks , requests , requests-toolbelt , shellingham , tomlkit , trove-classifiers +, urllib3 , virtualenv , xattr , tomli , importlib-metadata -, backports-cached-property , cachy , deepdiff , flatdict @@ -40,7 +44,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.3.2"; + version = "1.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -49,7 +53,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-12EiEGI9Vkb6EUY/W2KWeLigxWra1Be4ozvi8njBpEU="; + hash = "sha256-vbG9nsrCvytpKLJbC1EKeyTSjaDlsKvdRCwT6aSq6B4="; }; nativeBuildInputs = [ @@ -57,25 +61,30 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + build cachecontrol cleo crashtest dulwich filelock html5lib + installer jsonschema keyring + lockfile packaging pexpect pkginfo platformdirs poetry-core poetry-plugin-export + pyproject-hooks requests requests-toolbelt shellingham tomlkit trove-classifiers + urllib3 virtualenv ] ++ lib.optionals (stdenv.isDarwin) [ xattr @@ -83,8 +92,6 @@ buildPythonPackage rec { tomli ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata - ] ++ lib.optionals (pythonOlder "3.8") [ - backports-cached-property ] ++ cachecontrol.optional-dependencies.filecache; postInstall = '' @@ -129,6 +136,11 @@ buildPythonPackage rec { "lock" # fs permission errors "test_builder_should_execute_build_scripts" + # poetry.installation.chef.ChefBuildError: Backend 'poetry.core.masonry.api' is not available. + "test_prepare_sdist" + "test_prepare_directory" + "test_prepare_directory_with_extensions" + "test_prepare_directory_editable" ] ++ lib.optionals (pythonAtLeast "3.10") [ # RuntimeError: 'auto_spec' might be a typo; use unsafe=True if this is intended "test_info_setup_complex_pep517_error" diff --git a/third_party/nixpkgs/pkgs/tools/security/biscuit-cli/Cargo.lock b/third_party/nixpkgs/pkgs/tools/security/biscuit-cli/Cargo.lock new file mode 100644 index 0000000000..5081080cab --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/biscuit-cli/Cargo.lock @@ -0,0 +1,1080 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "0.7.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +dependencies = [ + "memchr", +] + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "biscuit-auth" +version = "3.0.0-alpha4" +source = "git+https://github.com/biscuit-auth/biscuit-rust?branch=main#676e32fd4071dd2f0ee0f76807f3ca53dd877c89" +dependencies = [ + "base64", + "biscuit-parser", + "biscuit-quote", + "ed25519-dalek", + "getrandom", + "hex", + "nom", + "prost", + "prost-types", + "rand", + "rand_core", + "regex", + "sha2", + "thiserror", + "time 0.3.17", + "zeroize", +] + +[[package]] +name = "biscuit-cli" +version = "0.2.0" +dependencies = [ + "anyhow", + "atty", + "biscuit-auth", + "chrono", + "clap", + "hex", + "parse_duration", + "shell-words", + "tempfile", + "thiserror", + "time 0.3.17", +] + +[[package]] +name = "biscuit-parser" +version = "0.1.0-alpha4" +source = "git+https://github.com/biscuit-auth/biscuit-rust?branch=main#676e32fd4071dd2f0ee0f76807f3ca53dd877c89" +dependencies = [ + "hex", + "nom", + "proc-macro2", + "quote", + "thiserror", + "time 0.3.17", +] + +[[package]] +name = "biscuit-quote" +version = "0.2.0-alpha5" +source = "git+https://github.com/biscuit-auth/biscuit-rust?branch=main#676e32fd4071dd2f0ee0f76807f3ca53dd877c89" +dependencies = [ + "biscuit-parser", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" + +[[package]] +name = "cc" +version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-integer", + "num-traits", + "time 0.1.44", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "clap" +version = "3.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +dependencies = [ + "atty", + "bitflags", + "clap_derive", + "clap_lex", + "indexmap", + "once_cell", + "strsim", + "termcolor", + "textwrap", +] + +[[package]] +name = "clap_derive" +version = "3.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] +name = "curve25519-dalek" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" +dependencies = [ + "byteorder", + "digest", + "rand_core", + "subtle", + "zeroize", +] + +[[package]] +name = "cxx" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97abf9f0eca9e52b7f81b945524e76710e6cb2366aead23b7d4fbf72e281f888" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cc32cc5fea1d894b77d269ddb9f192110069a8a9c1f1d441195fba90553dea3" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca220e4794c934dc6b1207c3b42856ad4c302f2df1712e9f8d2eec5afaacf1f" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b846f081361125bfc8dc9d3940c84e1fd83ba54bbca7b17cd29483c828be0704" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] + +[[package]] +name = "ed25519" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" +dependencies = [ + "signature", +] + +[[package]] +name = "ed25519-dalek" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" +dependencies = [ + "curve25519-dalek", + "ed25519", + "rand", + "serde", + "sha2", + "zeroize", +] + +[[package]] +name = "either" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[package]] +name = "fastrand" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] + +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "iana-time-zone" +version = "0.1.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + +[[package]] +name = "indexmap" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" + +[[package]] +name = "js-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.137" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" + +[[package]] +name = "link-cplusplus" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +dependencies = [ + "cc", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "nom" +version = "7.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "num" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "os_str_bytes" +version = "6.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3baf96e39c5359d2eb0dd6ccb42c62b91d9678aa68160d261b9e0ccbf9e9dea9" + +[[package]] +name = "parse_duration" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7037e5e93e0172a5a96874380bf73bc6ecef022e26fa25f2be26864d6b3ba95d" +dependencies = [ + "lazy_static", + "num", + "regex", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "prost" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "prost-types" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" +dependencies = [ + "bytes", + "prost", +] + +[[package]] +name = "quote" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom", + "libc", + "rand_chacha", + "rand_core", + "rand_hc", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] + +[[package]] +name = "scratch" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" + +[[package]] +name = "serde" +version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" + +[[package]] +name = "sha2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +dependencies = [ + "block-buffer", + "cfg-if", + "cpufeatures", + "digest", + "opaque-debug", +] + +[[package]] +name = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + +[[package]] +name = "signature" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "syn" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] + +[[package]] +name = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" + +[[package]] +name = "thiserror" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "time" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +dependencies = [ + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +dependencies = [ + "time-core", +] + +[[package]] +name = "typenum" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" + +[[package]] +name = "unicode-ident" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasm-bindgen" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "zeroize" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] diff --git a/third_party/nixpkgs/pkgs/tools/security/biscuit-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/biscuit-cli/default.nix new file mode 100644 index 0000000000..c4d21980bd --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/biscuit-cli/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "biscuit-cli"; + version = "0.2.0-next-pre20230103"; + + src = fetchFromGitHub { + owner = "biscuit-auth"; + repo = "biscuit-cli"; + rev = "0ecf1ec4c98a90b1bf3614558a029b47c57288df"; + sha256 = "sha256-ADJWqx70IwuvCBeK9rb9WBIsD+oQROQSduSQ8Bu8mfk="; + }; + + cargoLock = { + outputHashes."biscuit-auth-3.0.0-alpha4" = "sha256-4SzOupoD33D0KHZyVLriGzUHy9XXnWK1pbgqOjJH4PI="; + lockFile = ./Cargo.lock; + }; + + meta = { + description = "CLI to generate and inspect biscuit tokens"; + homepage = "https://www.biscuitsec.org/"; + maintainers = [ lib.maintainers.shlevy ]; + license = lib.licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/browserpass/default.nix b/third_party/nixpkgs/pkgs/tools/security/browserpass/default.nix index ba96e2a70f..31a0bd63db 100644 --- a/third_party/nixpkgs/pkgs/tools/security/browserpass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/browserpass/default.nix @@ -1,18 +1,18 @@ { lib, buildGoModule, fetchFromGitHub, makeWrapper, gnupg }: buildGoModule rec { pname = "browserpass"; - version = "3.0.10"; + version = "3.1.0"; src = fetchFromGitHub { owner = "browserpass"; repo = "browserpass-native"; rev = version; - sha256 = "8eAwUwcRTnhVDkQc3HsvTP0TqC4LfVrUelxdbJxe9t0="; + sha256 = "sha256-UZzOPRRiCUIG7uSSp9AEPMDN/+4cgyK47RhrI8oUx8U="; }; nativeBuildInputs = [ makeWrapper ]; - vendorSha256 = "gWXcYyIp86b/Pn6vj7qBj/VZS9rTr4weVw0YWmg+36c="; + vendorHash = "sha256-CjuH4ANP2bJDeA+o+1j+obbtk5/NVLet/OFS3Rms4r0="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/cdk-go/default.nix b/third_party/nixpkgs/pkgs/tools/security/cdk-go/default.nix index e2a997bd78..79040fb274 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cdk-go/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cdk-go/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cdk-go"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "cdk-team"; repo = "CDK"; rev = "refs/tags/v${version}"; - hash = "sha256-d1EwKu3QUbIhpgSQLL3GqaPQJ1K/QxwhsHuX5y1jWH0="; + hash = "sha256-jgGOSlhlLO1MU1mHWZgw+ov4IrZwMo2GdG6L25ah9Z8="; }; vendorHash = "sha256-aJN/d/BxmleRXKw6++k6e0Vb0Gs5zg1QfakviABYTog="; diff --git a/third_party/nixpkgs/pkgs/tools/security/crunch/default.nix b/third_party/nixpkgs/pkgs/tools/security/crunch/default.nix index df1d50c60f..d287fb32fb 100644 --- a/third_party/nixpkgs/pkgs/tools/security/crunch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/crunch/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0mgy6ghjvzr26yrhj1bn73qzw6v9qsniskc5wqq1kk0hfhy6r3va"; }; - buildInputs = [ which ]; + nativeBuildInputs = [ which ]; preBuild = '' substituteInPlace Makefile \ @@ -18,7 +18,10 @@ stdenv.mkDerivation rec { --replace 'sudo ' "" ''; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "PREFIX=$(out)" + ]; meta = with lib; { description = "Wordlist generator"; diff --git a/third_party/nixpkgs/pkgs/tools/security/cryptomator/default.nix b/third_party/nixpkgs/pkgs/tools/security/cryptomator/default.nix index 1e6833f3a8..b6a1726dd6 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cryptomator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cryptomator/default.nix @@ -116,6 +116,6 @@ in stdenv.mkDerivation rec { ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ bachp ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/cve-bin-tool/default.nix b/third_party/nixpkgs/pkgs/tools/security/cve-bin-tool/default.nix index 92405c20bb..c8a72a8842 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cve-bin-tool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cve-bin-tool/default.nix @@ -18,7 +18,7 @@ # aiohttp[speedups] , aiodns , brotlipy -, cchardet +, faust-cchardet , pillow , pytestCheckHook , xmlschema @@ -57,7 +57,7 @@ buildPythonApplication rec { # aiohttp[speedups] aiodns brotlipy - cchardet + faust-cchardet # needed by brotlipy pillow setuptools diff --git a/third_party/nixpkgs/pkgs/tools/security/enumerepo/default.nix b/third_party/nixpkgs/pkgs/tools/security/enumerepo/default.nix new file mode 100644 index 0000000000..31ff035950 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/enumerepo/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "enumerepo"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "trickest"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-PWWx6b+fttxKxMtuHAYPTeEsta0E6+IQ1DSKO6c7Jdc="; + }; + + vendorHash = "sha256-Dt3QS1Rm/20Yitgg4zbBcWQXV8mTlpNbzc/k4DaTuQc="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Tool to list all public repositories for (valid) GitHub usernames"; + homepage = "https://github.com/trickest/enumerepo"; + changelog = "https://github.com/trickest/enumerepo/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/expliot/default.nix b/third_party/nixpkgs/pkgs/tools/security/expliot/default.nix index 593ed49834..1414d7c36a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/expliot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/expliot/default.nix @@ -10,7 +10,7 @@ let version = "1.5.0"; src = oldAttrs.src.override { inherit version; - sha256 = "0qiax309my534drk81lihq9ghngr96qnm40kbmgc9ay4fncqq6kh"; + hash = "sha256-cBqMmXXEq8ReXROQarFJ+Vn4EoaRBjRzI6P4msDoKmI="; }; doCheck = false; }); diff --git a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix index 9aa32572d6..f963b607cf 100644 --- a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-03-06"; + version = "2023-03-15"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5ieCbYpQqL7+wYDJzGrnH8KWNOGvSQWkhUcIkXOhVo0="; + hash = "sha256-qP14hkYO8gXD9C3B6uhBnYDx3YZMbbvtzHOSKFtFSmA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/flare-floss/default.nix b/third_party/nixpkgs/pkgs/tools/security/flare-floss/default.nix index c301a90a55..8418585178 100644 --- a/third_party/nixpkgs/pkgs/tools/security/flare-floss/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/flare-floss/default.nix @@ -10,7 +10,7 @@ let version = "4.4.2"; src = o.src.override { inherit version; - sha256 = "sha256-46YvBSAXJEDKDcyCN0kxk4Ljd/N/FAoLme9F/suEv+c="; + hash = "sha256-46YvBSAXJEDKDcyCN0kxk4Ljd/N/FAoLme9F/suEv+c="; }; }); @@ -19,7 +19,7 @@ let version = "2.5.1"; src = o.src.override { inherit version; - sha256 = "sha256-EJzVhcrEEpf3EQPDxCrG73N58peI61TLdRvlpmO7I1o="; + hash = "sha256-EJzVhcrEEpf3EQPDxCrG73N58peI61TLdRvlpmO7I1o="; }; }); }; @@ -34,7 +34,7 @@ py.pkgs.buildPythonPackage rec { repo = "flare-floss"; rev = "v${version}"; fetchSubmodules = true; # for tests - sha256 = "sha256-V4OWYcISyRdjf8x93B6h2hJwRgmRmk32hr8TrgRDu8Q="; + hash = "sha256-V4OWYcISyRdjf8x93B6h2hJwRgmRmk32hr8TrgRDu8Q="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix b/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix index 3e245e02fe..eeffb2026d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.16.0"; + version = "8.16.1"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - hash = "sha256-EazTDPJMMUGmGSfQ5d7J1opv/KlapQLZZYxjbzBRaUY="; + hash = "sha256-zidRNnvbjqLxYE0fBRygYWWBf5pS9xLLYFpSB0dtNks="; }; vendorHash = "sha256-Ev0/CSpwJDmc+Dvu/bFDzsgsq80rWImJWXNAUqYHgoE="; diff --git a/third_party/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix b/third_party/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix index 50a1ff98d1..f5157fc9e4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix @@ -67,9 +67,6 @@ python3.pkgs.buildPythonApplication rec { twisted ]; - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - # bunch of linting doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/goverview/default.nix b/third_party/nixpkgs/pkgs/tools/security/goverview/default.nix new file mode 100644 index 0000000000..77f46526d9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/goverview/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "goverview"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "j3ssie"; + repo = "goverview"; + rev = "refs/tags/v${version}"; + hash = "sha256-IgvpMuDwMK9IdPs1IRbPbpgr7xZuDX3boVT5d7Lb+3w="; + }; + + vendorHash = "sha256-i/m2s9e8PDfGmguNihynVI3Y7nAXC4weoWFXOwUVDSE="; + + ldflags = [ + "-w" + "-s" + ]; + + # Tests require network access + doCheck = false; + + meta = with lib; { + description = "Tool to get an overview of the list of URLs"; + homepage = "https://github.com/j3ssie/goverview"; + changelog = "https://github.com/j3ssie/goverview/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix index 8334b03484..a9269eaac8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "grype"; - version = "0.59.0"; + version = "0.59.1"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TAoF67Fxl0OUiQd48h786+lIsdEuk4C/zdeEO/DRX/k="; + hash = "sha256-6NQRmgbV/if0S5jYus5R5oFjLz5wwHpJppi/Tyz2FjY="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-kRxKa3HUO2yvMai03voVvsprg/Kd01OtJQHJn3ECk58="; + vendorHash = "sha256-eCvoTGETtB76ILnYKJ5ybtLbZUBMxX2w2CDczY05L0E="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix b/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix index bcf55ea526..d32e486eec 100644 --- a/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.2.7"; + version = "1.2.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-kZU7k7vAKgQfCQobGa5i5ZnO8ARUSozv4gz93g912uM="; + hash = "sha256-uZTYRsOAmuROA8ZrePruE+eDIx9TW98ljByDkstZC1Q="; }; - vendorHash = "sha256-1EQt7L+dQvpBOGVHeaIOCUG960yv5h9nuQNnF4wSoug="; + vendorHash = "sha256-czW1bnQp5+Om5EfW1DvCkAaNaqfAupmSJJvS14xKQUg="; # Tests require network access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/keyscope/default.nix b/third_party/nixpkgs/pkgs/tools/security/keyscope/default.nix index 08c2ded80a..31d97256f0 100644 --- a/third_party/nixpkgs/pkgs/tools/security/keyscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/keyscope/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "keyscope"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "spectralops"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RKeEumj9HuifEXE8g5G7EsIalGD1vLRawh59s/ykUmg="; + sha256 = "sha256-SrBtgirg52q7gM3GZsJsV8ASACvb4sYv5HDbyItpjbk="; }; - cargoSha256 = "sha256-8lTwczuOgPhzwGcQ2KoqK5Zf3HS3uwsok036l+12Xb0="; + cargoSha256 = "sha256-MFP3AqlfaclmZxRwaWFw6hsZwCQMRKJEyFEyUN+QLqo="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix b/third_party/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix new file mode 100644 index 0000000000..26180e219f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix @@ -0,0 +1,52 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, packr, ... }: + +buildGoModule rec { + pname = "kubernetes-polaris"; + version = "7.3.2"; + + src = fetchFromGitHub { + owner = "FairwindsOps"; + repo = "polaris"; + rev = version; + sha256 = "sha256-LteclhYNMFNuGjFSuhPuY9ZA1Vlq4DPdcCGAQaujwh8="; + }; + + vendorSha256 = "sha256-3htwwRkUOf8jLyLfRlhcWhftBImmcUglc/PP/Yk2oF0="; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + "-X main.Commit=${version}" + ]; + + preBuild = '' + ${packr}/bin/packr2 -v --ignore-imports + ''; + + postInstall = '' + installShellCompletion --cmd polaris \ + --bash <($out/bin/polaris completion bash) \ + --fish <($out/bin/polaris completion fish) \ + --zsh <($out/bin/polaris completion zsh) + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/polaris help + $out/bin/polaris version | grep 'Polaris version:${version}' + + runHook postInstallCheck + ''; + + meta = with lib; { + description = "Validate and remediate Kubernetes resources to ensure configuration best practices are followed"; + homepage = "https://www.fairwinds.com/polaris"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ longer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix b/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix index 24820d08f9..b8994acdf1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubescape"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "kubescape"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-poLPG8C0YbjEFjqWMKO+9plArenkVmR5lGvflgxc3Iw="; + hash = "sha256-J3E41xQxI53iRfo5E+DMXD70sSCBO3TpSm3qZmpxvW8="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/kubesec/default.nix b/third_party/nixpkgs/pkgs/tools/security/kubesec/default.nix index 27c1b7fd06..a2b7078896 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kubesec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kubesec/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "kubesec"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "controlplaneio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0irZ3mCpXDWc/RovTK9d7AT/Gfbyt1R4WjCJFZ5RFdg="; + sha256 = "sha256-9WhY1mJawMkSgqM50DO0y9bxGYW89N14gLirO5zVuzc="; }; - vendorSha256 = "sha256-sRIGehDuAjtpOAYYtqANua8LSzl/+WolZimMxlkG5X8="; + vendorHash = "sha256-xcIFveR0MwpYGYhHKXwQPHF08620yilEtb+BdKZWrdw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile index d43ea431ea..04e4dc8916 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.5" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.7" diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index f188fc2c4d..c8bed8f11a 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: a5332d9785cb7c8d0bbc3f0d8532287858b15aea - ref: refs/tags/6.3.5 + revision: f6fdb097af15319fe1755e4e5fa5918edacbd5ca + ref: refs/tags/6.3.7 specs: - metasploit-framework (6.3.5) + metasploit-framework (6.3.7) actionpack (~> 7.0) activerecord (~> 7.0) activesupport (~> 7.0) @@ -13,6 +13,7 @@ GIT bcrypt bcrypt_pbkdf bson + chunky_png dnsruby ed25519 em-http-request @@ -31,7 +32,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.113) + metasploit-payloads (= 2.0.122) metasploit_data_models metasploit_payloads-mettle (= 1.0.20) mqtt @@ -99,25 +100,25 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (7.0.4.2) - actionview (= 7.0.4.2) - activesupport (= 7.0.4.2) + actionpack (7.0.4.3) + actionview (= 7.0.4.3) + activesupport (= 7.0.4.3) rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.4.2) - activesupport (= 7.0.4.2) + actionview (7.0.4.3) + activesupport (= 7.0.4.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (7.0.4.2) - activesupport (= 7.0.4.2) - activerecord (7.0.4.2) - activemodel (= 7.0.4.2) - activesupport (= 7.0.4.2) - activesupport (7.0.4.2) + activemodel (7.0.4.3) + activesupport (= 7.0.4.3) + activerecord (7.0.4.3) + activemodel (= 7.0.4.3) + activesupport (= 7.0.4.3) + activesupport (7.0.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -128,13 +129,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.720.0) + aws-partitions (1.726.0) aws-sdk-core (3.170.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.367.0) + aws-sdk-ec2 (1.369.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.75.0) @@ -154,6 +155,7 @@ GEM bindata (2.4.15) bson (4.15.0) builder (3.2.4) + chunky_png (1.4.0) concurrent-ruby (1.2.2) cookiejar (0.3.3) crass (1.0.6) @@ -179,7 +181,7 @@ GEM faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) - faraday-retry (2.0.0) + faraday-retry (2.1.0) faraday (~> 2.0) faye-websocket (0.11.1) eventmachine (>= 0.12.0) @@ -203,7 +205,7 @@ GEM i18n (1.12.0) concurrent-ruby (~> 1.0) io-console (0.6.0) - irb (1.6.2) + irb (1.6.3) reline (>= 0.3.0) jmespath (1.6.2) jsobfu (0.4.2) @@ -236,7 +238,7 @@ GEM activemodel (~> 7.0) activesupport (~> 7.0) railties (~> 7.0) - metasploit-payloads (2.0.113) + metasploit-payloads (2.0.122) metasploit_data_models (6.0.2) activerecord (~> 7.0) activesupport (~> 7.0) @@ -250,9 +252,9 @@ GEM metasploit_payloads-mettle (1.0.20) method_source (1.0.0) mini_portile2 (2.8.1) - minitest (5.17.0) + minitest (5.18.0) mqtt (0.6.0) - msgpack (1.6.0) + msgpack (1.6.1) multi_json (1.15.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) @@ -262,7 +264,7 @@ GEM timeout net-smtp (0.3.3) net-protocol - net-ssh (7.0.1) + net-ssh (7.1.0) network_interface (0.0.2) nexpose (7.3.0) nio4r (2.5.8) @@ -291,7 +293,7 @@ GEM puma (6.1.1) nio4r (~> 2.0) racc (1.6.2) - rack (2.2.6.3) + rack (2.2.6.4) rack-protection (3.0.5) rack rack-test (2.0.2) @@ -301,9 +303,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) - railties (7.0.4.2) - actionpack (= 7.0.4.2) - activesupport (= 7.0.4.2) + railties (7.0.4.3) + actionpack (= 7.0.4.3) + activesupport (= 7.0.4.3) method_source rake (>= 12.2) thor (~> 1.0) @@ -330,7 +332,7 @@ GEM metasm rex-arch rex-text - rex-exploitation (0.1.37) + rex-exploitation (0.1.38) jsobfu metasm rex-arch @@ -362,7 +364,7 @@ GEM rex-socket rex-text rex-struct2 (0.1.3) - rex-text (0.2.49) + rex-text (0.2.50) rex-zip (0.1.4) rex-text rexml (3.2.5) @@ -370,7 +372,7 @@ GEM ruby-macho (3.0.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.2.4) + ruby_smb (3.2.5) bindata openssl-ccm openssl-cmac diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix index 548f656930..3ce5c47e0f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.5"; + version = "6.3.7"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-T6MrvTnaTE+Pvx3UwzBZmw9jWcL4qr4TDbyCCqI6O0g="; + sha256 = "sha256-UT6KPiNz3f+peLt1mGEgk2OHBZJMBrxIz6Te8qfdiik="; }; 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 803631d68e..1575abf8d8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02q8mjgw70szmhx3hc5pdcf0yhk5hfhhvfng24xghiqkx7dkgf21"; + sha256 = "1cb0hqkfkc0b9s7swvi4nf64c24i3ma1gv09anr8a81k56s0rwxd"; type = "gem"; }; - version = "7.0.4.2"; + version = "7.0.4.3"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07fn4brsrz308b01rqql0n582zqva5q8ws2gnx2jdm9ab2ph1l4i"; + sha256 = "1h9027sqzfcbc84dnzw8nxjyg15zrk1y2fc0468wg1xi9nmyw96z"; type = "gem"; }; - version = "7.0.4.2"; + version = "7.0.4.3"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a961ak8n53d783k5p0n4clgvlbp9vkwxk32ysfww28nl00jlr0r"; + sha256 = "0ymhsxgdb68zgf4zp07g2bymmpgn0b9r38avn9pagz1p5zy1ql9v"; type = "gem"; }; - version = "7.0.4.2"; + version = "7.0.4.3"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "159z1m6294f2v1mjzbjbfajahiks4x2mg0s01hw407a9y23q07ln"; + sha256 = "01wb98i2zsbb4jcb4i6z72vb05wiks4hv9chc66h1rsxrv0zi4dv"; type = "gem"; }; - version = "7.0.4.2"; + version = "7.0.4.3"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dmywys50074vj5rivpx188b00qimlc4jn84xzqlialrgp3ckq5f"; + sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp"; type = "gem"; }; - version = "7.0.4.2"; + version = "7.0.4.3"; }; addressable = { groups = ["default"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f9dc7igx4wxza0vim2fg15hj1bgi6js2a2w2fkr2h8mi019nrgs"; + sha256 = "0pn77j932x8p5z992arfjwdjpp5m6zl8llma6pk61hm8dh9wxfw5"; type = "gem"; }; - version = "1.720.0"; + version = "1.726.0"; }; aws-sdk-core = { groups = ["default"]; @@ -124,10 +124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xxfa17xv9rl2xd0wp4vh9ddjj9zzb93nbb8y2n34phz7l2yxd0w"; + sha256 = "0kzlkvidm3hzh0168m0jz9w2c2r47dy8n97l2qyys77hl1cxa6kf"; type = "gem"; }; - version = "1.367.0"; + version = "1.369.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -219,6 +219,16 @@ }; version = "3.2.4"; }; + chunky_png = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1znw5x86hmm9vfhidwdsijz8m38pqgmv98l9ryilvky0aldv7mc9"; + type = "gem"; + }; + version = "1.4.0"; + }; concurrent-ruby = { groups = ["default"]; platforms = []; @@ -364,10 +374,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07bn75d784ndj9ljqk19ff6217hkqqmxjlnjx5b9v36k2nnj9kys"; + sha256 = "1zz0w4jpfa6h1wlirfcs9hzvlpijnd1nnmjq94w5yv50585p279n"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; faye-websocket = { groups = ["default"]; @@ -504,10 +514,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10qvm0s8784lhmz98blqnxh36i7d7rzkk17znx17d46666z7czrf"; + sha256 = "1h9s07n5v3z029v18924ws9vdkdc80n6llp9ccx77yg1krv2g0f3"; type = "gem"; }; - version = "1.6.2"; + version = "1.6.3"; }; jmespath = { groups = ["default"]; @@ -604,12 +614,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "a5332d9785cb7c8d0bbc3f0d8532287858b15aea"; - sha256 = "0j1v7ai0m0mw1l9vxapqq9cn63wvb4qc7m0xpy7lyk6s76yjp8sg"; + rev = "f6fdb097af15319fe1755e4e5fa5918edacbd5ca"; + sha256 = "0acavnkz5pm4rx4bq1jcj82qfqwk41hrhxdvg2lzzpbk4cz8lgji"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.5"; + version = "6.3.7"; }; metasploit-model = { groups = ["default"]; @@ -626,10 +636,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wmck8jldfdhfvax8dqa3dbxq76sn10xsvs02gf9wbs9zcp0nypi"; + sha256 = "054h5bvcyxfqpvczbmssxvjpginxxg9q9qsjm8n9wssaxjq8vvd6"; type = "gem"; }; - version = "2.0.113"; + version = "2.0.122"; }; metasploit_data_models = { groups = ["default"]; @@ -676,10 +686,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0"; + sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06"; type = "gem"; }; - version = "5.17.0"; + version = "5.18.0"; }; mqtt = { groups = ["default"]; @@ -696,10 +706,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q03pb0vq8388s431nbxabsfxnch6p304c8vnjlk0zzpcv713yr3"; + sha256 = "1jr9grsdnlb8wgd9by7mhsc9c1wixijh9an4m4yq1ph0jg26x9rk"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; multi_json = { groups = ["default"]; @@ -766,10 +776,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qp3i8bi7ji1np0530bp2p9zrrn6galvmbsivxwpkjdpjdyn19sr"; + sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687"; type = "gem"; }; - version = "7.0.1"; + version = "7.1.0"; }; network_interface = { groups = ["default"]; @@ -947,10 +957,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17wg99w29hpiq9p4cmm8c6kdg4lcw0ll2c36qw7y50gy1cs4h5j2"; + sha256 = "1qgwkcb8kxns8d5187cxjaxf18b7dmg9gh6cr9c1125m0bj2pnfk"; type = "gem"; }; - version = "2.2.6.3"; + version = "2.2.6.4"; }; rack-protection = { groups = ["default"]; @@ -997,10 +1007,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0056s3hh67mjqwb2gjsarx6v3ay2cb8dqiwj1zf84krlbj83l9kz"; + sha256 = "0w6pib1s0kmfnhjvxwh48flz7w4gy8y961n821w8by7d1g83vjwq"; type = "gem"; }; - version = "7.0.4.2"; + version = "7.0.4.3"; }; rake = { groups = ["default"]; @@ -1107,10 +1117,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15fcisxsxcs6kvg84cv4xdxpd0bhajbmdssrbbvacblvwxn0yydb"; + sha256 = "1afz3qvdmaav542klxz2jwwgrayhw1lyrivmpfv5jk2c613cky3n"; type = "gem"; }; - version = "0.1.37"; + version = "0.1.38"; }; rex-java = { groups = ["default"]; @@ -1227,10 +1237,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s25qqgjqz98240mfx9a39449v2f89yga3qm718zkdzks4f99c0x"; + sha256 = "1558dqyd9w290bxyq44kdwzsl7s7hq79gsjrrpfqzr6h8cri2slw"; type = "gem"; }; - version = "0.2.49"; + version = "0.2.50"; }; rex-zip = { groups = ["default"]; @@ -1297,10 +1307,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vzwh4r2056cyagx0kggrl82yi9ldhj5slp0rdy8fdchh6ac95rg"; + sha256 = "075ib787qp2g0ghx0pww76ff843l09y5d5h1x63zbnxzm3q3v4dz"; type = "gem"; }; - version = "3.2.4"; + version = "3.2.5"; }; rubyntlm = { groups = ["default"]; @@ -1353,7 +1363,7 @@ version = "3.0.5"; }; sqlite3 = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2"]; groups = ["default"]; platforms = []; source = { diff --git a/third_party/nixpkgs/pkgs/tools/security/mitmproxy2swagger/default.nix b/third_party/nixpkgs/pkgs/tools/security/mitmproxy2swagger/default.nix index 0253bdaeba..54af57873b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/mitmproxy2swagger/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/mitmproxy2swagger/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mitmproxy2swagger"; - version = "0.8.1"; + version = "0.8.2"; format = "pyproject"; src = fetchFromGitHub { owner = "alufers"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-F/25fVNM3ZSYqg6oeKT/PxCXBB3z5INBKMqYGAbFiQM="; + hash = "sha256-w9Jbtf/BFkr2qEVqpxkRkQ1ve5o77Mhs0kGwdG5ucKI="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix b/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix index 04b3f1aecb..50b1361eee 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix @@ -1,13 +1,11 @@ { lib , stdenv , rustPlatform -, fetchCrate +, fetchzip , openssl , pkg-config -, makeWrapper , installShellFiles , Security -, libiconv # rbw-fzf , withFzf ? false @@ -26,15 +24,14 @@ rustPlatform.buildRustPackage rec { pname = "rbw"; - version = "1.5.0"; + version = "1.6.0"; - src = fetchCrate { - inherit version; - crateName = pname; - sha256 = "sha256-3kSBE2D+kC9CTbWlCKPro9fLu2tnd6LFTV4EshHMm3Y="; + src = fetchzip { + url = "https://git.tozt.net/rbw/snapshot/rbw-${version}.tar.gz"; + sha256 = "sha256-f8ckTYfmwHt3g3n/D2U275G1nn7uG+2W+DIi6YmsvjQ="; }; - cargoSha256 = "sha256-DL3qaUZxWnzsJOxi8+GtXBbZC7vfsridJWqhOTdcsgM="; + cargoHash = "sha256-EVEl1hhaeYBXIMQTgl0tDIbhE3cUm8jiyDTeWtsNaq0="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/security/rsign2/default.nix b/third_party/nixpkgs/pkgs/tools/security/rsign2/default.nix new file mode 100644 index 0000000000..e83fdc7b2b --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/rsign2/default.nix @@ -0,0 +1,24 @@ +{ lib +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "rsign2"; + version = "0.6.2"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-Ono7cKXccYMmkrlsJ+Z85w8z0fEduuEQhRlHQQk0vzU="; + }; + + cargoHash = "sha256-Yuf4iTWGQp/1ZUVqaR0tKfFxKJ9JEmMLq1LL7gwf6w0="; + + meta = with lib; { + description = "A command-line tool to sign files and verify signatures"; + homepage = "https://github.com/jedisct1/rsign2"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "rsign"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix b/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix index d3295de5ba..b03f440a2d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix @@ -72,6 +72,6 @@ buildGoModule rec { changelog = "https://github.com/ossf/scorecard/releases/tag/v${version}"; description = "Security health metrics for Open Source"; license = licenses.asl20; - maintainers = with maintainers; [ jk ]; + maintainers = with maintainers; [ jk developer-guy ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/secp256k1/default.nix b/third_party/nixpkgs/pkgs/tools/security/secp256k1/default.nix index fa07080d2d..cb9cf172da 100644 --- a/third_party/nixpkgs/pkgs/tools/security/secp256k1/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/secp256k1/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "secp256k1"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "secp256k1"; rev = "refs/tags/v${version}"; - sha256 = "sha256-wYJIMCoo6ryeQN4ZnvEkJ5/332+AkaOwgplDuQQC5MU="; + sha256 = "sha256-ii4JuYd65L0FBWY+cqcFuUEjExZOj6Pt5T0OyaVhIEI="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/semgrep/common.nix b/third_party/nixpkgs/pkgs/tools/security/semgrep/common.nix index 0b3524dca5..d538ae7a65 100644 --- a/third_party/nixpkgs/pkgs/tools/security/semgrep/common.nix +++ b/third_party/nixpkgs/pkgs/tools/security/semgrep/common.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, fetchzip, stdenv }: rec { - version = "1.0.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "returntocorp"; repo = "semgrep"; rev = "v${version}"; - sha256 = "sha256-4fNBpokHKCtMB3P0ot1TzcuzOs5hlyH8nIw+bCGqThA="; + sha256 = "sha256-qtiOZRqN+EqJs7kDmNReW4uweEynJd0TrU7vpR/fbqI="; }; # submodule dependencies @@ -18,14 +18,14 @@ rec { "cli/src/semgrep/lang" = fetchFromGitHub { owner = "returntocorp"; repo = "semgrep-langs"; - rev = "65cb2ed80e31e01b122f893fef8428d14432da75"; - sha256 = "sha256-HdPJdOlMM1l7vNSATkEu5KrCkpt2feEAH8LFDU84KUM="; + rev = "08656cdefc9e6818c64e168cf51ee1e76ea8829e"; + sha256 = "sha256-vYf33JhfvEDmt/VW0hBOmqailIERS0GdUgrPuCxWt9I="; }; "cli/src/semgrep/semgrep_interfaces" = fetchFromGitHub { owner = "returntocorp"; repo = "semgrep-interfaces"; - rev = "c69e30a4cf39f11cab5378700f5e193e8282079e"; - sha256 = "sha256-Wr3/TWx/LHiTFCoGY4sqdsn3dHvMsEIVYA3RGiv88xQ="; + rev = "deffcb8e0e5166e29ce17b8af72716f45cbb2aa6"; + sha256 = "sha256-yrVn1fJcAkQd3TMIvrWa5NDb/fN3ngybOycu7DG4pbE="; }; }; @@ -35,11 +35,11 @@ rec { data = { x86_64-linux = { suffix = "-ubuntu-16.04.tgz"; - sha256 = "sha256-SsaAuhcDyO3nr6H2xOtdxzOoEQd6aIe0mlpehvDWzU0="; + sha256 = "sha256-cnF92jrVeRxDAbDQxicZ4+CfdOD7BJUz2fHjIHEim24="; }; x86_64-darwin = { suffix = "-osx.zip"; - sha256 = "sha256-DAcAB/q6XeljCp4mVljIJB4AUjUuzMSRMFzIuyjWMew="; + sha256 = "sha256-eg6oHTz3vRd4GubvOYiJIjv/NZgXRWHPBmFvSu60S+E="; }; }; src = let diff --git a/third_party/nixpkgs/pkgs/tools/security/semgrep/default.nix b/third_party/nixpkgs/pkgs/tools/security/semgrep/default.nix index 8a2b8f0273..510dd9f611 100644 --- a/third_party/nixpkgs/pkgs/tools/security/semgrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/semgrep/default.nix @@ -17,15 +17,17 @@ buildPythonApplication rec { pname = "semgrep"; inherit (common) src version; - postPatch = (lib.concatStringsSep "\n" (lib.mapAttrsToList ( - path: submodule: '' - # substitute ${path} - # remove git submodule placeholder - rm -r ${path} - # link submodule - ln -s ${submodule}/ ${path} - '' - ) common.submodules)) + '' + postPatch = (lib.concatStringsSep "\n" (lib.mapAttrsToList + ( + path: submodule: '' + # substitute ${path} + # remove git submodule placeholder + rm -r ${path} + # link submodule + ln -s ${submodule}/ ${path} + '' + ) + common.submodules)) + '' cd cli ''; @@ -50,6 +52,7 @@ buildPythonApplication rec { click-option-group glom requests + rich ruamel-yaml tqdm packaging diff --git a/third_party/nixpkgs/pkgs/tools/security/semgrep/update.sh b/third_party/nixpkgs/pkgs/tools/security/semgrep/update.sh index 2b464d6020..25b18edd6e 100755 --- a/third_party/nixpkgs/pkgs/tools/security/semgrep/update.sh +++ b/third_party/nixpkgs/pkgs/tools/security/semgrep/update.sh @@ -25,7 +25,7 @@ instantiateClean() { # get latest version NEW_VERSION=$( - curl -s -H + curl -s -H \ "Accept: application/vnd.github.v3+json" \ ${GITHUB_TOKEN:+ -H "Authorization: bearer $GITHUB_TOKEN"} \ https://api.github.com/repos/returntocorp/semgrep/releases/latest \ @@ -75,8 +75,8 @@ nix-instantiate -E "with import $NIXPKGS_ROOT {}; builtins.attrNames semgrep.com | jq '.[]' -r \ | while read -r PLATFORM; do echo "Updating core for $PLATFORM" - SUFFIX=$(instantiateClean semgrep.common.core.data."$1".suffix "$PLATFORM") - OLD_HASH=$(instantiateClean semgrep.common.core.data."$1".sha256 "$PLATFORM") + SUFFIX=$(instantiateClean semgrep.common.core.data."$PLATFORM".suffix) + OLD_HASH=$(instantiateClean semgrep.common.core.data."$PLATFORM".sha256) echo "Old hash $OLD_HASH" NEW_URL="https://github.com/returntocorp/semgrep/releases/download/v$NEW_VERSION/semgrep-v$NEW_VERSION$SUFFIX" @@ -123,7 +123,7 @@ nix-instantiate -E "with import $NIXPKGS_ROOT {}; builtins.attrNames semgrep.pas NEW_URL=$(instantiateClean semgrep.passthru.common.submodules."$SUBMODULE".url | sed "s@$OLD_REV@$NEW_REV@g") NEW_HASH=$(nix --experimental-features nix-command hash to-sri "sha256:$(nix-prefetch-url "$NEW_URL")") - TMP_HASH="sha256-ABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" + TMP_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" replace "$OLD_REV" "$NEW_REV" "$COMMON_FILE" replace "$OLD_HASH" "$TMP_HASH" "$COMMON_FILE" NEW_HASH="$(fetchgithub semgrep.passthru.common.submodules."$SUBMODULE")" diff --git a/third_party/nixpkgs/pkgs/tools/security/slsa-verifier/default.nix b/third_party/nixpkgs/pkgs/tools/security/slsa-verifier/default.nix new file mode 100644 index 0000000000..188052452d --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/slsa-verifier/default.nix @@ -0,0 +1,43 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: + +buildGoModule rec { + pname = "slsa-verifier"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "slsa-framework"; + repo = "slsa-verifier"; + rev = "v${version}"; + hash = "sha256-Gef8TQSd6bTWIzFOQ9xjqB49We7IKBu9p/Lb426nNbc="; + }; + + vendorHash = "sha256-1syIEjvqYHCiOLf8Fc2vghFKfN6ADM05By11jGNZODs="; + + CGO_ENABLED = 0; + GO111MODULE = "on"; + GOFLAGS = "-trimpath"; + + subPackages = [ "cli/slsa-verifier" ]; + + tags = [ "netgo" ]; + + ldflags = [ + "-s" + "-w" + "-buildid=" + "-X sigs.k8s.io/release-utils/version.gitVersion=${version}" + ]; + + doCheck = false; + + meta = { + homepage = "https://github.com/slsa-framework/slsa-verifier"; + changelog = "https://github.com/slsa-framework/slsa-verifier/releases/tag/v${version}"; + description = "Verify provenance from SLSA compliant builders"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ developer-guy mlieberman85 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix b/third_party/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix index 1745c71678..71e5a2602b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ssh-to-age"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "Mic92"; repo = "ssh-to-age"; rev = version; - sha256 = "sha256-S7iWwRyJfxG38ym5j0b9xwC0tCNhQE+X/UuHG1wFVXo="; + sha256 = "sha256-48j8NXKUepYDMnr/d9fGH+ISPPLN5zsvwt5XHJN6MCc="; }; - vendorHash = "sha256-ZOa352gtigbuEQHw6i9Mnh2MD6+8IHOJOg7WJCH+Q88="; + vendorHash = "sha256-qtjjrvvRVcrJIM+EPWTd6xFgIbKvEqkiT3vjXakoQp0="; checkPhase = '' runHook preCheck 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 344fcfb2cf..e79e8264a1 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.23.3"; + version = "0.23.4"; src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-gJsezi7yczVagR7faQvehyGWW6E7sfDXrJEVdsUSSp0="; + hash = "sha256-RNuYqmfMrIrWodrn7lpM0YO+HVxz+gKr5IregRqo5ak="; }; ldflags = [ @@ -25,7 +25,7 @@ buildGoModule rec { rm command/certificate/remote_test.go ''; - vendorHash = "sha256-YsZGs5/QQLdnXOeEnDXevlnJrOBoLkdYqTj2ZIoUOkA="; + vendorHash = "sha256-drIVwsqgJsYDXSuu5AhnBnKwwgkhVyNS/HS9FcoJeLM="; 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/step-kms-plugin/default.nix b/third_party/nixpkgs/pkgs/tools/security/step-kms-plugin/default.nix new file mode 100644 index 0000000000..eacfea39bd --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/step-kms-plugin/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +, pkg-config +, pcsclite +, softhsm +, opensc +, yubihsm-shell +, writeScriptBin }: + +buildGoModule rec { + pname = "step-kms-plugin"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "smallstep"; + repo = pname; + rev = "v${version}"; + hash = "sha256-5oMkR997ZbPpOqazpyxEvLKbak7THAu855FC6a/Tr+4="; + }; + + vendorHash = "sha256-Zd2rZez5vP9uL5dolGHO8FR0ARoYP78amcakK/lKtdc="; + + proxyVendor = true; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + opensc + pcsclite + softhsm + yubihsm-shell + ]; + + ldflags = [ + "-w" + "-s" + "-X github.com/smallstep/step-kms-plugin/cmd.Version=${version}" + ]; + + meta = with lib; { + description = "step plugin to manage keys and certificates on cloud KMSs and HSMs"; + homepage = "https://smallstep.com/cli/"; + license = licenses.asl20; + maintainers = with maintainers; [ qbit ]; + mainProgram = "step-kms-plugin"; + # can't find pcsclite header files + broken = stdenv.isDarwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/tlsx/default.nix b/third_party/nixpkgs/pkgs/tools/security/tlsx/default.nix index 620d38f377..a4d11f71cb 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tlsx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tlsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tlsx"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-9Cs5lkt7lAgCl/q2Xc8W5A8/frKER/d3mS1KH9jAy68="; + hash = "sha256-rKnnBvutJqWUOsYt47+VwreJVRtJYYhRVxZdSqymRiw="; }; - vendorHash = "sha256-eQnrSE45UGRbJ7zO6TdBh6UKooUEnhVxg4cdgoFu5eM="; + vendorHash = "sha256-kLZCtmKJKNjmEk7vPoHfzqEnuBrycDYGNMh/zUDZ76g="; # Tests require network access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix b/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix index 7ae37cf286..7bfa0e0a19 100644 --- a/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.28.7"; + version = "3.29.1"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-6oOIKvUocImC3HMeG5aJXLlruymechcsDhMxEyYiNzU="; + hash = "sha256-ZCHrqvqIlANqkZ/zVYbwOsRimWVUAZ8zvBnfTaBE8qk="; }; - vendorHash = "sha256-/4xZjqstrjfIlD15x2INSunb57WGR7NzKaQxUABxQV0="; + vendorHash = "sha256-Z1QJM2feKFQ8MEVwzYt+MkpDZHiaVWlzq2lbResWQWk="; # Test cases run git clone and require network access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/vals/default.nix b/third_party/nixpkgs/pkgs/tools/security/vals/default.nix index b029b710fc..c9fad8b068 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vals/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vals/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vals"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "variantdev"; repo = pname; - sha256 = "sha256-/XBjGbpQIeO7UehcZv2kN4k2ZOsfhduUteURAqaUpwQ="; + sha256 = "sha256-YIzy8WPguIrhkg1HW2X714Xp9b+eL6bej/oXN62kyus="; }; - vendorHash = "sha256-l837w2K3GsDTb9EEeYPfyrnkRSkv0FyoPr29Ud+iiJ8="; + vendorHash = "sha256-CzfAUNKskEbxWmVGz/XHItUS9Mp12zjTJ3z9X7YBjR4="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix b/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix index 49c0f8cd14..367123fad2 100644 --- a/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { humanize importlib-metadata loguru - Mako + mako markupsafe mitmproxy six diff --git a/third_party/nixpkgs/pkgs/tools/security/xcat/default.nix b/third_party/nixpkgs/pkgs/tools/security/xcat/default.nix index f5fa23d190..ea3390b38c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/xcat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/xcat/default.nix @@ -24,9 +24,9 @@ python3.pkgs.buildPythonApplication rec { aiodns aiohttp appdirs - cchardet click colorama + faust-cchardet prompt-toolkit xpath-expressions ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/xsser/default.nix b/third_party/nixpkgs/pkgs/tools/security/xsser/default.nix index 5028b3c772..6c75f2e733 100644 --- a/third_party/nixpkgs/pkgs/tools/security/xsser/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/xsser/default.nix @@ -22,10 +22,6 @@ buildPythonApplication rec { substituteInPlace setup.py --replace /usr/share share ''; - # Temporary fix - # See https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/system/acpica-tools/default.nix b/third_party/nixpkgs/pkgs/tools/system/acpica-tools/default.nix index 92f30e4ddb..214fe763f2 100644 --- a/third_party/nixpkgs/pkgs/tools/system/acpica-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/acpica-tools/default.nix @@ -29,11 +29,12 @@ stdenv.mkDerivation rec { "iasl" ]; - env.NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString ([ "-O3" + ] ++ lib.optionals (stdenv.cc.isGNU) [ # Needed with GCC 12 "-Wno-dangling-pointer" - ]; + ]); enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix b/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix index b2a7bb8a8b..53472de635 100644 --- a/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.68"; + version = "1.0.72"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wtmyUlkruFE3dQmsb9x2683gwEVjsBCQJ8VW4b0IdkU="; + sha256 = "sha256-JOf10wGpOwJTvBvaeoBPKWm6f3B6K9ZsJaKkkzwkM7Y="; }; - cargoHash = "sha256-nQx70KtWzvg6w8UNJqTrqzBc5SZKwCiHx2jhoBbmNP4="; + cargoHash = "sha256-4vzu77BLxJeVQgpI+g16XrqWt94r93v6Wz9wwFcbKlQ="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/third_party/nixpkgs/pkgs/tools/system/ipmitool/default.nix b/third_party/nixpkgs/pkgs/tools/system/ipmitool/default.nix index 9293951d74..407a1f91b3 100644 --- a/third_party/nixpkgs/pkgs/tools/system/ipmitool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/ipmitool/default.nix @@ -1,6 +1,13 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, openssl, readline }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, openssl, readline, fetchurl }: -stdenv.mkDerivation rec { +let + + iana-enterprise-numbers = fetchurl { + url = "https://web.archive.org/web/20230312103209id_/https://www.iana.org/assignments/enterprise-numbers.txt"; + sha256 = "sha256-huFWygMEylBKBMLV16UE6xLWP6Aw1FGYk5h1q5CErUs="; + }; + +in stdenv.mkDerivation rec { pname = "ipmitool"; version = "1.8.19"; @@ -16,7 +23,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace configure.ac \ - --replace 'AC_MSG_WARN([** Neither wget nor curl could be found.])' 'AM_CONDITIONAL([DOWNLOAD], [false])' + --replace 'AC_MSG_WARN([** Neither wget nor curl could be found.])' 'AM_CONDITIONAL([DOWNLOAD], [true])' + cp ${iana-enterprise-numbers} enterprise-numbers ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/system/logcheck/default.nix b/third_party/nixpkgs/pkgs/tools/system/logcheck/default.nix index dea241e11a..743265caf2 100644 --- a/third_party/nixpkgs/pkgs/tools/system/logcheck/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/logcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "logcheck"; - version = "1.3.23"; + version = "1.4.2"; _name = "logcheck_${version}"; src = fetchurl { url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz"; - sha256 = "sha256-ohiLpUn/9EEsggdLJxiE/2bSXz/bKkGRboF85naFWyk="; + sha256 = "sha256-DGUd6zHcIB8VhOzqKSslmTK65uPozvhG2zEJ6Jp/IX4="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix b/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix index 7c94c9c89e..5062fabbd9 100644 --- a/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.15.03"; + version = "0.15.05"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-ryZoW2N93f1jDNF+qZ8y9brPGrTLiOFi2ciIEh1Lt1c="; + hash = "sha256-MyV2GocnmZ9BqHq5ibjHenks5aSJkKdpqUXIDPxjfms="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/system/zfxtop/default.nix b/third_party/nixpkgs/pkgs/tools/system/zfxtop/default.nix index 79a88ade3d..9b5489e0dc 100644 --- a/third_party/nixpkgs/pkgs/tools/system/zfxtop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/zfxtop/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zfxtop"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "ssleert"; repo = "zfxtop"; rev = version; - hash = "sha256-9o32sryffcCt/sBnaT5QzD5oLRfJHgq1yKP8d0pk2JQ="; + hash = "sha256-auq5NvpI7De9/QBUDPFtXwsAeX/D2RmlVaKe/lrs1MQ="; }; - vendorHash = "sha256-H1X7j77Wp8ipgNTMZbFwoSA7NrILahFK8YwoP1W3h2c="; + vendorHash = "sha256-VKBRgDu9xVbZrC5fadkdFjd1OETNwaxgraRnA34ETzE="; meta = with lib; { description = "fetch top for gen Z with X written by bubbletea enjoyer"; diff --git a/third_party/nixpkgs/pkgs/tools/text/a2ps/default.nix b/third_party/nixpkgs/pkgs/tools/text/a2ps/default.nix index d3fe3a7e70..2bf62f73c4 100644 --- a/third_party/nixpkgs/pkgs/tools/text/a2ps/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/a2ps/default.nix @@ -1,37 +1,34 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoconf, bison, libpaper, gperf, file, perl }: +{ lib +, stdenv +, fetchurl +, autoconf +, bison +, file +, perl +, pkg-config +, boehmgc +, gperf +, libpaper +}: stdenv.mkDerivation rec { pname = "a2ps"; - version = "4.14"; + version = "4.15.1"; src = fetchurl { url = "mirror://gnu/a2ps/a2ps-${version}.tar.gz"; - sha256 = "195k78m1h03m961qn7jr120z815iyb93gwi159p1p9348lyqvbpk"; + hash = "sha256-l5dwi6AoBa/DtbkeBsuOrJe4WEOpDmbP3mp8Y8oEKyo="; }; - patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/a/a2ps/1:4.14-1.3/debian/patches/09_CVE-2001-1593.diff"; - sha256 = "1hrfmvb21zlklmg2fqikgywhqgc4qnvbhx517w87faafrhzhlnh0"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/a/a2ps/1:4.14-1.3/debian/patches/CVE-2014-0466.diff"; - sha256 = "0grqqsc3m45niac56m19m5gx7gc0m8zvia5iman1l4rlq31shf8s"; - }) - (fetchpatch { - name = "CVE-2015-8107.patch"; - url = "https://sources.debian.net/data/main/a/a2ps/1:4.14-1.3/debian/patches/fix-format-security.diff"; - sha256 = "0pq7zl41gf2kc6ahwyjnzn93vbxb4jc2c5g8j20isp4vw6dqrnwv"; - }) - ]; - postPatch = '' substituteInPlace afm/make_fonts_map.sh --replace "/bin/rm" "rm" substituteInPlace tests/defs.in --replace "/bin/rm" "rm" ''; - nativeBuildInputs = [ autoconf file bison perl ]; - buildInputs = [ libpaper gperf ]; + nativeBuildInputs = [ autoconf bison file perl pkg-config ]; + buildInputs = [ boehmgc gperf libpaper ]; + + strictDeps = true; meta = with lib; { description = "An Anything to PostScript converter and pretty-printer"; @@ -44,7 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/a2ps/"; license = licenses.gpl3Plus; maintainers = [ maintainers.bennofs ]; - platforms = platforms.linux; - + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/csvkit/default.nix b/third_party/nixpkgs/pkgs/tools/text/csvkit/default.nix index fdd3539b08..96383fa87f 100644 --- a/third_party/nixpkgs/pkgs/tools/text/csvkit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/csvkit/default.nix @@ -2,24 +2,45 @@ , python3 }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "1.4.46"; + src = super.fetchPypi { + pname = "SQLAlchemy"; + inherit version; + hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; + }; + nativeCheckInputs = oldAttrs.nativeCheckInputs ++ (with super; [ + pytest-xdist + ]); + disabledTestPaths = (oldAttrs.disabledTestPaths or []) ++ [ + "test/aaa_profiling" + "test/ext/mypy" + ]; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "csvkit"; version = "1.1.1"; format = "setuptools"; - src = python3.pkgs.fetchPypi { + src = python.pkgs.fetchPypi { inherit pname version; hash = "sha256-vt23t49rIq2+1urVrV3kv7Md0sVfMhGyorO2VSkEkiM="; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python.pkgs; [ agate agate-excel agate-dbf agate-sql ]; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/csvquote/csvquote-path.patch b/third_party/nixpkgs/pkgs/tools/text/csvquote/csvquote-path.patch new file mode 100644 index 0000000000..a3f87055f2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/csvquote/csvquote-path.patch @@ -0,0 +1,14 @@ +--- a/csvheader ++++ b/csvheader +@@ -29,10 +29,6 @@ while getopts "d:tq:r:" arg; do + esac + done + +-CSVQUOTE=`which csvquote` || CSVQUOTE="./csvquote" +-if [ ! -f $CSVQUOTE ]; then +- echo "csvquote program not found. exiting" +- exit 1 +-fi ++CSVQUOTE=@out@/bin/csvquote + + $CSVQUOTE $@ | head -n 1 | tr "$DEL" '\n' | nl -ba | $CSVQUOTE -u -d "$DEL" -q "$QUO" -r "$REC" diff --git a/third_party/nixpkgs/pkgs/tools/text/csvquote/default.nix b/third_party/nixpkgs/pkgs/tools/text/csvquote/default.nix new file mode 100644 index 0000000000..2812de2084 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/csvquote/default.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitHub +, patsh +}: + +stdenv.mkDerivation rec { + pname = "csvquote"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "dbro"; + repo = "csvquote"; + rev = "v${version}"; + hash = "sha256-847JAoDEfA9K4LB8z9cqSw+GTImqmITBylB/4odLDb0="; + }; + + patches = [ + # patch csvheader to use csvquote from the derivation + ./csvquote-path.patch + ]; + + nativeBuildInputs = [ + patsh + ]; + + makeFlags = [ + "BINDIR=$(out)/bin" + ]; + + preInstall = '' + mkdir -p "$out/bin" + ''; + + postInstall = '' + substituteAllInPlace $out/bin/csvheader + patsh $out/bin/csvheader -fs ${builtins.storeDir} + ''; + + meta = with lib; { + description = "Enables common unix utlities like cut, awk, wc, head to work correctly with csv data containing delimiters and newlines"; + homepage = "https://github.com/dbro/csvquote"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/d2/default.nix b/third_party/nixpkgs/pkgs/tools/text/d2/default.nix index ef6ab261f3..de2857da18 100644 --- a/third_party/nixpkgs/pkgs/tools/text/d2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/d2/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "d2"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "v${version}"; - hash = "sha256-HFopiZamQ0A40u/+/pTxwYb598vyvWlNV4510Ode5RM="; + hash = "sha256-aReYFw6mlPhf11bhLII5CrMG1G9d0hhPsFVrZxmt72o="; }; - vendorHash = "sha256-xmB1i7IKTELvqZBxVL23Zpr7CfihW6LPBKwPUUXnHmQ="; + vendorHash = "sha256-+Z8nzna5KedWzmhBKGSpsbE8ooaC9sPk6Bh5zkrzwrQ="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/text/diffutils/default.nix b/third_party/nixpkgs/pkgs/tools/text/diffutils/default.nix index d5f27747cf..fb0a95c49e 100644 --- a/third_party/nixpkgs/pkgs/tools/text/diffutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/diffutils/default.nix @@ -7,13 +7,25 @@ stdenv.mkDerivation rec { pname = "diffutils"; - version = "3.8"; + version = "3.9"; src = fetchurl { url = "mirror://gnu/diffutils/diffutils-${version}.tar.xz"; - sha256 = "sha256-pr3X0bMSZtEcT03mwbdI1GB6sCMa9RiPwlM9CuJDj+w="; + hash = "sha256-2A076QogGGjeg9eNrTQTrYgWDMU7zDbrnq98INvwI/E="; }; + patches = [ + # Backport of a fix for 'diff -D' output. + # TODO: remove when updating to 3.10. + ./fix-diff-D.patch + ]; + + postPatch = '' + # avoid the need for help2man + # TODO: can be removed when fix-diff-D.patch is removed. + touch man/diff.1 + ''; + outputs = [ "out" "info" ]; nativeBuildInputs = [ xz.bin ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/diffutils/fix-diff-D.patch b/third_party/nixpkgs/pkgs/tools/text/diffutils/fix-diff-D.patch new file mode 100644 index 0000000000..616f092791 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/diffutils/fix-diff-D.patch @@ -0,0 +1,15 @@ +https://git.savannah.gnu.org/cgit/diffutils.git/patch/?id=ba08fbbb0ca5da455bf695236c57bc50e7faed50 +https://github.com/NixOS/nixpkgs/pull/213421#issuecomment-1407749912 + +Fix 'diff -D' regression +--- a/src/diff.c ++++ b/src/diff.c +@@ -416,7 +416,7 @@ main (int argc, char **argv) + char *base = b; + int changes = 0; + +- for (i = 0; i < sizeof sizeof C_ifdef_group_formats; i++) ++ for (i = 0; i < sizeof C_ifdef_group_formats; i++) + { + char ch = C_ifdef_group_formats[i]; + switch (ch) diff --git a/third_party/nixpkgs/pkgs/tools/text/ebook-tools/default.nix b/third_party/nixpkgs/pkgs/tools/text/ebook-tools/default.nix index 1a46110e2a..5efdb69fe4 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ebook-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ebook-tools/default.nix @@ -12,11 +12,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libxml2 libzip ]; - preConfigure = - '' - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libzip)" - ''; - meta = with lib; { homepage = "http://ebook-tools.sourceforge.net"; description = "Tools and library for dealing with various ebook file formats"; diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-katex/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook-katex/default.nix index bb0db2740d..40999bc71e 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mdbook-katex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.3.9"; + version = "0.3.10"; src = fetchCrate { inherit pname version; - hash = "sha256-FsKHGw/6n/8eCJh1XatNsw3iCzD+siHdJ3i0dNKD5Go="; + hash = "sha256-oGefjf4URmE0i6mOjpZfBcSh280O+IvrAhu3vFAyntQ="; }; - cargoHash = "sha256-nyLWbwruzQeyPGkVuMiRCTHtFE+E9nQ57ZMXxqIcLxE="; + cargoHash = "sha256-tkMdxkJcvmDSH2ree1nol1JlKKhI5G4x9x5Hs0peKI8="; OPENSSL_DIR = "${lib.getDev openssl}"; OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-pagetoc/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook-pagetoc/default.nix index 7ee5f8fdde..74e88c8ef3 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mdbook-pagetoc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mdbook-pagetoc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-pagetoc"; - version = "0.1.5"; + version = "0.1.7"; src = fetchFromGitHub { owner = "slowsage"; repo = pname; rev = "v${version}"; - hash = "sha256-SRrlyUkEdC63NbdAv+J9kb5LTCL/GBwMhnUVdTE4nas="; + hash = "sha256-rhg/QDdO44Qwb/z1tQEYK5DcGuUI6cQvpHTYmqYyoWY="; }; - cargoHash = "sha256-Gx6N8VFUnaOvQ290TLeeNj/pVDeK/nUWLjM/KwVAjNo="; + cargoHash = "sha256-03/bLFbP+BSfRW6wyg7LnryDP0kqvfvYqrFBKFZ2xY8="; meta = with lib; { description = "Table of contents for mdbook (in sidebar)"; diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix index 9d00c8e1fd..155cca613a 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.26"; + version = "0.4.28"; src = fetchFromGitHub { owner = "rust-lang"; repo = "mdBook"; rev = "refs/tags/v${version}"; - sha256 = "sha256-+K2mbVbOMQDumcPgiPtqDts/RGi+E0lF7Cftt86X/5A="; + sha256 = "sha256-9Otjl3JLEQo+WojUOu0XE1GH2P4LjKhaxSd1xoekXdk="; }; - cargoHash = "sha256-C9ziW3LUBGR/K+nR3mDr62KoE9p3mn+50nfd/3NFjro="; + cargoHash = "sha256-TViBclvCJeoOInTt13B7297JDtRkwvOjIf6AVAbpanU="; auditable = true; # TODO: remove when this is the default diff --git a/third_party/nixpkgs/pkgs/tools/text/teip/default.nix b/third_party/nixpkgs/pkgs/tools/text/teip/default.nix index 14e1914dea..c0ac20a281 100644 --- a/third_party/nixpkgs/pkgs/tools/text/teip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/teip/default.nix @@ -1,28 +1,50 @@ -{ lib, rustPlatform, fetchCrate, installShellFiles, perl }: +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +, perl +, stdenv +}: rustPlatform.buildRustPackage rec { pname = "teip"; - version = "2.0.0"; + version = "2.3.0"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-fME+tS8wcC6mk5FjuDJpFWWhIsiXV4kuybSqj9awFUM="; + src = fetchFromGitHub { + owner = "greymd"; + repo = "teip"; + rev = "v${version}"; + hash = "sha256-09IKAM1ha40CvF5hdQIlUab7EBBFourC70LAagrs5+4="; }; - cargoSha256 = "sha256-wrfS+OEYF60nOhtrnmk7HKqVuAJQFaiT0GM+3OoZ3Wk="; + cargoHash = "sha256-cBFczgvLja6upuPnXphG2d9Rf1ZpNAVh16NHAHfXxHg="; nativeBuildInputs = [ installShellFiles ]; nativeCheckInputs = [ perl ]; + # Cargo.lock is outdated + preConfigure = '' + cargo update --offline + ''; + + # tests are locale sensitive + preCheck = '' + export LANG=${if stdenv.isDarwin then "en_US.UTF-8" else "C.UTF-8"} + ''; + postInstall = '' installManPage man/teip.1 - installShellCompletion --zsh completion/zsh/_teip + installShellCompletion \ + --bash completion/bash/teip \ + --fish completion/fish/teip.fish \ + --zsh completion/zsh/_teip ''; meta = with lib; { description = "A tool to bypass a partial range of standard input to any command"; homepage = "https://github.com/greymd/teip"; + changelog = "https://github.com/greymd/teip/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix index 20c9226efd..f1aaf769f6 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.23.3"; + version = "2.24.0"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-M4tq/gUpI0tGMJJOHE2TtGIbFzbv9/pP6yZGDf68VHI="; + hash = "sha256-mUZ9ktqy6zLwPNjr8raJHwn6/UL4kzlT1baE+HrwPgo="; }; vendorHash = "sha256-ZgBt4BgZWViNqYCuqb/Wt1zVjFM9h1UsmsYox7kMJ1A="; diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix b/third_party/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix index 05c9a16ad3..4e2566e5c5 100644 --- a/third_party/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "html-xml-utils"; - version = "8.4"; + version = "8.5"; src = fetchurl { url = "https://www.w3.org/Tools/HTML-XML-utils/${pname}-${version}.tar.gz"; - sha256 = "sha256-QbubFOH0zWEC4/jft55xRqJMCWk4aYcxZcQhdppX0Tc="; + sha256 = "sha256-8gpGrE7TDQKM14R25fIPXikXqVy3vOfffxfY+z5Peec="; }; buildInputs = [curl libiconv]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/lout/CVE-2019-19917-and-CVE-2019-19918.patch b/third_party/nixpkgs/pkgs/tools/typesetting/lout/CVE-2019-19917-and-CVE-2019-19918.patch deleted file mode 100644 index b146822c9c..0000000000 --- a/third_party/nixpkgs/pkgs/tools/typesetting/lout/CVE-2019-19917-and-CVE-2019-19918.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- a/externs.h -+++ b/externs.h -@@ -260,6 +260,9 @@ If you're compiling this, you've got the - /* that can appear correctly on one page. Can be */ - /* increased to any small positive integer. */ - /* */ -+/* MAX_FORMAT The maximum number of characters for sscanf formats */ -+/* for splitting strings with tab-delimited fields. */ -+/* */ - /*****************************************************************************/ - - #define MAX_FULL_LENGTH 8388607 /* 2**23 - 1, about 148 metres */ -@@ -275,6 +278,7 @@ If you're compiling this, you've got the - #define MAX_LEX_STACK 20 - #define MAX_CHARS 256 - #define MAX_HCOPIES 3 -+#define MAX_FORMAT 100 - - /*****************************************************************************/ - /* */ ---- a/z02.c -+++ b/z02.c -@@ -378,7 +378,7 @@ static void srcnext(void) - if( blksize != 0 && chpt < limit ) - { debugcond0(DLA, DD, stack_free <= 1, "srcnext: transferring."); - col = buf; -- while( chtbl[(*--col = *--limit)] != NEWLINE ); -+ while( col > mem_block && chtbl[(*--col = *--limit)] != NEWLINE ); - frst = col + 1; limit++; blksize = 0; - } - ---- a/z33.c -+++ b/z33.c -@@ -847,6 +847,7 @@ BOOLEAN DbRetrieve(OBJECT db, BOOLEAN ga - BOOLEAN DbRetrieveNext(OBJECT db, BOOLEAN *gall, OBJECT *sym, FULL_CHAR *tag, - FULL_CHAR *seq, FILE_NUM *dfnum, long *dfpos, int *dlnum, long *cont) - { FULL_CHAR line[MAX_BUFF], *cline, fname[MAX_BUFF]; int symnum; -+ char format[MAX_FORMAT]; - ifdebug(DPP, D, ProfileOn("DbRetrieveNext")); - debug2(DBS, DD, "DbRetrieveNext( %s, %ld )", string(db), *cont); - assert(reading(db), "DbRetrieveNext: not reading"); -@@ -858,6 +859,8 @@ BOOLEAN DbRetrieveNext(OBJECT db, BOOLEA - return FALSE; - } - -+ sprintf(format, "%%d&%%%d[^\t]\t%%%d[^\t]\t%%*[^\t]\t%%ld\t%%d\t%%%d[^\n\f]", MAX_BUFF-1, MAX_BUFF-1, MAX_BUFF-1); -+ - if( in_memory(db) ) - { - /* get next entry from internal database */ -@@ -868,7 +871,7 @@ BOOLEAN DbRetrieveNext(OBJECT db, BOOLEA - } - cline = (FULL_CHAR *) db_lines(db)[*cont]; - *gall = (cline[0] == '0' ? 1 : 0); -- sscanf((char *)&cline[*gall], "%d&%[^\t]\t%[^\t]\t%*[^\t]\t%ld\t%d\t%[^\n\f]", -+ sscanf((char *)&cline[*gall], format, - &symnum, tag, seq, dfpos, dlnum, fname); - *cont = *cont + 1; - } -@@ -882,7 +885,7 @@ BOOLEAN DbRetrieveNext(OBJECT db, BOOLEA - return FALSE; - } - *gall = (line[0] == '0' ? 1 : 0); -- sscanf((char *)&line[*gall], "%d&%[^\t]\t%[^\t]\t%*[^\t]\t%ld\t%d\t%[^\n\f]", -+ sscanf((char *)&line[*gall], format, - &symnum, tag, seq, dfpos, dlnum, fname); - *cont = ftell(db_filep(db)); - } ---- a/z39.c -+++ b/z39.c -@@ -79,11 +79,13 @@ int strcollcmp(char *a, char *b) - int strcollcmp(char *a, char *b) - { char a1[MAX_BUFF], a2[MAX_BUFF], a3[MAX_BUFF]; - char b1[MAX_BUFF], b2[MAX_BUFF], b3[MAX_BUFF]; -+ char format[MAX_FORMAT]; - int order; -+ sprintf(format, "%%%d[^\t]\t%%%d[^\t]\t%%%d[^\t]", MAX_BUFF-1, MAX_BUFF-1, MAX_BUFF-1); - a1[0] = a2[0] = a3[0] = '\0'; -- sscanf(a, "%[^\t]\t%[^\t]\t%[^\t]", a1, a2, a3); -+ sscanf(a, format, a1, a2, a3); - b1[0] = b2[0] = b3[0] = '\0'; -- sscanf(b, "%[^\t]\t%[^\t]\t%[^\t]", b1, b2, b3); -+ sscanf(b, format, b1, b2, b3); - order = strcoll(a1, b1); - if( order == 0 ) - { -@@ -251,7 +253,7 @@ FULL_CHAR *StringQuotedWord(OBJECT x) - *q++ = CH_QUOTE; - for( p = string(x); *p != '\0'; p++ ) - { -- for( r = (FULL_CHAR *) quoted_string[*p]; *r != '\0'; *q++ = *r++ ); -+ for( r = (FULL_CHAR *) quoted_string[*p]; *r != '\0' && q < &buff[MAX_BUFF-2]; *q++ = *r++ ); - } - *q++ = CH_QUOTE; - *q++ = '\0'; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/lout/builder.sh b/third_party/nixpkgs/pkgs/tools/typesetting/lout/builder.sh deleted file mode 100755 index cd513337f6..0000000000 --- a/third_party/nixpkgs/pkgs/tools/typesetting/lout/builder.sh +++ /dev/null @@ -1,43 +0,0 @@ -# Prepare a makefile specifying the appropriate output directories. -# -# Written by Ludovic Courtès . -if [ -e .attrs.sh ]; then source .attrs.sh; fi - -source "$stdenv/setup" || exit 1 - -nixMakefile="nix-makefile" - -# Build and install documentation, PS and PDF. -installDoc () -{ - echo "building and installing documentation..." - for doc in design expert slides user - do - echo "building \`$doc' document..." - if [ ! -f "doc/$doc/outfile.ps" ] - then - ( PATH="$PWD:$PATH" ; \ - cd "doc/$doc" && lout -r4 -o outfile.ps all ) \ - || return 1 - fi - cp "doc/$doc/outfile.ps" "$out/doc/lout/$doc.ps" && \ - ps2pdf -dPDFSETTINGS=/prepress -sPAPERSIZE=a4 \ - "doc/$doc/outfile.ps" "$out/doc/lout/$doc.pdf" - done - - return 0 -} - -unpackPhase && \ -cd lout-*.* && \ -cat makefile | \ - sed -e "s|^PREFIX[[:blank:]]*=.*\$|PREFIX = $out|g ; \ - s|^LOUTLIBDIR[[:blank:]]*=.*$|LOUTLIBDIR = \$(PREFIX)/lib/lout|g ; \ - s|^LOUTDOCDIR[[:blank:]]*=.*$|LOUTDOCDIR = \$(PREFIX)/doc/lout|g ; \ - s|^MANDIR[[:blank:]]*=.*$|MANDIR = \$(PREFIX)/man|g" \ - > "$nixMakefile" && \ -mkdir -p "$out/bin" && mkdir -p "$out/lib" \ -mkdir -p "$out/man" && mkdir -p "$out/doc/lout" && \ -make -f "$nixMakefile" CC=cc install installman && \ -installDoc && \ -fixupPhase diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/lout/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/lout/default.nix index f5bf22c0f3..ce3917a928 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/lout/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/lout/default.nix @@ -1,27 +1,19 @@ -{lib, stdenv, fetchurl, ghostscript}: +{lib, stdenv, fetchFromGitHub, ghostscript}: stdenv.mkDerivation rec { pname = "lout"; - version = "3.40"; + version = "3.42.2"; - src = fetchurl { - urls = [ - "ftp://ftp.cs.usyd.edu.au/jeff/lout/${pname}-${version}.tar.gz" - "mirror://savannah/lout/${pname}-${version}.tar.gz" # new! - "mirror://sourceforge/lout/${pname}-${version}.tar.gz" # to be phased out - # XXX: We could add the CTAN mirrors - # (see https://www.ctan.org/tex-archive/support/lout/). - ]; - sha256 = "1gb8vb1wl7ikn269dd1c7ihqhkyrwk19jwx5kd0rdvbk6g7g25ix"; + src = fetchFromGitHub { + owner = "william8000"; + repo = pname; + rev = version; + hash = "sha256-rzCRxmwppBno6o4RM2GjE0pe/5yvyzyo375XdfX04As="; }; - patches = [ - # https://build.opensuse.org/request/show/843612 - ./CVE-2019-19917-and-CVE-2019-19918.patch - ]; - buildInputs = [ ghostscript ]; - builder = ./builder.sh; + + makeFlags = [ "PREFIX=$(out)/" "CC=${stdenv.cc.targetPrefix}cc" ]; meta = { description = "Document layout system similar in style to LaTeX"; @@ -46,9 +38,7 @@ stdenv.mkDerivation rec { went back to the beginning. ''; - # Author's page: http://jeffreykingston.id.au/lout/ - # Wiki: https://sourceforge.net/p/lout/wiki/ - homepage = "https://savannah.nongnu.org/projects/lout/"; + homepage = "https://github.com/william8000/lout"; license = lib.licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/UPGRADING.md b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/UPGRADING.md index 86e650afd4..acad0646d2 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/UPGRADING.md +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/UPGRADING.md @@ -33,20 +33,31 @@ See https://tug.org/texlive/acquire-mirror.html for instructions. ### Upgrade package information from texlive package database +First, edit `default.nix` as follows. + +If upgrading to a daily snapshot: +- change `snapshot.year`, `snapshot.month`, `snapshot.day`; +- ensure `urlPrefixes` uses the https://texlive.info/tlnet-archive mirror; +- ensure `texlive.extraVersion` uses the `snapshot` info. + +If upgrading to a final release: +- upgrade `texlive.bin` first; +- ensure `urlPrefixes` uses the historic mirrors; +- ensure `texlive.extraVersion` is `"-final"`. + +Then upgrade `tlpdb.hash` to match the new hash of `texlive.tlpdb.xz` and run ```bash -curl -L https://texlive.info/tlnet-archive/$YEAR/$MONTH/$DAY/tlnet/tlpkg/texlive.tlpdb.xz \ - | xzcat | sed -rn -f ./tl2nix.sed | uniq > ./pkgs.nix +nix-build ../../../../.. -A texlive.tlpdb-nix --no-out-link ``` -This will download the daily snapshot of the CTAN package database `texlive.tlpdb.xz` -and regenerate all of the sha512 hashes for the current upstream distribution in `pkgs.nix`. +This will download the daily snapshot of the CTAN package database +`texlive.tlpdb.xz` and extract the relevant package info (including version +numbers and sha512 hashes) for the selected upstream distribution. Then replace +`tlpdb.nix` with the generated file. -Use the url - -https://ftp.math.utah.edu/pub/tex/historic/systems/texlive/$YEAR/tlnet-final/tlpkg/texlive.tlpdb.xz - -for the final TeX Live release. +The test `pkgs.tests.texlive.tlpdb-nix` verifies that the file `tlpdb.nix` +in Nixpkgs matches the one that generated from `texlive.tlpdb.xz`. ### Build packages locally and generate fix hashes diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix index 6876e40900..255c208783 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -30,6 +30,14 @@ let for i in texk/kpathsea/mktex*; do sed -i '/^mydir=/d' "$i" done + + # ST_NLINK_TRICK causes kpathsea to treat folders with no real subfolders + # as leaves, even if they contain symlinks to other folders; must be + # disabled to work correctly with the nix store", see section 5.3.6 + # “Subdirectory expansion” of the kpathsea manual + # http://mirrors.ctan.org/systems/doc/kpathsea/kpathsea.pdf for more + # details + sed -i '/^#define ST_NLINK_TRICK/d' texk/kpathsea/config.h ''; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix index 94b8c2db90..9737a12c0f 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix @@ -30,7 +30,7 @@ let # the set of TeX Live packages, collections, and schemes; using upstream naming tl = let - orig = import ./pkgs.nix; + orig = import ./tlpdb.nix; removeSelfDep = lib.mapAttrs (n: p: if p ? deps then p // { deps = lib.filter (dn: n != dn) p.deps; } else p); @@ -126,16 +126,34 @@ let day = "27"; }; + # The tarballs on CTAN mirrors for the current release are constantly + # receiving updates, so we can't use those directly. Stable snapshots + # need to be used instead. Ideally, for the release branches of NixOS we + # should be switching to the tlnet-final versions + # (https://tug.org/historic/). + urlPrefixes = [ + # tlnet-final snapshot + #"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/archive" + #"ftp://tug.org/texlive/historic/${bin.texliveYear}/tlnet-final/archive" + + # Daily snapshots hosted by one of the texlive release managers + "https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/archive" + ]; + tlpdb = fetchurl { # use the same mirror(s) as urlPrefixes below - urls = [ - #"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/tlpkg/texlive.tlpdb.xz" - #"ftp://tug.org/texlive/historic/${bin.texliveYear}/tlnet-final/tlpkg/texlive.tlpdb.xz" - "https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/tlpkg/texlive.tlpdb.xz" - ]; + urls = map (up: "${up}/../tlpkg/texlive.tlpdb.xz") urlPrefixes; hash = "sha256-i8DE3/rZmtp+gODJWeHV1VcCK5cgHUgmywf3Q/agTOA="; }; + tlpdb-nix = runCommand "tlpdb.nix" { + inherit tlpdb; + tl2nix = ./tl2nix.sed; + } + '' + xzcat "$tlpdb" | sed -rn -f "$tl2nix" | uniq > "$out" + ''; + # create a derivation that contains an unpacked upstream TL package mkPkg = { pname, tlType, revision, version, sha512, postUnpack ? "", stripPrefix ? 1, ... }@args: let @@ -145,21 +163,7 @@ let fixedHash = fixedHashes.${tlName} or null; # be graceful about missing hashes urls = args.urls or (if args ? url then [ args.url ] else - map (up: "${up}/${urlName}.r${toString revision}.tar.xz") urlPrefixes); - - # The tarballs on CTAN mirrors for the current release are constantly - # receiving updates, so we can't use those directly. Stable snapshots - # need to be used instead. Ideally, for the release branches of NixOS we - # should be switching to the tlnet-final versions - # (https://tug.org/historic/). - urlPrefixes = args.urlPrefixes or [ - # tlnet-final snapshot - #"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/archive" - #"ftp://tug.org/texlive/historic/${bin.texliveYear}/tlnet-final/archive" - - # Daily snapshots hosted by one of the texlive release managers - "https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/archive" - ]; + map (up: "${up}/${urlName}.r${toString revision}.tar.xz") (args.urlPrefixes or urlPrefixes)); in runCommand "texlive-${tlName}" ( { @@ -191,7 +195,7 @@ let in tl // { - inherit bin combine; + inherit bin combine tlpdb-nix; # Pre-defined combined packages for TeX Live schemes, # to make nix-env usage more comfortable and build selected on Hydra. diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/pkgs.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/tlpdb.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/pkgs.nix rename to third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/tlpdb.nix diff --git a/third_party/nixpkgs/pkgs/tools/video/lux/default.nix b/third_party/nixpkgs/pkgs/tools/video/lux/default.nix index 0ef5dcfc53..4dfbadb95d 100644 --- a/third_party/nixpkgs/pkgs/tools/video/lux/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/lux/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "lux"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "iawia002"; repo = "lux"; rev = "v${version}"; - sha256 = "sha256-kB625R6Qlo9sw0iz8MbaCFOjxpMyH+9ugC6JDn7L7eM="; + sha256 = "sha256-n6oWItz0tnhpyPBGsf4+fYGnJyeYyhI2owkLrJWu7uw="; }; nativeBuildInputs = [ makeWrapper ]; - vendorSha256 = "sha256-2cH5xVz3k9PPjzoMjWch3o8VBfP4nWAvakNwZNQLOeI="; + vendorHash = "sha256-4pn6JKE+VieadhDLkVhbJc6XSm95cNwoNBWYGEZl8iI="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix b/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix index 098b437ea0..938a686f84 100644 --- a/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix @@ -29,9 +29,11 @@ in rustPlatform.buildRustPackage rec { depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ cargo-c libgit2 nasm zlib ]; + nativeBuildInputs = [ cargo-c libgit2 nasm ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = [ + zlib + ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix index eca3baf4a6..ceeac7bb0f 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix @@ -2,12 +2,12 @@ let docker_compose = changeVersion (with localPython.pkgs; docker-compose_1.override { inherit colorama pyyaml six dockerpty docker jsonschema requests websocket-client paramiko; - }).overridePythonAttrs "1.25.5" "1ijhg93zs3lswkljnm0rhww7gdy0g94psvsya2741prz2zcbcbks"; + }).overridePythonAttrs "1.25.5" "sha256-ei622Bc/30COUF5vfUl6wLd3OIcZVCvp5JoO/Ud6UMY="; - changeVersion = overrideFunc: version: sha256: overrideFunc (oldAttrs: rec { + changeVersion = overrideFunc: version: hash: overrideFunc (oldAttrs: rec { inherit version; src = oldAttrs.src.override { - inherit version sha256; + inherit version hash; }; }); @@ -15,9 +15,9 @@ let { self = localPython; packageOverrides = self: super: { - cement = changeVersion super.cement.overridePythonAttrs "2.8.2" "1li2whjzfhbpg6fjb6r1r92fb3967p1xv6hqs3j787865h2ysrc7"; - wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "1wf5ycjx8s066rdvr0fgz4xds9a8zhs91c4jzxvvymm1c8l8cwzf"; - semantic-version = changeVersion super.semantic-version.overridePythonAttrs "2.8.5" "d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54"; + cement = changeVersion super.cement.overridePythonAttrs "2.8.2" "sha256-h2XtBSwGHXTk0Bia3cM9Jo3lRMohmyWdeXdB9yXkItI="; + wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "sha256-7nOGKGKhVr93/5KwkDT8SCXdOvnPgbxbNgZo1CXzxfE="; + semantic-version = changeVersion super.semantic-version.overridePythonAttrs "2.8.5" "sha256-0sst4FWHYpNGebmhBOguynr0SMn0l00fPuzP9lHfilQ="; pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { version = "5.4.1"; checkPhase = '' @@ -28,7 +28,7 @@ let src = localPython.pkgs.fetchPypi { pname = "PyYAML"; inherit version; - sha256 = "sha256-YHd0y7oocyv6gCtUuqdIQhX1MJkQVbtWLvvtWy8gpF4="; + hash = "sha256-YHd0y7oocyv6gCtUuqdIQhX1MJkQVbtWLvvtWy8gpF4="; }; }); }; @@ -40,7 +40,7 @@ with localPython.pkgs; buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-W3nUXPAXoicDQNXigktR1+b/9W6qvi90fujrXAekxTU="; + hash = "sha256-W3nUXPAXoicDQNXigktR1+b/9W6qvi90fujrXAekxTU="; }; @@ -49,10 +49,10 @@ with localPython.pkgs; buildPythonApplication rec { --replace "six>=1.11.0,<1.15.0" "six==1.16.0" \ --replace "requests>=2.20.1,<=2.26" "requests<3" \ --replace "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<2" \ - --replace "pathspec==0.9.0" "pathspec>=0.10.0,<0.11.0" \ + --replace "pathspec==0.9.0" "pathspec>=0.10.0,<1" \ --replace "colorama>=0.2.5,<0.4.4" "colorama>=0.2.5,<=0.4.6" \ --replace "future>=0.16.0,<0.17.0" "future" \ - --replace "termcolor == 1.1.0" "termcolor>=2.0.0,<2.2.0" + --replace "termcolor == 1.1.0" "termcolor>=2.0.0,<3" ''; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix index d358125a28..e7fe212863 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cri-tools"; - version = "1.26.0"; + version = "1.26.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ALeK51fsGEys9iEHv0C8vCZVD4vx+VYUooj7pH7p7tg="; + sha256 = "sha256-jJhHlqnc7wDsc6nn5CTZMnaZpUJrEDkGzyvQ2EoX4GE="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/wayland/cliphist/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/cliphist/default.nix index 473c6fabc5..9ca747ca46 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/cliphist/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/cliphist/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cliphist"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "sentriz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kmXR8xzjAphgaC2Yd55VwZIJ4ehxP1LEA24hgyAbM7A="; + sha256 = "sha256-V115xsdSAsxp1RQpCVoGqkkb8J6Rvj5NNNtPMwT9IAg="; }; - vendorSha256 = "sha256-LZnefa0FjYG39YJrSN9ef6OnXHXgSrlSL4LvRqLxFx4="; + vendorHash = "sha256-/xu1kcSOBOVz7XNxe4Jl905HtFWFOaZHKkLNFaLMVEs="; meta = with lib; { description = "Wayland clipboard manager"; diff --git a/third_party/nixpkgs/pkgs/tools/wayland/swww/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/swww/default.nix new file mode 100644 index 0000000000..a766a51188 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/wayland/swww/default.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, fetchFromGitHub, rustPlatform, pkg-config, lz4, libxkbcommon }: +rustPlatform.buildRustPackage rec { + pname = "swww"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "Horus645"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-1SmCeIlcjOX3yCvpfqQ82uq4h2xlGhX9OCwKb6jGK78="; + }; + + cargoSha256 = "sha256-08YM9yTCRJPHdOc1+7F3guYiP3y1WSi3/hzlDRVpitc="; + buildInputs = [ lz4 libxkbcommon ]; + doCheck = false; # Integration tests do not work in sandbox environment + nativeBuildInputs = [ pkg-config ]; + + meta = with lib; { + description = "Efficient animated wallpaper daemon for wayland, controlled at runtime"; + homepage = "https://github.com/Horus645/swww"; + license = licenses.gpl3; + maintainers = with maintainers; [ mateodd25 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 3670019404..dd2c8c7735 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -511,6 +511,8 @@ mapAliases ({ gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead"; # Added 2021-04-03 gdb-multitarget = throw "'gdb-multitarget' has been renamed to/replaced by 'gdb'"; # Converted to throw 2022-02-22 gdk_pixbuf = throw "'gdk_pixbuf' has been renamed to/replaced by 'gdk-pixbuf'"; # Converted to throw 2022-02-22 + geekbench4 = throw "'geekbench4' has been renamed to 'geekbench_4'"; # Added 2023-03-10 + geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10 getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6"; # Added 2022-01-12 gettextWithExpat = throw "'gettextWithExpat' has been renamed to/replaced by 'gettext'"; # Converted to throw 2022-02-22 gfm = throw "gfm has been removed"; # Added 2021-01-15 @@ -1095,6 +1097,7 @@ mapAliases ({ odpdown = throw "odpdown has been removed because it lacks python3 support"; # Added 2022-04-25 ofp = throw "ofp is not compatible with odp-dpdk"; olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05 + opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08 openafs_1_8 = openafs; # Added 2022-08-22 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 @@ -1153,6 +1156,7 @@ mapAliases ({ phantomjs2 = throw "phantomjs2 has been dropped due to lack of maintenance"; # Added 2022-04-22 philter = throw "philter has been removed: abandoned by upstream"; # Added 2022-04-26 phodav_2_0 = throw "'phodav_2_0' has been renamed to/replaced by 'phodav'"; # Added 2023-02-21 + photoflow = throw "photoflow was removed because it was broken and unmaintained by upstream"; # Added 2023-03-10 phraseapp-client = throw "phraseapp-client is archived by upstream. Use phrase-cli instead"; # Added 2022-05-15 phwmon = throw "phwmon has been removed: abandoned by upstream"; # Added 2022-04-24 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 9310dbae3c..f31686659a 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -110,7 +110,7 @@ with pkgs; by Hydra. ''; - tests = callPackages ../test {}; + tests = callPackages ../test { }; defaultPkgConfigPackages = # We don't want nix-env -q to enter this, because all of these are aliases. @@ -308,29 +308,29 @@ with pkgs; avro-tools = callPackage ../development/tools/avro-tools { }; - bacnet-stack = callPackage ../tools/networking/bacnet-stack {}; + bacnet-stack = callPackage ../tools/networking/bacnet-stack { }; - bada-bib = callPackage ../applications/science/misc/bada-bib {}; + bada-bib = callPackage ../applications/science/misc/bada-bib { }; - banana-accounting = callPackage ../applications/office/banana-accounting {}; + banana-accounting = callPackage ../applications/office/banana-accounting { }; bakelite = callPackage ../tools/backup/bakelite { }; - benthos = callPackage ../development/tools/benthos {}; + benthos = callPackage ../development/tools/benthos { }; - beyond-identity = callPackage ../tools/security/beyond-identity {}; + beyond-identity = callPackage ../tools/security/beyond-identity { }; bibtex-tidy = nodePackages.bibtex-tidy; - binbloom = callPackage ../tools/security/binbloom {}; + binbloom = callPackage ../tools/security/binbloom { }; - bingo = callPackage ../development/tools/bingo {}; + bingo = callPackage ../development/tools/bingo { }; binserve = callPackage ../servers/binserve { inherit (darwin.apple_sdk.frameworks) CoreServices; }; - bootstrap-studio = callPackage ../development/web/bootstrap-studio {}; + bootstrap-studio = callPackage ../development/web/bootstrap-studio { }; breakpad = callPackage ../development/misc/breakpad { }; @@ -372,7 +372,7 @@ with pkgs; buildFHSUserEnvChroot = callPackage ../build-support/build-fhs-userenv { }; buildFHSUserEnvBubblewrap = callPackage ../build-support/build-fhs-userenv-bubblewrap { }; - buildMaven = callPackage ../build-support/build-maven.nix {}; + buildMaven = callPackage ../build-support/build-maven.nix { }; c64-debugger = callPackage ../applications/emulators/c64-debugger { }; @@ -402,7 +402,9 @@ with pkgs; cewl = callPackage ../tools/security/cewl { }; - checkov = callPackage ../development/tools/analysis/checkov {}; + checkov = callPackage ../development/tools/analysis/checkov { + python3 = python311; + }; chrysalis = callPackage ../applications/misc/chrysalis { }; @@ -460,6 +462,8 @@ with pkgs; crc = callPackage ../applications/networking/cluster/crc { }; + confy = callPackage ../applications/misc/confy { }; + coordgenlibs = callPackage ../development/libraries/coordgenlibs { }; copilot-cli = callPackage ../tools/admin/copilot-cli { }; @@ -518,9 +522,11 @@ with pkgs; evans = callPackage ../development/tools/evans { }; + evhz = callPackage ../tools/misc/evhz { }; + expressvpn = callPackage ../applications/networking/expressvpn { }; - figma-linux = callPackage ../applications/graphics/figma-linux {}; + figma-linux = callPackage ../applications/graphics/figma-linux { }; firefly-desktop = callPackage ../applications/misc/firefly-desktop { }; @@ -616,19 +622,21 @@ with pkgs; demoit = callPackage ../servers/demoit { }; - deviceTree = callPackage ../os-specific/linux/device-tree {}; + deviceTree = callPackage ../os-specific/linux/device-tree { }; - enum4linux = callPackage ../tools/security/enum4linux {}; + enum4linux = callPackage ../tools/security/enum4linux { }; enum4linux-ng = python3Packages.callPackage ../tools/security/enum4linux-ng { }; + enumerepo = callPackage ../tools/security/enumerepo {}; + erosmb = callPackage ../tools/security/erosmb { }; octosuite = callPackage ../tools/security/octosuite { }; octosql = callPackage ../tools/misc/octosql { }; - onesixtyone = callPackage ../tools/security/onesixtyone {}; + onesixtyone = callPackage ../tools/security/onesixtyone { }; oletools = with python3.pkgs; toPythonApplication oletools; @@ -636,9 +644,9 @@ with pkgs; credslayer = callPackage ../tools/security/credslayer { }; - device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix {}; + device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix { }; - devour = callPackage ../tools/X11/devour {}; + devour = callPackage ../tools/X11/devour { }; didyoumean = callPackage ../tools/misc/didyoumean { inherit (darwin.apple_sdk.frameworks) AppKit; @@ -726,11 +734,11 @@ with pkgs; fetchNuGet = callPackage ../build-support/dotnet/fetchnuget { }; dotnetbuildhelpers = callPackage ../build-support/dotnet/dotnetbuildhelpers { }; - dumb-init = callPackage ../applications/virtualization/dumb-init {}; + dumb-init = callPackage ../applications/virtualization/dumb-init { }; - umoci = callPackage ../applications/virtualization/umoci {}; + umoci = callPackage ../applications/virtualization/umoci { }; - dippi = callPackage ../tools/graphics/dippi {}; + dippi = callPackage ../tools/graphics/dippi { }; dispad = callPackage ../tools/X11/dispad { }; @@ -831,7 +839,7 @@ with pkgs; pet = callPackage ../development/tools/pet { }; - pe-bear = libsForQt5.callPackage ../applications/misc/pe-bear {}; + pe-bear = libsForQt5.callPackage ../applications/misc/pe-bear { }; pkger = callPackage ../development/libraries/pkger { }; @@ -857,7 +865,7 @@ with pkgs; v8 = v8_8_x; }; - broadlink-cli = callPackage ../tools/misc/broadlink-cli {}; + broadlink-cli = callPackage ../tools/misc/broadlink-cli { }; fetchpatch = callPackage ../build-support/fetchpatch { # 0.3.4 would change hashes: https://github.com/NixOS/nixpkgs/issues/25154 @@ -892,7 +900,7 @@ with pkgs; tests = pkgs.tests.fetchFirefoxAddon; }; - fetchNextcloudApp = callPackage ../build-support/fetchnextcloudapp {}; + fetchNextcloudApp = callPackage ../build-support/fetchnextcloudapp { }; # `fetchurl' downloads a file from the network. fetchurl = if stdenv.buildPlatform != stdenv.hostPlatform @@ -968,19 +976,19 @@ with pkgs; fetchFromGitea = callPackage ../build-support/fetchgitea { }; - fetchFromGitHub = callPackage ../build-support/fetchgithub {}; + fetchFromGitHub = callPackage ../build-support/fetchgithub { }; - fetchFromBitbucket = callPackage ../build-support/fetchbitbucket {}; + fetchFromBitbucket = callPackage ../build-support/fetchbitbucket { }; - fetchFromSavannah = callPackage ../build-support/fetchsavannah {}; + fetchFromSavannah = callPackage ../build-support/fetchsavannah { }; fetchFromSourcehut = callPackage ../build-support/fetchsourcehut { }; - fetchFromGitLab = callPackage ../build-support/fetchgitlab {}; + fetchFromGitLab = callPackage ../build-support/fetchgitlab { }; - fetchFromGitiles = callPackage ../build-support/fetchgitiles {}; + fetchFromGitiles = callPackage ../build-support/fetchgitiles { }; - fetchFromRepoOrCz = callPackage ../build-support/fetchrepoorcz {}; + fetchFromRepoOrCz = callPackage ../build-support/fetchrepoorcz { }; fetchgx = callPackage ../build-support/fetchgx { }; @@ -991,7 +999,7 @@ with pkgs; inherit url; }; - installShellFiles = callPackage ../build-support/install-shell-files {}; + installShellFiles = callPackage ../build-support/install-shell-files { }; lazydocker = callPackage ../tools/misc/lazydocker { }; @@ -1027,7 +1035,7 @@ with pkgs; makeInitrd = callPackage ../build-support/kernel/make-initrd.nix; # Args intentionally left out makeInitrdNG = callPackage ../build-support/kernel/make-initrd-ng.nix; - makeInitrdNGTool = callPackage ../build-support/kernel/make-initrd-ng-tool.nix {}; + makeInitrdNGTool = callPackage ../build-support/kernel/make-initrd-ng-tool.nix { }; makeWrapper = makeShellWrapper; @@ -1093,7 +1101,7 @@ with pkgs; sirula = callPackage ../tools/wayland/sirula { }; - sitelen-seli-kiwen = callPackage ../data/fonts/sitelen-seli-kiwen {}; + sitelen-seli-kiwen = callPackage ../data/fonts/sitelen-seli-kiwen { }; srcOnly = callPackage ../build-support/src-only { }; @@ -1156,7 +1164,7 @@ with pkgs; makeHardcodeGsettingsPatch = callPackage ../build-support/make-hardcode-gsettings-patch { }; - # intended to be used like nix-build -E 'with import {}; enableDebugging fooPackage' + # intended to be used like nix-build -E 'with import { }; enableDebugging fooPackage' enableDebugging = pkg: pkg.override { stdenv = stdenvAdapters.keepDebugInfo pkg.stdenv; }; findXMLCatalogs = makeSetupHook { @@ -1183,21 +1191,21 @@ with pkgs; name = "use-old-cxx-abi-hook"; } ../build-support/setup-hooks/use-old-cxx-abi.sh; - iconConvTools = callPackage ../build-support/icon-conv-tools {}; + iconConvTools = callPackage ../build-support/icon-conv-tools { }; validatePkgConfig = makeSetupHook { name = "validate-pkg-config"; propagatedBuildInputs = [ findutils pkg-config ]; } ../build-support/setup-hooks/validate-pkg-config.sh; - patchPpdFilesHook = callPackage ../build-support/setup-hooks/patch-ppd-files {}; + patchPpdFilesHook = callPackage ../build-support/setup-hooks/patch-ppd-files { }; #package writers - writers = callPackage ../build-support/writers {}; + writers = callPackage ../build-support/writers { }; # lib functions depending on pkgs inherit (import ../pkgs-lib { inherit lib pkgs; }) formats; - testers = callPackage ../build-support/testers {}; + testers = callPackage ../build-support/testers { }; ### TOOLS @@ -1217,7 +1225,7 @@ with pkgs; _9pfs = callPackage ../tools/filesystems/9pfs { }; - aaa = callPackage ../tools/misc/aaa {}; + aaa = callPackage ../tools/misc/aaa { }; aardvark-dns = callPackage ../tools/networking/aardvark-dns { }; @@ -1284,7 +1292,7 @@ with pkgs; blobs_gg = callPackage ../servers/akkoma/emoji/blobs_gg.nix { }; }; - advancecomp = callPackage ../tools/compression/advancecomp {}; + advancecomp = callPackage ../tools/compression/advancecomp { }; aefs = callPackage ../tools/filesystems/aefs { }; @@ -1391,7 +1399,7 @@ with pkgs; akku = callPackage ../tools/package-management/akku { }; - albert = libsForQt5.callPackage ../applications/misc/albert {}; + albert = libsForQt5.callPackage ../applications/misc/albert { }; alice-tools = callPackage ../tools/games/alice-tools { withGUI = false; @@ -1401,13 +1409,13 @@ with pkgs; alice-tools-qt6 = qt6Packages.callPackage ../tools/games/alice-tools { }; - allure = callPackage ../development/tools/allure {}; + allure = callPackage ../development/tools/allure { }; aquosctl = callPackage ../tools/misc/aquosctl { }; - arch-install-scripts = callPackage ../tools/misc/arch-install-scripts {}; + arch-install-scripts = callPackage ../tools/misc/arch-install-scripts { }; - argocd-vault-plugin = callPackage ../tools/security/argocd-vault-plugin {}; + argocd-vault-plugin = callPackage ../tools/security/argocd-vault-plugin { }; arubaotp-seed-extractor = callPackage ../tools/security/arubaotp-seed-extractor { }; @@ -1455,7 +1463,9 @@ with pkgs; libgamemode32 = pkgsi686Linux.gamemode.lib; }; - gamescope = callPackage ../applications/window-managers/gamescope { }; + gamescope = callPackage ../applications/window-managers/gamescope { + wlroots = wlroots_0_16; + }; gay = callPackage ../tools/misc/gay { }; @@ -1513,7 +1523,7 @@ with pkgs; inherit (callPackage ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service; - jobber = callPackage ../tools/system/jobber {}; + jobber = callPackage ../tools/system/jobber { }; kanata = callPackage ../tools/system/kanata { }; @@ -1557,11 +1567,11 @@ with pkgs; paperview = callPackage ../tools/X11/paperview { }; - pferd = callPackage ../tools/misc/pferd {}; + pferd = callPackage ../tools/misc/pferd { }; - proycon-wayout = callPackage ../tools/wayland/proycon-wayout {}; + proycon-wayout = callPackage ../tools/wayland/proycon-wayout { }; - q = callPackage ../tools/networking/q {}; + q = callPackage ../tools/networking/q { }; qFlipper = libsForQt5.callPackage ../tools/misc/qflipper { }; @@ -1589,9 +1599,11 @@ with pkgs; spectre-cli = callPackage ../tools/security/spectre-cli { }; + speedtest-go = callPackage ../tools/networking/speedtest-go { }; + speedtest-rs = callPackage ../tools/networking/speedtest-rs { }; - steamtinkerlaunch = callPackage ../tools/games/steamtinkerlaunch {}; + steamtinkerlaunch = callPackage ../tools/games/steamtinkerlaunch { }; supermin = callPackage ../tools/virtualization/supermin { }; @@ -1631,7 +1643,7 @@ with pkgs; withNtfs = true; }; - vitess = callPackage ../development/tools/database/vitess {}; + vitess = callPackage ../development/tools/database/vitess { }; voms = callPackage ../tools/networking/voms { }; @@ -1641,7 +1653,7 @@ with pkgs; wine = wineWowPackages.staging; }; - wtwitch = callPackage ../tools/video/wtwitch {}; + wtwitch = callPackage ../tools/video/wtwitch { }; wwcd = callPackage ../tools/misc/wwcd { }; @@ -1673,7 +1685,7 @@ with pkgs; ### APPLICATIONS/VERSION-MANAGEMENT - deepgit = callPackage ../applications/version-management/deepgit {}; + deepgit = callPackage ../applications/version-management/deepgit { }; git = callPackage ../applications/version-management/git { inherit (darwin.apple_sdk.frameworks) CoreServices Security; @@ -2128,7 +2140,7 @@ with pkgs; dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; - duckstation = qt6Packages.callPackage ../applications/emulators/duckstation {}; + duckstation = qt6Packages.callPackage ../applications/emulators/duckstation { }; dynamips = callPackage ../applications/emulators/dynamips { }; @@ -2151,7 +2163,7 @@ with pkgs; fsuae-launcher = libsForQt5.callPackage ../applications/emulators/fs-uae/launcher.nix { }; - fuse-emulator = callPackage ../applications/emulators/fuse-emulator {}; + fuse-emulator = callPackage ../applications/emulators/fuse-emulator { }; fw = callPackage ../tools/misc/fw { inherit (darwin.apple_sdk.frameworks) Security; @@ -2246,7 +2258,7 @@ with pkgs; py65 = python3Packages.callPackage ../applications/emulators/py65 { }; - resim = callPackage ../applications/emulators/resim {}; + resim = callPackage ../applications/emulators/resim { }; retrofe = callPackage ../applications/emulators/retrofe { }; @@ -2320,8 +2332,6 @@ with pkgs; inherit (darwin) moltenvk; stdenv = if stdenv.isDarwin && stdenv.isAarch64 then llvmPackages_14.stdenv - # https://github.com/NixOS/nixpkgs/issues/201254 - else if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv; }; @@ -2503,7 +2513,7 @@ with pkgs; ; }; - kitty-themes = callPackage ../misc/kitty-themes {}; + kitty-themes = callPackage ../applications/terminal-emulators/kitty/themes.nix { }; lxterminal = callPackage ../applications/terminal-emulators/lxterminal { }; @@ -2638,22 +2648,22 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - amberol = callPackage ../applications/audio/amberol {}; + amberol = callPackage ../applications/audio/amberol { }; inherit (callPackages ../development/tools/ammonite {}) ammonite_2_12 ammonite_2_13; ammonite = if scala == scala_2_12 then ammonite_2_12 else ammonite_2_13; - amp = callPackage ../applications/editors/amp {}; + amp = callPackage ../applications/editors/amp { }; - ams = callPackage ../applications/audio/ams {}; + ams = callPackage ../applications/audio/ams { }; - amtterm = callPackage ../tools/system/amtterm {}; + amtterm = callPackage ../tools/system/amtterm { }; - analog = callPackage ../tools/admin/analog {}; + analog = callPackage ../tools/admin/analog { }; - android-backup-extractor = callPackage ../tools/backup/android-backup-extractor {}; + android-backup-extractor = callPackage ../tools/backup/android-backup-extractor { }; android-tools = lowPrio (darwin.apple_sdk_11_0.callPackage ../tools/misc/android-tools (lib.optionalAttrs (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isLinux) { @@ -2662,11 +2672,11 @@ with pkgs; anewer = callPackage ../tools/text/anewer { }; - angle-grinder = callPackage ../tools/text/angle-grinder {}; + angle-grinder = callPackage ../tools/text/angle-grinder { }; - ansifilter = callPackage ../tools/text/ansifilter {}; + ansifilter = callPackage ../tools/text/ansifilter { }; - antora = callPackage ../development/tools/documentation/antora {}; + antora = callPackage ../development/tools/documentation/antora { }; apfs-fuse = callPackage ../tools/filesystems/apfs-fuse { }; @@ -2695,7 +2705,7 @@ with pkgs; }; }; - appimagekit = callPackage ../tools/package-management/appimagekit {}; + appimagekit = callPackage ../tools/package-management/appimagekit { }; apt-cacher-ng = callPackage ../servers/http/apt-cacher-ng { }; @@ -2729,11 +2739,11 @@ with pkgs; arduino-language-server = callPackage ../development/embedded/arduino/arduino-language-server { }; - arduino-mk = callPackage ../development/embedded/arduino/arduino-mk {}; + arduino-mk = callPackage ../development/embedded/arduino/arduino-mk { }; apio = python3Packages.callPackage ../development/embedded/fpga/apio { }; - apitrace = libsForQt5.callPackage ../applications/graphics/apitrace {}; + apitrace = libsForQt5.callPackage ../applications/graphics/apitrace { }; argagg = callPackage ../development/libraries/argagg { }; @@ -2741,11 +2751,11 @@ with pkgs; arguments = callPackage ../development/libraries/arguments { }; - argus = callPackage ../tools/networking/argus {}; + argus = callPackage ../tools/networking/argus { }; - argus-clients = callPackage ../tools/networking/argus-clients {}; + argus-clients = callPackage ../tools/networking/argus-clients { }; - argyllcms = callPackage ../tools/graphics/argyllcms {}; + argyllcms = callPackage ../tools/graphics/argyllcms { }; arj = callPackage ../tools/archivers/arj { stdenv = gccStdenv; @@ -2756,27 +2766,27 @@ with pkgs; inherit (callPackages ../data/fonts/arphic {}) arphic-ukai arphic-uming; - artyFX = callPackage ../applications/audio/artyFX {}; + artyFX = callPackage ../applications/audio/artyFX { }; oggvideotools = callPackage ../tools/misc/oggvideotools { }; - owl-lisp = callPackage ../development/compilers/owl-lisp {}; + owl-lisp = callPackage ../development/compilers/owl-lisp { }; ascii = callPackage ../tools/text/ascii { }; - asciinema = callPackage ../tools/misc/asciinema {}; + asciinema = callPackage ../tools/misc/asciinema { }; asciinema-agg = callPackage ../tools/misc/asciinema-agg { inherit (darwin.apple_sdk.frameworks) Security; }; - asciinema-scenario = callPackage ../tools/misc/asciinema-scenario {}; + asciinema-scenario = callPackage ../tools/misc/asciinema-scenario { }; - asciiquarium = callPackage ../applications/misc/asciiquarium {}; + asciiquarium = callPackage ../applications/misc/asciiquarium { }; - ashuffle = callPackage ../applications/audio/ashuffle {}; + ashuffle = callPackage ../applications/audio/ashuffle { }; - ashpd-demo = callPackage ../development/tools/ashpd-demo {}; + ashpd-demo = callPackage ../development/tools/ashpd-demo { }; asls = callPackage ../development/tools/misc/asls { }; @@ -2786,7 +2796,7 @@ with pkgs; texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super texinfo media9 ocgx2 collection-latexextra; }; }; - async = callPackage ../development/tools/async {}; + async = callPackage ../development/tools/async { }; async-profiler = callPackage ../development/tools/async-profiler { }; @@ -2812,13 +2822,13 @@ with pkgs; aliyun-cli = callPackage ../tools/admin/aliyun-cli { }; - aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator {}; + aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator { }; awscli = callPackage ../tools/admin/awscli { }; awscli2 = callPackage ../tools/admin/awscli2 { }; - awsebcli = callPackage ../tools/virtualization/awsebcli {}; + awsebcli = callPackage ../tools/virtualization/awsebcli { }; awslimitchecker = callPackage ../tools/admin/awslimitchecker { }; @@ -2929,7 +2939,7 @@ with pkgs; exoscale-cli = callPackage ../tools/admin/exoscale-cli { }; - altermime = callPackage ../tools/networking/altermime {}; + altermime = callPackage ../tools/networking/altermime { }; alttab = callPackage ../tools/X11/alttab { }; @@ -2990,6 +3000,8 @@ with pkgs; electron = electron_13; }; + biscuit-cli = callPackage ../tools/security/biscuit-cli { }; + bitwarden = callPackage ../tools/security/bitwarden { }; inherit (nodePackages) bitwarden-cli; @@ -3098,7 +3110,7 @@ with pkgs; codespell = callPackage ../development/tools/codespell { }; - coolreader = libsForQt5.callPackage ../applications/misc/coolreader {}; + coolreader = libsForQt5.callPackage ../applications/misc/coolreader { }; corsair = with python3Packages; toPythonApplication corsair-scan; @@ -3134,7 +3146,7 @@ with pkgs; writeCueValidator = callPackage ../development/tools/cue/validator.nix { }; - cuelsp = callPackage ../development/tools/cuelsp {}; + cuelsp = callPackage ../development/tools/cuelsp { }; cyclonedds = callPackage ../development/libraries/cyclonedds { }; @@ -3358,7 +3370,7 @@ with pkgs; hilbish = callPackage ../shells/hilbish { }; - hime = callPackage ../tools/inputmethods/hime {}; + hime = callPackage ../tools/inputmethods/hime { }; himitsu = callPackage ../tools/security/himitsu { inherit (harePackages) hare; @@ -3396,7 +3408,7 @@ with pkgs; ipp-usb = callPackage ../os-specific/linux/ipp-usb { }; - itch = callPackage ../games/itch {}; + itch = callPackage ../games/itch { }; itchiodl = callPackage ../games/itchiodl { }; @@ -3516,9 +3528,9 @@ with pkgs; plausible = callPackage ../servers/web-apps/plausible { }; - pam-reattach = callPackage ../os-specific/darwin/pam-reattach {}; + pam-reattach = callPackage ../os-specific/darwin/pam-reattach { }; - reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {}; + reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace { }; skhd = callPackage ../os-specific/darwin/skhd { inherit (darwin.apple_sdk.frameworks) Carbon; @@ -3562,7 +3574,7 @@ with pkgs; titaniumenv = callPackage ../development/mobile/titaniumenv { }; - abootimg = callPackage ../development/mobile/abootimg {}; + abootimg = callPackage ../development/mobile/abootimg { }; adbfs-rootless = callPackage ../development/mobile/adbfs-rootless { adb = androidenv.androidPkgs_9_0.platform-tools; @@ -3572,7 +3584,7 @@ with pkgs; inherit (androidenv.androidPkgs_9_0) platform-tools; }; - amoco = callPackage ../tools/security/amoco {}; + amoco = callPackage ../tools/security/amoco { }; anbox = callPackage ../os-specific/linux/anbox { }; @@ -3602,7 +3614,7 @@ with pkgs; apprise = with python3Packages; toPythonApplication apprise; - aptdec = callPackage ../development/libraries/aptdec {}; + aptdec = callPackage ../development/libraries/aptdec { }; argc = callPackage ../development/tools/argc { }; @@ -3633,7 +3645,7 @@ with pkgs; automysqlbackup = callPackage ../tools/backup/automysqlbackup { }; - autorandr = callPackage ../tools/misc/autorandr {}; + autorandr = callPackage ../tools/misc/autorandr { }; avahi = callPackage ../development/libraries/avahi (config.avahi or {}); @@ -3659,7 +3671,7 @@ with pkgs; libssl = openssl; }; - b3sum = callPackage ../tools/security/b3sum {}; + b3sum = callPackage ../tools/security/b3sum { }; backblaze-b2 = callPackage ../development/tools/backblaze-b2 { }; @@ -3667,11 +3679,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - badrobot = callPackage ../tools/security/badrobot {}; + badrobot = callPackage ../tools/security/badrobot { }; - bao = callPackage ../tools/security/bao {}; + bao = callPackage ../tools/security/bao { }; - bar = callPackage ../tools/system/bar {}; + bar = callPackage ../tools/system/bar { }; base16-shell-preview = callPackage ../misc/base16-shell-preview { }; @@ -3687,13 +3699,13 @@ with pkgs; badchars = python3Packages.callPackage ../tools/security/badchars { }; - badvpn = callPackage ../tools/networking/badvpn {}; + badvpn = callPackage ../tools/networking/badvpn { }; baget = callPackage ../servers/web-apps/baget { }; - barcode = callPackage ../tools/graphics/barcode {}; + barcode = callPackage ../tools/graphics/barcode { }; - bashmount = callPackage ../tools/filesystems/bashmount {}; + bashmount = callPackage ../tools/filesystems/bashmount { }; bat = callPackage ../tools/misc/bat { inherit (darwin.apple_sdk.frameworks) Security; @@ -3784,11 +3796,11 @@ with pkgs; charles4 ; - libquotient = libsForQt5.callPackage ../development/libraries/libquotient {}; + libquotient = libsForQt5.callPackage ../development/libraries/libquotient { }; quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }; - mirage-im = libsForQt5.callPackage ../applications/networking/instant-messengers/mirage {}; + mirage-im = libsForQt5.callPackage ../applications/networking/instant-messengers/mirage { }; tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; @@ -3844,7 +3856,6 @@ with pkgs; bookstack = callPackage ../servers/web-apps/bookstack { }; - # Upstream recommends qt5.12 and it doesn't build with qt5.15 boomerang = libsForQt5.callPackage ../development/tools/boomerang { }; boost-build = callPackage ../development/tools/boost-build { }; @@ -3897,7 +3908,7 @@ with pkgs; bottom-rs = callPackage ../tools/misc/bottom-rs { }; - bsp-layout = callPackage ../tools/misc/bsp-layout {}; + bsp-layout = callPackage ../tools/misc/bsp-layout { }; buildtorrent = callPackage ../tools/misc/buildtorrent { }; @@ -3928,9 +3939,9 @@ with pkgs; bukubrow = callPackage ../tools/networking/bukubrow { }; - burpsuite = callPackage ../tools/networking/burpsuite {}; + burpsuite = callPackage ../tools/networking/burpsuite { }; - bs-platform = callPackage ../development/compilers/bs-platform {}; + bs-platform = callPackage ../development/compilers/bs-platform { }; ciano = callPackage ../applications/graphics/ciano { inherit (pantheon) granite; @@ -3978,7 +3989,7 @@ with pkgs; boost = boost.override { enablePython = true; python = python3; }; }; calamares-nixos = lowPrio (calamares.override { nixos-extensions = true; }); - calamares-nixos-extensions = callPackage ../tools/misc/calamares-nixos-extensions {}; + calamares-nixos-extensions = callPackage ../tools/misc/calamares-nixos-extensions { }; calendar-cli = callPackage ../tools/networking/calendar-cli { }; @@ -4057,9 +4068,9 @@ with pkgs; ckbcomp = callPackage ../tools/X11/ckbcomp { }; - clac = callPackage ../tools/misc/clac {}; + clac = callPackage ../tools/misc/clac { }; - map-cmd = callPackage ../tools/misc/map {}; + map-cmd = callPackage ../tools/misc/map { }; clash = callPackage ../tools/networking/clash { }; @@ -4113,13 +4124,13 @@ with pkgs; colpack = callPackage ../applications/science/math/colpack { }; - cz-cli = callPackage ../applications/version-management/cz-cli {}; + cz-cli = callPackage ../applications/version-management/cz-cli { }; comma = callPackage ../tools/package-management/comma { }; commitizen = python3Packages.callPackage ../applications/version-management/commitizen { }; - common-licenses = callPackage ../data/misc/common-licenses {}; + common-licenses = callPackage ../data/misc/common-licenses { }; compactor = callPackage ../applications/networking/compactor { }; @@ -4189,6 +4200,8 @@ with pkgs; swaytools = python3Packages.callPackage ../tools/wayland/swaytools { }; + swww = callPackage ../tools/wayland/swww { }; + wayland-utils = callPackage ../tools/wayland/wayland-utils { }; wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { }; @@ -4217,7 +4230,7 @@ with pkgs; wlopm = callPackage ../tools/wayland/wlopm { }; - wlprop = callPackage ../tools/wayland/wlprop {}; + wlprop = callPackage ../tools/wayland/wlprop { }; wlr-randr = callPackage ../tools/wayland/wlr-randr { }; @@ -4282,15 +4295,15 @@ with pkgs; coturn = callPackage ../servers/coturn { }; - coursier = callPackage ../development/tools/coursier {}; + coursier = callPackage ../development/tools/coursier { }; - cppclean = callPackage ../development/tools/cppclean {}; + cppclean = callPackage ../development/tools/cppclean { }; - credhub-cli = callPackage ../tools/admin/credhub-cli {}; + credhub-cli = callPackage ../tools/admin/credhub-cli { }; crex = callPackage ../tools/misc/crex { }; - cri-tools = callPackage ../tools/virtualization/cri-tools {}; + cri-tools = callPackage ../tools/virtualization/cri-tools { }; crip = callPackage ../applications/audio/crip { }; @@ -4314,6 +4327,8 @@ with pkgs; csvkit = callPackage ../tools/text/csvkit { }; + csvquote = callPackage ../tools/text/csvquote { }; + csvtool = callPackage ../development/ocaml-modules/csv/csvtool.nix { }; csv2latex = callPackage ../tools/misc/csv2latex { }; @@ -4322,11 +4337,11 @@ with pkgs; csvs-to-sqlite = callPackage ../tools/misc/csvs-to-sqlite { }; - cucumber = callPackage ../development/tools/cucumber {}; + cucumber = callPackage ../development/tools/cucumber { }; cutemarked-ng = libsForQt5.callPackage ../applications/office/cutemarked-ng { }; - dab_lib = callPackage ../development/libraries/dab_lib {}; + dab_lib = callPackage ../development/libraries/dab_lib { }; dabet = callPackage ../tools/misc/dabet { }; @@ -4344,7 +4359,7 @@ with pkgs; dante = callPackage ../servers/dante { }; - dapr-cli = callPackage ../development/tools/dapr/cli {}; + dapr-cli = callPackage ../development/tools/dapr/cli { }; dasel = callPackage ../applications/misc/dasel { }; @@ -4396,7 +4411,7 @@ with pkgs; dbx = callPackage ../applications/misc/dbx { }; - ioport = callPackage ../os-specific/linux/ioport {}; + ioport = callPackage ../os-specific/linux/ioport { }; dgoss = callPackage ../tools/misc/dgoss { }; @@ -4463,7 +4478,7 @@ with pkgs; dislocker = callPackage ../tools/filesystems/dislocker { }; - distgen = callPackage ../development/tools/distgen {}; + distgen = callPackage ../development/tools/distgen { }; distrobuilder = callPackage ../tools/virtualization/distrobuilder { }; @@ -4484,7 +4499,7 @@ with pkgs; dolibarr = callPackage ../servers/web-apps/dolibarr { }; - doppler = callPackage ../tools/security/doppler {}; + doppler = callPackage ../tools/security/doppler { }; dosage = callPackage ../applications/graphics/dosage { }; @@ -4498,7 +4513,7 @@ with pkgs; dpic = callPackage ../tools/graphics/dpic { }; - dsdcc = callPackage ../development/libraries/dsdcc {}; + dsdcc = callPackage ../development/libraries/dsdcc { }; dstp = callPackage ../development/tools/dstp { }; @@ -4632,15 +4647,15 @@ with pkgs; esptool-ck = callPackage ../tools/misc/esptool-ck { }; - ephemeralpg = callPackage ../development/tools/database/ephemeralpg {}; + ephemeralpg = callPackage ../development/tools/database/ephemeralpg { }; - et = callPackage ../applications/misc/et {}; + et = callPackage ../applications/misc/et { }; - ejson = callPackage ../development/tools/ejson {}; + ejson = callPackage ../development/tools/ejson { }; - eternal-terminal = callPackage ../tools/networking/eternal-terminal {}; + eternal-terminal = callPackage ../tools/networking/eternal-terminal { }; - extism-cli = callPackage ../development/tools/extism-cli {}; + extism-cli = callPackage ../development/tools/extism-cli { }; extrude = callPackage ../tools/security/extrude { }; @@ -4648,7 +4663,7 @@ with pkgs; # If buildGoModule is overridden, provide a matching version of the go attribute }; - f2 = callPackage ../tools/misc/f2 {}; + f2 = callPackage ../tools/misc/f2 { }; f3 = callPackage ../tools/filesystems/f3 { }; @@ -4690,7 +4705,7 @@ with pkgs; filebot = callPackage ../applications/video/filebot { }; - fileshare = callPackage ../servers/fileshare {}; + fileshare = callPackage ../servers/fileshare { }; fileshelter = callPackage ../servers/web-apps/fileshelter { }; @@ -4824,9 +4839,9 @@ with pkgs; go-containerregistry = callPackage ../development/tools/go-containerregistry { }; inherit (go-containerregistry) crane gcrane; - go-rice = callPackage ../tools/misc/go.rice {}; + go-rice = callPackage ../tools/misc/go.rice { }; - go-2fa = callPackage ../tools/security/2fa {}; + go-2fa = callPackage ../tools/security/2fa { }; go-dependency-manager = callPackage ../development/tools/gdm { }; @@ -4836,9 +4851,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - geekbench4 = callPackage ../tools/misc/geekbench/4.nix { }; - geekbench5 = callPackage ../tools/misc/geekbench { }; - geekbench = geekbench5; + geekbench_4 = callPackage ../tools/misc/geekbench/4.nix { }; + geekbench_5 = callPackage ../tools/misc/geekbench/5.nix { }; + geekbench_6 = callPackage ../tools/misc/geekbench/6.nix { }; + geekbench = geekbench_6; gencfsm = callPackage ../tools/security/gencfsm { }; @@ -4849,7 +4865,7 @@ with pkgs; ghdorker = callPackage ../tools/security/ghdorker { }; ghidra = if stdenv.isDarwin then darwin.apple_sdk_11_0.callPackage ../tools/security/ghidra/build.nix {} - else callPackage ../tools/security/ghidra/build.nix {}; + else callPackage ../tools/security/ghidra/build.nix { }; ghidra-bin = callPackage ../tools/security/ghidra { }; @@ -4946,7 +4962,7 @@ with pkgs; heatseeker = callPackage ../tools/misc/heatseeker { }; - hebcal = callPackage ../tools/misc/hebcal {}; + hebcal = callPackage ../tools/misc/hebcal { }; hebbot = callPackage ../servers/matrix-hebbot { inherit (darwin.apple_sdk.frameworks) Security; @@ -4968,17 +4984,17 @@ with pkgs; hocr-tools = with python3Packages; toPythonApplication hocr-tools; - home-manager = callPackage ../tools/package-management/home-manager {}; + home-manager = callPackage ../tools/package-management/home-manager { }; hostsblock = callPackage ../tools/misc/hostsblock { }; hottext = callPackage ../tools/text/hottext { }; - hopper = qt5.callPackage ../development/tools/analysis/hopper {}; + hopper = qt5.callPackage ../development/tools/analysis/hopper { }; hr = callPackage ../applications/misc/hr { }; - humioctl = callPackage ../applications/logging/humioctl {}; + humioctl = callPackage ../applications/logging/humioctl { }; huniq = callPackage ../tools/text/huniq { }; @@ -4988,37 +5004,33 @@ with pkgs; cairo = cairo.override { xcbSupport = true; }; }; - hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { - stdenv = gcc12Stdenv; - }; + hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { }; - hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { - stdenv = gcc12Stdenv; - }; + hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { }; hysteria = callPackage ../tools/networking/hysteria { }; hyx = callPackage ../tools/text/hyx { }; - icdiff = callPackage ../tools/text/icdiff {}; + icdiff = callPackage ../tools/text/icdiff { }; - inchi = callPackage ../development/libraries/inchi {}; + inchi = callPackage ../development/libraries/inchi { }; icon-slicer = callPackage ../tools/X11/icon-slicer { }; - ifm = callPackage ../tools/graphics/ifm {}; + ifm = callPackage ../tools/graphics/ifm { }; iina = callPackage ../applications/video/iina { }; ink = callPackage ../tools/misc/ink { }; - inklecate = callPackage ../development/compilers/inklecate {}; + inklecate = callPackage ../development/compilers/inklecate { }; intensity-normalization = with python3Packages; toPythonApplication intensity-normalization; interactsh = callPackage ../tools/misc/interactsh { }; - interlock = callPackage ../servers/interlock {}; + interlock = callPackage ../servers/interlock { }; invoiceplane = callPackage ../servers/web-apps/invoiceplane { }; @@ -5039,13 +5051,15 @@ with pkgs; jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player { inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; # Disable pipewire to avoid segfault, see https://github.com/jellyfin/jellyfin-media-player/issues/341 - mpv = wrapMpv (mpv-unwrapped.override { pipewireSupport = false; }) {}; + mpv = wrapMpv (mpv-unwrapped.override { pipewireSupport = false; }) { }; }; jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; jellyfin-web = callPackage ../servers/jellyfin/web.nix { }; + jellyseerr = callPackage ../servers/jellyseerr { }; + jiten = callPackage ../applications/misc/jiten { }; kanjidraw = callPackage ../applications/misc/kanjidraw { }; @@ -5054,7 +5068,7 @@ with pkgs; joycond = callPackage ../os-specific/linux/joycond { }; - joystickwake = callPackage ../tools/games/joystickwake {}; + joystickwake = callPackage ../tools/games/joystickwake { }; jwt-cli = callPackage ../tools/security/jwt-cli { inherit (darwin.apple_sdk.frameworks) Security; @@ -5157,7 +5171,7 @@ with pkgs; loccount = callPackage ../development/tools/misc/loccount { }; - long-shebang = callPackage ../misc/long-shebang {}; + long-shebang = callPackage ../misc/long-shebang { }; lowdown = callPackage ../tools/typesetting/lowdown { }; @@ -5191,9 +5205,9 @@ with pkgs; maple-mono-NF = (callPackage ../data/fonts/maple-font { }).NF; maple-mono-SC-NF = (callPackage ../data/fonts/maple-font { }).SC-NF; - marl = callPackage ../development/libraries/marl {}; + marl = callPackage ../development/libraries/marl { }; - marlin-calc = callPackage ../tools/misc/marlin-calc {}; + marlin-calc = callPackage ../tools/misc/marlin-calc { }; masscan = callPackage ../tools/security/masscan { }; @@ -5201,7 +5215,7 @@ with pkgs; mat2 = with python3.pkgs; toPythonApplication mat2; - maxcso = callPackage ../tools/archivers/maxcso {}; + maxcso = callPackage ../tools/archivers/maxcso { }; medusa = callPackage ../tools/security/medusa { }; @@ -5271,21 +5285,21 @@ with pkgs; inherit (gst_all_1) gstreamer gst-plugins-base; }; - mons = callPackage ../tools/misc/mons {}; + mons = callPackage ../tools/misc/mons { }; - monsoon = callPackage ../tools/security/monsoon {}; + monsoon = callPackage ../tools/security/monsoon { }; moodle-dl = callPackage ../tools/networking/moodle-dl { }; moonraker = callPackage ../servers/moonraker { }; - morsel = callPackage ../tools/text/morsel {}; + morsel = callPackage ../tools/text/morsel { }; mousetweaks = callPackage ../applications/accessibility/mousetweaks { }; mp3blaster = callPackage ../applications/audio/mp3blaster { }; - mp3cat = callPackage ../tools/audio/mp3cat {}; + mp3cat = callPackage ../tools/audio/mp3cat { }; mp3fs = callPackage ../tools/filesystems/mp3fs { }; @@ -5395,27 +5409,27 @@ with pkgs; libpsm2 = callPackage ../os-specific/linux/libpsm2 { }; - optar = callPackage ../tools/graphics/optar {}; + optar = callPackage ../tools/graphics/optar { }; oni2 = callPackage ../applications/editors/oni2 { }; - obinskit = callPackage ../applications/misc/obinskit {}; + obinskit = callPackage ../applications/misc/obinskit { }; - odoo = callPackage ../applications/finance/odoo {}; + odoo = callPackage ../applications/finance/odoo { }; - odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {}; + odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter { }; oil-buku = callPackage ../applications/misc/oil-buku { }; osdlyrics = callPackage ../applications/audio/osdlyrics { }; - ossutil = callPackage ../tools/admin/ossutil {}; + ossutil = callPackage ../tools/admin/ossutil { }; - ospd-openvas = callPackage ../tools/security/ospd-openvas {}; + ospd-openvas = callPackage ../tools/security/ospd-openvas { }; - osv-detector = callPackage ../tools/security/osv-detector {}; + osv-detector = callPackage ../tools/security/osv-detector { }; - osv-scanner = callPackage ../tools/security/osv-scanner {}; + osv-scanner = callPackage ../tools/security/osv-scanner { }; pastel = callPackage ../applications/misc/pastel { inherit (darwin.apple_sdk.frameworks) Security; @@ -5486,13 +5500,13 @@ with pkgs; pixcat = with python3Packages; toPythonApplication pixcat; - pixiecore = callPackage ../tools/networking/pixiecore {}; + pixiecore = callPackage ../tools/networking/pixiecore { }; waitron = callPackage ../tools/networking/waitron { }; - pyCA = python3Packages.callPackage ../applications/video/pyca {}; + pyCA = python3Packages.callPackage ../applications/video/pyca { }; - pyznap = python3Packages.callPackage ../tools/backup/pyznap {}; + pyznap = python3Packages.callPackage ../tools/backup/pyznap { }; procs = darwin.apple_sdk_11_0.callPackage ../tools/admin/procs { inherit (darwin.apple_sdk_11_0.frameworks) Security; @@ -5503,7 +5517,7 @@ with pkgs; profetch = callPackage ../tools/misc/profetch { }; - psrecord = python3Packages.callPackage ../tools/misc/psrecord {}; + psrecord = python3Packages.callPackage ../tools/misc/psrecord { }; r53-ddns = callPackage ../applications/networking/r53-ddns { }; @@ -5539,7 +5553,7 @@ with pkgs; sfz = callPackage ../tools/misc/sfz { }; - sgp4 = callPackage ../development/libraries/sgp4 {}; + sgp4 = callPackage ../development/libraries/sgp4 { }; shab = callPackage ../tools/text/shab { }; @@ -5571,9 +5585,9 @@ with pkgs; simg2img = callPackage ../tools/filesystems/simg2img { }; - smokegen = callPackage ../development/libraries/smokegen {}; + smokegen = callPackage ../development/libraries/smokegen { }; - smokeqt = callPackage ../development/libraries/smokeqt {}; + smokeqt = callPackage ../development/libraries/smokeqt { }; snazy = callPackage ../development/tools/snazy { }; @@ -5609,6 +5623,8 @@ with pkgs; step-cli = callPackage ../tools/security/step-cli { }; + step-kms-plugin = callPackage ../tools/security/step-kms-plugin { }; + string-machine = callPackage ../applications/audio/string-machine { }; stripe-cli = callPackage ../tools/admin/stripe-cli { @@ -5629,9 +5645,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Security; }; - syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {}; + syscall_limiter = callPackage ../os-specific/linux/syscall_limiter { }; - skeema = callPackage ../tools/system/skeema {}; + skeema = callPackage ../tools/system/skeema { }; syslogng = callPackage ../tools/system/syslog-ng { }; @@ -5673,6 +5689,8 @@ with pkgs; rsbkb = callPackage ../tools/text/rsbkb { }; + rsign2 = callPackage ../tools/security/rsign2 { }; + rsyslog = callPackage ../tools/system/rsyslog { withHadoop = false; # Currently Broken withKsi = false; # Currently Broken @@ -5899,7 +5917,7 @@ with pkgs; bukut = callPackage ../applications/misc/bukut { }; - byzanz = callPackage ../applications/video/byzanz {}; + byzanz = callPackage ../applications/video/byzanz { }; algolia-cli = callPackage ../development/tools/algolia-cli { }; @@ -6057,11 +6075,11 @@ with pkgs; cmst = libsForQt5.callPackage ../tools/networking/cmst { }; - cmt = callPackage ../applications/audio/cmt {}; + cmt = callPackage ../applications/audio/cmt { }; - crlfsuite = callPackage ../tools/security/crlfsuite {}; + crlfsuite = callPackage ../tools/security/crlfsuite { }; - crlfuzz = callPackage ../tools/security/crlfuzz {}; + crlfuzz = callPackage ../tools/security/crlfuzz { }; hedgedoc = callPackage ../servers/web-apps/hedgedoc { inherit (callPackage ../development/tools/yarn2nix-moretea/yarn2nix { @@ -6080,7 +6098,7 @@ with pkgs; connect = callPackage ../tools/networking/connect { }; - conspy = callPackage ../os-specific/linux/conspy {}; + conspy = callPackage ../os-specific/linux/conspy { }; connmanPackages = recurseIntoAttrs (callPackage ../tools/networking/connman { }); @@ -6261,9 +6279,9 @@ with pkgs; inherit (pkgs.darwin.apple_sdk.frameworks) Foundation PCSC; }; - artim-dark = callPackage ../data/themes/artim-dark {}; + artim-dark = callPackage ../data/themes/artim-dark { }; - bbin = callPackage ../development/tools/bbin {}; + bbin = callPackage ../development/tools/bbin { }; bore = callPackage ../tools/networking/bore { inherit (darwin) Libsystem; @@ -6409,6 +6427,8 @@ with pkgs; ctlptl = callPackage ../development/tools/ctlptl { }; + dumpnar = callPackage ../tools/archivers/dumpnar { }; + snooze = callPackage ../tools/system/snooze { }; cudaPackages_10_0 = callPackage ./cuda-packages.nix { cudaVersion = "10.0"; }; @@ -6742,10 +6762,12 @@ with pkgs; drive = callPackage ../applications/networking/drive { }; - driftnet = callPackage ../tools/networking/driftnet {}; + driftnet = callPackage ../tools/networking/driftnet { }; driftctl = callPackage ../applications/networking/cluster/driftctl { }; + eks-node-viewer = callPackage ../applications/networking/cluster/eks-node-viewer { }; + drill = callPackage ../tools/networking/drill { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -6813,7 +6835,7 @@ with pkgs; # customConfig = builtins.readFile ./dvtm.config.h; }; - dvtm-unstable = callPackage ../tools/misc/dvtm/unstable.nix {}; + dvtm-unstable = callPackage ../tools/misc/dvtm/unstable.nix { }; ecmtools = callPackage ../tools/cd-dvd/ecm-tools { }; @@ -6851,7 +6873,7 @@ with pkgs; eff = callPackage ../development/interpreters/eff { }; - eflite = callPackage ../applications/audio/eflite {}; + eflite = callPackage ../applications/audio/eflite { }; eid-mw = callPackage ../tools/security/eid-mw { autoreconfHook = buildPackages.autoreconfHook269; @@ -6881,7 +6903,7 @@ with pkgs; magic-vlsi = callPackage ../applications/science/electronics/magic-vlsi { }; - mcrcon = callPackage ../tools/networking/mcrcon {}; + mcrcon = callPackage ../tools/networking/mcrcon { }; mozillavpn = qt6Packages.callPackage ../tools/networking/mozillavpn { }; @@ -6901,7 +6923,7 @@ with pkgs; s9fes = callPackage ../development/interpreters/s9fes { }; - s-tar = callPackage ../tools/archivers/s-tar {}; + s-tar = callPackage ../tools/archivers/s-tar { }; solo2-cli = callPackage ../tools/security/solo2-cli { inherit (darwin.apple_sdk.frameworks) PCSC IOKit CoreFoundation AppKit; @@ -6929,7 +6951,7 @@ with pkgs; ''; schildichat-web = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-web.nix { - conf = config.schildichat-web.conf or {}; + conf = config.schildichat-web.conf or { }; }; schleuder = callPackage ../tools/security/schleuder { }; @@ -7221,7 +7243,7 @@ with pkgs; f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; - Fabric = with python3Packages; toPythonApplication Fabric; + Fabric = with python3Packages; toPythonApplication fabric; fail2ban = callPackage ../tools/security/fail2ban { }; @@ -7320,11 +7342,11 @@ with pkgs; fcron = callPackage ../tools/system/fcron { }; - fdm = callPackage ../tools/networking/fdm {}; + fdm = callPackage ../tools/networking/fdm { }; fdtools = callPackage ../tools/misc/fdtools { }; - featherpad = qt5.callPackage ../applications/editors/featherpad {}; + featherpad = qt5.callPackage ../applications/editors/featherpad { }; fend = callPackage ../tools/misc/fend { }; @@ -7341,7 +7363,7 @@ with pkgs; fgallery = callPackage ../tools/graphics/fgallery { }; flannel = callPackage ../tools/networking/flannel { }; - cni-plugin-flannel = callPackage ../tools/networking/flannel/plugin.nix {}; + cni-plugin-flannel = callPackage ../tools/networking/flannel/plugin.nix { }; flashbench = callPackage ../os-specific/linux/flashbench { }; @@ -7361,7 +7383,7 @@ with pkgs; flux = callPackage ../development/compilers/flux { }; - fido2luks = callPackage ../tools/security/fido2luks {}; + fido2luks = callPackage ../tools/security/fido2luks { }; fierce = callPackage ../tools/security/fierce { }; @@ -7392,9 +7414,9 @@ with pkgs; bsd-finger = callPackage ../tools/networking/bsd-finger { }; bsd-fingerd = bsd-finger.override({ buildClient = false; }); - iprange = callPackage ../applications/networking/firehol/iprange.nix {}; + iprange = callPackage ../applications/networking/firehol/iprange.nix { }; - firehol = callPackage ../applications/networking/firehol {}; + firehol = callPackage ../applications/networking/firehol { }; fio = callPackage ../tools/system/fio { }; @@ -7438,7 +7460,7 @@ with pkgs; fastlane = callPackage ../tools/admin/fastlane { }; - fatresize = callPackage ../tools/filesystems/fatresize {}; + fatresize = callPackage ../tools/filesystems/fatresize { }; fdk_aac = callPackage ../development/libraries/fdk-aac { }; @@ -7452,7 +7474,7 @@ with pkgs; fbv = callPackage ../tools/graphics/fbv { }; - fbvnc = callPackage ../tools/admin/fbvnc {}; + fbvnc = callPackage ../tools/admin/fbvnc { }; fim = callPackage ../tools/graphics/fim { }; @@ -7487,15 +7509,15 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; - fontforge-fonttools = callPackage ../tools/misc/fontforge/fontforge-fonttools.nix {}; + fontforge-fonttools = callPackage ../tools/misc/fontforge/fontforge-fonttools.nix { }; - fontmatrix = libsForQt5.callPackage ../applications/graphics/fontmatrix {}; + fontmatrix = libsForQt5.callPackage ../applications/graphics/fontmatrix { }; footswitch = callPackage ../tools/inputmethods/footswitch { }; foremost = callPackage ../tools/system/foremost { }; - forktty = callPackage ../os-specific/linux/forktty {}; + forktty = callPackage ../os-specific/linux/forktty { }; fortune = callPackage ../tools/misc/fortune { }; @@ -7509,7 +7531,7 @@ with pkgs; fpart = callPackage ../tools/misc/fpart { }; - fping = callPackage ../tools/networking/fping {}; + fping = callPackage ../tools/networking/fping { }; fpm = callPackage ../tools/package-management/fpm { }; @@ -7535,7 +7557,7 @@ with pkgs; freebind = callPackage ../tools/networking/freebind { }; - freeipmi = callPackage ../tools/system/freeipmi {}; + freeipmi = callPackage ../tools/system/freeipmi { }; freetalk = callPackage ../applications/networking/instant-messengers/freetalk { guile = guile_2_0; @@ -7551,7 +7573,7 @@ with pkgs; wxGTK = wxGTK32; }; - frescobaldi = python3Packages.callPackage ../misc/frescobaldi {}; + frescobaldi = python3Packages.callPackage ../misc/frescobaldi { }; freshfetch = callPackage ../tools/misc/freshfetch { inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation DiskArbitration Foundation IOKit; @@ -7576,7 +7598,7 @@ with pkgs; fuseiso = callPackage ../tools/filesystems/fuseiso { }; - fusuma = callPackage ../tools/inputmethods/fusuma {}; + fusuma = callPackage ../tools/inputmethods/fusuma { }; fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -7594,7 +7616,7 @@ with pkgs; fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { }; - fuse-overlayfs = callPackage ../tools/filesystems/fuse-overlayfs {}; + fuse-overlayfs = callPackage ../tools/filesystems/fuse-overlayfs { }; fusee-interfacee-tk = callPackage ../applications/misc/fusee-interfacee-tk { }; @@ -7626,7 +7648,7 @@ with pkgs; free42 = callPackage ../applications/misc/free42 { }; - galen = callPackage ../development/tools/galen {}; + galen = callPackage ../development/tools/galen { }; gallery-dl = python3Packages.callPackage ../applications/misc/gallery-dl { }; @@ -7641,11 +7663,11 @@ with pkgs; }) garage garage_0_7 garage_0_8 - garage_0_7_3 garage_0_8_0; + garage_0_7_3 garage_0_8_2; - garmin-plugin = callPackage ../applications/misc/garmin-plugin {}; + garmin-plugin = callPackage ../applications/misc/garmin-plugin { }; - garmintools = callPackage ../development/libraries/garmintools {}; + garmintools = callPackage ../development/libraries/garmintools { }; gau = callPackage ../tools/security/gau { }; @@ -7658,7 +7680,7 @@ with pkgs; gawk-with-extensions = callPackage ../tools/text/gawk/gawk-with-extensions.nix { extensions = gawkextlib.full; }; - gawkextlib = callPackage ../tools/text/gawk/gawkextlib.nix {}; + gawkextlib = callPackage ../tools/text/gawk/gawkextlib.nix { }; gawkInteractive = gawk.override { interactive = true; }; @@ -7678,7 +7700,7 @@ with pkgs; gelasio = callPackage ../data/fonts/gelasio { }; - gemget = callPackage ../tools/networking/gemget {}; + gemget = callPackage ../tools/networking/gemget { }; gen-oath-safe = callPackage ../tools/security/gen-oath-safe { }; @@ -7690,7 +7712,7 @@ with pkgs; genmap = callPackage ../applications/science/biology/genmap { }; - geonkick = callPackage ../applications/audio/geonkick {}; + geonkick = callPackage ../applications/audio/geonkick { }; gerrit = callPackage ../applications/version-management/gerrit { }; @@ -7743,6 +7765,8 @@ with pkgs; gitlab-clippy = callPackage ../development/tools/rust/gitlab-clippy { }; + gitlab-pages = callPackage ../applications/version-management/gitlab/gitlab-pages { }; + gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { }; @@ -7753,7 +7777,9 @@ with pkgs; gitleaks = callPackage ../tools/security/gitleaks { }; - gitaly = callPackage ../applications/version-management/gitlab/gitaly { }; + gitaly = callPackage ../applications/version-management/gitlab/gitaly { + libgit2 = libgit2_1_5; + }; gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { }; @@ -7765,7 +7791,7 @@ with pkgs; gitea-actions-runner = callPackage ../development/tools/continuous-integration/gitea-actions-runner { }; - forgejo = callPackage ../applications/version-management/forgejo {}; + forgejo = callPackage ../applications/version-management/forgejo { }; gokart = callPackage ../development/tools/gokart { }; @@ -7798,7 +7824,7 @@ with pkgs; gnome-extension-manager = callPackage ../applications/misc/gnome-extension-manager { }; - gnome-feeds = callPackage ../applications/networking/feedreaders/gnome-feeds {}; + gnome-feeds = callPackage ../applications/networking/feedreaders/gnome-feeds { }; gnome-frog = callPackage ../applications/misc/gnome-frog { }; @@ -7986,7 +8012,7 @@ with pkgs; grafterm = callPackage ../tools/misc/grafterm { }; - grafx2 = callPackage ../applications/graphics/grafx2 {}; + grafx2 = callPackage ../applications/graphics/grafx2 { }; grails = callPackage ../development/web/grails { jdk = null; }; @@ -8132,13 +8158,13 @@ with pkgs; gtest = callPackage ../development/libraries/gtest { }; - gbenchmark = callPackage ../development/libraries/gbenchmark {}; + gbenchmark = callPackage ../development/libraries/gbenchmark { }; gkraken = callPackage ../tools/system/gkraken { }; - gtkdatabox = callPackage ../development/libraries/gtkdatabox {}; + gtkdatabox = callPackage ../development/libraries/gtkdatabox { }; - gtdialog = callPackage ../development/libraries/gtdialog {}; + gtdialog = callPackage ../development/libraries/gtdialog { }; gtkd = callPackage ../development/libraries/gtkd { dcompiler = ldc; }; @@ -8148,29 +8174,29 @@ with pkgs; gtkradiant = callPackage ../applications/misc/gtkradiant { }; - gtk-frdp = callPackage ../development/libraries/gtk-frdp {}; + gtk-frdp = callPackage ../development/libraries/gtk-frdp { }; - gtk-vnc = callPackage ../tools/admin/gtk-vnc {}; + gtk-vnc = callPackage ../tools/admin/gtk-vnc { }; - gup = callPackage ../development/tools/build-managers/gup {}; + gup = callPackage ../development/tools/build-managers/gup { }; gupnp = callPackage ../development/libraries/gupnp { }; gupnp_1_6 = callPackage ../development/libraries/gupnp/1.6.nix { }; - gupnp-av = callPackage ../development/libraries/gupnp-av {}; + gupnp-av = callPackage ../development/libraries/gupnp-av { }; - gupnp-dlna = callPackage ../development/libraries/gupnp-dlna {}; + gupnp-dlna = callPackage ../development/libraries/gupnp-dlna { }; - gupnp-igd = callPackage ../development/libraries/gupnp-igd {}; + gupnp-igd = callPackage ../development/libraries/gupnp-igd { }; - gupnp-tools = callPackage ../tools/networking/gupnp-tools {}; + gupnp-tools = callPackage ../tools/networking/gupnp-tools { }; gvm-tools = with python3.pkgs; toPythonApplication gvm-tools; - gvpe = callPackage ../tools/networking/gvpe {}; + gvpe = callPackage ../tools/networking/gvpe { }; - gvolicon = callPackage ../tools/audio/gvolicon {}; + gvolicon = callPackage ../tools/audio/gvolicon { }; gvproxy = callPackage ../tools/networking/gvproxy { }; @@ -8316,7 +8342,7 @@ with pkgs; hecate = callPackage ../applications/editors/hecate { }; - heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack {}; + heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack { }; heatshrink = callPackage ../tools/compression/heatshrink { }; @@ -8371,7 +8397,7 @@ with pkgs; host = bind.host; - hostess = callPackage ../development/tools/hostess {}; + hostess = callPackage ../development/tools/hostess { }; hostname-debian = callPackage ../tools/networking/hostname-debian { }; @@ -8403,7 +8429,7 @@ with pkgs; httpie = with python3Packages; toPythonApplication httpie; - httping = callPackage ../tools/networking/httping {}; + httping = callPackage ../tools/networking/httping { }; httplz = callPackage ../tools/networking/httplz { inherit (darwin.apple_sdk.frameworks) Security; @@ -8417,6 +8443,8 @@ with pkgs; httpx = callPackage ../tools/security/httpx { }; + hue-plus = libsForQt5.callPackage ../applications/misc/hue-plus { }; + hurl = callPackage ../tools/networking/hurl { }; hubicfuse = callPackage ../tools/filesystems/hubicfuse { }; @@ -8609,31 +8637,31 @@ with pkgs; iptsd = callPackage ../applications/misc/iptsd { }; - ipmitool = callPackage ../tools/system/ipmitool {}; + ipmitool = callPackage ../tools/system/ipmitool { }; - ipmiutil = callPackage ../tools/system/ipmiutil {}; + ipmiutil = callPackage ../tools/system/ipmiutil { }; - ipmicfg = callPackage ../applications/misc/ipmicfg {}; + ipmicfg = callPackage ../applications/misc/ipmicfg { }; - ipmiview = callPackage ../applications/misc/ipmiview {}; + ipmiview = callPackage ../applications/misc/ipmiview { }; - ipcalc = callPackage ../tools/networking/ipcalc {}; + ipcalc = callPackage ../tools/networking/ipcalc { }; - netmask = callPackage ../tools/networking/netmask {}; + netmask = callPackage ../tools/networking/netmask { }; - netifd = callPackage ../tools/networking/netifd {}; + netifd = callPackage ../tools/networking/netifd { }; - ipinfo = callPackage ../tools/networking/ipinfo {}; + ipinfo = callPackage ../tools/networking/ipinfo { }; ipscan = callPackage ../tools/security/ipscan { }; - ipv6calc = callPackage ../tools/networking/ipv6calc {}; + ipv6calc = callPackage ../tools/networking/ipv6calc { }; ipxe = callPackage ../tools/misc/ipxe { }; irker = callPackage ../servers/irker { }; - ised = callPackage ../tools/misc/ised {}; + ised = callPackage ../tools/misc/ised { }; isl = isl_0_20; isl_0_11 = callPackage ../development/libraries/isl/0.11.1.nix { }; @@ -8795,9 +8823,9 @@ with pkgs; jtc = callPackage ../development/tools/jtc { }; - jumpapp = callPackage ../tools/X11/jumpapp {}; + jumpapp = callPackage ../tools/X11/jumpapp { }; - jove = callPackage ../applications/editors/jove {}; + jove = callPackage ../applications/editors/jove { }; jucipp = callPackage ../applications/editors/jucipp { }; @@ -8826,12 +8854,7 @@ with pkgs; wrapKakoune = kakoune: attrs: callPackage ../applications/editors/kakoune/wrapper.nix (attrs // { inherit kakoune; }); kakounePlugins = recurseIntoAttrs (callPackage ../applications/editors/kakoune/plugins { }); - kakoune-unwrapped = callPackage ../applications/editors/kakoune { - # See comments on https://github.com/NixOS/nixpkgs/pull/198836 - # Remove below when stdenv for linux-aarch64 become recent enough. - # https://github.com/NixOS/nixpkgs/issues/201254 - stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv; - }; + kakoune-unwrapped = callPackage ../applications/editors/kakoune { }; kakoune = wrapKakoune kakoune-unwrapped { plugins = [ ]; # override with the list of desired plugins }; @@ -8993,7 +9016,7 @@ with pkgs; lalezar-fonts = callPackage ../data/fonts/lalezar-fonts { }; - last-resort = callPackage ../data/fonts/last-resort {}; + last-resort = callPackage ../data/fonts/last-resort { }; ldc = callPackage ../development/compilers/ldc { }; @@ -9013,7 +9036,7 @@ with pkgs; lha = callPackage ../tools/archivers/lha { }; - lhasa = callPackage ../tools/compression/lhasa {}; + lhasa = callPackage ../tools/compression/lhasa { }; libcpuid = callPackage ../tools/misc/libcpuid { }; @@ -9104,7 +9127,7 @@ with pkgs; lsd = callPackage ../tools/misc/lsd { }; - lsdvd = callPackage ../tools/cd-dvd/lsdvd {}; + lsdvd = callPackage ../tools/cd-dvd/lsdvd { }; lsyncd = callPackage ../applications/networking/sync/lsyncd { inherit (darwin) xnu; @@ -9115,7 +9138,7 @@ with pkgs; lvmsync = callPackage ../tools/backup/lvmsync { }; - kapp = callPackage ../tools/networking/kapp {}; + kapp = callPackage ../tools/networking/kapp { }; kdbg = libsForQt5.callPackage ../development/tools/misc/kdbg { }; @@ -9154,13 +9177,13 @@ with pkgs; matrix-appservice-irc = callPackage ../servers/matrix-synapse/matrix-appservice-irc { }; - matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack {}; + matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack { }; matrix-appservice-discord = callPackage ../servers/matrix-appservice-discord { }; matrix-corporal = callPackage ../servers/matrix-corporal { }; - matrix-hookshot = callPackage ../servers/matrix-synapse/matrix-hookshot {}; + matrix-hookshot = callPackage ../servers/matrix-synapse/matrix-hookshot { }; mautrix-facebook = callPackage ../servers/mautrix-facebook { }; @@ -9265,7 +9288,7 @@ with pkgs; mmv-go = callPackage ../tools/misc/mmv-go { }; - mob = callPackage ../applications/misc/mob {}; + mob = callPackage ../applications/misc/mob { }; most = callPackage ../tools/misc/most { }; @@ -9313,7 +9336,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; # Exposed here so the bots can auto-upgrade it - netdata-go-plugins = callPackage ../tools/system/netdata/go.d.plugin.nix {}; + netdata-go-plugins = callPackage ../tools/system/netdata/go.d.plugin.nix { }; netsurf = recurseIntoAttrs (callPackage ../applications/networking/browsers/netsurf { }); netsurf-browser = netsurf.browser; @@ -9389,21 +9412,21 @@ with pkgs; file-rename = callPackage ../tools/filesystems/file-rename { }; - kcollectd = libsForQt5.callPackage ../tools/misc/kcollectd {}; + kcollectd = libsForQt5.callPackage ../tools/misc/kcollectd { }; kea = callPackage ../tools/networking/kea { }; iredis = callPackage ../tools/admin/iredis { }; - ispell = callPackage ../tools/text/ispell {}; + ispell = callPackage ../tools/text/ispell { }; iodash = callPackage ../development/libraries/iodash { }; - jbofihe = callPackage ../tools/text/jbofihe {}; + jbofihe = callPackage ../tools/text/jbofihe { }; - jumanpp = callPackage ../tools/text/jumanpp {}; + jumanpp = callPackage ../tools/text/jumanpp { }; - jump = callPackage ../tools/system/jump {}; + jump = callPackage ../tools/system/jump { }; larynx = callPackage ../tools/audio/larynx { }; @@ -9415,6 +9438,8 @@ with pkgs; lcdf-typetools = callPackage ../tools/misc/lcdf-typetools { }; + ldapdomaindump = with python3Packages; toPythonApplication ldapdomaindump; + ldapmonitor = callPackage ../tools/security/ldapmonitor { }; ldapnomnom = callPackage ../tools/security/ldapnomnom { }; @@ -9488,7 +9513,7 @@ with pkgs; libinsane = callPackage ../development/libraries/libinsane { }; - libint = callPackage ../development/libraries/libint {}; + libint = callPackage ../development/libraries/libint { }; libintPsi4 = callPackage ../development/libraries/libint { enableFortran = false; enableSSE = false; @@ -9564,7 +9589,7 @@ with pkgs; libmongo-client = callPackage ../development/libraries/libmongo-client { }; - libmesode = callPackage ../development/libraries/libmesode {}; + libmesode = callPackage ../development/libraries/libmesode { }; libmsym = callPackage ../development/libraries/science/chemistry/libmsym { }; @@ -9605,14 +9630,14 @@ with pkgs; libxcomp = callPackage ../development/libraries/libxcomp { }; - libxl = callPackage ../development/libraries/libxl {}; + libxl = callPackage ../development/libraries/libxl { }; libx86emu = callPackage ../development/libraries/libx86emu { }; - libzim = callPackage ../development/libraries/libzim {}; + libzim = callPackage ../development/libraries/libzim { }; - libzmf = callPackage ../development/libraries/libzmf {}; + libzmf = callPackage ../development/libraries/libzmf { }; libreddit = callPackage ../servers/libreddit { inherit (darwin.apple_sdk.frameworks) Security; @@ -9676,7 +9701,7 @@ with pkgs; logrotate = callPackage ../tools/system/logrotate { }; - logstalgia = callPackage ../tools/graphics/logstalgia {}; + logstalgia = callPackage ../tools/graphics/logstalgia { }; lokalise2-cli = callPackage ../tools/misc/lokalise2-cli { }; @@ -9752,7 +9777,7 @@ with pkgs; maildrop = callPackage ../tools/networking/maildrop { }; - mailhog = callPackage ../servers/mail/mailhog {}; + mailhog = callPackage ../servers/mail/mailhog { }; mailnag = callPackage ../applications/networking/mailreaders/mailnag { availablePlugins = { @@ -9776,7 +9801,7 @@ with pkgs; email = callPackage ../tools/networking/email { }; - maim = callPackage ../tools/graphics/maim {}; + maim = callPackage ../tools/graphics/maim { }; mairix = callPackage ../tools/text/mairix { }; @@ -9797,7 +9822,7 @@ with pkgs; mangohud = callPackage ../tools/graphics/mangohud { libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; mangohud32 = pkgsi686Linux.mangohud; - inherit (python3Packages) Mako; + inherit (python3Packages) mako; }; manix = callPackage ../tools/nix/manix { @@ -9934,7 +9959,7 @@ with pkgs; withMinimal = false; }; - mkclean = callPackage ../applications/video/mkclean {}; + mkclean = callPackage ../applications/video/mkclean { }; mkcue = callPackage ../tools/cd-dvd/mkcue { stdenv = gcc10StdenvCompat; }; @@ -9954,9 +9979,9 @@ with pkgs; mmixware = callPackage ../development/tools/mmixware { }; - modemmanager = callPackage ../tools/networking/modemmanager {}; + modemmanager = callPackage ../tools/networking/modemmanager { }; - modem-manager-gui = callPackage ../applications/networking/modem-manager-gui {}; + modem-manager-gui = callPackage ../applications/networking/modem-manager-gui { }; modsecurity_standalone = callPackage ../tools/security/modsecurity { }; @@ -9964,7 +9989,7 @@ with pkgs; molly-guard = callPackage ../os-specific/linux/molly-guard { }; - molotov = callPackage ../applications/video/molotov {}; + molotov = callPackage ../applications/video/molotov { }; moneyplex = callPackage ../applications/office/moneyplex { }; @@ -10022,15 +10047,15 @@ with pkgs; mtools = callPackage ../tools/filesystems/mtools { }; - mtr = callPackage ../tools/networking/mtr {}; + mtr = callPackage ../tools/networking/mtr { }; - mtr-exporter = callPackage ../tools/networking/mtr-exporter {}; + mtr-exporter = callPackage ../tools/networking/mtr-exporter { }; mtr-gui = callPackage ../tools/networking/mtr { withGtk = true; }; - mtx = callPackage ../tools/backup/mtx {}; + mtx = callPackage ../tools/backup/mtx { }; - mt-st = callPackage ../tools/backup/mt-st {}; + mt-st = callPackage ../tools/backup/mt-st { }; mubeng = callPackage ../tools/networking/mubeng { }; @@ -10040,7 +10065,7 @@ with pkgs; multitime = callPackage ../tools/misc/multitime { }; - sta = callPackage ../tools/misc/sta {}; + sta = callPackage ../tools/misc/sta { }; multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in { multitrandata = callPackage ../tools/text/multitran/data { }; @@ -10141,7 +10166,7 @@ with pkgs; ndisc6 = callPackage ../tools/networking/ndisc6 { }; - netboot = callPackage ../tools/networking/netboot {}; + netboot = callPackage ../tools/networking/netboot { }; netbootxyz-efi = callPackage ../tools/misc/netbootxyz-efi { }; @@ -10335,9 +10360,9 @@ with pkgs; nifskope = libsForQt5.callPackage ../tools/graphics/nifskope { }; - nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; + nilfs-utils = callPackage ../tools/filesystems/nilfs-utils { }; - nitrogen = callPackage ../tools/X11/nitrogen {}; + nitrogen = callPackage ../tools/X11/nitrogen { }; smart-wallpaper = callPackage ../tools/X11/smart-wallpaper { }; @@ -10345,19 +10370,19 @@ with pkgs; nomachine-client = callPackage ../tools/admin/nomachine-client { }; - notify-desktop = callPackage ../tools/misc/notify-desktop {}; + notify-desktop = callPackage ../tools/misc/notify-desktop { }; - nkf = callPackage ../tools/text/nkf {}; + nkf = callPackage ../tools/text/nkf { }; nlopt = callPackage ../development/libraries/nlopt { octave = null; }; - npapi_sdk = callPackage ../development/libraries/npapi-sdk {}; + npapi_sdk = callPackage ../development/libraries/npapi-sdk { }; nickel = callPackage ../development/interpreters/nickel { }; npiet = callPackage ../development/interpreters/npiet { }; - npth = callPackage ../development/libraries/npth {}; + npth = callPackage ../development/libraries/npth { }; nmap = callPackage ../tools/security/nmap { }; @@ -10381,9 +10406,9 @@ with pkgs; nq = callPackage ../tools/system/nq { }; - nsjail = callPackage ../tools/security/nsjail {}; + nsjail = callPackage ../tools/security/nsjail { }; - nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {}; + nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd { }; ntfs3g = callPackage ../tools/filesystems/ntfs-3g { inherit (darwin.apple_sdk.frameworks) DiskArbitration; @@ -10392,7 +10417,7 @@ with pkgs; # ntfsprogs are merged into ntfs-3g ntfsprogs = pkgs.ntfs3g; - ntfy = callPackage ../tools/misc/ntfy { python = python39; }; + ntfy = callPackage ../tools/misc/ntfy { }; ntfy-sh = callPackage ../tools/misc/ntfy-sh { }; @@ -10491,7 +10516,7 @@ with pkgs; obexftp = callPackage ../tools/bluetooth/obexftp { }; - objconv = callPackage ../development/tools/misc/objconv {}; + objconv = callPackage ../development/tools/misc/objconv { }; odpic = callPackage ../development/libraries/odpic { }; @@ -10507,7 +10532,7 @@ with pkgs; ogdf = callPackage ../development/libraries/ogdf { }; - oh-my-posh = callPackage ../development/tools/oh-my-posh {}; + oh-my-posh = callPackage ../development/tools/oh-my-posh { }; oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { }; @@ -10655,7 +10680,7 @@ with pkgs; alttpr-opentracker = callPackage ../tools/games/opentracker { }; - opentsdb = callPackage ../tools/misc/opentsdb {}; + opentsdb = callPackage ../tools/misc/opentsdb { }; inherit (callPackages ../tools/networking/openvpn {}) openvpn; @@ -10720,9 +10745,9 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - os-prober = callPackage ../tools/misc/os-prober {}; + os-prober = callPackage ../tools/misc/os-prober { }; - oshka = callPackage ../development/tools/oshka {}; + oshka = callPackage ../development/tools/oshka { }; osl = libsForQt5.callPackage ../development/compilers/osl { boost = boost17x; @@ -10730,13 +10755,13 @@ with pkgs; osqp = callPackage ../development/libraries/science/math/osqp { }; - ossec = callPackage ../tools/security/ossec {}; + ossec = callPackage ../tools/security/ossec { }; - osslsigncode = callPackage ../development/tools/osslsigncode {}; + osslsigncode = callPackage ../development/tools/osslsigncode { }; ostree = callPackage ../tools/misc/ostree { }; - otel-cli = callPackage ../tools/misc/otel-cli {}; + otel-cli = callPackage ../tools/misc/otel-cli { }; otfcc = callPackage ../tools/misc/otfcc { }; @@ -10768,7 +10793,9 @@ with pkgs; payload_dumper = callPackage ../tools/archivers/payload_dumper { }; - p2pvc = callPackage ../applications/video/p2pvc {}; + payload-dumper-go = callPackage ../tools/archivers/payload-dumper-go { }; + + p2pvc = callPackage ../applications/video/p2pvc { }; p3x-onenote = callPackage ../applications/office/p3x-onenote { }; @@ -11042,7 +11069,7 @@ with pkgs; pius = callPackage ../tools/security/pius { }; - pixiewps = callPackage ../tools/networking/pixiewps {}; + pixiewps = callPackage ../tools/networking/pixiewps { }; pinyin-tool = callPackage ../tools/text/pinyin-tool { inherit (darwin.apple_sdk.frameworks) Security; @@ -11147,7 +11174,7 @@ with pkgs; podman = callPackage ../applications/virtualization/podman { }; - podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; + podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose { }; podman-tui = callPackage ../applications/virtualization/podman-tui { }; @@ -11183,7 +11210,7 @@ with pkgs; libjpeg8 = libjpeg.override { enableJpeg8 = true; }; }; - posteid-seed-extractor = callPackage ../tools/security/posteid-seed-extractor {}; + posteid-seed-extractor = callPackage ../tools/security/posteid-seed-extractor { }; postscript-lexmark = callPackage ../misc/drivers/postscript-lexmark { }; @@ -11197,9 +11224,9 @@ with pkgs; ppp = callPackage ../tools/networking/ppp { }; - pptp = callPackage ../tools/networking/pptp {}; + pptp = callPackage ../tools/networking/pptp { }; - pptpd = callPackage ../tools/networking/pptpd {}; + pptpd = callPackage ../tools/networking/pptpd { }; pre-commit = callPackage ../tools/misc/pre-commit { }; @@ -11287,7 +11314,7 @@ with pkgs; libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; }; - pubs = callPackage ../tools/misc/pubs {}; + pubs = callPackage ../tools/misc/pubs { }; pulumictl = callPackage ../development/tools/pulumictl { }; @@ -11339,7 +11366,7 @@ with pkgs; pywal = with python3Packages; toPythonApplication pywal; - pystring = callPackage ../development/libraries/pystring {}; + pystring = callPackage ../development/libraries/pystring { }; rbw = callPackage ../tools/security/rbw { inherit (darwin.apple_sdk.frameworks) Security; @@ -11382,13 +11409,13 @@ with pkgs; ouch = callPackage ../tools/compression/ouch { }; - outils = callPackage ../tools/misc/outils {}; + outils = callPackage ../tools/misc/outils { }; mpi = openmpi; # this attribute should used to build MPI applications - ucc = callPackage ../development/libraries/ucc {}; + ucc = callPackage ../development/libraries/ucc { }; - ucx = callPackage ../development/libraries/ucx {}; + ucx = callPackage ../development/libraries/ucx { }; openmodelica = recurseIntoAttrs (callPackage ../applications/science/misc/openmodelica {}); @@ -11472,13 +11499,15 @@ with pkgs; raider = callPackage ../applications/misc/raider { }; - railway = callPackage ../development/tools/railway { }; + railway = callPackage ../development/tools/railway { + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; quota = if stdenv.isLinux then linuxquota else unixtools.quota; qvge = libsForQt5.callPackage ../applications/graphics/qvge { }; - qview = libsForQt5.callPackage ../applications/graphics/qview {}; + qview = libsForQt5.callPackage ../applications/graphics/qview { }; wayback_machine_downloader = callPackage ../applications/networking/wayback_machine_downloader { }; @@ -11524,7 +11553,7 @@ with pkgs; rdma-core = callPackage ../os-specific/linux/rdma-core { }; - rdrview = callPackage ../tools/networking/rdrview {}; + rdrview = callPackage ../tools/networking/rdrview { }; real_time_config_quick_scan = callPackage ../applications/audio/real_time_config_quick_scan { }; @@ -11532,6 +11561,8 @@ with pkgs; react-native-debugger = callPackage ../development/tools/react-native-debugger { }; + readarr = callPackage ../servers/readarr { }; + read-edid = callPackage ../os-specific/linux/read-edid { }; readstat = callPackage ../applications/science/math/readstat { }; @@ -11581,13 +11612,13 @@ with pkgs; rtss = callPackage ../development/tools/misc/rtss { }; - realvnc-vnc-viewer = callPackage ../tools/admin/realvnc-vnc-viewer {}; + realvnc-vnc-viewer = callPackage ../tools/admin/realvnc-vnc-viewer { }; re-isearch = callPackage ../applications/search/re-isearch { }; - reaverwps = callPackage ../tools/networking/reaver-wps {}; + reaverwps = callPackage ../tools/networking/reaver-wps { }; - reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x {}; + reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x { }; rx = callPackage ../applications/graphics/rx { }; @@ -11635,14 +11666,14 @@ with pkgs; reposurgeon = callPackage ../applications/version-management/reposurgeon { }; - reptyr = callPackage ../os-specific/linux/reptyr {}; + reptyr = callPackage ../os-specific/linux/reptyr { }; rescuetime = libsForQt5.callPackage ../applications/misc/rescuetime { }; inherit (callPackage ../development/misc/resholve { }) resholve; - restool = callPackage ../os-specific/linux/restool {}; + restool = callPackage ../os-specific/linux/restool { }; reuse = callPackage ../tools/package-management/reuse { }; @@ -11661,11 +11692,11 @@ with pkgs; riemann_c_client = callPackage ../tools/misc/riemann-c-client { }; riemann-tools = callPackage ../tools/misc/riemann-tools { }; - ripmime = callPackage ../tools/networking/ripmime {}; + ripmime = callPackage ../tools/networking/ripmime { }; rkflashtool = callPackage ../tools/misc/rkflashtool { }; - rkrlv2 = callPackage ../applications/audio/rkrlv2 {}; + rkrlv2 = callPackage ../applications/audio/rkrlv2 { }; rmlint = callPackage ../tools/misc/rmlint { inherit (python3Packages) sphinx; @@ -11730,8 +11761,6 @@ with pkgs; rpm-ostree = callPackage ../tools/misc/rpm-ostree { gperf = gperf_3_0; - # https://github.com/NixOS/nixpkgs/issues/201254 - stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv; }; rpm2targz = callPackage ../tools/archivers/rpm2targz { }; @@ -11846,15 +11875,15 @@ with pkgs; saldl = callPackage ../tools/networking/saldl { }; - salt = callPackage ../tools/admin/salt {}; + salt = callPackage ../tools/admin/salt { }; - samim-fonts = callPackage ../data/fonts/samim-fonts {}; + samim-fonts = callPackage ../data/fonts/samim-fonts { }; saml2aws = callPackage ../tools/security/saml2aws { inherit (darwin.apple_sdk.frameworks) AppKit; }; - sammler = callPackage ../tools/security/sammler {}; + sammler = callPackage ../tools/security/sammler { }; samplicator = callPackage ../tools/networking/samplicator { }; @@ -11866,7 +11895,7 @@ with pkgs; sasquatch = callPackage ../tools/filesystems/sasquatch { }; - sasview = libsForQt5.callPackage ../applications/science/misc/sasview {}; + sasview = libsForQt5.callPackage ../applications/science/misc/sasview { }; scanbd = callPackage ../tools/graphics/scanbd { }; @@ -12031,9 +12060,9 @@ with pkgs; sic = callPackage ../applications/networking/irc/sic { }; - siege = callPackage ../tools/networking/siege {}; + siege = callPackage ../tools/networking/siege { }; - sieve-connect = callPackage ../applications/networking/sieve-connect {}; + sieve-connect = callPackage ../applications/networking/sieve-connect { }; sigal = callPackage ../applications/misc/sigal { }; @@ -12092,13 +12121,13 @@ with pkgs; sisco.lv2 = callPackage ../applications/audio/sisco.lv2 { }; - sixpair = callPackage ../tools/misc/sixpair {}; + sixpair = callPackage ../tools/misc/sixpair { }; sketchybar = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/sketchybar { inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa DisplayServices SkyLight; }; - skippy-xd = callPackage ../tools/X11/skippy-xd {}; + skippy-xd = callPackage ../tools/X11/skippy-xd { }; sks = callPackage ../servers/sks { ocamlPackages = ocaml-ng.ocamlPackages_4_12; @@ -12118,9 +12147,9 @@ with pkgs; tex = texlive.combined.scheme-small; }; - skytemple = callPackage ../applications/misc/skytemple {}; + skytemple = callPackage ../applications/misc/skytemple { }; - sleuthkit = callPackage ../tools/system/sleuthkit {}; + sleuthkit = callPackage ../tools/system/sleuthkit { }; slides = callPackage ../applications/misc/slides { }; @@ -12128,6 +12157,8 @@ with pkgs; slowlorust = callPackage ../tools/networking/slowlorust { }; + slsa-verifier = callPackage ../tools/security/slsa-verifier { }; + slsnif = callPackage ../tools/misc/slsnif { }; slstatus = callPackage ../applications/misc/slstatus { @@ -12143,7 +12174,7 @@ with pkgs; smarty3 = callPackage ../development/libraries/smarty3 { }; smarty3-i18n = callPackage ../development/libraries/smarty3-i18n { }; - smbnetfs = callPackage ../tools/filesystems/smbnetfs {}; + smbnetfs = callPackage ../tools/filesystems/smbnetfs { }; smenu = callPackage ../tools/misc/smenu { }; @@ -12151,7 +12182,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - boost-sml = callPackage ../development/libraries/boost-ext/boost-sml {}; + boost-sml = callPackage ../development/libraries/boost-ext/boost-sml { }; smu = callPackage ../tools/text/smu { }; @@ -12178,7 +12209,7 @@ with pkgs; libpng = libpng12; }; - snmpcheck = callPackage ../tools/networking/snmpcheck {}; + snmpcheck = callPackage ../tools/networking/snmpcheck { }; sniffglue = callPackage ../tools/networking/sniffglue { }; @@ -12209,9 +12240,9 @@ with pkgs; ssh-askpass-fullscreen = callPackage ../tools/networking/ssh-askpass-fullscreen { }; - sshguard = callPackage ../tools/security/sshguard {}; + sshguard = callPackage ../tools/security/sshguard { }; - sshping = callPackage ../tools/networking/sshping {}; + sshping = callPackage ../tools/networking/sshping { }; ssh-chat = callPackage ../applications/networking/instant-messengers/ssh-chat { }; @@ -12252,7 +12283,7 @@ with pkgs; sozu = callPackage ../servers/sozu { }; sparrow = callPackage ../applications/blockchains/sparrow { - openimajgrabber = callPackage ../applications/blockchains/sparrow/openimajgrabber.nix {}; + openimajgrabber = callPackage ../applications/blockchains/sparrow/openimajgrabber.nix { }; }; sparsehash = callPackage ../development/libraries/sparsehash { }; @@ -12289,9 +12320,9 @@ with pkgs; surface-control = callPackage ../applications/misc/surface-control { }; - syntex = callPackage ../tools/graphics/syntex {}; + syntex = callPackage ../tools/graphics/syntex { }; - synapse-admin = callPackage ../tools/admin/synapse-admin {}; + synapse-admin = callPackage ../tools/admin/synapse-admin { }; sl = callPackage ../tools/misc/sl { }; @@ -12299,7 +12330,7 @@ with pkgs; sockperf = callPackage ../tools/networking/sockperf { }; - solaar = callPackage ../applications/misc/solaar {}; + solaar = callPackage ../applications/misc/solaar { }; solanum = callPackage ../servers/irc/solanum { autoreconfHook = buildPackages.autoreconfHook269; @@ -12316,7 +12347,7 @@ with pkgs; Carbon Cocoa ScriptingBridge SkyLight; }; - speech-denoiser = callPackage ../applications/audio/speech-denoiser {}; + speech-denoiser = callPackage ../applications/audio/speech-denoiser { }; splot = haskell.lib.compose.justStaticExecutables haskellPackages.splot; @@ -12349,7 +12380,7 @@ with pkgs; sslsplit = callPackage ../tools/networking/sslsplit { }; - sstp = callPackage ../tools/networking/sstp {}; + sstp = callPackage ../tools/networking/sstp { }; strip-nondeterminism = perlPackages.strip-nondeterminism; @@ -12357,7 +12388,7 @@ with pkgs; structure-synth = callPackage ../tools/graphics/structure-synth { }; - su-exec = callPackage ../tools/security/su-exec {}; + su-exec = callPackage ../tools/security/su-exec { }; subberthehut = callPackage ../tools/misc/subberthehut { }; @@ -12482,7 +12513,7 @@ with pkgs; synaesthesia = callPackage ../applications/audio/synaesthesia { }; - sysbench = callPackage ../development/tools/misc/sysbench {}; + sysbench = callPackage ../development/tools/misc/sysbench { }; systemc = callPackage ../applications/science/electronics/systemc { }; @@ -12499,11 +12530,11 @@ with pkgs; stone-phaser = callPackage ../applications/audio/stone-phaser { }; - systrayhelper = callPackage ../tools/misc/systrayhelper {}; + systrayhelper = callPackage ../tools/misc/systrayhelper { }; syft = callPackage ../tools/admin/syft { }; - Sylk = callPackage ../applications/networking/Sylk {}; + Sylk = callPackage ../applications/networking/Sylk { }; privoxy = callPackage ../tools/networking/privoxy { w3m = w3m-batch; @@ -12540,7 +12571,7 @@ with pkgs; t1utils = callPackage ../tools/misc/t1utils { }; - talkfilters = callPackage ../misc/talkfilters {}; + talkfilters = callPackage ../misc/talkfilters { }; znapzend = callPackage ../tools/backup/znapzend { }; @@ -12560,7 +12591,7 @@ with pkgs; tarssh = callPackage ../servers/tarssh { }; - tartan = callPackage ../development/tools/analysis/tartan {}; + tartan = callPackage ../development/tools/analysis/tartan { }; tartube = callPackage ../applications/video/tartube { }; @@ -12836,7 +12867,7 @@ with pkgs; tpm2-tools = callPackage ../tools/security/tpm2-tools { }; - trezor-udev-rules = callPackage ../os-specific/linux/trezor-udev-rules {}; + trezor-udev-rules = callPackage ../os-specific/linux/trezor-udev-rules { }; trezorctl = with python3Packages; toPythonApplication trezor; @@ -12888,11 +12919,11 @@ with pkgs; trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom { }; - trickle = callPackage ../tools/networking/trickle {}; + trickle = callPackage ../tools/networking/trickle { }; inherit (nodePackages) triton; - triggerhappy = callPackage ../tools/inputmethods/triggerhappy {}; + triggerhappy = callPackage ../tools/inputmethods/triggerhappy { }; inherit (callPackage ../applications/office/trilium {}) trilium-desktop @@ -12974,7 +13005,7 @@ with pkgs; twitch-chat-downloader = python3Packages.callPackage ../applications/misc/twitch-chat-downloader { }; - twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; + twitterBootstrap = callPackage ../development/web/twitter-bootstrap { }; twspace-crawler = callPackage ../tools/misc/twspace-crawler { }; @@ -13018,7 +13049,7 @@ with pkgs; ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { }; - udftools = callPackage ../tools/filesystems/udftools {}; + udftools = callPackage ../tools/filesystems/udftools { }; udp2raw = callPackage ../tools/networking/udp2raw { }; @@ -13060,6 +13091,8 @@ with pkgs; untrunc-anthwlock = callPackage ../tools/video/untrunc-anthwlock { }; + unzrip = callPackage ../tools/compression/unzrip { }; + up = callPackage ../tools/misc/up { }; upbound = callPackage ../development/tools/upbound { }; @@ -13072,23 +13105,23 @@ with pkgs; uqmi = callPackage ../tools/networking/uqmi { }; - urdfdom = callPackage ../development/libraries/urdfdom {}; + urdfdom = callPackage ../development/libraries/urdfdom { }; - urdfdom-headers = callPackage ../development/libraries/urdfdom-headers {}; + urdfdom-headers = callPackage ../development/libraries/urdfdom-headers { }; - uriparser = callPackage ../development/libraries/uriparser {}; + uriparser = callPackage ../development/libraries/uriparser { }; urlscan = callPackage ../applications/misc/urlscan { }; - urlview = callPackage ../applications/misc/urlview {}; + urlview = callPackage ../applications/misc/urlview { }; urn-timer = callPackage ../tools/misc/urn-timer { }; - ursadb = callPackage ../servers/ursadb {}; + ursadb = callPackage ../servers/ursadb { }; - usbmuxd = callPackage ../tools/misc/usbmuxd {}; + usbmuxd = callPackage ../tools/misc/usbmuxd { }; - usbmuxd2 = callPackage ../tools/misc/usbmuxd2 {}; + usbmuxd2 = callPackage ../tools/misc/usbmuxd2 { }; ustreamer = callPackage ../applications/video/ustreamer { }; @@ -13108,21 +13141,21 @@ with pkgs; v2ray-geoip = callPackage ../data/misc/v2ray-geoip { }; - vacuum = callPackage ../applications/networking/instant-messengers/vacuum {}; + vacuum = callPackage ../applications/networking/instant-messengers/vacuum { }; validator-nu = callPackage ../tools/text/validator-nu { }; - vampire = callPackage ../applications/science/logic/vampire {}; + vampire = callPackage ../applications/science/logic/vampire { }; - variety = callPackage ../applications/misc/variety {}; + variety = callPackage ../applications/misc/variety { }; - vdmfec = callPackage ../applications/backup/vdmfec {}; + vdmfec = callPackage ../applications/backup/vdmfec { }; vk-bootstrap = callPackage ../development/libraries/vk-bootstrap { }; vk-cli = callPackage ../applications/networking/instant-messengers/vk-cli { }; - vk-messenger = callPackage ../applications/networking/instant-messengers/vk-messenger {}; + vk-messenger = callPackage ../applications/networking/instant-messengers/vk-messenger { }; volatility = callPackage ../tools/security/volatility { }; @@ -13134,7 +13167,7 @@ with pkgs; vde2 = callPackage ../tools/networking/vde2 { }; - vboot_reference = callPackage ../tools/system/vboot_reference {}; + vboot_reference = callPackage ../tools/system/vboot_reference { }; vcftools = callPackage ../applications/science/biology/vcftools { }; @@ -13148,7 +13181,7 @@ with pkgs; verco = callPackage ../applications/version-management/verco { }; - verilator = callPackage ../applications/science/electronics/verilator {}; + verilator = callPackage ../applications/science/electronics/verilator { }; verilog = callPackage ../applications/science/electronics/verilog { autoconf = buildPackages.autoconf269; @@ -13168,9 +13201,9 @@ with pkgs; video-trimmer = callPackage ../applications/video/video-trimmer { }; - via = callPackage ../tools/misc/via {}; + via = callPackage ../tools/misc/via { }; - vial = callPackage ../tools/misc/vial {}; + vial = callPackage ../tools/misc/vial { }; viking = callPackage ../applications/misc/viking { }; @@ -13281,9 +13314,9 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) CoreServices; }; - wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {}; + wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse { }; - wbox = callPackage ../tools/networking/wbox {}; + wbox = callPackage ../tools/networking/wbox { }; webassemblyjs-cli = nodePackages."@webassemblyjs/cli-1.11.1"; webassemblyjs-repl = nodePackages."@webassemblyjs/repl-1.11.1"; @@ -13296,18 +13329,20 @@ with pkgs; nodejs = nodejs_latest; }; + wasm-tools = callPackage ../tools/misc/wasm-tools { }; + wasmedge = callPackage ../development/tools/wasmedge { llvmPackages = llvmPackages_12; inherit (darwin.apple_sdk.frameworks) Foundation; }; - welkin = callPackage ../tools/graphics/welkin {}; + welkin = callPackage ../tools/graphics/welkin { }; wemux = callPackage ../tools/misc/wemux { }; wf-recorder = callPackage ../applications/video/wf-recorder { }; - whatip = callPackage ../tools/networking/whatip {}; + whatip = callPackage ../tools/networking/whatip { }; whatweb = callPackage ../tools/security/whatweb { }; @@ -13355,19 +13390,19 @@ with pkgs; wpscan = callPackage ../tools/security/wpscan { }; - wsmancli = callPackage ../tools/system/wsmancli {}; + wsmancli = callPackage ../tools/system/wsmancli { }; wstunnel = haskell.lib.compose.justStaticExecutables haskellPackages.wstunnel; wolfebin = callPackage ../tools/networking/wolfebin { }; - xautoclick = callPackage ../applications/misc/xautoclick {}; + xautoclick = callPackage ../applications/misc/xautoclick { }; xl2tpd = callPackage ../tools/networking/xl2tpd { }; xe = callPackage ../tools/system/xe { }; - xplr = callPackage ../applications/misc/xplr {}; + xplr = callPackage ../applications/misc/xplr { }; xray = callPackage ../tools/networking/xray { }; @@ -13391,15 +13426,15 @@ with pkgs; htmltest = callPackage ../development/tools/htmltest { }; - rcm = callPackage ../tools/misc/rcm {}; + rcm = callPackage ../tools/misc/rcm { }; td = callPackage ../tools/misc/td { }; tdfgo = callPackage ../tools/misc/tdfgo { }; - tftp-hpa = callPackage ../tools/networking/tftp-hpa {}; + tftp-hpa = callPackage ../tools/networking/tftp-hpa { }; - tigervnc = callPackage ../tools/admin/tigervnc {}; + tigervnc = callPackage ../tools/admin/tigervnc { }; tightvnc = callPackage ../tools/admin/tightvnc { fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc @@ -13447,7 +13482,7 @@ with pkgs; udunits = callPackage ../development/libraries/udunits { }; - uftp = callPackage ../servers/uftp {}; + uftp = callPackage ../servers/uftp { }; uhttpmock = callPackage ../development/libraries/uhttpmock { }; @@ -13461,7 +13496,7 @@ with pkgs; unclutter-xfixes = callPackage ../tools/misc/unclutter-xfixes { }; - unbound = callPackage ../tools/networking/unbound {}; + unbound = callPackage ../tools/networking/unbound { }; unbound-with-systemd = unbound.override { withSystemd = true; @@ -13523,9 +13558,9 @@ with pkgs; xprompt = callPackage ../tools/X11/xprompt { }; - xprintidle = callPackage ../tools/X11/xprintidle {}; + xprintidle = callPackage ../tools/X11/xprintidle { }; - xprintidle-ng = callPackage ../tools/X11/xprintidle-ng {}; + xprintidle-ng = callPackage ../tools/X11/xprintidle-ng { }; xscast = callPackage ../applications/video/xscast { }; @@ -13598,6 +13633,10 @@ with pkgs; veryfasttree = callPackage ../applications/science/biology/veryfasttree { }; + viceroy = callPackage ../development/tools/viceroy { + inherit (darwin.apple_sdk.frameworks) Security; + }; + vlan = callPackage ../tools/networking/vlan { }; vmtouch = callPackage ../tools/misc/vmtouch { }; @@ -13658,7 +13697,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation IOBluetooth; }; - wipefreespace = callPackage ../tools/filesystems/wipefreespace {}; + wipefreespace = callPackage ../tools/filesystems/wipefreespace { }; woeusb = callPackage ../tools/misc/woeusb { }; @@ -13795,17 +13834,17 @@ with pkgs; boost = boost17x; }; - xurls = callPackage ../tools/text/xurls {}; + xurls = callPackage ../tools/text/xurls { }; - xxv = callPackage ../tools/misc/xxv {}; + xxv = callPackage ../tools/misc/xxv { }; xvfb-run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; }; - xvkbd = callPackage ../tools/X11/xvkbd {}; + xvkbd = callPackage ../tools/X11/xvkbd { }; - xwinmosaic = callPackage ../tools/X11/xwinmosaic {}; + xwinmosaic = callPackage ../tools/X11/xwinmosaic { }; - xwinwrap = callPackage ../tools/X11/xwinwrap {}; + xwinwrap = callPackage ../tools/X11/xwinwrap { }; yajsv = callPackage ../tools/misc/yajsv { }; @@ -13833,7 +13872,7 @@ with pkgs; yamlfix = with python3Packages; toPythonApplication yamlfix; - yamlfmt = callPackage ../development/tools/yamlfmt {}; + yamlfmt = callPackage ../development/tools/yamlfmt { }; yamllint = with python3Packages; toPythonApplication yamllint; @@ -13856,13 +13895,13 @@ with pkgs; zprint = callPackage ../development/tools/zprint { }; - yle-dl = callPackage ../tools/misc/yle-dl {}; + yle-dl = callPackage ../tools/misc/yle-dl { }; you-get = callPackage ../tools/misc/you-get { }; - zasm = callPackage ../development/compilers/zasm {}; + zasm = callPackage ../development/compilers/zasm { }; - zbackup = callPackage ../tools/backup/zbackup {}; + zbackup = callPackage ../tools/backup/zbackup { }; zbar = libsForQt5.callPackage ../tools/graphics/zbar { inherit (darwin.apple_sdk.frameworks) Foundation; @@ -13894,7 +13933,7 @@ with pkgs; zerofree = callPackage ../tools/filesystems/zerofree { }; - zfp = callPackage ../tools/compression/zfp {}; + zfp = callPackage ../tools/compression/zfp { }; zfs-autobackup = callPackage ../tools/backup/zfs-autobackup { }; @@ -13932,7 +13971,7 @@ with pkgs; zps = callPackage ../tools/system/zps { }; - zi = callPackage ../shells/zsh/zi {}; + zi = callPackage ../shells/zsh/zi { }; zinit = callPackage ../shells/zsh/zinit {} ; @@ -13988,7 +14027,7 @@ with pkgs; zsh-command-time = callPackage ../shells/zsh/zsh-command-time { }; - zsh-vi-mode = callPackage ../shells/zsh/zsh-vi-mode {}; + zsh-vi-mode = callPackage ../shells/zsh/zsh-vi-mode { }; zsh-you-should-use = callPackage ../shells/zsh/zsh-you-should-use { }; @@ -14004,7 +14043,7 @@ with pkgs; zsync = callPackage ../tools/compression/zsync { }; - zxing = callPackage ../tools/graphics/zxing {}; + zxing = callPackage ../tools/graphics/zxing { }; zkar = callPackage ../tools/security/zkar { }; @@ -14074,7 +14113,7 @@ with pkgs; fishPlugins = recurseIntoAttrs (callPackage ../shells/fish/plugins { }); - fzf-git-sh = callPackage ../shells/fzf-git-sh {}; + fzf-git-sh = callPackage ../shells/fzf-git-sh { }; ion = callPackage ../shells/ion { }; @@ -14278,7 +14317,7 @@ with pkgs; inherit (darwin) cctools; }; - chez-racket = callPackage ../development/compilers/chez-racket {}; + chez-racket = callPackage ../development/compilers/chez-racket { }; chez-srfi = callPackage ../development/chez-modules/chez-srfi { }; @@ -14389,7 +14428,7 @@ with pkgs; inherit (coqPackages) compcert; - computecpp-unwrapped = callPackage ../development/compilers/computecpp {}; + computecpp-unwrapped = callPackage ../development/compilers/computecpp { }; computecpp = wrapCCWith rec { cc = computecpp-unwrapped; extraPackages = [ @@ -14408,7 +14447,7 @@ with pkgs; ''; }; - copper = callPackage ../development/compilers/copper {}; + copper = callPackage ../development/compilers/copper { }; cotton = callPackage ../development/tools/cotton { inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -14434,9 +14473,9 @@ with pkgs; dbmonster = callPackage ../tools/security/dbmonster { }; - devpi-client = python3Packages.callPackage ../development/tools/devpi-client {}; + devpi-client = python3Packages.callPackage ../development/tools/devpi-client { }; - devpi-server = python3Packages.callPackage ../development/tools/devpi-server {}; + devpi-server = python3Packages.callPackage ../development/tools/devpi-server { }; dictu = callPackage ../development/compilers/dictu { }; @@ -14445,7 +14484,7 @@ with pkgs; eli = callPackage ../development/compilers/eli { }; - eql = callPackage ../development/compilers/eql {}; + eql = callPackage ../development/compilers/eql { }; elm2nix = haskell.lib.compose.justStaticExecutables haskellPackages.elm2nix; @@ -14501,7 +14540,6 @@ with pkgs; inherit (let num = if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then 6 - else if (stdenv.targetPlatform.isAarch64 && stdenv.isLinux) then 9 else 12; numS = toString num; in { @@ -14631,7 +14669,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; isl = if !stdenv.isDarwin then isl_0_14 else null; cloog = if !stdenv.isDarwin then cloog else null; @@ -14645,7 +14683,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; isl = if !stdenv.isDarwin then isl_0_11 else null; @@ -14662,7 +14700,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; # gcc 10 is too strict to cross compile gcc <= 8 stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; @@ -14681,7 +14719,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; # gcc 10 is too strict to cross compile gcc <= 8 stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; @@ -14696,7 +14734,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; # gcc 10 is too strict to cross compile gcc <= 8 stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; @@ -14711,7 +14749,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -14723,7 +14761,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -14735,7 +14773,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -14747,7 +14785,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -14948,13 +14986,13 @@ with pkgs; gcl_2_6_13_pre = callPackage ../development/compilers/gcl/2.6.13-pre.nix { }; - gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 {}; - gcc-arm-embedded-7 = callPackage ../development/compilers/gcc-arm-embedded/7 {}; - gcc-arm-embedded-8 = callPackage ../development/compilers/gcc-arm-embedded/8 {}; - gcc-arm-embedded-9 = callPackage ../development/compilers/gcc-arm-embedded/9 {}; - gcc-arm-embedded-10 = callPackage ../development/compilers/gcc-arm-embedded/10 {}; - gcc-arm-embedded-11 = callPackage ../development/compilers/gcc-arm-embedded/11 {}; - gcc-arm-embedded-12 = callPackage ../development/compilers/gcc-arm-embedded/12 {}; + gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 { }; + gcc-arm-embedded-7 = callPackage ../development/compilers/gcc-arm-embedded/7 { }; + gcc-arm-embedded-8 = callPackage ../development/compilers/gcc-arm-embedded/8 { }; + gcc-arm-embedded-9 = callPackage ../development/compilers/gcc-arm-embedded/9 { }; + gcc-arm-embedded-10 = callPackage ../development/compilers/gcc-arm-embedded/10 { }; + gcc-arm-embedded-11 = callPackage ../development/compilers/gcc-arm-embedded/11 { }; + gcc-arm-embedded-12 = callPackage ../development/compilers/gcc-arm-embedded/12 { }; gcc-arm-embedded = gcc-arm-embedded-12; # Has to match the default gcc so that there are no linking errors when @@ -14967,15 +15005,15 @@ with pkgs; profiledCompiler = false; }); - gforth = callPackage ../development/compilers/gforth {}; + gforth = callPackage ../development/compilers/gforth { }; gleam = callPackage ../development/compilers/gleam { inherit (darwin.apple_sdk.frameworks) Security; }; - gmqcc = callPackage ../development/compilers/gmqcc {}; + gmqcc = callPackage ../development/compilers/gmqcc { }; - gtk-server = callPackage ../development/interpreters/gtk-server {}; + gtk-server = callPackage ../development/interpreters/gtk-server { }; # Haskell and GHC @@ -14984,7 +15022,7 @@ with pkgs; haskellPackages = dontRecurseIntoAttrs # JS backend is only available for GHC >= 9.6 (if stdenv.hostPlatform.isGhcjs - then haskell.packages.native-bignum.ghcHEAD + then haskell.packages.native-bignum.ghc96 # Prefer native-bignum to avoid linking issues with gmp else if stdenv.hostPlatform.isStatic then haskell.packages.native-bignum.ghc92 @@ -15086,7 +15124,7 @@ with pkgs; glslang = callPackage ../development/compilers/glslang { }; - gnostic = callPackage ../development/compilers/gnostic {}; + gnostic = callPackage ../development/compilers/gnostic { }; go-junit-report = callPackage ../development/tools/go-junit-report { }; @@ -15477,11 +15515,11 @@ with pkgs; enableX11 = true; }; - miranda = callPackage ../development/compilers/miranda {}; + miranda = callPackage ../development/compilers/miranda { }; - mkcl = callPackage ../development/compilers/mkcl {}; + mkcl = callPackage ../development/compilers/mkcl { }; - mlkit = callPackage ../development/compilers/mlkit {}; + mlkit = callPackage ../development/compilers/mlkit { }; inherit (callPackage ../development/compilers/mlton {}) mlton20130715 @@ -15591,9 +15629,6 @@ with pkgs; opam = callPackage ../development/tools/ocaml/opam { inherit (darwin.apple_sdk.frameworks) Foundation; }; - opam_1_2 = callPackage ../development/tools/ocaml/opam/1.2.2.nix { - inherit (ocaml-ng.ocamlPackages_4_05) ocaml; - }; opam-installer = callPackage ../development/tools/ocaml/opam/installer.nix { }; @@ -15607,13 +15642,13 @@ with pkgs; passerine = callPackage ../development/compilers/passerine { }; - pforth = callPackage ../development/compilers/pforth {}; + pforth = callPackage ../development/compilers/pforth { }; picat = callPackage ../development/compilers/picat { }; ponyc = callPackage ../development/compilers/ponyc { - # Upstream pony has dropped support for versions compiled with gcc. - stdenv = llvmPackages_9.stdenv; + # Upstream pony no longer supports GCC + stdenv = llvmPackages.stdenv; }; blaze = callPackage ../development/libraries/blaze { }; @@ -15856,8 +15891,6 @@ with pkgs; rust_1_67 = callPackage ../development/compilers/rust/1_67.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_15 = llvmPackages_15.libllvm; - # https://github.com/NixOS/nixpkgs/issues/201254 - stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; }; rust = rust_1_67; @@ -15873,7 +15906,7 @@ with pkgs; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; - makeRustPlatform = callPackage ../development/compilers/rust/make-rust-platform.nix {}; + makeRustPlatform = callPackage ../development/compilers/rust/make-rust-platform.nix { }; buildRustCrate = callPackage ../build-support/rust/build-rust-crate { stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; }; buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; @@ -15938,6 +15971,9 @@ with pkgs; cargo-pgx = callPackage ../development/tools/rust/cargo-pgx { inherit (darwin.apple_sdk.frameworks) Security; }; + buildPgxExtension = callPackage ../development/tools/rust/cargo-pgx/buildPgxExtension.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-release = callPackage ../development/tools/rust/cargo-release { }; cargo-rr = callPackage ../development/tools/rust/cargo-rr { }; cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { @@ -16018,11 +16054,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-play = callPackage ../development/tools/rust/cargo-play { }; - cargo-profiler = callPackage ../development/tools/rust/cargo-profiler {}; + cargo-profiler = callPackage ../development/tools/rust/cargo-profiler { }; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-readme = callPackage ../development/tools/rust/cargo-readme {}; + cargo-readme = callPackage ../development/tools/rust/cargo-readme { }; cargo-semver-checks = callPackage ../development/tools/rust/cargo-semver-checks { }; cargo-show-asm = callPackage ../development/tools/rust/cargo-show-asm { }; @@ -16035,7 +16071,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; - cargo-sync-readme = callPackage ../development/tools/rust/cargo-sync-readme {}; + cargo-sync-readme = callPackage ../development/tools/rust/cargo-sync-readme { }; cargo-tally = callPackage ../development/tools/rust/cargo-tally { }; cargo-temp = callPackage ../development/tools/rust/cargo-temp { }; cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { @@ -16113,9 +16149,9 @@ with pkgs; rusty-man = callPackage ../development/tools/rust/rusty-man { }; typeshare = callPackage ../development/tools/rust/typeshare { }; - sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme {}; + sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme { }; - sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; + sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix { }; sbcl_2_0_8 = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.0.8"; }; sbcl_2_0_9 = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.0.9"; }; sbcl_2_1_1 = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.1.1"; }; @@ -16223,7 +16259,10 @@ with pkgs; }; swiPrologWithGui = swiProlog.override { withGui = true; }; - tbb = callPackage ../development/libraries/tbb { }; + tbb_2020_3 = callPackage ../development/libraries/tbb/2020_3.nix { }; + tbb_2021_8 = callPackage ../development/libraries/tbb { }; + # many packages still fail with latest version + tbb = tbb_2020_3; terra = callPackage ../development/compilers/terra { llvmPackages = llvmPackages_11; @@ -16365,9 +16404,9 @@ with pkgs; acl2 = callPackage ../development/interpreters/acl2 { }; acl2-minimal = callPackage ../development/interpreters/acl2 { certifyBooks = false; }; - angelscript = callPackage ../development/interpreters/angelscript {}; + angelscript = callPackage ../development/interpreters/angelscript { }; - angelscript_2_22 = callPackage ../development/interpreters/angelscript/2.22.nix {}; + angelscript_2_22 = callPackage ../development/interpreters/angelscript/2.22.nix { }; babashka = callPackage ../development/interpreters/clojure/babashka.nix { }; @@ -16564,23 +16603,23 @@ with pkgs; jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc92.jacinda; - janet = callPackage ../development/interpreters/janet {}; + janet = callPackage ../development/interpreters/janet { }; - jpm = callPackage ../development/interpreters/janet/jpm.nix {}; + jpm = callPackage ../development/interpreters/janet/jpm.nix { }; - jelly = callPackage ../development/interpreters/jelly {}; + jelly = callPackage ../development/interpreters/jelly { }; - jimtcl = callPackage ../development/interpreters/jimtcl {}; + jimtcl = callPackage ../development/interpreters/jimtcl { }; - jmeter = callPackage ../applications/networking/jmeter {}; + jmeter = callPackage ../applications/networking/jmeter { }; - joker = callPackage ../development/interpreters/joker {}; + joker = callPackage ../development/interpreters/joker { }; - davmail = callPackage ../applications/networking/davmail {}; + davmail = callPackage ../applications/networking/davmail { }; kanif = callPackage ../applications/networking/cluster/kanif { }; - kona = callPackage ../development/interpreters/kona {}; + kona = callPackage ../development/interpreters/kona { }; konf = callPackage ../development/tools/konf { }; @@ -16595,7 +16634,7 @@ with pkgs; zuo = callPackage ../development/interpreters/zuo { }; ### LUA interpreters - luaInterpreters = callPackage ./../development/interpreters/lua-5 {}; + luaInterpreters = callPackage ./../development/interpreters/lua-5 { }; inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_2_1 luajit_2_0 luajit_openresty; lua5 = lua5_2_compat; @@ -16708,9 +16747,9 @@ with pkgs; php80Packages = recurseIntoAttrs php80.packages; - picoc = callPackage ../development/interpreters/picoc {}; + picoc = callPackage ../development/interpreters/picoc { }; - picolisp = callPackage ../development/interpreters/picolisp {}; + picolisp = callPackage ../development/interpreters/picolisp { }; polyml = callPackage ../development/compilers/polyml { }; polyml56 = callPackage ../development/compilers/polyml/5.6.nix { }; @@ -16806,13 +16845,13 @@ with pkgs; pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {}); - check-jsonschema = callPackage ../development/tools/check-jsonschema {}; + check-jsonschema = callPackage ../development/tools/check-jsonschema { }; - pypi2nix = callPackage ../development/tools/pypi2nix {}; + pypi2nix = callPackage ../development/tools/pypi2nix { }; - pypi-mirror = callPackage ../development/tools/pypi-mirror {}; + pypi-mirror = callPackage ../development/tools/pypi-mirror { }; - setupcfg2nix = python3Packages.callPackage ../development/tools/setupcfg2nix {}; + setupcfg2nix = python3Packages.callPackage ../development/tools/setupcfg2nix { }; # These pyside tools do not provide any Python modules and are meant to be here. # See ../development/python-modules/pyside for details. @@ -16823,7 +16862,7 @@ with pkgs; svg2pdf = callPackage ../tools/graphics/svg2pdf { }; - pew = callPackage ../development/tools/pew {}; + pew = callPackage ../development/tools/pew { }; poetry = callPackage ../tools/package-management/poetry { }; @@ -16835,9 +16874,9 @@ with pkgs; poetry2conda = callPackage ../tools/package-management/poetry2conda { }; - pip-audit = callPackage ../development/tools/pip-audit {}; + pip-audit = callPackage ../development/tools/pip-audit { }; - pipenv = callPackage ../development/tools/pipenv {}; + pipenv = callPackage ../development/tools/pipenv { }; pipx = with python3.pkgs; toPythonApplication pipx; @@ -16849,14 +16888,14 @@ with pkgs; ffmpeg = ffmpeg-headless; }; - pipewire-media-session = callPackage ../development/libraries/pipewire/media-session.nix {}; + pipewire-media-session = callPackage ../development/libraries/pipewire/media-session.nix { }; - pipewire_0_2 = callPackage ../development/libraries/pipewire/0.2.nix {}; - wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix {}; + pipewire_0_2 = callPackage ../development/libraries/pipewire/0.2.nix { }; + wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix { }; - pw-volume = callPackage ../tools/audio/pw-volume {}; + pw-volume = callPackage ../tools/audio/pw-volume { }; - pyradio = callPackage ../applications/audio/pyradio {}; + pyradio = callPackage ../applications/audio/pyradio { }; racket = callPackage ../development/interpreters/racket { # racket 6.11 doesn't build with gcc6 + recent glibc: @@ -16871,7 +16910,7 @@ with pkgs; }; racket-minimal = callPackage ../development/interpreters/racket/minimal.nix { }; - rakudo = callPackage ../development/interpreters/rakudo {}; + rakudo = callPackage ../development/interpreters/rakudo { }; moarvm = callPackage ../development/interpreters/rakudo/moarvm.nix { inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; @@ -17015,7 +17054,7 @@ with pkgs; amtk = callPackage ../development/libraries/amtk { }; - avrlibc = callPackage ../development/misc/avr/libc {}; + avrlibc = callPackage ../development/misc/avr/libc { }; avrlibcCross = callPackage ../development/misc/avr/libc { stdenv = crossLibcStdenv; }; @@ -17024,11 +17063,11 @@ with pkgs; cppreference-doc = callPackage ../development/misc/cppreference-doc { }; - sourceFromHead = callPackage ../build-support/source-from-head-fun.nix {}; + sourceFromHead = callPackage ../build-support/source-from-head-fun.nix { }; jruby = callPackage ../development/interpreters/jruby { }; - jython = callPackage ../development/interpreters/jython {}; + jython = callPackage ../development/interpreters/jython { }; gImageReader = callPackage ../applications/misc/gImageReader { }; @@ -17083,6 +17122,8 @@ with pkgs; infracost = callPackage ../tools/misc/infracost { }; + jetbrains-toolbox = callPackage ../applications/misc/jetbrains-toolbox { }; + msp430GccSupport = callPackage ../development/misc/msp430/gcc-support.nix { }; msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { }; @@ -17095,9 +17136,9 @@ with pkgs; mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { }; - vc4-newlib = callPackage ../development/misc/vc4/newlib.nix {}; + vc4-newlib = callPackage ../development/misc/vc4/newlib.nix { }; - or1k-newlib = callPackage ../development/misc/or1k/newlib.nix {}; + or1k-newlib = callPackage ../development/misc/or1k/newlib.nix { }; rappel = callPackage ../development/misc/rappel { }; @@ -17242,9 +17283,10 @@ with pkgs; antlr4_8 antlr4_9 antlr4_10 - antlr4_11; + antlr4_11 + antlr4_12; - antlr4 = antlr4_11; + antlr4 = antlr4_12; antlr = antlr4; @@ -17259,15 +17301,15 @@ with pkgs; apacheKafka_3_2 = callPackage ../servers/apache-kafka { majorVersion = "3.2"; }; apacheKafka_3_3 = callPackage ../servers/apache-kafka { majorVersion = "3.3"; }; - kt = callPackage ../tools/misc/kt {}; + kt = callPackage ../tools/misc/kt { }; - argbash = callPackage ../development/tools/misc/argbash {}; + argbash = callPackage ../development/tools/misc/argbash { }; arpa2cm = callPackage ../development/tools/build-managers/arpa2cm { }; arpa2common = callPackage ../development/libraries/arpa2common { }; - asn2quickder = python3Packages.callPackage ../development/tools/asn2quickder {}; + asn2quickder = python3Packages.callPackage ../development/tools/asn2quickder { }; astyle = callPackage ../development/tools/misc/astyle { }; @@ -17343,7 +17385,7 @@ with pkgs; babeltrace = callPackage ../development/tools/misc/babeltrace { }; - bam = callPackage ../development/tools/build-managers/bam {}; + bam = callPackage ../development/tools/build-managers/bam { }; bazel = bazel_6; @@ -17620,7 +17662,7 @@ with pkgs; chefdk = callPackage ../development/tools/chefdk { }; - matter-compiler = callPackage ../development/compilers/matter-compiler {}; + matter-compiler = callPackage ../development/compilers/matter-compiler { }; cfr = callPackage ../development/tools/java/cfr { }; @@ -17640,7 +17682,7 @@ with pkgs; chruby-fish = callPackage ../development/tools/misc/chruby-fish { }; - cl-launch = callPackage ../development/tools/misc/cl-launch {}; + cl-launch = callPackage ../development/tools/misc/cl-launch { }; cloud-nuke = callPackage ../development/tools/cloud-nuke { }; @@ -17652,7 +17694,7 @@ with pkgs; cloudfoundry-cli = callPackage ../applications/networking/cluster/cloudfoundry-cli { }; - clpm = callPackage ../development/tools/clpm {}; + clpm = callPackage ../development/tools/clpm { }; coan = callPackage ../development/tools/analysis/coan { }; @@ -17670,13 +17712,13 @@ with pkgs; corundum = callPackage ../development/tools/corundum { }; - confluencepot = callPackage ../servers/confluencepot {}; + confluencepot = callPackage ../servers/confluencepot { }; - confluent-platform = callPackage ../servers/confluent-platform {}; + confluent-platform = callPackage ../servers/confluent-platform { }; ctags = callPackage ../development/tools/misc/ctags { }; - ctagsWrapped = callPackage ../development/tools/misc/ctags/wrapped.nix {}; + ctagsWrapped = callPackage ../development/tools/misc/ctags/wrapped.nix { }; ctodo = callPackage ../applications/misc/ctodo { }; @@ -17720,7 +17762,7 @@ with pkgs; cflow = callPackage ../development/tools/misc/cflow { }; - cov-build = callPackage ../development/tools/analysis/cov-build {}; + cov-build = callPackage ../development/tools/analysis/cov-build { }; cppcheck = callPackage ../development/tools/analysis/cppcheck { }; @@ -17831,7 +17873,7 @@ with pkgs; # }; # distccWrapper = makeOverridable ({ extraConfig ? "" }: - wrapCC (distcc.links extraConfig)) {}; + wrapCC (distcc.links extraConfig)) { }; distccStdenv = lowPrio (overrideCC stdenv buildPackages.distccWrapper); distccMasquerade = if stdenv.isDarwin @@ -17999,6 +18041,8 @@ with pkgs; gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { }; + pifpaf = callPackage ../development/tools/pifpaf { }; + pmd = callPackage ../development/tools/analysis/pmd { openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; @@ -18034,13 +18078,13 @@ with pkgs; component = "gnatinspect"; }; - gnome-doc-utils = callPackage ../development/tools/documentation/gnome-doc-utils {}; + gnome-doc-utils = callPackage ../development/tools/documentation/gnome-doc-utils { }; - gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing {}; + gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing { }; - gnome-firmware = callPackage ../applications/misc/gnome-firmware {}; + gnome-firmware = callPackage ../applications/misc/gnome-firmware { }; - gnome-usage = callPackage ../applications/misc/gnome-usage {}; + gnome-usage = callPackage ../applications/misc/gnome-usage { }; gnome-inform7 = callPackage ../applications/editors/gnome-inform7 { }; @@ -18048,7 +18092,7 @@ with pkgs; gnome-network-displays = callPackage ../applications/networking/gnome-network-displays { }; - gnome-multi-writer = callPackage ../applications/misc/gnome-multi-writer {}; + gnome-multi-writer = callPackage ../applications/misc/gnome-multi-writer { }; gnome-online-accounts = callPackage ../development/libraries/gnome-online-accounts { }; @@ -18061,6 +18105,10 @@ with pkgs; gnumake = callPackage ../development/tools/build-managers/gnumake { }; gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; + # openjdk-17 fails on 4.4.1. Provide 4.4 until we fix it. + gnumake44 = callPackage ../development/tools/build-managers/gnumake/4.4 { }; + + go-licenses = callPackage ../development/tools/misc/go-licenses { }; gob2 = callPackage ../development/tools/misc/gob2 { }; @@ -18126,7 +18174,7 @@ with pkgs; hadolint = haskell.lib.compose.justStaticExecutables haskellPackages.hadolint; - halfempty = callPackage ../development/tools/halfempty {}; + halfempty = callPackage ../development/tools/halfempty { }; hcloud = callPackage ../development/tools/hcloud { }; @@ -18263,6 +18311,8 @@ with pkgs; kubeprompt = callPackage ../development/tools/kubeprompt { }; + kubernetes-polaris = callPackage ../tools/security/kubernetes-polaris { }; + kubescape = callPackage ../tools/security/kubescape { }; kubesec = callPackage ../tools/security/kubesec { }; @@ -18317,11 +18367,11 @@ with pkgs; lit = callPackage ../development/tools/misc/lit { }; - litecli = callPackage ../development/tools/database/litecli {}; + litecli = callPackage ../development/tools/database/litecli { }; - litefs = callPackage ../development/tools/database/litefs {}; + litefs = callPackage ../development/tools/database/litefs { }; - litestream = callPackage ../development/tools/database/litestream {}; + litestream = callPackage ../development/tools/database/litestream { }; ls-lint = callPackage ../development/tools/ls-lint { }; @@ -18344,7 +18394,7 @@ with pkgs; lurk = callPackage ../development/tools/lurk { }; - malt = callPackage ../development/tools/profiling/malt {}; + malt = callPackage ../development/tools/profiling/malt { }; marksman = callPackage ../development/tools/marksman { }; @@ -18357,7 +18407,7 @@ with pkgs; mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { }; - go-md2man = callPackage ../development/tools/misc/go-md2man {}; + go-md2man = callPackage ../development/tools/misc/go-md2man { }; mage = callPackage ../development/tools/build-managers/mage { }; @@ -18410,7 +18460,7 @@ with pkgs; nap = callPackage ../development/tools/nap { }; - nex = callPackage ../development/tools/parsing/nex {}; + nex = callPackage ../development/tools/parsing/nex { }; ninja = callPackage ../development/tools/build-managers/ninja { }; @@ -18485,9 +18535,9 @@ with pkgs; pahole = callPackage ../development/tools/misc/pahole { }; - panopticon = callPackage ../development/tools/analysis/panopticon {}; + panopticon = callPackage ../development/tools/analysis/panopticon { }; - parinfer-rust = callPackage ../development/tools/parinfer-rust {}; + parinfer-rust = callPackage ../development/tools/parinfer-rust { }; parse-cli-bin = callPackage ../development/tools/parse-cli-bin { }; @@ -18540,9 +18590,9 @@ with pkgs; inherit (nodePackages) postcss-cli; - postiats-utilities = callPackage ../development/tools/postiats-utilities {}; + postiats-utilities = callPackage ../development/tools/postiats-utilities { }; - postman = callPackage ../development/web/postman {}; + postman = callPackage ../development/web/postman { }; pprof = callPackage ../development/tools/profiling/pprof { }; @@ -18578,7 +18628,7 @@ with pkgs; puppet-lint = callPackage ../development/tools/puppet/puppet-lint { }; - puppeteer-cli = callPackage ../tools/graphics/puppeteer-cli {}; + puppeteer-cli = callPackage ../tools/graphics/puppeteer-cli { }; pyrseas = callPackage ../development/tools/database/pyrseas { }; @@ -18708,7 +18758,7 @@ with pkgs; sconsPackages = dontRecurseIntoAttrs (callPackage ../development/tools/build-managers/scons { }); scons = sconsPackages.scons_latest; - mill = callPackage ../development/tools/build-managers/mill {}; + mill = callPackage ../development/tools/build-managers/mill { }; sbt = callPackage ../development/tools/build-managers/sbt { }; sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { }; @@ -18716,7 +18766,7 @@ with pkgs; sbt-extras = callPackage ../development/tools/build-managers/sbt-extras { }; - scala-cli = callPackage ../development/tools/build-managers/scala-cli {}; + scala-cli = callPackage ../development/tools/build-managers/scala-cli { }; scc = callPackage ../development/tools/misc/scc { }; @@ -18744,7 +18794,7 @@ with pkgs; inherit (__splicedPackages.haskellPackages) ShellCheck; }; - shellharden = callPackage ../development/tools/shellharden {}; + shellharden = callPackage ../development/tools/shellharden { }; schemaspy = callPackage ../development/tools/database/schemaspy { }; @@ -18762,7 +18812,7 @@ with pkgs; simpleTpmPk11 = callPackage ../tools/security/simple-tpm-pk11 { }; - slimerjs = callPackage ../development/tools/slimerjs {}; + slimerjs = callPackage ../development/tools/slimerjs { }; slint-lsp = callPackage ../development/tools/misc/slint-lsp { inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; @@ -18803,13 +18853,13 @@ with pkgs; spoofer-gui = callPackage ../tools/networking/spoofer { withGUI = true; }; - spooles = callPackage ../development/libraries/science/math/spooles {}; + spooles = callPackage ../development/libraries/science/math/spooles { }; spr = callPackage ../development/tools/spr { inherit (darwin.apple_sdk.frameworks) Security; }; - spruce = callPackage ../development/tools/misc/spruce {}; + spruce = callPackage ../development/tools/misc/spruce { }; sqlc = callPackage ../development/tools/database/sqlc { }; @@ -18907,7 +18957,8 @@ with pkgs; texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; # needed for allegro texinfo6_7 = callPackage ../development/tools/misc/texinfo/6.7.nix { }; # needed for gpm, iksemel and fwknop texinfo6 = callPackage ../development/tools/misc/texinfo/6.8.nix { }; - texinfo = texinfo6; + texinfo7 = callPackage ../development/tools/misc/texinfo/7.0.nix { }; + texinfo = texinfo7; texinfoInteractive = texinfo.override { interactive = true; }; texi2html = callPackage ../development/tools/misc/texi2html { }; @@ -18969,7 +19020,7 @@ with pkgs; unused = callPackage ../development/tools/misc/unused { }; - vagrant = callPackage ../development/tools/vagrant {}; + vagrant = callPackage ../development/tools/vagrant { }; bashdb = callPackage ../development/tools/misc/bashdb { }; @@ -18994,7 +19045,7 @@ with pkgs; valkyrie = callPackage ../development/tools/analysis/valkyrie { }; - qcachegrind = libsForQt5.callPackage ../development/tools/analysis/qcachegrind {}; + qcachegrind = libsForQt5.callPackage ../development/tools/analysis/qcachegrind { }; visualvm = callPackage ../development/tools/java/visualvm { }; @@ -19014,7 +19065,7 @@ with pkgs; inherit (llvmPackages) clang-unwrapped; }; - watson-ruby = callPackage ../development/tools/misc/watson-ruby {}; + watson-ruby = callPackage ../development/tools/misc/watson-ruby { }; webdis = callPackage ../development/tools/database/webdis { }; @@ -19044,9 +19095,9 @@ with pkgs; xeus = callPackage ../development/libraries/xeus { }; - xmlindent = callPackage ../development/web/xmlindent {}; + xmlindent = callPackage ../development/web/xmlindent { }; - xpwn = callPackage ../development/mobile/xpwn {}; + xpwn = callPackage ../development/mobile/xpwn { }; xxdiff = libsForQt5.callPackage ../development/tools/misc/xxdiff { }; @@ -19072,7 +19123,7 @@ with pkgs; yq-go = callPackage ../development/tools/yq-go { }; - ytt = callPackage ../development/tools/ytt {}; + ytt = callPackage ../development/tools/ytt { }; zydis = callPackage ../development/libraries/zydis { }; @@ -19124,10 +19175,12 @@ with pkgs; alass = callPackage ../applications/video/alass { }; allegro = allegro4; - allegro4 = callPackage ../development/libraries/allegro {}; - allegro5 = callPackage ../development/libraries/allegro/5.nix {}; + allegro4 = callPackage ../development/libraries/allegro { }; + allegro5 = callPackage ../development/libraries/allegro/5.nix { }; - amdvlk = callPackage ../development/libraries/amdvlk {}; + amdvlk = callPackage ../development/libraries/amdvlk { }; + + amf-headers = callPackage ../development/libraries/amf-headers { }; aml = callPackage ../development/libraries/aml { }; @@ -19137,7 +19190,7 @@ with pkgs; ansi2html = with python3.pkgs; toPythonApplication ansi2html; - antic = callPackage ../development/libraries/antic {}; + antic = callPackage ../development/libraries/antic { }; anttweakbar = callPackage ../development/libraries/AntTweakBar { }; @@ -19153,23 +19206,23 @@ with pkgs; aravis = callPackage ../development/libraries/aravis { }; - arb = callPackage ../development/libraries/arb {}; + arb = callPackage ../development/libraries/arb { }; argparse = callPackage ../development/libraries/argparse { }; - argp-standalone = callPackage ../development/libraries/argp-standalone {}; + argp-standalone = callPackage ../development/libraries/argp-standalone { }; aribb25 = callPackage ../development/libraries/aribb25 { inherit (darwin.apple_sdk.frameworks) PCSC; }; - armadillo = callPackage ../development/libraries/armadillo {}; + armadillo = callPackage ../development/libraries/armadillo { }; - arrayfire = callPackage ../development/libraries/arrayfire {}; + arrayfire = callPackage ../development/libraries/arrayfire { }; - arrow-cpp = callPackage ../development/libraries/arrow-cpp {}; + arrow-cpp = callPackage ../development/libraries/arrow-cpp { }; - arrow-glib = callPackage ../development/libraries/arrow-glib {}; + arrow-glib = callPackage ../development/libraries/arrow-glib { }; arsenal = callPackage ../tools/security/arsenal { }; @@ -19284,11 +19337,7 @@ with pkgs; else callPackage ../os-specific/linux/bionic-prebuilt { }; - bobcat = callPackage ../development/libraries/bobcat { - # C++20 is required, aarch64-linux has gcc 9 by default - # https://github.com/NixOS/nixpkgs/issues/201254 - stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv; - }; + bobcat = callPackage ../development/libraries/bobcat { }; boehmgc = callPackage ../development/libraries/boehm-gc { }; @@ -19357,7 +19406,7 @@ with pkgs; }; }); - calcium = callPackage ../development/libraries/calcium {}; + calcium = callPackage ../development/libraries/calcium { }; cubeb = callPackage ../development/libraries/audio/cubeb { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreServices; @@ -19379,21 +19428,17 @@ with pkgs; captive-browser = callPackage ../applications/networking/browsers/captive-browser { }; - ndn-cxx = callPackage ../development/libraries/ndn-cxx { - openssl = openssl_1_1; - }; + ndn-cxx = callPackage ../development/libraries/ndn-cxx { }; - ndn-tools = callPackage ../tools/networking/ndn-tools { - openssl = openssl_1_1; - }; + ndn-tools = callPackage ../tools/networking/ndn-tools { }; nfd = callPackage ../servers/nfd { }; - cddlib = callPackage ../development/libraries/cddlib {}; + cddlib = callPackage ../development/libraries/cddlib { }; - cdk = callPackage ../development/libraries/cdk {}; + cdk = callPackage ../development/libraries/cdk { }; - cdk-go = callPackage ../tools/security/cdk-go {}; + cdk-go = callPackage ../tools/security/cdk-go { }; cdo = callPackage ../development/libraries/cdo { }; @@ -19409,9 +19454,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - celt = callPackage ../development/libraries/celt {}; - celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {}; - celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix {}; + celt = callPackage ../development/libraries/celt { }; + celt_0_7 = callPackage ../development/libraries/celt/0.7.nix { }; + celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix { }; cegui = callPackage ../development/libraries/cegui { ogre = ogre1_10; @@ -19425,14 +19470,14 @@ with pkgs; certbot-dns-route53 ]); - caf = callPackage ../development/libraries/caf {}; + caf = callPackage ../development/libraries/caf { }; # CGAL 5 has API changes - cgal_4 = callPackage ../development/libraries/CGAL/4.nix {}; - cgal_5 = callPackage ../development/libraries/CGAL {}; + cgal_4 = callPackage ../development/libraries/CGAL/4.nix { }; + cgal_5 = callPackage ../development/libraries/CGAL { }; cgal = cgal_4; - cgui = callPackage ../development/libraries/cgui {}; + cgui = callPackage ../development/libraries/cgui { }; charls = callPackage ../development/libraries/charls { }; @@ -19440,7 +19485,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - chipmunk = callPackage ../development/libraries/chipmunk {}; + chipmunk = callPackage ../development/libraries/chipmunk { }; chmlib = callPackage ../development/libraries/chmlib { }; @@ -19684,26 +19729,26 @@ with pkgs; drogon = callPackage ../development/libraries/drogon { }; - dssi = callPackage ../development/libraries/dssi {}; + dssi = callPackage ../development/libraries/dssi { }; - duckdb = callPackage ../development/libraries/duckdb {}; + duckdb = callPackage ../development/libraries/duckdb { }; - easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; + easyloggingpp = callPackage ../development/libraries/easyloggingpp { }; eccodes = callPackage ../development/libraries/eccodes { pythonPackages = python3Packages; stdenv = if stdenv.isDarwin then gccStdenv else stdenv; }; - eclib = callPackage ../development/libraries/eclib {}; + eclib = callPackage ../development/libraries/eclib { }; editline = callPackage ../development/libraries/editline { }; edencommon = callPackage ../development/libraries/edencommon { }; - eigen = callPackage ../development/libraries/eigen {}; + eigen = callPackage ../development/libraries/eigen { }; - eigen2 = callPackage ../development/libraries/eigen/2.0.nix {}; + eigen2 = callPackage ../development/libraries/eigen/2.0.nix { }; eigenmath = callPackage ../applications/science/math/eigenmath { }; @@ -19719,7 +19764,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; }; - egl-wayland = callPackage ../development/libraries/egl-wayland {}; + egl-wayland = callPackage ../development/libraries/egl-wayland { }; elastix = callPackage ../development/libraries/science/biology/elastix { inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -19847,7 +19892,7 @@ with pkgs; }; fftwMpi = fftw.override { enableMpi = true; }; - filter-audio = callPackage ../development/libraries/filter-audio {}; + filter-audio = callPackage ../development/libraries/filter-audio { }; filtron = callPackage ../servers/filtron { }; @@ -19890,8 +19935,8 @@ with pkgs; fmt = fmt_9; - fplll = callPackage ../development/libraries/fplll {}; - fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {}; + fplll = callPackage ../development/libraries/fplll { }; + fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix { }; freeimage = callPackage ../development/libraries/freeimage { inherit (darwin) autoSignDarwinBinariesHook; @@ -19984,19 +20029,21 @@ with pkgs; gecode_6 = qt5.callPackage ../development/libraries/gecode { }; gecode = gecode_6; + geph = callPackages ../applications/networking/geph { }; + gephi = callPackage ../applications/science/misc/gephi { }; gegl = callPackage ../development/libraries/gegl { inherit (darwin.apple_sdk.frameworks) OpenCL; }; - gensio = callPackage ../development/libraries/gensio {}; + gensio = callPackage ../development/libraries/gensio { }; - geoclue2 = callPackage ../development/libraries/geoclue {}; + geoclue2 = callPackage ../development/libraries/geoclue { }; geoclue2-with-demo-agent = geoclue2.override { withDemoAgent = true; }; - geocode-glib = callPackage ../development/libraries/geocode-glib {}; + geocode-glib = callPackage ../development/libraries/geocode-glib { }; geocode-glib_2 = geocode-glib.override { libsoup = libsoup_3; @@ -20026,7 +20073,7 @@ with pkgs; gettext = callPackage ../development/libraries/gettext { }; - gf2x = callPackage ../development/libraries/gf2x {}; + gf2x = callPackage ../development/libraries/gf2x { }; gd = callPackage ../development/libraries/gd { automake = automake115x; @@ -20038,17 +20085,17 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices Cocoa; }; - ggz_base_libs = callPackage ../development/libraries/ggz_base_libs {}; + ggz_base_libs = callPackage ../development/libraries/ggz_base_libs { }; gifticlib = callPackage ../development/libraries/science/biology/gifticlib { }; gio-sharp = callPackage ../development/libraries/gio-sharp { }; - givaro = callPackage ../development/libraries/givaro {}; - givaro_3 = callPackage ../development/libraries/givaro/3.nix {}; - givaro_3_7 = callPackage ../development/libraries/givaro/3.7.nix {}; + givaro = callPackage ../development/libraries/givaro { }; + givaro_3 = callPackage ../development/libraries/givaro/3.nix { }; + givaro_3_7 = callPackage ../development/libraries/givaro/3.7.nix { }; - ghc_filesystem = callPackage ../development/libraries/ghc_filesystem {}; + ghc_filesystem = callPackage ../development/libraries/ghc_filesystem { }; ghp-import = with python3Packages; toPythonApplication ghp-import; @@ -20077,6 +20124,16 @@ with pkgs; patches = []; }); + libgit2_1_5 = libgit2.overrideAttrs (_: rec { + version = "1.5.1"; + src = pkgs.fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + hash = "sha256-KzBMwpqn6wUFhgB3KDclBS0BvZSVcasM5AG/y+L91xM="; + }; + }); + libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; libhsts = callPackage ../development/libraries/libhsts { }; @@ -20174,7 +20231,7 @@ with pkgs; model = "mcf"; # For win32 or posix set this to null package = targetPackages.windows.mcfgthreads or windows.mcfgthreads; - } else {}; + } else { }; wasilibc = callPackage ../development/libraries/wasilibc { stdenv = crossLibcStdenv; @@ -20210,7 +20267,7 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string; }; - glui = callPackage ../development/libraries/glui {}; + glui = callPackage ../development/libraries/glui { }; gmime2 = callPackage ../development/libraries/gmime/2.nix { }; gmime3 = callPackage ../development/libraries/gmime/3.nix { }; @@ -20234,7 +20291,7 @@ with pkgs; mpfshell = callPackage ../development/tools/mpfshell { }; # A GMP fork - mpir = callPackage ../development/libraries/mpir {}; + mpir = callPackage ../development/libraries/mpir { }; gl3w = callPackage ../development/libraries/gl3w { }; @@ -20298,12 +20355,12 @@ with pkgs; gusb = callPackage ../development/libraries/gusb { }; - qt-mobility = callPackage ../development/libraries/qt-mobility {}; + qt-mobility = callPackage ../development/libraries/qt-mobility { }; qtstyleplugin-kvantum-qt4 = callPackage ../development/libraries/qtstyleplugin-kvantum-qt4 { }; - qxmpp = libsForQt5.callPackage ../development/libraries/qxmpp {}; + qxmpp = libsForQt5.callPackage ../development/libraries/qxmpp { }; gnet = callPackage ../development/libraries/gnet { }; @@ -20325,7 +20382,7 @@ with pkgs; pgpdump = callPackage ../tools/security/pgpdump { }; - pgpkeyserver-lite = callPackage ../servers/web-apps/pgpkeyserver-lite {}; + pgpkeyserver-lite = callPackage ../servers/web-apps/pgpkeyserver-lite { }; pgweb = callPackage ../development/tools/database/pgweb { }; @@ -20337,7 +20394,7 @@ with pkgs; gsl-lite = callPackage ../development/libraries/gsl-lite { }; - gsm = callPackage ../development/libraries/gsm {}; + gsm = callPackage ../development/libraries/gsm { }; gsoap = callPackage ../development/libraries/gsoap { }; @@ -20363,7 +20420,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - glib-networking = callPackage ../development/libraries/glib-networking {}; + glib-networking = callPackage ../development/libraries/glib-networking { }; glib-testing = callPackage ../development/libraries/glib-testing { }; @@ -20472,7 +20529,7 @@ with pkgs; gtk-mac-integration-gtk3 = gtk-mac-integration; - gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {}; + gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler { }; gtksourceview = gtksourceview3; @@ -20527,7 +20584,7 @@ with pkgs; haxor-news = callPackage ../applications/misc/haxor-news { }; - hdt = callPackage ../misc/hdt {}; + hdt = callPackage ../misc/hdt { }; hfinger = callPackage ../tools/security/hfinger { }; @@ -20580,7 +20637,7 @@ with pkgs; hunspellWithDicts = dicts: callPackage ../development/libraries/hunspell/wrapper.nix { inherit dicts; }; - hwloc = callPackage ../development/libraries/hwloc {}; + hwloc = callPackage ../development/libraries/hwloc { }; hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_11; }; @@ -20695,7 +20752,7 @@ with pkgs; intltool = callPackage ../development/tools/misc/intltool { }; - ios-cross-compile = callPackage ../development/compilers/ios-cross-compile/9.2.nix {}; + ios-cross-compile = callPackage ../development/compilers/ios-cross-compile/9.2.nix { }; ip2location-c = callPackage ../development/libraries/ip2location-c { }; @@ -20827,7 +20884,7 @@ with pkgs; LASzip = callPackage ../development/libraries/LASzip { }; LASzip2 = callPackage ../development/libraries/LASzip/LASzip2.nix { }; - lcm = callPackage ../development/libraries/lcm {}; + lcm = callPackage ../development/libraries/lcm { }; lcms = lcms1; @@ -20839,7 +20896,7 @@ with pkgs; ldb = callPackage ../development/libraries/ldb { }; - lensfun = callPackage ../development/libraries/lensfun {}; + lensfun = callPackage ../development/libraries/lensfun { }; lesstif = callPackage ../development/libraries/lesstif { }; @@ -20901,7 +20958,7 @@ with pkgs; libamqpcpp = callPackage ../development/libraries/libamqpcpp { }; - libantlr3c = callPackage ../development/libraries/libantlr3c {}; + libantlr3c = callPackage ../development/libraries/libantlr3c { }; libaom = callPackage ../development/libraries/libaom { # Remove circular dependency for libavif @@ -20930,7 +20987,7 @@ with pkgs; libasyncns = callPackage ../development/libraries/libasyncns { }; - libatomic_ops = callPackage ../development/libraries/libatomic_ops {}; + libatomic_ops = callPackage ../development/libraries/libatomic_ops { }; libaudclient = callPackage ../development/libraries/libaudclient { }; @@ -21005,11 +21062,11 @@ with pkgs; libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; - libcef = callPackage ../development/libraries/libcef {}; + libcef = callPackage ../development/libraries/libcef { }; - libcello = callPackage ../development/libraries/libcello {}; + libcello = callPackage ../development/libraries/libcello { }; - libcerf = callPackage ../development/libraries/libcerf {}; + libcerf = callPackage ../development/libraries/libcerf { }; libcdada = callPackage ../development/libraries/libcdada { }; @@ -21114,7 +21171,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - libde265 = callPackage ../development/libraries/libde265 {}; + libde265 = callPackage ../development/libraries/libde265 { }; libdeflate = darwin.apple_sdk_11_0.callPackage ../development/libraries/libdeflate { }; @@ -21303,7 +21360,7 @@ with pkgs; libsystemtap = callPackage ../development/libraries/libsystemtap { }; - libgtop = callPackage ../development/libraries/libgtop {}; + libgtop = callPackage ../development/libraries/libgtop { }; libLAS = callPackage ../development/libraries/libLAS { boost = boost172; @@ -21329,7 +21386,7 @@ with pkgs; libexif = callPackage ../development/libraries/libexif { }; - libexosip = callPackage ../development/libraries/exosip {}; + libexosip = callPackage ../development/libraries/exosip { }; libexsid = callPackage ../development/libraries/libexsid { }; @@ -21337,15 +21394,15 @@ with pkgs; libmpeg2 = mpeg2dec; }; - libexttextcat = callPackage ../development/libraries/libexttextcat {}; + libexttextcat = callPackage ../development/libraries/libexttextcat { }; - libf2c = callPackage ../development/libraries/libf2c {}; + libf2c = callPackage ../development/libraries/libf2c { }; - libfabric = callPackage ../development/libraries/libfabric {}; + libfabric = callPackage ../development/libraries/libfabric { }; libfive = libsForQt5.callPackage ../development/libraries/libfive { }; - libfixposix = callPackage ../development/libraries/libfixposix {}; + libfixposix = callPackage ../development/libraries/libfixposix { }; libff = callPackage ../development/libraries/libff { }; @@ -21402,7 +21459,7 @@ with pkgs; libgudev = callPackage ../development/libraries/libgudev { }; - libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {}; + libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix { }; libguestfs = callPackage ../development/libraries/libguestfs { autoreconfHook = buildPackages.autoreconfHook264; }; @@ -21418,7 +21475,7 @@ with pkgs; libhdhomerun = callPackage ../development/libraries/libhdhomerun { }; - libheif = callPackage ../development/libraries/libheif {}; + libheif = callPackage ../development/libraries/libheif { }; libhttpseverywhere = callPackage ../development/libraries/libhttpseverywhere { }; @@ -21490,15 +21547,15 @@ with pkgs; libmaxminddb = callPackage ../development/libraries/libmaxminddb { }; - libmcrypt = callPackage ../development/libraries/libmcrypt {}; + libmcrypt = callPackage ../development/libraries/libmcrypt { }; libmediaart = callPackage ../development/libraries/libmediaart { }; libmediainfo = callPackage ../development/libraries/libmediainfo { }; - libmhash = callPackage ../development/libraries/libmhash {}; + libmhash = callPackage ../development/libraries/libmhash { }; - libmodbus = callPackage ../development/libraries/libmodbus {}; + libmodbus = callPackage ../development/libraries/libmodbus { }; libmtp = callPackage ../development/libraries/libmtp { }; @@ -21506,7 +21563,7 @@ with pkgs; libmysofa = callPackage ../development/libraries/audio/libmysofa { }; - libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp {}; + libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp { }; libnatpmp = callPackage ../development/libraries/libnatpmp { }; @@ -21526,11 +21583,11 @@ with pkgs; libplist = callPackage ../development/libraries/libplist { }; - libre = callPackage ../development/libraries/libre {}; + libre = callPackage ../development/libraries/libre { }; - libredwg = callPackage ../development/libraries/libredwg {}; + libredwg = callPackage ../development/libraries/libredwg { }; - librem = callPackage ../development/libraries/librem {}; + librem = callPackage ../development/libraries/librem { }; librelp = callPackage ../development/libraries/librelp { }; @@ -21538,9 +21595,9 @@ with pkgs; python = python3; }; - libresample = callPackage ../development/libraries/libresample {}; + libresample = callPackage ../development/libraries/libresample { }; - librevenge = callPackage ../development/libraries/librevenge {}; + librevenge = callPackage ../development/libraries/librevenge { }; librime = callPackage ../development/libraries/librime { boost = boost174; @@ -21618,7 +21675,7 @@ with pkgs; libiec61883 = callPackage ../development/libraries/libiec61883 { }; - libimagequant = callPackage ../development/libraries/libimagequant {}; + libimagequant = callPackage ../development/libraries/libimagequant { }; libime = callPackage ../development/libraries/libime { }; @@ -21628,7 +21685,7 @@ with pkgs; graphviz = graphviz-nox; }; - libinput-gestures = callPackage ../tools/inputmethods/libinput-gestures {}; + libinput-gestures = callPackage ../tools/inputmethods/libinput-gestures { }; libinstpatch = callPackage ../development/libraries/audio/libinstpatch { }; @@ -21717,7 +21774,7 @@ with pkgs; libmnl = callPackage ../development/libraries/libmnl { }; - libmodplug = callPackage ../development/libraries/libmodplug {}; + libmodplug = callPackage ../development/libraries/libmodplug { }; libmodule = callPackage ../development/libraries/libmodule { }; @@ -21795,7 +21852,7 @@ with pkgs; libosinfo = callPackage ../development/libraries/libosinfo { }; - libosip = callPackage ../development/libraries/osip {}; + libosip = callPackage ../development/libraries/osip { }; libosmium = callPackage ../development/libraries/libosmium { }; @@ -21871,6 +21928,8 @@ with pkgs; libqt5pas = libsForQt5.callPackage ../development/compilers/fpc/libqt5pas.nix { }; + librclone = callPackage ../development/libraries/librclone { }; + libroxml = callPackage ../development/libraries/libroxml { }; librsvg = callPackage ../development/libraries/librsvg { @@ -21914,7 +21973,7 @@ with pkgs; libspectrum = callPackage ../development/libraries/libspectrum { }; - libspiro = callPackage ../development/libraries/libspiro {}; + libspiro = callPackage ../development/libraries/libspiro { }; libspng = callPackage ../development/libraries/libspng { }; @@ -21985,7 +22044,7 @@ with pkgs; libtorrent-rasterbar = libtorrent-rasterbar-2_0_x; - libtoxcore = callPackage ../development/libraries/libtoxcore {}; + libtoxcore = callPackage ../development/libraries/libtoxcore { }; libtpms = callPackage ../tools/security/libtpms { }; @@ -22046,7 +22105,7 @@ with pkgs; libjaylink = callPackage ../development/libraries/libjaylink { }; - libusb-compat-0_1 = callPackage ../development/libraries/libusb-compat/0.1.nix {}; + libusb-compat-0_1 = callPackage ../development/libraries/libusb-compat/0.1.nix { }; libusb1 = callPackage ../development/libraries/libusb1 { inherit (darwin) libobjc; @@ -22158,7 +22217,7 @@ with pkgs; libwpg = callPackage ../development/libraries/libwpg { }; - libx86 = callPackage ../development/libraries/libx86 {}; + libx86 = callPackage ../development/libraries/libx86 { }; libxcrypt = callPackage ../development/libraries/libxcrypt { fetchurl = stdenv.fetchurlBoot; @@ -22320,7 +22379,7 @@ with pkgs; manticoresearch = callPackage ../servers/search/manticoresearch { }; - marisa = callPackage ../development/libraries/marisa {}; + marisa = callPackage ../development/libraries/marisa { }; matio = callPackage ../development/libraries/matio { }; @@ -22478,10 +22537,7 @@ with pkgs; mtpfs = callPackage ../tools/filesystems/mtpfs { }; - mtxclient = callPackage ../development/libraries/mtxclient { - # https://github.com/NixOS/nixpkgs/issues/201254 - stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv; - }; + mtxclient = callPackage ../development/libraries/mtxclient { }; mu = callPackage ../tools/networking/mu { texinfo = texinfo4; @@ -22557,7 +22613,7 @@ with pkgs; nettle = import ../development/libraries/nettle { inherit callPackage fetchurl; }; - newman = callPackage ../development/web/newman {}; + newman = callPackage ../development/web/newman { }; newt = callPackage ../development/libraries/newt { python = python3; }; @@ -22661,8 +22717,8 @@ with pkgs; ogre = callPackage ../development/libraries/ogre { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - ogre1_9 = callPackage ../development/libraries/ogre/1.9.x.nix {}; - ogre1_10 = callPackage ../development/libraries/ogre/1.10.x.nix {}; + ogre1_9 = callPackage ../development/libraries/ogre/1.9.x.nix { }; + ogre1_10 = callPackage ../development/libraries/ogre/1.10.x.nix { }; ogrepaged = callPackage ../development/libraries/ogrepaged { ogre = ogre1_9; @@ -22780,7 +22836,7 @@ with pkgs; openslide = callPackage ../development/libraries/openslide { }; - openslp = callPackage ../development/libraries/openslp {}; + openslp = callPackage ../development/libraries/openslp { }; openstackclient = with python3Packages; toPythonApplication python-openstackclient; glanceclient = with python3Packages; toPythonApplication python-glanceclient; @@ -22788,7 +22844,9 @@ with pkgs; ironicclient = with python3Packages; toPythonApplication python-ironicclient; manilaclient = with python3Packages; toPythonApplication python-manilaclient; - openvdb = callPackage ../development/libraries/openvdb {}; + openvdb = callPackage ../development/libraries/openvdb { }; + + openvr = callPackage ../development/libraries/openvr { }; inherit (callPackages ../development/libraries/libressl { }) libressl_3_4 @@ -22821,9 +22879,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Accelerate; }; - open-wbo = callPackage ../applications/science/logic/open-wbo {}; + open-wbo = callPackage ../applications/science/logic/open-wbo { }; - openwsman = callPackage ../development/libraries/openwsman {}; + openwsman = callPackage ../development/libraries/openwsman { }; ortp = callPackage ../development/libraries/ortp { }; @@ -22842,7 +22900,7 @@ with pkgs; osm-gps-map = callPackage ../development/libraries/osm-gps-map { }; - osmid = callPackage ../applications/audio/osmid {}; + osmid = callPackage ../applications/audio/osmid { }; osinfo-db = callPackage ../data/misc/osinfo-db { }; osinfo-db-tools = callPackage ../tools/misc/osinfo-db-tools { }; @@ -22987,20 +23045,20 @@ with pkgs; pslib = callPackage ../development/libraries/pslib { }; - pstreams = callPackage ../development/libraries/pstreams {}; + pstreams = callPackage ../development/libraries/pstreams { }; pufferpanel = callPackage ../servers/pufferpanel { }; pugixml = callPackage ../development/libraries/pugixml { }; - pylode = callPackage ../misc/pylode {}; + pylode = callPackage ../misc/pylode { }; python-qt = callPackage ../development/libraries/python-qt { python = python3; inherit (qt5) qmake qttools qtwebengine qtxmlpatterns; }; - pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside {}; + pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside { }; plasma-hud = callPackage ../misc/plasma-hud { }; @@ -23008,7 +23066,7 @@ with pkgs; qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { }; - qimageblitz = callPackage ../development/libraries/qimageblitz {}; + qimageblitz = callPackage ../development/libraries/qimageblitz { }; qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; @@ -23044,12 +23102,11 @@ with pkgs; qt5 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.15) { - inherit newScope; - inherit lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper; - inherit bison cups dconf harfbuzz libGL perl gtk3 python3; - inherit (gst_all_1) gstreamer gst-plugins-base; - inherit darwin; - inherit buildPackages; + inherit (__splicedPackages) + makeScopeWithSplicing generateSplicesForMkScope lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper + bison cups dconf harfbuzz libGL perl gtk3 python3 + darwin buildPackages; + inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base; stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }); @@ -23059,7 +23116,7 @@ with pkgs; # TODO: remove once no package needs this anymore or together with OpenSSL 1.1 # Current users: mumble, murmur - qt5_openssl_1_1 = qt5.overrideScope' (_: super: { + qt5_openssl_1_1 = qt5.overrideScope (_: super: { qtbase = super.qtbase.override { openssl = openssl_1_1; libmysqlclient = libmysqlclient.override { @@ -23101,9 +23158,9 @@ with pkgs; quesoglc = callPackage ../development/libraries/quesoglc { }; - quickder = callPackage ../development/libraries/quickder {}; + quickder = callPackage ../development/libraries/quickder { }; - quickmem = callPackage ../development/libraries/quickmem {}; + quickmem = callPackage ../development/libraries/quickmem { }; quicksynergy = callPackage ../applications/misc/quicksynergy { }; @@ -23111,30 +23168,30 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray {}; + qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray { }; qwt6_qt4 = callPackage ../development/libraries/qwt/6_qt4.nix { inherit (darwin.apple_sdk.frameworks) AGL; }; - rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {}; + rabbitmq-c = callPackage ../development/libraries/rabbitmq-c { }; raft-canonical = callPackage ../development/libraries/raft-canonical { }; - range-v3 = callPackage ../development/libraries/range-v3 {}; + range-v3 = callPackage ../development/libraries/range-v3 { }; rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - rapidcheck = callPackage ../development/libraries/rapidcheck {}; + rapidcheck = callPackage ../development/libraries/rapidcheck { }; rapidfuzz-cpp = callPackage ../development/libraries/rapidfuzz-cpp { }; - rapidjson = callPackage ../development/libraries/rapidjson {}; + rapidjson = callPackage ../development/libraries/rapidjson { }; - rapidxml = callPackage ../development/libraries/rapidxml {}; + rapidxml = callPackage ../development/libraries/rapidxml { }; raul = callPackage ../development/libraries/audio/raul { }; @@ -23206,7 +23263,7 @@ with pkgs; resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; - restinio = callPackage ../development/libraries/restinio {}; + restinio = callPackage ../development/libraries/restinio { }; rhino = callPackage ../development/libraries/java/rhino { javac = jdk8; @@ -23264,7 +23321,7 @@ with pkgs; sad = callPackage ../applications/science/logic/sad { }; */ - safefile = callPackage ../development/libraries/safefile {}; + safefile = callPackage ../development/libraries/safefile { }; sbc = callPackage ../development/libraries/sbc { }; @@ -23302,7 +23359,7 @@ with pkgs; SDL_net = callPackage ../development/libraries/SDL_net { }; - SDL_Pango = callPackage ../development/libraries/SDL_Pango {}; + SDL_Pango = callPackage ../development/libraries/SDL_Pango { }; SDL_sound = callPackage ../development/libraries/SDL_sound { }; @@ -23340,7 +23397,7 @@ with pkgs; SDL2_ttf_2_0_15 = callPackage ../development/libraries/SDL2_ttf/2.0.15.nix { }; - sdrplay = callPackage ../applications/radio/sdrplay {}; + sdrplay = callPackage ../applications/radio/sdrplay { }; sdrpp = callPackage ../applications/radio/sdrpp { inherit (darwin.apple_sdk.frameworks) AppKit; @@ -23350,7 +23407,7 @@ with pkgs; sigutils = callPackage ../applications/radio/sigutils { }; - sblim-sfcc = callPackage ../development/libraries/sblim-sfcc {}; + sblim-sfcc = callPackage ../development/libraries/sblim-sfcc { }; selinux-sandbox = callPackage ../os-specific/linux/selinux-sandbox { }; @@ -23360,14 +23417,14 @@ with pkgs; semver-cpp = callPackage ../development/libraries/semver-cpp { }; - serd = callPackage ../development/libraries/serd {}; + serd = callPackage ../development/libraries/serd { }; serf = callPackage ../development/libraries/serf { openssl = openssl_1_1; aprutil = aprutil.override { openssl = openssl_1_1; }; }; - sfsexp = callPackage ../development/libraries/sfsexp {}; + sfsexp = callPackage ../development/libraries/sfsexp { }; shhgit = callPackage ../tools/security/shhgit { }; @@ -23377,7 +23434,7 @@ with pkgs; shine = callPackage ../development/libraries/shine { }; - graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {}; + graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix { }; s2n-tls = callPackage ../development/libraries/s2n-tls { }; @@ -23529,22 +23586,22 @@ with pkgs; sord = callPackage ../development/libraries/sord { }; - soundtouch = callPackage ../development/libraries/soundtouch {}; + soundtouch = callPackage ../development/libraries/soundtouch { }; span-lite = callPackage ../development/libraries/span-lite { }; - spandsp = callPackage ../development/libraries/spandsp {}; - spandsp3 = callPackage ../development/libraries/spandsp/3.nix {}; + spandsp = callPackage ../development/libraries/spandsp { }; + spandsp3 = callPackage ../development/libraries/spandsp/3.nix { }; - spaceship-prompt = callPackage ../shells/zsh/spaceship-prompt {}; + spaceship-prompt = callPackage ../shells/zsh/spaceship-prompt { }; spdk = callPackage ../development/libraries/spdk { }; speechd = callPackage ../development/libraries/speechd { }; - speech-tools = callPackage ../development/libraries/speech-tools {}; + speech-tools = callPackage ../development/libraries/speech-tools { }; - speedtest-exporter = callPackage ../development/libraries/speedtest-exporter {}; + speedtest-exporter = callPackage ../development/libraries/speedtest-exporter { }; speex = callPackage ../development/libraries/speex { fftw = fftwFloat; @@ -23631,10 +23688,10 @@ with pkgs; stlink = callPackage ../development/tools/misc/stlink { }; stlink-gui = callPackage ../development/tools/misc/stlink { withGUI = true; }; - stegseek = callPackage ../tools/security/stegseek {}; + stegseek = callPackage ../tools/security/stegseek { }; streamlink = callPackage ../applications/video/streamlink { }; - streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix {}; + streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix { }; sub-batch = callPackage ../applications/video/sub-batch { }; @@ -23686,7 +23743,7 @@ with pkgs; taskflow = callPackage ../development/libraries/taskflow { }; - tclap = callPackage ../development/libraries/tclap {}; + tclap = callPackage ../development/libraries/tclap { }; tcllib = callPackage ../development/libraries/tcllib { }; @@ -23694,7 +23751,7 @@ with pkgs; tclx = callPackage ../development/libraries/tclx { }; - tdb = callPackage ../development/libraries/tdb {}; + tdb = callPackage ../development/libraries/tdb { }; tdlib = callPackage ../development/libraries/tdlib { }; @@ -23708,7 +23765,7 @@ with pkgs; telepathy-glib = callPackage ../development/libraries/telepathy/glib { }; - telepathy-farstream = callPackage ../development/libraries/telepathy/farstream {}; + telepathy-farstream = callPackage ../development/libraries/telepathy/farstream { }; termbox = callPackage ../development/libraries/termbox { }; @@ -23799,9 +23856,9 @@ with pkgs; unibilium = callPackage ../development/libraries/unibilium { }; - unicap = callPackage ../development/libraries/unicap {}; + unicap = callPackage ../development/libraries/unicap { }; - unicon-lang = callPackage ../development/interpreters/unicon-lang {}; + unicon-lang = callPackage ../development/interpreters/unicon-lang { }; tsocks = callPackage ../development/libraries/tsocks { }; @@ -23877,13 +23934,7 @@ with pkgs; vsqlite = callPackage ../development/libraries/vsqlite { }; - vte = callPackage ../development/libraries/vte { - # Needs GCC ≥10 but aarch64 defaults to GCC 9. - stdenv = - if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU && lib.versionOlder stdenv.cc.version "10" - then clangStdenv - else stdenv; - }; + vte = callPackage ../development/libraries/vte { }; vte-gtk4 = vte.override { gtkVersion = "4"; @@ -23964,7 +24015,7 @@ with pkgs; gtk3 = gtk4; }; - webp-pixbuf-loader = callPackage ../development/libraries/webp-pixbuf-loader {}; + webp-pixbuf-loader = callPackage ../development/libraries/webp-pixbuf-loader { }; websocketpp = callPackage ../development/libraries/websocket++ { }; @@ -24051,9 +24102,9 @@ with pkgs; xautolock = callPackage ../misc/screensavers/xautolock { }; - xercesc = callPackage ../development/libraries/xercesc {}; + xercesc = callPackage ../development/libraries/xercesc { }; - xalanc = callPackage ../development/libraries/xalanc {}; + xalanc = callPackage ../development/libraries/xalanc { }; xgboost = callPackage ../development/libraries/xgboost { }; @@ -24081,7 +24132,7 @@ with pkgs; xvidcore = callPackage ../development/libraries/xvidcore { }; - xxHash = callPackage ../development/libraries/xxHash {}; + xxHash = callPackage ../development/libraries/xxHash { }; xylib = callPackage ../development/libraries/xylib { }; @@ -24128,12 +24179,12 @@ with pkgs; zlog = callPackage ../development/libraries/zlog { }; - zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {}; + zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix { }; zeromq = zeromq4; - cppzmq = callPackage ../development/libraries/cppzmq {}; + cppzmq = callPackage ../development/libraries/cppzmq { }; - czmq = callPackage ../development/libraries/czmq {}; + czmq = callPackage ../development/libraries/czmq { }; zmqpp = callPackage ../development/libraries/zmqpp { }; @@ -24158,6 +24209,8 @@ with pkgs; zita-resampler = callPackage ../development/libraries/audio/zita-resampler { }; + zix = callPackage ../development/libraries/audio/zix { }; + zz = callPackage ../development/compilers/zz { }; zziplib = callPackage ../development/libraries/zziplib { }; @@ -24258,9 +24311,9 @@ with pkgs; ### DEVELOPMENT / GO # the unversioned attributes should always point to the same go version - go = go_1_19; - buildGoModule = buildGo119Module; - buildGoPackage = buildGo119Package; + go = go_1_20; + buildGoModule = buildGo120Module; + buildGoPackage = buildGo120Package; # requires a newer Apple SDK go_1_18 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.18.nix { @@ -24346,7 +24399,7 @@ with pkgs; ### DEVELOPMENT / PERL MODULES - perlInterpreters = callPackages ../development/interpreters/perl {}; + perlInterpreters = callPackages ../development/interpreters/perl { }; inherit (perlInterpreters) perl534 perl536 perldevel; perl534Packages = recurseIntoAttrs perl534.pkgs; @@ -24389,6 +24442,19 @@ with pkgs; packages = []; }; + radianWrapper = callPackage ../development/r-modules/wrapper-radian.nix { + recommendedPackages = with rPackages; [ + boot class cluster codetools foreign KernSmooth lattice MASS + Matrix mgcv nlme nnet rpart spatial survival + ]; + radian = python3Packages.radian; + # Override this attribute to register additional libraries. + packages = []; + # Override this attribute if you want to expose R with the same set of + # packages as specified in radian + wrapR = false; + }; + rstudioWrapper = libsForQt5.callPackage ../development/r-modules/wrapper-rstudio.nix { recommendedPackages = with rPackages; [ boot class cluster codetools foreign KernSmooth lattice MASS @@ -24408,19 +24474,19 @@ with pkgs; _389-ds-base = callPackage ../servers/ldap/389 { }; - _5etools = callPackage ../servers/web-apps/5etools {}; + _5etools = callPackage ../servers/web-apps/5etools { }; - adguardhome = callPackage ../servers/adguardhome {}; + adguardhome = callPackage ../servers/adguardhome { }; alerta = callPackage ../servers/monitoring/alerta/client.nix { }; alerta-server = callPackage ../servers/monitoring/alerta { }; - allmark = callPackage ../servers/allmark {}; + allmark = callPackage ../servers/allmark { }; alps = callPackage ../servers/alps { }; - apache-directory-server = callPackage ../servers/ldap/apache-directory-server {}; + apache-directory-server = callPackage ../servers/ldap/apache-directory-server { }; apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = apacheHttpd_2_4; @@ -24522,7 +24588,7 @@ with pkgs; baserow = callPackage ../servers/baserow { }; - bftpd = callPackage ../servers/ftp/bftpd {}; + bftpd = callPackage ../servers/ftp/bftpd { }; bind = callPackage ../servers/dns/bind { }; dnsutils = bind.dnsutils; @@ -24580,16 +24646,16 @@ with pkgs; dico = callPackage ../servers/dico { }; dict = callPackage ../servers/dict { - libmaa = callPackage ../servers/dict/libmaa.nix {}; + libmaa = callPackage ../servers/dict/libmaa.nix { }; }; dictdDBs = recurseIntoAttrs (callPackages ../servers/dict/dictd-db.nix {}); - dictDBCollector = callPackage ../servers/dict/dictd-db-collector.nix {}; + dictDBCollector = callPackage ../servers/dict/dictd-db-collector.nix { }; diod = callPackage ../servers/diod { lua = lua5_1; }; - directx-headers = callPackage ../development/libraries/directx-headers {}; + directx-headers = callPackage ../development/libraries/directx-headers { }; directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler { # https://github.com/NixOS/nixpkgs/issues/216294 @@ -24688,8 +24754,6 @@ with pkgs; gatling = callPackage ../servers/http/gatling { }; - gitlab-pages = callPackage ../servers/http/gitlab-pages { }; - glabels = callPackage ../applications/graphics/glabels { }; nats-server = callPackage ../servers/nats-server { }; @@ -24724,7 +24788,7 @@ with pkgs; grafana-dash-n-grab = callPackage ../servers/monitoring/grafana-dash-n-grab { }; - gerbera = callPackage ../servers/gerbera {}; + gerbera = callPackage ../servers/gerbera { }; gobetween = callPackage ../servers/gobetween { }; @@ -24736,7 +24800,7 @@ with pkgs; haka = callPackage ../tools/security/haka { }; - hashi-ui = callPackage ../servers/hashi-ui {}; + hashi-ui = callPackage ../servers/hashi-ui { }; hashi-up = callPackage ../applications/networking/cluster/hashi-up { }; @@ -24749,9 +24813,9 @@ with pkgs; hbase3 = hbase_3_0; hbase = hbase2; # when updating, point to the latest stable release - headphones = callPackage ../servers/headphones {}; + headphones = callPackage ../servers/headphones { }; - hiawatha = callPackage ../servers/http/hiawatha {}; + hiawatha = callPackage ../servers/http/hiawatha { }; hoard = callPackage ../tools/misc/hoard { inherit (darwin) Security; }; @@ -24792,7 +24856,7 @@ with pkgs; inspircdMinimal = inspircd.override { extraModules = []; }; - imaginary = callPackage ../servers/imaginary {}; + imaginary = callPackage ../servers/imaginary { }; imgproxy = callPackage ../servers/imgproxy { }; @@ -24849,7 +24913,7 @@ with pkgs; listmonk = callPackage ../servers/mail/listmonk { }; - linx-server = callPackage ../servers/web-apps/linx-server {}; + linx-server = callPackage ../servers/web-apps/linx-server { }; livepeer = callPackage ../servers/livepeer { }; @@ -24865,7 +24929,7 @@ with pkgs; mailman-rss = callPackage ../tools/misc/mailman-rss { }; - listadmin = callPackage ../applications/networking/listadmin {}; + listadmin = callPackage ../applications/networking/listadmin { }; maker-panel = callPackage ../tools/misc/maker-panel { }; @@ -24886,13 +24950,13 @@ with pkgs; mbusd = callPackage ../servers/mbusd { }; - memcached = callPackage ../servers/memcached {}; + memcached = callPackage ../servers/memcached { }; merecat = callPackage ../servers/http/merecat { }; meteor = callPackage ../servers/meteor { }; - micronaut = callPackage ../development/tools/micronaut {}; + micronaut = callPackage ../development/tools/micronaut { }; minio = callPackage ../servers/minio { }; # Keep around to allow people to migrate their data from the old legacy fs format @@ -24927,7 +24991,7 @@ with pkgs; micro-httpd = callPackage ../servers/http/micro-httpd { }; - miniHttpd = callPackage ../servers/http/mini-httpd {}; + miniHttpd = callPackage ../servers/http/mini-httpd { }; mlflow-server = callPackage ../servers/mlflow-server { }; @@ -25015,9 +25079,9 @@ with pkgs; ngircd = callPackage ../servers/irc/ngircd { }; - nix-binary-cache = callPackage ../servers/http/nix-binary-cache {}; + nix-binary-cache = callPackage ../servers/http/nix-binary-cache { }; - nix-tour = callPackage ../applications/misc/nix-tour {}; + nix-tour = callPackage ../applications/misc/nix-tour { }; nosqli = callPackage ../tools/security/nosqli { }; @@ -25027,7 +25091,7 @@ with pkgs; oauth2-proxy = callPackage ../servers/oauth2-proxy { }; - olaris-server = callPackage ../servers/olaris {}; + olaris-server = callPackage ../servers/olaris { }; onlyoffice-documentserver = callPackage ../servers/onlyoffice-documentserver { }; @@ -25275,18 +25339,18 @@ with pkgs; neo4j-desktop = callPackage ../applications/misc/neo4j-desktop { }; - check-esxi-hardware = callPackage ../servers/monitoring/plugins/esxi.nix {}; + check-esxi-hardware = callPackage ../servers/monitoring/plugins/esxi.nix { }; net-snmp = callPackage ../servers/monitoring/net-snmp { }; newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { }; - nullidentdmod = callPackage ../servers/identd/nullidentdmod {}; + nullidentdmod = callPackage ../servers/identd/nullidentdmod { }; riemann = callPackage ../servers/monitoring/riemann { }; riemann-dash = callPackage ../servers/monitoring/riemann-dash { }; - unpfs = callPackage ../servers/unpfs {}; + unpfs = callPackage ../servers/unpfs { }; oidentd = callPackage ../servers/identd/oidentd { }; @@ -25431,6 +25495,8 @@ with pkgs; proximity-sort = callPackage ../tools/misc/proximity-sort { }; + psql2csv = callPackage ../tools/misc/psql2csv { }; + psqlodbc = callPackage ../development/libraries/psqlodbc { }; public-inbox = perlPackages.callPackage ../servers/mail/public-inbox { }; @@ -25524,7 +25590,7 @@ with pkgs; sharing = callPackage ../servers/sharing { }; - showoff = callPackage ../servers/http/showoff {}; + showoff = callPackage ../servers/http/showoff { }; serfdom = callPackage ../servers/serf { }; @@ -25719,7 +25785,7 @@ with pkgs; abiCompat = config.xorg.abiCompat or null; # `config` because we have no `xorg.override` }; - generatedPackages = lib.callPackageWith __splicedPackages ../servers/x11/xorg/default.nix {}; + generatedPackages = lib.callPackageWith __splicedPackages ../servers/x11/xorg/default.nix { }; xorgPackages = makeScopeWithSplicing (generateSplicesForMkScope "xorg") @@ -25843,7 +25909,7 @@ with pkgs; libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam apparmor-profiles apparmor-kernel-patches apparmorRulesFromClosure; - aseq2json = callPackage ../os-specific/linux/aseq2json {}; + aseq2json = callPackage ../os-specific/linux/aseq2json { }; atop = callPackage ../os-specific/linux/atop { }; @@ -26040,7 +26106,7 @@ with pkgs; fbterm = callPackage ../os-specific/linux/fbterm { }; - firejail = callPackage ../os-specific/linux/firejail {}; + firejail = callPackage ../os-specific/linux/firejail { }; fnotifystat = callPackage ../os-specific/linux/fnotifystat { }; @@ -26059,7 +26125,7 @@ with pkgs; fxload = callPackage ../os-specific/linux/fxload { }; - gfxtablet = callPackage ../os-specific/linux/gfxtablet {}; + gfxtablet = callPackage ../os-specific/linux/gfxtablet { }; gmailctl = callPackage ../applications/networking/gmailctl { }; @@ -26119,9 +26185,9 @@ with pkgs; pcm = callPackage ../os-specific/linux/pcm { }; - ifmetric = callPackage ../os-specific/linux/ifmetric {}; + ifmetric = callPackage ../os-specific/linux/ifmetric { }; - ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils {}; + ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { }; intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { }; @@ -26140,6 +26206,20 @@ with pkgs; iproute2 = callPackage ../os-specific/linux/iproute { }; + ipu6-camera-bin = callPackage ../os-specific/linux/firmware/ipu6-camera-bins {}; + + ipu6-camera-hal = callPackage ../development/libraries/ipu6-camera-hal {}; + + ipu6ep-camera-bin = callPackage ../os-specific/linux/firmware/ipu6-camera-bins { + ipuVersion = "ipu6ep"; + }; + + ipu6ep-camera-hal = callPackage ../development/libraries/ipu6-camera-hal { + ipu6-camera-bin = ipu6ep-camera-bin; + }; + + ivsc-firmware = callPackage ../os-specific/linux/firmware/ivsc-firmware { }; + iputils = hiPrio (callPackage ../os-specific/linux/iputils { }); # hiPrio for collisions with inetutils (ping) @@ -26192,7 +26272,7 @@ with pkgs; libaio = callPackage ../os-specific/linux/libaio { }; - libajantv2 = callPackage ../development/libraries/libajantv2 {}; + libajantv2 = callPackage ../development/libraries/libajantv2 { }; libargon2 = callPackage ../development/libraries/libargon2 { }; @@ -26214,11 +26294,11 @@ with pkgs; libnl-tiny = callPackage ../os-specific/linux/libnl-tiny { }; - libtraceevent = callPackage ../os-specific/linux/libtraceevent {}; + libtraceevent = callPackage ../os-specific/linux/libtraceevent { }; - libtracefs = callPackage ../os-specific/linux/libtracefs {}; + libtracefs = callPackage ../os-specific/linux/libtracefs { }; - lieer = callPackage ../applications/networking/lieer {}; + lieer = callPackage ../applications/networking/lieer { }; linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; @@ -26433,7 +26513,7 @@ with pkgs; lsscsi = callPackage ../os-specific/linux/lsscsi { }; - lvm2-2_03 = callPackage ../os-specific/linux/lvm2/2_03.nix { + lvm2 = callPackage ../os-specific/linux/lvm2/2_03.nix { # udev is the same package as systemd which depends on cryptsetup # which depends on lvm2 again. But we only need the libudev part # which does not depend on cryptsetup. @@ -26443,10 +26523,6 @@ with pkgs; # systemd (optionally, but on by default) on cryptsetup and cryptsetup depends on lvm2 util-linux = util-linuxMinimal; }; - lvm2-2_02 = callPackage ../os-specific/linux/lvm2/2_02.nix { - udev = systemdMinimal; - }; - lvm2 = if stdenv.hostPlatform.isMusl then lvm2-2_02 else lvm2-2_03; lvm2_dmeventd = lvm2.override { enableDmeventd = true; @@ -26596,6 +26672,8 @@ with pkgs; govendor = callPackage ../development/tools/govendor { }; + goverview = callPackage ../tools/security/goverview { }; + go-tools = callPackage ../development/tools/go-tools { }; gotest = callPackage ../development/tools/gotest { }; @@ -26755,8 +26833,8 @@ with pkgs; # Building with `xen` instead of `xen-slim` is possible, but makes no sense. qemu_xen = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-slim; }); qemu_xen-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-light; }); - qemu_xen_4_10 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_10-slim; }); - qemu_xen_4_10-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_10-light; }); + qemu_xen_4_15 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_15-slim; }); + qemu_xen_4_15-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_15-light; }); qemu_test = lowPrio (qemu.override { hostCpuOnly = true; nixosTestRunner = true; }); @@ -26772,12 +26850,12 @@ with pkgs; rasdaemon = callPackage ../os-specific/linux/rasdaemon { }; - raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi {}; + raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi { }; raspberrypiWirelessFirmware = callPackage ../os-specific/linux/firmware/raspberrypi-wireless { }; - raspberrypi-eeprom = callPackage ../os-specific/linux/raspberrypi-eeprom {}; + raspberrypi-eeprom = callPackage ../os-specific/linux/raspberrypi-eeprom { }; - raspberrypi-armstubs = callPackage ../os-specific/linux/firmware/raspberrypi/armstubs.nix {}; + raspberrypi-armstubs = callPackage ../os-specific/linux/firmware/raspberrypi/armstubs.nix { }; reap = callPackage ../os-specific/linux/reap { }; @@ -26958,7 +27036,7 @@ with pkgs; tpacpi-bat = callPackage ../os-specific/linux/tpacpi-bat { }; - trickster = callPackage ../servers/trickster/trickster.nix {}; + trickster = callPackage ../servers/trickster/trickster.nix { }; trinity = callPackage ../os-specific/linux/trinity { }; @@ -27089,7 +27167,7 @@ with pkgs; vdo = callPackage ../os-specific/linux/vdo { }; - windows = callPackages ../os-specific/windows {}; + windows = callPackages ../os-specific/windows { }; wirelesstools = callPackage ../os-specific/linux/wireless-tools { }; @@ -27234,7 +27312,7 @@ with pkgs; cacert = callPackage ../data/misc/cacert { }; - caladea = callPackage ../data/fonts/caladea {}; + caladea = callPackage ../data/fonts/caladea { }; canta-theme = callPackage ../data/themes/canta { }; @@ -27244,7 +27322,7 @@ with pkgs; capitaine-cursors-themed = callPackage ../data/icons/capitaine-cursors-themed { }; - carlito = callPackage ../data/fonts/carlito {}; + carlito = callPackage ../data/fonts/carlito { }; cascadia-code = callPackage ../data/fonts/cascadia-code { }; @@ -27266,23 +27344,23 @@ with pkgs; clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { }; - cnstrokeorder = callPackage ../data/fonts/cnstrokeorder {}; + cnstrokeorder = callPackage ../data/fonts/cnstrokeorder { }; colloid-gtk-theme = callPackage ../data/themes/colloid-gtk-theme { }; colloid-icon-theme = callPackage ../data/icons/colloid-icon-theme { }; - comfortaa = callPackage ../data/fonts/comfortaa {}; + comfortaa = callPackage ../data/fonts/comfortaa { }; - colloid-kde = callPackage ../data/themes/colloid-kde {}; + colloid-kde = callPackage ../data/themes/colloid-kde { }; comic-mono = callPackage ../data/fonts/comic-mono { }; comic-neue = callPackage ../data/fonts/comic-neue { }; - comic-relief = callPackage ../data/fonts/comic-relief {}; + comic-relief = callPackage ../data/fonts/comic-relief { }; - comixcursors = callPackage ../data/icons/comixcursors {}; + comixcursors = callPackage ../data/icons/comixcursors { }; corefonts = callPackage ../data/fonts/corefonts { }; @@ -27294,13 +27372,13 @@ with pkgs; clearlyU = callPackage ../data/fonts/clearlyU { }; - cm_unicode = callPackage ../data/fonts/cm-unicode {}; + cm_unicode = callPackage ../data/fonts/cm-unicode { }; creep = callPackage ../data/fonts/creep { }; - crimson = callPackage ../data/fonts/crimson {}; + crimson = callPackage ../data/fonts/crimson { }; - crimson-pro = callPackage ../data/fonts/crimson-pro {}; + crimson-pro = callPackage ../data/fonts/crimson-pro { }; dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts {}); @@ -27419,7 +27497,7 @@ with pkgs; ezra-sil = callPackage ../data/fonts/ezra-sil { }; - fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; + fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono { }; fanwood = callPackage ../data/fonts/fanwood { }; @@ -27455,13 +27533,13 @@ with pkgs; garamond-libre = callPackage ../data/fonts/garamond-libre { }; - g15daemon = callPackage ../os-specific/linux/g15daemon {}; + g15daemon = callPackage ../os-specific/linux/g15daemon { }; galatia-sil = callPackage ../data/fonts/galatia-sil { }; - gentium = callPackage ../data/fonts/gentium {}; + gentium = callPackage ../data/fonts/gentium { }; - gentium-book-basic = callPackage ../data/fonts/gentium-book-basic {}; + gentium-book-basic = callPackage ../data/fonts/gentium-book-basic { }; geolite-legacy = callPackage ../data/misc/geolite-legacy { }; @@ -27499,11 +27577,11 @@ with pkgs; inherit (plasma5Packages) breeze-icons; }; - gruvbox-gtk-theme = callPackage ../data/themes/gruvbox-gtk-theme {}; + gruvbox-gtk-theme = callPackage ../data/themes/gruvbox-gtk-theme { }; gubbi-font = callPackage ../data/fonts/gubbi { }; - gyre-fonts = callPackage ../data/fonts/gyre {}; + gyre-fonts = callPackage ../data/fonts/gyre { }; hack-font = callPackage ../data/fonts/hack { }; @@ -27541,9 +27619,9 @@ with pkgs; iconpack-obsidian = callPackage ../data/icons/iconpack-obsidian { }; - inconsolata = callPackage ../data/fonts/inconsolata {}; + inconsolata = callPackage ../data/fonts/inconsolata { }; - inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix {}; + inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix { }; inconsolata-nerdfont = nerdfonts.override { fonts = [ "Inconsolata" ]; @@ -27553,12 +27631,12 @@ with pkgs; inriafonts = callPackage ../data/fonts/inriafonts { }; - iosevka = callPackage ../data/fonts/iosevka {}; - iosevka-bin = callPackage ../data/fonts/iosevka/bin.nix {}; + iosevka = callPackage ../data/fonts/iosevka { }; + iosevka-bin = callPackage ../data/fonts/iosevka/bin.nix { }; iosevka-comfy = recurseIntoAttrs (callPackages ../data/fonts/iosevka/comfy.nix {}); - ipafont = callPackage ../data/fonts/ipafont {}; - ipaexfont = callPackage ../data/fonts/ipaexfont {}; + ipafont = callPackage ../data/fonts/ipafont { }; + ipaexfont = callPackage ../data/fonts/ipaexfont { }; iwona = callPackage ../data/fonts/iwona { }; @@ -27578,21 +27656,21 @@ with pkgs; kanit-font = callPackage ../data/fonts/kanit { }; - kanji-stroke-order-font = callPackage ../data/fonts/kanji-stroke-order-font {}; + kanji-stroke-order-font = callPackage ../data/fonts/kanji-stroke-order-font { }; - kacst = callPackage ../data/fonts/kacst {}; + kacst = callPackage ../data/fonts/kacst { }; - kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; + kawkab-mono-font = callPackage ../data/fonts/kawkab-mono { }; kde-rounded-corners = libsForQt5.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; - khmeros = callPackage ../data/fonts/khmeros {}; + khmeros = callPackage ../data/fonts/khmeros { }; knewave = callPackage ../data/fonts/knewave { }; - kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; + kochi-substitute = callPackage ../data/fonts/kochi-substitute { }; - kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; + kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 { }; kopia = callPackage ../tools/backup/kopia { }; @@ -27601,7 +27679,7 @@ with pkgs; inherit (libsForQt5.kdeFrameworks) breeze-icons; }; - koreader = callPackage ../applications/misc/koreader {}; + koreader = callPackage ../applications/misc/koreader { }; kreative-square-fonts = callPackage ../data/fonts/kreative-square-fonts { }; @@ -27614,19 +27692,19 @@ with pkgs; layan-kde = callPackage ../data/themes/layan-kde { }; - lao = callPackage ../data/fonts/lao {}; + lao = callPackage ../data/fonts/lao { }; - lato = callPackage ../data/fonts/lato {}; + lato = callPackage ../data/fonts/lato { }; league-gothic = callPackage ../data/fonts/league-gothic { }; - league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; + league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type { }; league-script-number-one = callPackage ../data/fonts/league-script-number-one { }; league-spartan = callPackage ../data/fonts/league-spartan { }; - ledger-udev-rules = callPackage ../os-specific/linux/ledger-udev-rules {}; + ledger-udev-rules = callPackage ../os-specific/linux/ledger-udev-rules { }; libGDSII = callPackage ../development/libraries/science/chemistry/libGDSII { }; @@ -27666,13 +27744,13 @@ with pkgs; line-awesome = callPackage ../data/fonts/line-awesome { }; - linja-pi-pu-lukin = callPackage ../data/fonts/linja-pi-pu-lukin {}; + linja-pi-pu-lukin = callPackage ../data/fonts/linja-pi-pu-lukin { }; linux-manual = callPackage ../data/documentation/linux-manual { }; - lklug-sinhala = callPackage ../data/fonts/lklug-sinhala {}; + lklug-sinhala = callPackage ../data/fonts/lklug-sinhala { }; - lmmath = callPackage ../data/fonts/lmmath {}; + lmmath = callPackage ../data/fonts/lmmath { }; lmodern = callPackage ../data/fonts/lmodern { }; @@ -27738,17 +27816,17 @@ with pkgs; material-kwin-decoration = libsForQt5.callPackage ../data/themes/material-kwin-decoration { }; - meslo-lg = callPackage ../data/fonts/meslo-lg {}; + meslo-lg = callPackage ../data/fonts/meslo-lg { }; - meslo-lgs-nf = callPackage ../data/fonts/meslo-lgs-nf {}; + meslo-lgs-nf = callPackage ../data/fonts/meslo-lgs-nf { }; - migmix = callPackage ../data/fonts/migmix {}; + migmix = callPackage ../data/fonts/migmix { }; - migu = callPackage ../data/fonts/migu {}; + migu = callPackage ../data/fonts/migu { }; miscfiles = callPackage ../data/misc/miscfiles { }; - media-player-info = callPackage ../data/misc/media-player-info {}; + media-player-info = callPackage ../data/misc/media-player-info { }; medio = callPackage ../data/fonts/medio { }; @@ -27798,7 +27876,7 @@ with pkgs; nanum-gothic-coding = callPackage ../data/fonts/nanum-gothic-coding { }; - nasin-nanpa = callPackage ../data/fonts/nasin-nanpa {}; + nasin-nanpa = callPackage ../data/fonts/nasin-nanpa { }; national-park-typeface = callPackage ../data/fonts/national-park { }; @@ -27877,7 +27955,7 @@ with pkgs; orchis-theme = callPackage ../data/themes/orchis-theme { }; - orion = callPackage ../data/themes/orion {}; + orion = callPackage ../data/themes/orion { }; ostrich-sans = callPackage ../data/fonts/ostrich-sans { }; @@ -27907,19 +27985,19 @@ with pkgs; paps = callPackage ../tools/misc/paps { }; - pecita = callPackage ../data/fonts/pecita {}; + pecita = callPackage ../data/fonts/pecita { }; - paratype-pt-mono = callPackage ../data/fonts/paratype-pt/mono.nix {}; - paratype-pt-sans = callPackage ../data/fonts/paratype-pt/sans.nix {}; - paratype-pt-serif = callPackage ../data/fonts/paratype-pt/serif.nix {}; + paratype-pt-mono = callPackage ../data/fonts/paratype-pt/mono.nix { }; + paratype-pt-sans = callPackage ../data/fonts/paratype-pt/sans.nix { }; + paratype-pt-serif = callPackage ../data/fonts/paratype-pt/serif.nix { }; - pari-galdata = callPackage ../data/misc/pari-galdata {}; + pari-galdata = callPackage ../data/misc/pari-galdata { }; - pari-seadata-small = callPackage ../data/misc/pari-seadata-small {}; + pari-seadata-small = callPackage ../data/misc/pari-seadata-small { }; penna = callPackage ../data/fonts/penna { }; - pitch-black = callPackage ../data/themes/pitch-black {}; + pitch-black = callPackage ../data/themes/pitch-black { }; plano-theme = callPackage ../data/themes/plano { }; @@ -28028,7 +28106,7 @@ with pkgs; sil-padauk = callPackage ../data/fonts/sil-padauk { }; - snap7 = callPackage ../development/libraries/snap7 {}; + snap7 = callPackage ../development/libraries/snap7 { }; sniglet = callPackage ../data/fonts/sniglet { }; @@ -28078,9 +28156,9 @@ with pkgs; pretendard-jp pretendard-std; - quattrocento = callPackage ../data/fonts/quattrocento {}; + quattrocento = callPackage ../data/fonts/quattrocento { }; - quattrocento-sans = callPackage ../data/fonts/quattrocento-sans {}; + quattrocento-sans = callPackage ../data/fonts/quattrocento-sans { }; raleway = callPackage ../data/fonts/raleway { }; @@ -28100,7 +28178,7 @@ with pkgs; roboto-slab = callPackage ../data/fonts/roboto-slab { }; - hasklig = callPackage ../data/fonts/hasklig {}; + hasklig = callPackage ../data/fonts/hasklig { }; maligned = callPackage ../development/tools/maligned { }; @@ -28114,7 +28192,7 @@ with pkgs; sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { }; - source-code-pro = callPackage ../data/fonts/source-code-pro {}; + source-code-pro = callPackage ../data/fonts/source-code-pro { }; source-sans = callPackage ../data/fonts/source-sans { }; source-sans-pro = callPackage ../data/fonts/source-sans-pro { }; @@ -28153,7 +28231,7 @@ with pkgs; theme-obsidian2 = callPackage ../data/themes/obsidian2 { }; - themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {}; + themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) { }; theano = callPackage ../data/fonts/theano { }; @@ -28193,7 +28271,7 @@ with pkgs; ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { }; - ttf-envy-code-r = callPackage ../data/fonts/ttf-envy-code-r {}; + ttf-envy-code-r = callPackage ../data/fonts/ttf-envy-code-r { }; ttf-tw-moe = callPackage ../data/fonts/ttf-tw-moe { }; @@ -28289,13 +28367,13 @@ with pkgs; xlsx2csv = with python3Packages; toPythonApplication xlsx2csv; - xorg-rgb = callPackage ../data/misc/xorg-rgb {}; + xorg-rgb = callPackage ../data/misc/xorg-rgb { }; - yanone-kaffeesatz = callPackage ../data/fonts/yanone-kaffeesatz {}; + yanone-kaffeesatz = callPackage ../data/fonts/yanone-kaffeesatz { }; - yaru-theme = callPackage ../data/themes/yaru {}; + yaru-theme = callPackage ../data/themes/yaru { }; - yaru-remix-theme = callPackage ../data/themes/yaru-remix {}; + yaru-remix-theme = callPackage ../data/themes/yaru-remix { }; zafiro-icons = callPackage ../data/icons/zafiro-icons { inherit (plasma5Packages) breeze-icons; @@ -28359,7 +28437,7 @@ with pkgs; aacgain = callPackage ../applications/audio/aacgain { }; - aaxtomp3 = callPackage ../applications/audio/aaxtomp3 {}; + aaxtomp3 = callPackage ../applications/audio/aaxtomp3 { }; abcde = callPackage ../applications/audio/abcde { inherit (python3Packages) eyeD3; @@ -28375,7 +28453,7 @@ with pkgs; requests requests-toolbelt setuptools sqlalchemy fusepy; }; - acorn = callPackage ../applications/networking/cluster/acorn {}; + acorn = callPackage ../applications/networking/cluster/acorn { }; adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { }; @@ -28420,7 +28498,7 @@ with pkgs; akira-unstable = callPackage ../applications/graphics/akira { }; - alembic = callPackage ../development/libraries/alembic {}; + alembic = callPackage ../development/libraries/alembic { }; alfaview = callPackage ../applications/networking/instant-messengers/alfaview { }; @@ -28453,11 +28531,11 @@ with pkgs; animbar = callPackage ../applications/graphics/animbar { }; - antfs-cli = callPackage ../applications/misc/antfs-cli {}; + antfs-cli = callPackage ../applications/misc/antfs-cli { }; - antimony = libsForQt5.callPackage ../applications/graphics/antimony {}; + antimony = libsForQt5.callPackage ../applications/graphics/antimony { }; - antiword = callPackage ../applications/office/antiword {}; + antiword = callPackage ../applications/office/antiword { }; anup = callPackage ../applications/misc/anup { inherit (darwin.apple_sdk.frameworks) Security; @@ -28467,14 +28545,14 @@ with pkgs; ao = libfive; - apache-directory-studio = callPackage ../applications/networking/apache-directory-studio {}; + apache-directory-studio = callPackage ../applications/networking/apache-directory-studio { }; apkeep = callPackage ../tools/misc/apkeep { inherit (darwin.apple_sdk.frameworks) Security; }; - apngasm = callPackage ../applications/graphics/apngasm {}; - apngasm_2 = callPackage ../applications/graphics/apngasm/2.nix {}; + apngasm = callPackage ../applications/graphics/apngasm { }; + apngasm_2 = callPackage ../applications/graphics/apngasm/2.nix { }; appeditor = callPackage ../applications/misc/appeditor { }; @@ -28556,7 +28634,7 @@ with pkgs; autotalent = callPackage ../applications/audio/autotalent { }; - autotrace = callPackage ../applications/graphics/autotrace {}; + autotrace = callPackage ../applications/graphics/autotrace { }; av-98 = callPackage ../applications/networking/browsers/av-98 { }; @@ -28566,11 +28644,11 @@ with pkgs; avizo = callPackage ../applications/misc/avizo { }; - avocode = callPackage ../applications/graphics/avocode {}; + avocode = callPackage ../applications/graphics/avocode { }; - ax25-apps = callPackage ../applications/radio/ax25-apps {}; + ax25-apps = callPackage ../applications/radio/ax25-apps { }; - ax25-tools = callPackage ../applications/radio/ax25-tools {}; + ax25-tools = callPackage ../applications/radio/ax25-tools { }; azpainter = callPackage ../applications/graphics/azpainter { }; @@ -28599,11 +28677,11 @@ with pkgs; schismtracker = callPackage ../applications/audio/schismtracker { }; - jnetmap = callPackage ../applications/networking/jnetmap {}; + jnetmap = callPackage ../applications/networking/jnetmap { }; join-desktop = callPackage ../applications/misc/join-desktop { }; - json-plot = callPackage ../applications/graphics/json-plot {}; + json-plot = callPackage ../applications/graphics/json-plot { }; libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix { boost = boost175; # fatal error: 'boost/interprocess/detail/posix_time_types_wrk.hpp' file not found @@ -28659,7 +28737,7 @@ with pkgs; baresip = callPackage ../applications/networking/instant-messengers/baresip { }; - barrier = libsForQt5.callPackage ../applications/misc/barrier {}; + barrier = libsForQt5.callPackage ../applications/misc/barrier { }; bashSnippets = callPackage ../applications/misc/bashSnippets { }; @@ -28737,7 +28815,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; }; - blender-with-packages = callPackage ../applications/misc/blender/wrapper.nix {}; + blender-with-packages = callPackage ../applications/misc/blender/wrapper.nix { }; blender-hip = blender.override { hipSupport = true; }; @@ -28765,11 +28843,11 @@ with pkgs; bombadillo = callPackage ../applications/networking/browsers/bombadillo { }; - bombono = callPackage ../applications/video/bombono {}; + bombono = callPackage ../applications/video/bombono { }; bonzomatic = callPackage ../applications/editors/bonzomatic { }; - booster = callPackage ../applications/system/booster {}; + booster = callPackage ../applications/system/booster { }; bottles = callPackage ../applications/misc/bottles/fhsenv.nix { }; @@ -28823,7 +28901,7 @@ with pkgs; calcurse = callPackage ../applications/misc/calcurse { }; - calculix = callPackage ../applications/science/math/calculix {}; + calculix = callPackage ../applications/science/math/calculix { }; calibre = qt6Packages.callPackage ../applications/misc/calibre { }; @@ -28887,7 +28965,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon; }; - cyan = callPackage ../applications/graphics/cyan {}; + celeste = callPackage ../applications/networking/sync/celeste { }; + + cyan = callPackage ../applications/graphics/cyan { }; cyanrip = callPackage ../applications/audio/cyanrip { }; @@ -28940,7 +29020,7 @@ with pkgs; claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { }; - cligh = python3Packages.callPackage ../development/tools/github/cligh {}; + cligh = python3Packages.callPackage ../development/tools/github/cligh { }; clight = callPackage ../applications/misc/clight { }; @@ -28973,12 +29053,12 @@ with pkgs; cmusfm = callPackage ../applications/audio/cmusfm { }; - cni = callPackage ../applications/networking/cluster/cni {}; - cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix {}; + cni = callPackage ../applications/networking/cluster/cni { }; + cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix { }; - dnsname-cni = callPackage ../applications/networking/cluster/dnsname-cni {}; + dnsname-cni = callPackage ../applications/networking/cluster/dnsname-cni { }; - multus-cni = callPackage ../applications/networking/cluster/multus-cni {}; + multus-cni = callPackage ../applications/networking/cluster/multus-cni { }; cntr = callPackage ../applications/virtualization/cntr { }; @@ -28994,7 +29074,7 @@ with pkgs; corectrl = libsForQt5.callPackage ../applications/misc/corectrl { }; - coreth = callPackage ../applications/networking/coreth {}; + coreth = callPackage ../applications/networking/coreth { }; coriander = callPackage ../applications/video/coriander { inherit (gnome2) libgnomeui GConf; @@ -29033,15 +29113,15 @@ with pkgs; containerd = callPackage ../applications/virtualization/containerd { }; - convchain = callPackage ../tools/graphics/convchain {}; + convchain = callPackage ../tools/graphics/convchain { }; cordless = callPackage ../applications/networking/instant-messengers/cordless { }; - coursera-dl = callPackage ../applications/misc/coursera-dl {}; + coursera-dl = callPackage ../applications/misc/coursera-dl { }; coyim = callPackage ../applications/networking/instant-messengers/coyim { }; - cozy-drive = callPackage ../applications/networking/cozy-drive {}; + cozy-drive = callPackage ../applications/networking/cozy-drive { }; cplay-ng = callPackage ../applications/audio/cplay-ng { }; @@ -29051,7 +29131,7 @@ with pkgs; hamlib = hamlib_4; }; - crun = callPackage ../applications/virtualization/crun {}; + crun = callPackage ../applications/virtualization/crun { }; csdp = callPackage ../applications/science/math/csdp { }; @@ -29063,7 +29143,7 @@ with pkgs; cum = callPackage ../applications/misc/cum { }; - cuneiform = callPackage ../tools/graphics/cuneiform {}; + cuneiform = callPackage ../tools/graphics/cuneiform { }; curseradio = callPackage ../applications/audio/curseradio { }; @@ -29099,7 +29179,7 @@ with pkgs; das_watchdog = callPackage ../tools/system/das_watchdog { }; datadog-agent = callPackage ../tools/networking/dd-agent/datadog-agent.nix { - pythonPackages = datadog-integrations-core {}; + pythonPackages = datadog-integrations-core { }; }; datadog-process-agent = callPackage ../tools/networking/dd-agent/datadog-process-agent.nix { }; datadog-integrations-core = extras: callPackage ../tools/networking/dd-agent/integrations-core.nix { @@ -29132,15 +29212,15 @@ with pkgs; dia = callPackage ../applications/graphics/dia { }; - digital = callPackage ../applications/science/electronics/digital {}; + digital = callPackage ../applications/science/electronics/digital { }; direwolf = callPackage ../applications/radio/direwolf { hamlib = hamlib_4; }; - dirt = callPackage ../applications/audio/dirt {}; + dirt = callPackage ../applications/audio/dirt { }; - distrho = callPackage ../applications/audio/distrho {}; + distrho = callPackage ../applications/audio/distrho { }; dit = callPackage ../applications/editors/dit { }; @@ -29191,11 +29271,11 @@ with pkgs; dockfmt = callPackage ../development/tools/dockfmt { }; - afterburn = callPackage ../tools/admin/afterburn {}; + afterburn = callPackage ../tools/admin/afterburn { }; docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { }; docker-compose = callPackage ../applications/virtualization/docker/compose.nix { }; - docker-compose_1 = python3Packages.callPackage ../applications/virtualization/docker/compose_1.nix {}; + docker-compose_1 = python3Packages.callPackage ../applications/virtualization/docker/compose_1.nix { }; amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { }; @@ -29203,7 +29283,7 @@ with pkgs; docker-credential-helpers = callPackage ../tools/admin/docker-credential-helpers { }; - dockstarter = callPackage ../tools/virtualization/dockstarter {}; + dockstarter = callPackage ../tools/virtualization/dockstarter { }; doodle = callPackage ../applications/search/doodle { }; @@ -29217,7 +29297,7 @@ with pkgs; drawing = callPackage ../applications/graphics/drawing { }; - drawio = callPackage ../applications/graphics/drawio {}; + drawio = callPackage ../applications/graphics/drawio { }; drawio-headless = callPackage ../applications/graphics/drawio/headless.nix { }; drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { }; @@ -29279,7 +29359,7 @@ with pkgs; dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; - emoji-picker = callPackage ../applications/misc/emoji-picker {}; + emoji-picker = callPackage ../applications/misc/emoji-picker { }; exploitdb = callPackage ../tools/security/exploitdb { }; @@ -29392,7 +29472,7 @@ with pkgs; # If you turn this into "real" alias again, please add it to pkgs/top-level/packages-config.nix again too emacsPackages = emacs.pkgs; - emptty = callPackage ../applications/display-managers/emptty {}; + emptty = callPackage ../applications/display-managers/emptty { }; endeavour = callPackage ../applications/office/endeavour { }; @@ -29441,7 +29521,7 @@ with pkgs; etebase-server = with python3Packages; toPythonApplication etebase-server; - etesync-dav = callPackage ../applications/misc/etesync-dav {}; + etesync-dav = callPackage ../applications/misc/etesync-dav { }; etherape = callPackage ../applications/networking/sniffers/etherape { }; @@ -29482,7 +29562,7 @@ with pkgs; gspeech = callPackage ../applications/audio/gspeech { }; - gtkcord4 = callPackage ../applications/audio/gtkcord4 {}; + gtkcord4 = callPackage ../applications/audio/gtkcord4 { }; haruna = libsForQt5.callPackage ../applications/video/haruna { }; @@ -29532,7 +29612,7 @@ with pkgs; exrtools = callPackage ../applications/graphics/exrtools { }; - f1viewer = callPackage ../applications/video/f1viewer {}; + f1viewer = callPackage ../applications/video/f1viewer { }; faircamp = callPackage ../applications/misc/faircamp { }; @@ -29864,15 +29944,13 @@ with pkgs; libpcap = libpcap.override { withBluez = stdenv.isLinux; }; }; - sngrep = callPackage ../applications/networking/sniffers/sngrep {}; + sngrep = callPackage ../applications/networking/sniffers/sngrep { }; termshark = callPackage ../tools/networking/termshark { }; fbida = callPackage ../applications/graphics/fbida { }; - fclones = callPackage ../tools/misc/fclones { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; + fclones = callPackage ../tools/misc/fclones { }; fcp = callPackage ../tools/misc/fcp { }; @@ -29882,7 +29960,7 @@ with pkgs; imlib2 = imlib2Full; }; - feishu = callPackage ../applications/networking/instant-messengers/feishu {}; + feishu = callPackage ../applications/networking/instant-messengers/feishu { }; filezilla = callPackage ../applications/networking/ftp/filezilla { }; @@ -29891,7 +29969,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.libs) simd; }; - buildMozillaMach = opts: callPackage (import ../applications/networking/browsers/firefox/common.nix opts) {}; + buildMozillaMach = opts: callPackage (import ../applications/networking/browsers/firefox/common.nix opts) { }; firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix {}); @@ -29939,7 +30017,7 @@ with pkgs; wmClass = "firefox-devedition"; }; - librewolf-unwrapped = callPackage ../applications/networking/browsers/librewolf {}; + librewolf-unwrapped = callPackage ../applications/networking/browsers/librewolf { }; librewolf = wrapFirefox librewolf-unwrapped { inherit (librewolf-unwrapped) extraPrefsFiles extraPoliciesFiles; @@ -30018,7 +30096,7 @@ with pkgs; freenet = callPackage ../applications/networking/p2p/freenet { }; - freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix {}; + freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { }; freeplane = callPackage ../applications/misc/freeplane { }; @@ -30054,7 +30132,7 @@ with pkgs; gcolor3 = callPackage ../applications/graphics/gcolor3 { }; - get_iplayer = callPackage ../applications/misc/get_iplayer {}; + get_iplayer = callPackage ../applications/misc/get_iplayer { }; getxbook = callPackage ../applications/misc/getxbook { }; @@ -30078,7 +30156,7 @@ with pkgs; inherit (gnome) gitg; - gmrun = callPackage ../applications/misc/gmrun {}; + gmrun = callPackage ../applications/misc/gmrun { }; gnucash = callPackage ../applications/office/gnucash { }; @@ -30094,7 +30172,7 @@ with pkgs; hydrus = python3Packages.callPackage ../applications/graphics/hydrus { inherit miniupnpc swftools; - inherit (qt5) wrapQtAppsHook; + inherit (qt6) wrapQtAppsHook qtbase qtcharts; }; jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains { @@ -30135,7 +30213,7 @@ with pkgs; losslessaudiochecker = callPackage ../applications/audio/losslessaudiochecker { }; - m32edit = callPackage ../applications/audio/midas/m32edit.nix {}; + m32edit = callPackage ../applications/audio/midas/m32edit.nix { }; manim = callPackage ../applications/video/manim { }; @@ -30143,13 +30221,13 @@ with pkgs; mindforger = libsForQt5.callPackage ../applications/editors/mindforger { }; - mi2ly = callPackage ../applications/audio/mi2ly {}; + mi2ly = callPackage ../applications/audio/mi2ly { }; moe = callPackage ../applications/editors/moe { }; molsketch = libsForQt5.callPackage ../applications/editors/molsketch { }; - pattypan = callPackage ../applications/misc/pattypan {}; + pattypan = callPackage ../applications/misc/pattypan { }; praat = callPackage ../applications/audio/praat { }; @@ -30164,11 +30242,11 @@ with pkgs; svox = callPackage ../applications/audio/svox { }; - giada = callPackage ../applications/audio/giada {}; + giada = callPackage ../applications/audio/giada { }; giara = callPackage ../applications/networking/giara { }; - gitit = callPackage ../applications/misc/gitit {}; + gitit = callPackage ../applications/misc/gitit { }; gkrellm = callPackage ../applications/misc/gkrellm { inherit (darwin.apple_sdk.frameworks) IOKit; @@ -30227,9 +30305,9 @@ with pkgs; gqview = callPackage ../applications/graphics/gqview { }; - gmpc = callPackage ../applications/audio/gmpc {}; + gmpc = callPackage ../applications/audio/gmpc { }; - gmtp = callPackage ../applications/misc/gmtp {}; + gmtp = callPackage ../applications/misc/gmtp { }; gnomecast = callPackage ../applications/video/gnomecast { }; @@ -30255,7 +30333,7 @@ with pkgs; go-graft = callPackage ../applications/networking/go-graft { }; - gostatic = callPackage ../applications/misc/gostatic {}; + gostatic = callPackage ../applications/misc/gostatic { }; gosmore = callPackage ../applications/misc/gosmore { stdenv = gcc10StdenvCompat; }; @@ -30315,10 +30393,12 @@ with pkgs; hackrf = callPackage ../applications/radio/hackrf { }; - hacksaw = callPackage ../tools/misc/hacksaw {}; + hacksaw = callPackage ../tools/misc/hacksaw { }; hakuneko = callPackage ../tools/misc/hakuneko { }; + halp = callPackage ../tools/misc/halp { }; + manga-cli = callPackage ../tools/misc/manga-cli { }; hamster = callPackage ../applications/misc/hamster { }; @@ -30419,7 +30499,7 @@ with pkgs; haunt = callPackage ../applications/misc/haunt { }; - huggle = libsForQt5.callPackage ../applications/misc/huggle {}; + huggle = libsForQt5.callPackage ../applications/misc/huggle { }; hugo = callPackage ../applications/misc/hugo { }; @@ -30490,7 +30570,7 @@ with pkgs; p2pool = callPackage ../applications/misc/p2pool { }; - pass2csv = python3Packages.callPackage ../tools/security/pass2csv {}; + pass2csv = python3Packages.callPackage ../tools/security/pass2csv { }; pass-secret-service = callPackage ../applications/misc/pass-secret-service { }; @@ -30514,7 +30594,7 @@ with pkgs; pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { }; - popura = callPackage ../tools/networking/popura {}; + popura = callPackage ../tools/networking/popura { }; pureref = callPackage ../applications/graphics/pureref { }; @@ -30590,7 +30670,7 @@ with pkgs; swaynotificationcenter = callPackage ../applications/misc/swaynotificationcenter { }; - swaynag-battery = callPackage ../applications/misc/swaynag-battery {}; + swaynag-battery = callPackage ../applications/misc/swaynag-battery { }; swayest-workstyle = callPackage ../applications/window-managers/sway/swayest-workstyle { }; @@ -30598,9 +30678,9 @@ with pkgs; rlaunch = callPackage ../applications/misc/rlaunch { }; - rootbar = callPackage ../applications/misc/rootbar {}; + rootbar = callPackage ../applications/misc/rootbar { }; - waybar = callPackage ../applications/misc/waybar {}; + waybar = callPackage ../applications/misc/waybar { }; waylock = callPackage ../applications/misc/waylock { zig = zig_0_10; @@ -30674,9 +30754,7 @@ with pkgs; i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { }; - waybox = callPackage ../applications/window-managers/waybox { - wlroots = wlroots_0_14; - }; + waybox = callPackage ../applications/window-managers/waybox { }; workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { }; @@ -30688,7 +30766,7 @@ with pkgs; i810switch = callPackage ../os-specific/linux/i810switch { }; - icewm = callPackage ../applications/window-managers/icewm {}; + icewm = callPackage ../applications/window-managers/icewm { }; icon-library = callPackage ../applications/graphics/icon-library { }; @@ -30808,7 +30886,7 @@ with pkgs; imhex = callPackage ../applications/editors/imhex { }; - inframap = callPackage ../applications/networking/cluster/inframap {}; + inframap = callPackage ../applications/networking/cluster/inframap { }; inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; @@ -30872,7 +30950,8 @@ with pkgs; }; jabref = callPackage ../applications/office/jabref { - jdk = javaPackages.compiler.openjdk18; + jdk = jdk19.override { enableJavaFX = true; }; + gradle = gradle_7; }; jack_capture = callPackage ../applications/audio/jack-capture { }; @@ -30930,7 +31009,7 @@ with pkgs; k3s_1_26 = callPackage ../applications/networking/cluster/k3s/1_26 { }; k3s = k3s_1_26; - k3sup = callPackage ../applications/networking/cluster/k3sup {}; + k3sup = callPackage ../applications/networking/cluster/k3sup { }; kconf = callPackage ../applications/networking/cluster/kconf { }; @@ -31032,7 +31111,7 @@ with pkgs; abseil-cpp = abseil-cpp_202111; }; - kotatogram-desktop-with-webkit = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix {}; + kotatogram-desktop-with-webkit = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix { }; kpt = callPackage ../applications/networking/cluster/kpt { }; @@ -31065,6 +31144,8 @@ with pkgs; kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { }; kubectl-convert = kubectl.convert; + kubernetes-metrics-server = callPackage ../applications/networking/cluster/kubernetes-metrics-server { }; + kubemqctl = callPackage ../applications/networking/cluster/kubemqctl { }; kubent = callPackage ../applications/networking/cluster/kubent { }; @@ -31144,9 +31225,9 @@ with pkgs; kiln = callPackage ../applications/misc/kiln { }; - karmor = callPackage ../applications/networking/cluster/karmor {}; + karmor = callPackage ../applications/networking/cluster/karmor { }; - kubernetes-code-generator = callPackage ../development/tools/kubernetes-code-generator {}; + kubernetes-code-generator = callPackage ../development/tools/kubernetes-code-generator { }; kubernetes-controller-tools = callPackage ../development/tools/kubernetes-controller-tools { }; @@ -31154,7 +31235,7 @@ with pkgs; wrapHelm = callPackage ../applications/networking/cluster/helm/wrapper.nix { }; - kubernetes-helm-wrapped = wrapHelm kubernetes-helm {}; + kubernetes-helm-wrapped = wrapHelm kubernetes-helm { }; kubernetes-helmPlugins = recurseIntoAttrs (callPackage ../applications/networking/cluster/helm/plugins { }); @@ -31187,8 +31268,7 @@ with pkgs; ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird { - # https://github.com/NixOS/nixpkgs/issues/201254 - stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc12Stdenv; + stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else stdenv; }; lazpaint = callPackage ../applications/graphics/lazpaint { }; @@ -31201,7 +31281,7 @@ with pkgs; lbzip2 = callPackage ../tools/compression/lbzip2 { }; - lci = callPackage ../applications/science/logic/lci {}; + lci = callPackage ../applications/science/logic/lci { }; lemonbar = callPackage ../applications/window-managers/lemonbar { }; @@ -31211,6 +31291,8 @@ with pkgs; lens = callPackage ../applications/networking/cluster/lens { }; + openlens = callPackage ../applications/networking/cluster/openlens { }; + leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { }; libkiwix = callPackage ../applications/misc/kiwix/lib.nix { }; @@ -31227,7 +31309,7 @@ with pkgs; libreoffice = hiPrio libreoffice-still; - libreoffice-unwrapped = (hiPrio libreoffice-still).libreoffice; + libreoffice-unwrapped = libreoffice.unwrapped; libreoffice-args = { inherit (perlPackages) ArchiveZip IOCompress; @@ -31248,7 +31330,7 @@ with pkgs; }; libreoffice-qt = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - libreoffice = libsForQt5.callPackage ../applications/office/libreoffice + unwrapped = libsForQt5.callPackage ../applications/office/libreoffice (libreoffice-args // { kdeIntegration = true; variant = "fresh"; @@ -31256,20 +31338,20 @@ with pkgs; }); libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - libreoffice = callPackage ../applications/office/libreoffice + unwrapped = callPackage ../applications/office/libreoffice (libreoffice-args // { variant = "fresh"; }); }); - libreoffice-fresh-unwrapped = libreoffice-fresh.libreoffice; + libreoffice-fresh-unwrapped = libreoffice-fresh.unwrapped; libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - libreoffice = callPackage ../applications/office/libreoffice + unwrapped = callPackage ../applications/office/libreoffice (libreoffice-args // { variant = "still"; }); }); - libreoffice-still-unwrapped = libreoffice-still.libreoffice; + libreoffice-still-unwrapped = libreoffice-still.unwrapped; libresprite = callPackage ../applications/editors/libresprite { inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation; @@ -31319,6 +31401,8 @@ with pkgs; lls = callPackage ../applications/networking/lls { }; + localsend = callPackage ../applications/networking/localsend { }; + lmms = libsForQt5.callPackage ../applications/audio/lmms { lame = null; libsoundio = null; @@ -31462,7 +31546,7 @@ with pkgs; matrix-dl = callPackage ../applications/networking/instant-messengers/matrix-dl { }; - matrix-recorder = callPackage ../applications/networking/instant-messengers/matrix-recorder {}; + matrix-recorder = callPackage ../applications/networking/instant-messengers/matrix-recorder { }; mblaze = callPackage ../applications/networking/mailreaders/mblaze { }; @@ -31575,7 +31659,7 @@ with pkgs; mimic = callPackage ../applications/audio/mimic { }; - meh = callPackage ../applications/graphics/meh {}; + meh = callPackage ../applications/graphics/meh { }; mixxx = libsForQt5.callPackage ../applications/audio/mixxx { }; @@ -31622,6 +31706,8 @@ with pkgs; mod-distortion = callPackage ../applications/audio/mod-distortion { }; + monitorcontrol = callPackage ../applications/misc/monitorcontrol { }; + xmr-stak = callPackage ../applications/misc/xmr-stak { }; xmrig = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig { }; @@ -31774,7 +31860,7 @@ with pkgs; nqptp = callPackage ../tools/networking/nqptp { }; - mailspring = callPackage ../applications/networking/mailreaders/mailspring {}; + mailspring = callPackage ../applications/networking/mailreaders/mailspring { }; mm = callPackage ../applications/networking/instant-messengers/mm { }; @@ -31792,21 +31878,22 @@ with pkgs; # Wraps without trigerring a rebuild wrapMpv = callPackage ../applications/video/mpv/wrapper.nix { }; - mpv = wrapMpv mpv-unwrapped {}; + mpv = wrapMpv mpv-unwrapped { }; mpvpaper = callPackage ../tools/wayland/mpvpaper { }; mpvScripts = recurseIntoAttrs { - autoload = callPackage ../applications/video/mpv/scripts/autoload.nix {}; - convert = callPackage ../applications/video/mpv/scripts/convert.nix {}; - inhibit-gnome = callPackage ../applications/video/mpv/scripts/inhibit-gnome.nix {}; - mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {}; - mpv-playlistmanager = callPackage ../applications/video/mpv/scripts/mpv-playlistmanager.nix {}; - mpvacious = callPackage ../applications/video/mpv/scripts/mpvacious.nix {}; - simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {}; - sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {}; + autoload = callPackage ../applications/video/mpv/scripts/autoload.nix { }; + convert = callPackage ../applications/video/mpv/scripts/convert.nix { }; + inhibit-gnome = callPackage ../applications/video/mpv/scripts/inhibit-gnome.nix { }; + mpris = callPackage ../applications/video/mpv/scripts/mpris.nix { }; + mpv-playlistmanager = callPackage ../applications/video/mpv/scripts/mpv-playlistmanager.nix { }; + mpvacious = callPackage ../applications/video/mpv/scripts/mpvacious.nix { }; + simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix { }; + sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix { }; thumbnail = callPackage ../applications/video/mpv/scripts/thumbnail.nix { }; - vr-reversal = callPackage ../applications/video/mpv/scripts/vr-reversal.nix {}; + uosc = callPackage ../applications/video/mpv/scripts/uosc.nix { }; + vr-reversal = callPackage ../applications/video/mpv/scripts/vr-reversal.nix { }; webtorrent-mpv-hook = callPackage ../applications/video/mpv/scripts/webtorrent-mpv-hook.nix { }; youtube-quality = callPackage ../applications/video/mpv/scripts/youtube-quality.nix { }; cutter = callPackage ../applications/video/mpv/scripts/cutter.nix { }; @@ -31865,7 +31952,7 @@ with pkgs; pythonPackages = python3Packages; }; - n8n = callPackage ../applications/networking/n8n {}; + n8n = callPackage ../applications/networking/n8n { }; neomutt = callPackage ../applications/networking/mailreaders/neomutt { }; @@ -31878,7 +31965,7 @@ with pkgs; nerd-font-patcher = callPackage ../applications/misc/nerd-font-patcher { }; netmaker = callPackage ../applications/networking/netmaker {subPackages = ["."];}; - netmaker-full = callPackage ../applications/networking/netmaker {}; + netmaker-full = callPackage ../applications/networking/netmaker { }; newsflash = callPackage ../applications/networking/feedreaders/newsflash { webkitgtk = webkitgtk_5_0; @@ -31888,15 +31975,15 @@ with pkgs; nice-dcv-client = callPackage ../applications/networking/remote/nice-dcv-client { }; - nixos-shell = callPackage ../tools/virtualization/nixos-shell {}; + nixos-shell = callPackage ../tools/virtualization/nixos-shell { }; - nix-ld = callPackage ../os-specific/linux/nix-ld {}; + nix-ld = callPackage ../os-specific/linux/nix-ld { }; noaa-apt = callPackage ../applications/radio/noaa-apt { }; node-problem-detector = callPackage ../applications/networking/cluster/node-problem-detector { }; - ninjas2 = callPackage ../applications/audio/ninjas2 {}; + ninjas2 = callPackage ../applications/audio/ninjas2 { }; nncp = darwin.apple_sdk_11_0.callPackage ../tools/misc/nncp { }; @@ -31949,7 +32036,7 @@ with pkgs; opsdroid = callPackage ../applications/networking/opsdroid { }; - oroborus = callPackage ../applications/window-managers/oroborus {}; + oroborus = callPackage ../applications/window-managers/oroborus { }; osm2pgsql = callPackage ../tools/misc/osm2pgsql { # fmt_9 is not supported: https://github.com/openstreetmap/osm2pgsql/issues/1859 @@ -31965,7 +32052,7 @@ with pkgs; p4d = callPackage ../applications/version-management/p4d { }; p4v = callPackage ../applications/version-management/p4v { }; - partio = callPackage ../development/libraries/partio {}; + partio = callPackage ../development/libraries/partio { }; pc-ble-driver = callPackage ../development/libraries/pc-ble-driver { inherit (darwin.apple_sdk.frameworks) IOKit; @@ -31977,7 +32064,7 @@ with pkgs; pdfmixtool = libsForQt5.callPackage ../applications/office/pdfmixtool { }; - pdfmm = callPackage ../applications/office/pdfmm {}; + pdfmm = callPackage ../applications/office/pdfmm { }; pig = callPackage ../applications/networking/cluster/pig { }; @@ -31991,7 +32078,7 @@ with pkgs; piper = callPackage ../os-specific/linux/piper { }; - pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer {}; + pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { }; plank = callPackage ../applications/misc/plank { }; @@ -32028,7 +32115,7 @@ with pkgs; psi-notify = callPackage ../applications/misc/psi-notify { }; - ptex = callPackage ../development/libraries/ptex {}; + ptex = callPackage ../development/libraries/ptex { }; pyright = nodePackages.pyright; @@ -32036,7 +32123,7 @@ with pkgs; qemacs = callPackage ../applications/editors/qemacs { }; - rime-cli = callPackage ../applications/office/rime-cli {}; + rime-cli = callPackage ../applications/office/rime-cli { }; roxctl = callPackage ../applications/networking/cluster/roxctl { }; @@ -32059,15 +32146,15 @@ with pkgs; smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; - smtube = libsForQt5.callPackage ../applications/video/smtube {}; + smtube = libsForQt5.callPackage ../applications/video/smtube { }; - softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix {}; + softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix { }; - songrec = callPackage ../applications/audio/songrec {}; + songrec = callPackage ../applications/audio/songrec { }; storrent = callPackage ../applications/networking/p2p/storrent { }; - spacegun = callPackage ../applications/networking/cluster/spacegun {}; + spacegun = callPackage ../applications/networking/cluster/spacegun { }; speedread = callPackage ../applications/misc/speedread { }; @@ -32204,10 +32291,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation; }; - nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { - # https://github.com/NixOS/nixpkgs/issues/201254 - stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv; - }; + nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { }; + + nimdow = callPackage ../applications/window-managers/nimdow { }; nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { }; @@ -32255,7 +32341,7 @@ with pkgs; }; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); - wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix {}; + wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { }; obsidian = callPackage ../applications/misc/obsidian { electron = electron_21; @@ -32265,7 +32351,7 @@ with pkgs; oculante = callPackage ../applications/graphics/oculante { }; - ocr-a = callPackage ../data/fonts/ocr-a {}; + ocr-a = callPackage ../data/fonts/ocr-a { }; ocrad = callPackage ../applications/graphics/ocrad { }; @@ -32294,7 +32380,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AppKit; }; - openfx = callPackage ../development/libraries/openfx {}; + openfx = callPackage ../development/libraries/openfx { }; openimageio_1 = callPackage ../development/libraries/openimageio/1.x.nix { boost = boost175; @@ -32322,11 +32408,11 @@ with pkgs; openrsync = darwin.apple_sdk_11_0.callPackage ../applications/networking/sync/openrsync { }; - openscad = libsForQt5.callPackage ../applications/graphics/openscad {}; + openscad = libsForQt5.callPackage ../applications/graphics/openscad { }; open-stage-control = callPackage ../applications/audio/open-stage-control { }; - opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; + opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client { }; opentoonz = let opentoonz-libtiff = callPackage ../applications/graphics/opentoonz/libtiff.nix { }; @@ -32339,13 +32425,13 @@ with pkgs; opentx = libsForQt5.callPackage ../applications/misc/opentx { }; - opera = callPackage ../applications/networking/browsers/opera {}; + opera = callPackage ../applications/networking/browsers/opera { }; orca = python3Packages.callPackage ../applications/misc/orca { inherit pkg-config; }; - orca-c = callPackage ../applications/audio/orca-c {}; + orca-c = callPackage ../applications/audio/orca-c { }; organicmaps = libsForQt5.callPackage ../applications/misc/organicmaps { }; @@ -32367,9 +32453,9 @@ with pkgs; vieb = callPackage ../applications/networking/browsers/vieb { }; - vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; + vivaldi = callPackage ../applications/networking/browsers/vivaldi { }; - vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {}; + vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix { }; libopenmpt = callPackage ../development/libraries/audio/libopenmpt { }; @@ -32426,9 +32512,9 @@ with pkgs; metal-cli = callPackage ../development/tools/metal-cli { }; - pb_cli = callPackage ../tools/misc/pb_cli {}; + pb_cli = callPackage ../tools/misc/pb_cli { }; - capture = callPackage ../tools/misc/capture {}; + capture = callPackage ../tools/misc/capture { }; pbrt = callPackage ../applications/graphics/pbrt { }; @@ -32449,7 +32535,7 @@ with pkgs; pencil = callPackage ../applications/graphics/pencil { }; - perseus = callPackage ../applications/science/math/perseus {}; + perseus = callPackage ../applications/science/math/perseus { }; petrifoo = callPackage ../applications/audio/petrifoo { inherit (gnome2) libgnomecanvas; @@ -32475,7 +32561,7 @@ with pkgs; nodejs = nodejs-16_x; }; - pflask = callPackage ../os-specific/linux/pflask {}; + pflask = callPackage ../os-specific/linux/pflask { }; pfsshell = callPackage ../tools/misc/pfsshell { }; @@ -32483,8 +32569,6 @@ with pkgs; photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { }; - photoflow = callPackage ../applications/graphics/photoflow { }; - phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { }; phrasendrescher = callPackage ../tools/security/phrasendrescher { }; @@ -32615,7 +32699,7 @@ with pkgs; poezio = python3Packages.poezio; - pommed_light = callPackage ../os-specific/linux/pommed-light {}; + pommed_light = callPackage ../os-specific/linux/pommed-light { }; polylith = callPackage ../development/tools/misc/polylith { }; @@ -32633,11 +32717,11 @@ with pkgs; pop-launcher = callPackage ../applications/misc/pop-launcher { }; - popcorntime = callPackage ../applications/video/popcorntime {}; + popcorntime = callPackage ../applications/video/popcorntime { }; pothos = libsForQt5.callPackage ../applications/radio/pothos { }; - potrace = callPackage ../applications/graphics/potrace {}; + potrace = callPackage ../applications/graphics/potrace { }; posterazor = callPackage ../applications/misc/posterazor { }; @@ -32715,7 +32799,7 @@ with pkgs; eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { }; - qdirstat = libsForQt5.callPackage ../applications/misc/qdirstat {}; + qdirstat = libsForQt5.callPackage ../applications/misc/qdirstat { }; qemu = callPackage ../applications/virtualization/qemu { inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Hypervisor vmnet; @@ -32723,7 +32807,7 @@ with pkgs; inherit (darwin) sigtool; }; - qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {}; + qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix { }; canokey-qemu = callPackage ../applications/virtualization/qemu/canokey-qemu.nix { }; @@ -32744,7 +32828,7 @@ with pkgs; proj = proj_7; }; - garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {}; + garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix { }; qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { }; @@ -32752,7 +32836,7 @@ with pkgs; qmetro = callPackage ../applications/misc/qmetro { }; - qmidiarp = callPackage ../applications/audio/qmidiarp {}; + qmidiarp = callPackage ../applications/audio/qmidiarp { }; qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { }; @@ -32764,7 +32848,7 @@ with pkgs; qpwgraph = libsForQt5.callPackage ../applications/audio/qpwgraph { }; - qrcode = callPackage ../tools/graphics/qrcode {}; + qrcode = callPackage ../tools/graphics/qrcode { }; qsampler = libsForQt5.callPackage ../applications/audio/qsampler { }; @@ -32825,11 +32909,11 @@ with pkgs; quill-qr = callPackage ../tools/security/quill-qr { }; - quirc = callPackage ../tools/graphics/quirc {}; + quirc = callPackage ../tools/graphics/quirc { }; quisk = python39Packages.callPackage ../applications/radio/quisk { }; - quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss {}; + quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss { }; quodlibet = callPackage ../applications/audio/quodlibet { inherit (gnome) adwaita-icon-theme; @@ -32876,15 +32960,15 @@ with pkgs; inherit (qt6Packages) qtbase qtwebengine wrapQtAppsHook qtwayland; }; - qxw = callPackage ../applications/editors/qxw {}; + qxw = callPackage ../applications/editors/qxw { }; - rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; + rabbitvcs = callPackage ../applications/version-management/rabbitvcs { }; rakarrack = callPackage ../applications/audio/rakarrack { fltk = fltk13; }; - renoise = callPackage ../applications/audio/renoise {}; + renoise = callPackage ../applications/audio/renoise { }; redux = callPackage ../applications/audio/redux { }; @@ -32896,13 +32980,13 @@ with pkgs; wxGTK = wxGTK30; }; - raiseorlaunch = callPackage ../applications/misc/raiseorlaunch {}; + raiseorlaunch = callPackage ../applications/misc/raiseorlaunch { }; rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { }; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; - ratmen = callPackage ../tools/X11/ratmen {}; + ratmen = callPackage ../tools/X11/ratmen { }; ratox = callPackage ../applications/networking/instant-messengers/ratox { }; @@ -32967,7 +33051,7 @@ with pkgs; rkdeveloptool-pine64 = callPackage ../misc/rkdeveloptool-pine64 { }; - rke = callPackage ../applications/networking/cluster/rke {}; + rke = callPackage ../applications/networking/cluster/rke { }; rocketchat-desktop = callPackage ../applications/networking/instant-messengers/rocketchat-desktop { }; @@ -32988,7 +33072,7 @@ with pkgs; inherit (python3Packages) buildPythonApplication configargparse; }; - rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; + rootlesskit = callPackage ../tools/virtualization/rootlesskit { }; rsclock = callPackage ../applications/misc/rsclock { }; @@ -32999,7 +33083,7 @@ with pkgs; rstudio-server = rstudio.override { server = true; }; rsync = callPackage ../applications/networking/sync/rsync (config.rsync or {}); - rrsync = callPackage ../applications/networking/sync/rsync/rrsync.nix {}; + rrsync = callPackage ../applications/networking/sync/rsync/rrsync.nix { }; rtl_433 = callPackage ../applications/radio/rtl_433 { }; @@ -33007,16 +33091,16 @@ with pkgs; rtl-sdr = callPackage ../applications/radio/rtl-sdr { }; - rubyripper = callPackage ../applications/audio/rubyripper {}; + rubyripper = callPackage ../applications/audio/rubyripper { }; rucredstash = callPackage ../tools/security/rucredstash { inherit (darwin.apple_sdk.frameworks) Security; openssl = openssl_1_1; }; - runc = callPackage ../applications/virtualization/runc {}; + runc = callPackage ../applications/virtualization/runc { }; - rusty-psn = callPackage ../applications/misc/rusty-psn {}; + rusty-psn = callPackage ../applications/misc/rusty-psn { }; rusty-psn-gui = rusty-psn.override { withGui = true; }; @@ -33028,9 +33112,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; - uade = callPackage ../applications/audio/uade {}; + uade = callPackage ../applications/audio/uade { }; - udevil = callPackage ../applications/misc/udevil {}; + udevil = callPackage ../applications/misc/udevil { }; udiskie = callPackage ../applications/misc/udiskie { }; @@ -33119,9 +33203,9 @@ with pkgs; SkypeExport = callPackage ../applications/networking/instant-messengers/SkypeExport { }; - slmenu = callPackage ../applications/misc/slmenu {}; + slmenu = callPackage ../applications/misc/slmenu { }; - slop = callPackage ../tools/misc/slop {}; + slop = callPackage ../tools/misc/slop { }; slowhttptest = callPackage ../tools/security/slowhttptest { }; @@ -33271,9 +33355,9 @@ with pkgs; curaPlugins = callPackage ../applications/misc/cura/plugins.nix { }; - peru = callPackage ../applications/version-management/peru {}; + peru = callPackage ../applications/version-management/peru { }; - petrinizer = haskellPackages.callPackage ../applications/science/logic/petrinizer {}; + petrinizer = haskellPackages.callPackage ../applications/science/logic/petrinizer { }; pmidi = callPackage ../applications/audio/pmidi { }; @@ -33293,7 +33377,7 @@ with pkgs; buildGoModule = buildGo118Module; # build fails with 1.19 }; - skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; + skrooge = libsForQt5.callPackage ../applications/office/skrooge { }; smartgithg = callPackage ../applications/version-management/smartgithg { jre = openjdk11; @@ -33360,7 +33444,7 @@ with pkgs; ssrc = callPackage ../applications/audio/ssrc { }; - stalonetray = callPackage ../applications/window-managers/stalonetray {}; + stalonetray = callPackage ../applications/window-managers/stalonetray { }; inherit (ocaml-ng.ocamlPackages_4_12) stog; @@ -33370,7 +33454,7 @@ with pkgs; stuffbin = callPackage ../tools/filesystems/stuffbin { }; - stumpish = callPackage ../applications/window-managers/stumpish {}; + stumpish = callPackage ../applications/window-managers/stumpish { }; stumpwm = lispPackages.stumpwm; @@ -33475,13 +33559,13 @@ with pkgs; inherit (haskellPackages) ghcWithPackages taffybar; }; - tagainijisho = libsForQt5.callPackage ../applications/office/tagainijisho {}; + tagainijisho = libsForQt5.callPackage ../applications/office/tagainijisho { }; - tagger = callPackage ../applications/audio/tagger {}; + tagger = callPackage ../applications/audio/tagger { }; - tahoe-lafs = callPackage ../tools/networking/p2p/tahoe-lafs {}; + tahoe-lafs = callPackage ../tools/networking/p2p/tahoe-lafs { }; - tailor = callPackage ../applications/version-management/tailor {}; + tailor = callPackage ../applications/version-management/tailor { }; taizen = callPackage ../applications/misc/taizen { inherit (darwin.apple_sdk.frameworks) Security; @@ -33548,17 +33632,17 @@ with pkgs; telepathy-gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { }; - telepathy-haze = callPackage ../applications/networking/instant-messengers/telepathy/haze {}; + telepathy-haze = callPackage ../applications/networking/instant-messengers/telepathy/haze { }; - telepathy-logger = callPackage ../applications/networking/instant-messengers/telepathy/logger {}; + telepathy-logger = callPackage ../applications/networking/instant-messengers/telepathy/logger { }; telepathy-mission-control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { }; - telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; + telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle { }; - teleprompter = callPackage ../applications/misc/teleprompter {}; + teleprompter = callPackage ../applications/misc/teleprompter { }; - tempo = callPackage ../servers/tracing/tempo {}; + tempo = callPackage ../servers/tracing/tempo { }; temporal = callPackage ../applications/networking/cluster/temporal { }; @@ -33574,7 +33658,7 @@ with pkgs; termdown = python3Packages.callPackage ../applications/misc/termdown { }; - terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; + terminal-notifier = callPackage ../applications/misc/terminal-notifier { }; textpieces = callPackage ../tools/text/textpieces { }; @@ -33627,7 +33711,7 @@ with pkgs; generated = import ../applications/networking/mailreaders/thunderbird-bin/release_sources.nix; }; - thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; + thunderbolt = callPackage ../os-specific/linux/thunderbolt { }; ticpp = callPackage ../development/libraries/ticpp { }; @@ -33699,7 +33783,7 @@ with pkgs; tokyo-night-gtk = callPackage ../data/themes/tokyo-night-gtk { }; - topydo = callPackage ../applications/misc/topydo {}; + topydo = callPackage ../applications/misc/topydo { }; torrential = callPackage ../applications/networking/p2p/torrential { }; @@ -33749,7 +33833,7 @@ with pkgs; transmission-gtk = transmission.override { enableGTK3 = true; }; transmission-qt = transmission.override { enableQt = true; }; - transmission-remote-gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {}; + transmission-remote-gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk { }; transgui = callPackage ../applications/networking/p2p/transgui { }; @@ -33765,9 +33849,9 @@ with pkgs; tdrop = callPackage ../applications/misc/tdrop { }; - tre-command = callPackage ../tools/system/tre-command {}; + tre-command = callPackage ../tools/system/tre-command { }; - tree = callPackage ../tools/system/tree {}; + tree = callPackage ../tools/system/tree { }; treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK32; @@ -33943,7 +34027,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - qpdfview = libsForQt5.callPackage ../applications/office/qpdfview {}; + qpdfview = libsForQt5.callPackage ../applications/office/qpdfview { }; qtile = callPackage ../applications/window-managers/qtile { }; @@ -33966,6 +34050,8 @@ with pkgs; }; neovim = wrapNeovim neovim-unwrapped { }; + neovim-gtk = callPackage ../applications/editors/neovim/neovim-gtk.nix { }; + neovim-qt-unwrapped = libsForQt5.callPackage ../applications/editors/neovim/neovim-qt.nix { }; neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; @@ -33997,9 +34083,9 @@ with pkgs; qtermwidget = lxqt.qtermwidget; }; - virtscreen = callPackage ../tools/admin/virtscreen {}; + virtscreen = callPackage ../tools/admin/virtscreen { }; - virtual-ans = callPackage ../applications/audio/virtual-ans {}; + virtual-ans = callPackage ../applications/audio/virtual-ans { }; virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; @@ -34059,7 +34145,7 @@ with pkgs; viper4linux = callPackage ../applications/audio/viper4linux { }; viper4linux-gui = libsForQt5.callPackage ../applications/audio/viper4linux-gui { }; - vkeybd = callPackage ../applications/audio/vkeybd {}; + vkeybd = callPackage ../applications/audio/vkeybd { }; vlc = libsForQt5.callPackage ../applications/video/vlc { # Newest libcaca changed the API, and libvlc didn't catch it. Until next @@ -34195,7 +34281,7 @@ with pkgs; waypipe = callPackage ../applications/networking/remote/waypipe { }; - wayv = callPackage ../tools/X11/wayv {}; + wayv = callPackage ../tools/X11/wayv { }; wayvnc = callPackage ../applications/networking/remote/wayvnc { }; @@ -34203,17 +34289,17 @@ with pkgs; webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { }; - webcord = callPackage ../applications/networking/instant-messengers/webcord {}; + webcord = callPackage ../applications/networking/instant-messengers/webcord { }; - webex = callPackage ../applications/networking/instant-messengers/webex {}; + webex = callPackage ../applications/networking/instant-messengers/webex { }; - webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {}; + webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs { }; - websploit = python3Packages.callPackage ../tools/security/websploit {}; + websploit = python3Packages.callPackage ../tools/security/websploit { }; webssh = with python3Packages; toPythonApplication webssh; - webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {}; + webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop { }; wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { }; @@ -34244,7 +34330,7 @@ with pkgs; weston = callPackage ../applications/window-managers/weston { }; - wgnord = callPackage ../applications/networking/wgnord/default.nix {}; + wgnord = callPackage ../applications/networking/wgnord/default.nix { }; whalebird = callPackage ../applications/misc/whalebird { electron = electron_19; @@ -34344,7 +34430,7 @@ with pkgs; x2vnc = callPackage ../tools/X11/x2vnc { }; - x32edit = callPackage ../applications/audio/midas/x32edit.nix {}; + x32edit = callPackage ../applications/audio/midas/x32edit.nix { }; x42-avldrums = callPackage ../applications/audio/x42-avldrums { }; @@ -34352,7 +34438,7 @@ with pkgs; x42-plugins = callPackage ../applications/audio/x42-plugins { }; - xannotate = callPackage ../tools/X11/xannotate {}; + xannotate = callPackage ../tools/X11/xannotate { }; xaos = libsForQt5.callPackage ../applications/graphics/xaos { }; @@ -34410,15 +34496,15 @@ with pkgs; x-create-mouse-void = callPackage ../applications/window-managers/x-create-mouse-void { }; - picom = callPackage ../applications/window-managers/picom {}; + picom = callPackage ../applications/window-managers/picom { }; picom-jonaburg = callPackage ../applications/window-managers/picom/picom-jonaburg.nix { }; picom-next = callPackage ../applications/window-managers/picom/picom-next.nix { }; - xd = callPackage ../applications/networking/p2p/xd {}; + xd = callPackage ../applications/networking/p2p/xd { }; - xdaliclock = callPackage ../tools/misc/xdaliclock {}; + xdaliclock = callPackage ../tools/misc/xdaliclock { }; xdg-dbus-proxy = callPackage ../development/libraries/xdg-dbus-proxy { }; @@ -34450,9 +34536,9 @@ with pkgs; xen-slim = xenPackages.xen-slim; xen-light = xenPackages.xen-light; - xen_4_10 = xenPackages.xen_4_10-vanilla; - xen_4_10-slim = xenPackages.xen_4_10-slim; - xen_4_10-light = xenPackages.xen_4_10-light; + xen_4_15 = xenPackages.xen_4_15-vanilla; + xen_4_15-slim = xenPackages.xen_4_15-slim; + xen_4_15-light = xenPackages.xen_4_15-light; xkbset = callPackage ../tools/X11/xkbset { }; @@ -34466,7 +34552,7 @@ with pkgs; xfig = callPackage ../applications/graphics/xfig { }; - xfractint = callPackage ../applications/graphics/xfractint {}; + xfractint = callPackage ../applications/graphics/xfractint { }; xine-ui = callPackage ../applications/video/xine-ui { }; @@ -34498,7 +34584,7 @@ with pkgs; xplugd = callPackage ../tools/X11/xplugd { }; - xpointerbarrier = callPackage ../tools/X11/xpointerbarrier {}; + xpointerbarrier = callPackage ../tools/X11/xpointerbarrier { }; xkb-switch = callPackage ../tools/X11/xkb-switch { }; @@ -34535,7 +34621,7 @@ with pkgs; xmountains = callPackage ../applications/graphics/xmountains { }; - xmppc = callPackage ../applications/networking/instant-messengers/xmppc {}; + xmppc = callPackage ../applications/networking/instant-messengers/xmppc { }; libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; @@ -34605,7 +34691,7 @@ with pkgs; yabar-unstable = callPackage ../applications/window-managers/yabar/unstable.nix { }; - yarp = callPackage ../applications/science/robotics/yarp {}; + yarp = callPackage ../applications/science/robotics/yarp { }; yate = callPackage ../applications/misc/yate { }; @@ -34613,9 +34699,9 @@ with pkgs; ydiff = with python3.pkgs; toPythonApplication ydiff; - ydict = callPackage ../applications/misc/ydict {}; + ydict = callPackage ../applications/misc/ydict { }; - yed = callPackage ../applications/graphics/yed {}; + yed = callPackage ../applications/graphics/yed { }; yeetgif = callPackage ../applications/graphics/yeetgif { }; @@ -34625,7 +34711,7 @@ with pkgs; yewtube = callPackage ../applications/misc/yewtube { }; - yokadi = python3Packages.callPackage ../applications/misc/yokadi {}; + yokadi = python3Packages.callPackage ../applications/misc/yokadi { }; yoshimi = callPackage ../applications/audio/yoshimi { }; @@ -34676,7 +34762,7 @@ with pkgs; zerobin = callPackage ../applications/networking/zerobin { }; - zeroc-ice = callPackage ../development/libraries/zeroc-ice {}; + zeroc-ice = callPackage ../development/libraries/zeroc-ice { }; zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; }; @@ -34719,13 +34805,13 @@ with pkgs; zotero = callPackage ../applications/office/zotero { }; - zscroll = callPackage ../applications/misc/zscroll {}; + zscroll = callPackage ../applications/misc/zscroll { }; zsteg = callPackage ../tools/security/zsteg { }; inherit (nodePackages) zx; - zxfer = callPackage ../applications/system/zxfer {}; + zxfer = callPackage ../applications/system/zxfer { }; zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { guiModule = "zest"; @@ -35029,7 +35115,7 @@ with pkgs; conmon-rs = callPackage ../applications/virtualization/conmon-rs { }; - digikam = libsForQt5.callPackage ../applications/graphics/digikam {}; + digikam = libsForQt5.callPackage ../applications/graphics/digikam { }; drumkv1 = libsForQt5.callPackage ../applications/audio/drumkv1 { }; @@ -35039,7 +35125,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - fava = callPackage ../applications/office/fava {}; + fava = callPackage ../applications/office/fava { }; nux = callPackage ../tools/misc/nux { }; @@ -35332,7 +35418,7 @@ with pkgs; cuyo = callPackage ../games/cuyo { }; - darkplaces = callPackage ../games/darkplaces {}; + darkplaces = callPackage ../games/darkplaces { }; deliantra-server = callPackage ../games/deliantra/server.nix { stdenv = gcc10StdenvCompat; @@ -36044,7 +36130,7 @@ with pkgs; protonup-ng = with python3Packages; toPythonApplication protonup-ng; - steam-rom-manager = callPackage ../tools/games/steam-rom-manager {}; + steam-rom-manager = callPackage ../tools/games/steam-rom-manager { }; sdlpop = callPackage ../games/sdlpop { }; @@ -36396,7 +36482,7 @@ with pkgs; plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { }; - plasma-theme-switcher = libsForQt5.callPackage ../applications/misc/plasma-theme-switcher {}; + plasma-theme-switcher = libsForQt5.callPackage ../applications/misc/plasma-theme-switcher { }; plasma-pass = libsForQt5.callPackage ../tools/security/plasma-pass { }; @@ -36431,11 +36517,11 @@ with pkgs; cp2k = callPackage ../applications/science/chemistry/cp2k { }; - d-seams = callPackage ../applications/science/chemistry/d-seams {}; + d-seams = callPackage ../applications/science/chemistry/d-seams { }; ergoscf = callPackage ../applications/science/chemistry/ergoscf { }; - gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; + gwyddion = callPackage ../applications/science/chemistry/gwyddion { }; jmol = callPackage ../applications/science/chemistry/jmol { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -36840,9 +36926,9 @@ with pkgs; # standard BLAS and LAPACK. openblasCompat = openblas.override { blas64 = false; }; - openlibm = callPackage ../development/libraries/science/math/openlibm {}; + openlibm = callPackage ../development/libraries/science/math/openlibm { }; - openspecfun = callPackage ../development/libraries/science/math/openspecfun {}; + openspecfun = callPackage ../development/libraries/science/math/openspecfun { }; planarity = callPackage ../development/libraries/science/math/planarity { }; @@ -36893,9 +36979,9 @@ with pkgs; version = "11"; }; - metis = callPackage ../development/libraries/science/math/metis {}; + metis = callPackage ../development/libraries/science/math/metis { }; - nauty = callPackage ../applications/science/math/nauty {}; + nauty = callPackage ../applications/science/math/nauty { }; osi = callPackage ../development/libraries/science/math/osi { }; @@ -36939,19 +37025,19 @@ with pkgs; subread = callPackage ../applications/science/biology/subread { }; suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { }; - suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse/4.4.nix {}; - suitesparse_5_3 = callPackage ../development/libraries/science/math/suitesparse {}; + suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse/4.4.nix { }; + suitesparse_5_3 = callPackage ../development/libraries/science/math/suitesparse { }; suitesparse = suitesparse_5_3; - suitesparse-graphblas = callPackage ../development/libraries/science/math/suitesparse-graphblas {}; + suitesparse-graphblas = callPackage ../development/libraries/science/math/suitesparse-graphblas { }; - superlu = callPackage ../development/libraries/science/math/superlu {}; + superlu = callPackage ../development/libraries/science/math/superlu { }; - symmetrica = callPackage ../applications/science/math/symmetrica {}; + symmetrica = callPackage ../applications/science/math/symmetrica { }; sympow = callPackage ../development/libraries/science/math/sympow { }; - trilinos = callPackage ../development/libraries/science/math/trilinos {}; + trilinos = callPackage ../development/libraries/science/math/trilinos { }; trilinos-mpi = callPackage ../development/libraries/science/math/trilinos { withMPI = true; }; @@ -37021,11 +37107,11 @@ with pkgs; ### SCIENCE/PHYSICS - dawn = callPackage ../applications/science/physics/dawn {}; + dawn = callPackage ../applications/science/physics/dawn { }; - dawncut = callPackage ../applications/science/physics/dawncut {}; + dawncut = callPackage ../applications/science/physics/dawncut { }; - elmerfem = callPackage ../applications/science/physics/elmerfem {}; + elmerfem = callPackage ../applications/science/physics/elmerfem { }; mcfm = callPackage ../applications/science/physics/MCFM { stdenv = gccStdenv; @@ -37036,15 +37122,15 @@ with pkgs; professor = callPackage ../applications/science/physics/professor { }; - sacrifice = callPackage ../applications/science/physics/sacrifice {}; + sacrifice = callPackage ../applications/science/physics/sacrifice { }; - sherpa = callPackage ../applications/science/physics/sherpa {}; + sherpa = callPackage ../applications/science/physics/sherpa { }; shtns = callPackage ../applications/science/physics/shtns { }; validphys2 = with python3Packages; toPythonApplication validphys2; - xfitter = callPackage ../applications/science/physics/xfitter {}; + xfitter = callPackage ../applications/science/physics/xfitter { }; xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { }; @@ -37060,27 +37146,27 @@ with pkgs; ### SCIENCE/LOGIC - abc-verifier = callPackage ../applications/science/logic/abc {}; + abc-verifier = callPackage ../applications/science/logic/abc { }; abella = callPackage ../applications/science/logic/abella { ocamlPackages = ocaml-ng.ocamlPackages_4_12; }; - acgtk = callPackage ../applications/science/logic/acgtk {}; + acgtk = callPackage ../applications/science/logic/acgtk { }; - alt-ergo = callPackage ../applications/science/logic/alt-ergo {}; + alt-ergo = callPackage ../applications/science/logic/alt-ergo { }; aspino = callPackage ../applications/science/logic/aspino { stdenv = gcc10StdenvCompat; }; - beluga = callPackage ../applications/science/logic/beluga {}; + beluga = callPackage ../applications/science/logic/beluga { }; boogie = dotnetPackages.Boogie; cbmc = callPackage ../applications/science/logic/cbmc { }; - cadical = callPackage ../applications/science/logic/cadical {}; + cadical = callPackage ../applications/science/logic/cadical { }; inherit (callPackage ./coq-packages.nix { inherit (ocaml-ng) @@ -37123,7 +37209,7 @@ with pkgs; cvc5 = callPackage ../applications/science/logic/cvc5 { }; - drat-trim = callPackage ../applications/science/logic/drat-trim {}; + drat-trim = callPackage ../applications/science/logic/drat-trim { }; ekrhyper = callPackage ../applications/science/logic/ekrhyper { ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml; @@ -37137,7 +37223,7 @@ with pkgs; gappa = callPackage ../applications/science/logic/gappa { }; - gfan = callPackage ../applications/science/math/gfan {}; + gfan = callPackage ../applications/science/math/gfan { }; giac = callPackage ../applications/science/math/giac { }; giac-with-xcas = giac.override { enableGUI = true; }; @@ -37157,9 +37243,9 @@ with pkgs; honeytrap = callPackage ../tools/security/honeytrap { }; - kissat = callPackage ../applications/science/logic/kissat {}; + kissat = callPackage ../applications/science/logic/kissat { }; - tini = callPackage ../applications/virtualization/tini {}; + tini = callPackage ../applications/virtualization/tini { }; ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; @@ -37187,42 +37273,42 @@ with pkgs; keymapviz = callPackage ../tools/misc/keymapviz { }; - lean = callPackage ../applications/science/logic/lean {}; - lean2 = callPackage ../applications/science/logic/lean2 {}; + lean = callPackage ../applications/science/logic/lean { }; + lean2 = callPackage ../applications/science/logic/lean2 { }; lean3 = lean; - elan = callPackage ../applications/science/logic/elan {}; + elan = callPackage ../applications/science/logic/elan { }; mathlibtools = with python3Packages; toPythonApplication mathlibtools; leo2 = callPackage ../applications/science/logic/leo2 { inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml camlp4; }; - leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix {}; + leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix { }; - logisim = callPackage ../applications/science/logic/logisim {}; + logisim = callPackage ../applications/science/logic/logisim { }; - logisim-evolution = callPackage ../applications/science/logic/logisim-evolution {}; + logisim-evolution = callPackage ../applications/science/logic/logisim-evolution { }; - ltl2ba = callPackage ../applications/science/logic/ltl2ba {}; + ltl2ba = callPackage ../applications/science/logic/ltl2ba { }; metis-prover = callPackage ../applications/science/logic/metis-prover { }; mcrl2 = callPackage ../applications/science/logic/mcrl2 { }; - minisat = callPackage ../applications/science/logic/minisat {}; + minisat = callPackage ../applications/science/logic/minisat { }; - monosat = callPackage ../applications/science/logic/monosat {}; + monosat = callPackage ../applications/science/logic/monosat { }; nusmv = callPackage ../applications/science/logic/nusmv { }; - nuXmv = callPackage ../applications/science/logic/nuXmv {}; + nuXmv = callPackage ../applications/science/logic/nuXmv { }; opensmt = callPackage ../applications/science/logic/opensmt { }; ott = callPackage ../applications/science/logic/ott { }; - picosat = callPackage ../applications/science/logic/picosat {}; + picosat = callPackage ../applications/science/logic/picosat { }; - libpoly = callPackage ../applications/science/logic/poly {}; + libpoly = callPackage ../applications/science/logic/poly { }; prooftree = callPackage ../applications/science/logic/prooftree { ocamlPackages = ocaml-ng.ocamlPackages_4_12; @@ -37234,7 +37320,7 @@ with pkgs; satallax = callPackage ../applications/science/logic/satallax { }; - saw-tools = callPackage ../applications/science/logic/saw-tools {}; + saw-tools = callPackage ../applications/science/logic/saw-tools { }; spass = callPackage ../applications/science/logic/spass { stdenv = gccStdenv; @@ -37244,7 +37330,7 @@ with pkgs; ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml; }; - tptp = callPackage ../applications/science/logic/tptp {}; + tptp = callPackage ../applications/science/logic/tptp { }; celf = callPackage ../applications/science/logic/celf { }; @@ -37252,7 +37338,7 @@ with pkgs; twelf = callPackage ../applications/science/logic/twelf { }; - verifast = callPackage ../applications/science/logic/verifast {}; + verifast = callPackage ../applications/science/logic/verifast { }; veriT = callPackage ../applications/science/logic/verit { stdenv = gccStdenv; @@ -37262,7 +37348,7 @@ with pkgs; wayback-machine-archiver = callPackage ../tools/misc/wayback-machine-archiver { }; - workcraft = callPackage ../applications/science/logic/workcraft {}; + workcraft = callPackage ../applications/science/logic/workcraft { }; yices = callPackage ../applications/science/logic/yices { gmp-static = gmp.override { withStatic = true; }; @@ -37274,7 +37360,7 @@ with pkgs; z3_4_8 z3_4_8_5; z3 = z3_4_8; - z3-tptp = callPackage ../applications/science/logic/z3/tptp.nix {}; + z3-tptp = callPackage ../applications/science/logic/z3/tptp.nix { }; zchaff = callPackage ../applications/science/logic/zchaff { }; @@ -37284,29 +37370,29 @@ with pkgs; tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix { inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml; }; - tlaplusToolbox = callPackage ../applications/science/logic/tlaplus/toolbox.nix {}; + tlaplusToolbox = callPackage ../applications/science/logic/tlaplus/toolbox.nix { }; - aiger = callPackage ../applications/science/logic/aiger {}; + aiger = callPackage ../applications/science/logic/aiger { }; - avy = callPackage ../applications/science/logic/avy {}; + avy = callPackage ../applications/science/logic/avy { }; - btor2tools = callPackage ../applications/science/logic/btor2tools {}; + btor2tools = callPackage ../applications/science/logic/btor2tools { }; - boolector = callPackage ../applications/science/logic/boolector {}; + boolector = callPackage ../applications/science/logic/boolector { }; - bitwuzla = callPackage ../applications/science/logic/bitwuzla {}; + bitwuzla = callPackage ../applications/science/logic/bitwuzla { }; - symbiyosys = callPackage ../applications/science/logic/symbiyosys {}; + symbiyosys = callPackage ../applications/science/logic/symbiyosys { }; - symfpu = callPackage ../applications/science/logic/symfpu {}; + symfpu = callPackage ../applications/science/logic/symfpu { }; - uhdm = callPackage ../applications/science/logic/uhdm {}; + uhdm = callPackage ../applications/science/logic/uhdm { }; - surelog = callPackage ../applications/science/logic/surelog {}; + surelog = callPackage ../applications/science/logic/surelog { }; - mcy = callPackage ../applications/science/logic/mcy {}; + mcy = callPackage ../applications/science/logic/mcy { }; - lingeling = callPackage ../applications/science/logic/lingeling {}; + lingeling = callPackage ../applications/science/logic/lingeling { }; ### SCIENCE / ENGINEERING @@ -37353,9 +37439,9 @@ with pkgs; fped = callPackage ../applications/science/electronics/fped { }; - gaw = callPackage ../applications/science/electronics/gaw {}; + gaw = callPackage ../applications/science/electronics/gaw { }; - horizon-eda = callPackage ../applications/science/electronics/horizon-eda {}; + horizon-eda = callPackage ../applications/science/electronics/horizon-eda { }; # this is a wrapper for kicad.base and kicad.libraries kicad = callPackage ../applications/science/electronics/kicad { }; @@ -37413,7 +37499,7 @@ with pkgs; caffeWithCuda = caffe.override { cudaSupport = true; }; - caffeine-ng = python3Packages.callPackage ../tools/X11/caffeine-ng {}; + caffeine-ng = python3Packages.callPackage ../tools/X11/caffeine-ng { }; cntk = callPackage ../applications/science/math/cntk { stdenv = gcc7Stdenv; @@ -37449,6 +37535,10 @@ with pkgs; maxima-ecl = maxima.override { lisp-compiler = ecl; }; + # old version temporarily kept for sage + maxima-ecl-5_45 = callPackage ../applications/science/math/maxima/5.45.nix { + lisp-compiler = ecl; + }; mxnet = callPackage ../applications/science/math/mxnet { inherit (linuxPackages) nvidia_x11; @@ -37465,7 +37555,7 @@ with pkgs; palp = callPackage ../applications/science/math/palp { }; - ratpoints = callPackage ../applications/science/math/ratpoints {}; + ratpoints = callPackage ../applications/science/math/ratpoints { }; calc = callPackage ../applications/science/math/calc { }; @@ -37487,7 +37577,7 @@ with pkgs; singular = callPackage ../applications/science/math/singular { }; - scilab-bin = callPackage ../applications/science/math/scilab-bin {}; + scilab-bin = callPackage ../applications/science/math/scilab-bin { }; scilla = callPackage ../tools/security/scilla { }; @@ -37564,8 +37654,6 @@ with pkgs; root = callPackage ../applications/science/misc/root { python = python3; inherit (darwin.apple_sdk.frameworks) Cocoa CoreSymbolication OpenGL; - # https://github.com/NixOS/nixpkgs/issues/201254 - stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv; }; root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix { @@ -37684,7 +37772,7 @@ with pkgs; atlantis = callPackage ../applications/networking/cluster/atlantis { }; - atmos = callPackage ../applications/networking/cluster/atmos {}; + atmos = callPackage ../applications/networking/cluster/atmos { }; fn-cli = callPackage ../applications/networking/cluster/fn-cli { }; @@ -37708,15 +37796,15 @@ with pkgs; bootil = callPackage ../development/libraries/bootil { }; - brgenml1lpr = pkgsi686Linux.callPackage ../misc/cups/drivers/brgenml1lpr {}; + brgenml1lpr = pkgsi686Linux.callPackage ../misc/cups/drivers/brgenml1lpr { }; - brgenml1cupswrapper = callPackage ../misc/cups/drivers/brgenml1cupswrapper {}; + brgenml1cupswrapper = callPackage ../misc/cups/drivers/brgenml1cupswrapper { }; brightnessctl = callPackage ../misc/brightnessctl { }; - cached-nix-shell = callPackage ../tools/nix/cached-nix-shell {}; + cached-nix-shell = callPackage ../tools/nix/cached-nix-shell { }; - calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {}; + calaos_installer = libsForQt5.callPackage ../misc/calaos/installer { }; civo = callPackage ../applications/networking/cluster/civo { }; @@ -37734,19 +37822,19 @@ with pkgs; cups-pk-helper = callPackage ../misc/cups/cups-pk-helper.nix { }; - cups-kyocera = callPackage ../misc/cups/drivers/kyocera {}; + cups-kyocera = callPackage ../misc/cups/drivers/kyocera { }; - cups-kyocera-ecosys-m2x35-40-p2x35-40dnw = callPackage ../misc/cups/drivers/kyocera-ecosys-m2x35-40-p2x35-40dnw {}; + cups-kyocera-ecosys-m2x35-40-p2x35-40dnw = callPackage ../misc/cups/drivers/kyocera-ecosys-m2x35-40-p2x35-40dnw { }; - cups-kyocera-ecosys-m552x-p502x = callPackage ../misc/cups/drivers/kyocera-ecosys-m552x-p502x {}; + cups-kyocera-ecosys-m552x-p502x = callPackage ../misc/cups/drivers/kyocera-ecosys-m552x-p502x { }; - cups-kyodialog = callPackage ../misc/cups/drivers/kyodialog {}; + cups-kyodialog = callPackage ../misc/cups/drivers/kyodialog { }; - cups-dymo = callPackage ../misc/cups/drivers/dymo {}; + cups-dymo = callPackage ../misc/cups/drivers/dymo { }; - cups-pdf-to-pdf = callPackage ../misc/cups/drivers/cups-pdf-to-pdf {}; + cups-pdf-to-pdf = callPackage ../misc/cups/drivers/cups-pdf-to-pdf { }; - cups-toshiba-estudio = callPackage ../misc/cups/drivers/estudio {}; + cups-toshiba-estudio = callPackage ../misc/cups/drivers/estudio { }; cups-zj-58 = callPackage ../misc/cups/drivers/zj-58 { }; @@ -37767,10 +37855,10 @@ with pkgs; epson-workforce-635-nx625-series = callPackage ../misc/drivers/epson-workforce-635-nx625-series { }; - foomatic-db = callPackage ../misc/cups/drivers/foomatic-db {}; - foomatic-db-engine = callPackage ../misc/cups/drivers/foomatic-db-engine {}; - foomatic-db-nonfree = callPackage ../misc/cups/drivers/foomatic-db-nonfree {}; - foomatic-db-ppds = callPackage ../misc/cups/drivers/foomatic-db-ppds {}; + foomatic-db = callPackage ../misc/cups/drivers/foomatic-db { }; + foomatic-db-engine = callPackage ../misc/cups/drivers/foomatic-db-engine { }; + foomatic-db-nonfree = callPackage ../misc/cups/drivers/foomatic-db-nonfree { }; + foomatic-db-ppds = callPackage ../misc/cups/drivers/foomatic-db-ppds { }; foomatic-db-ppds-withNonfreeDb = callPackage ../misc/cups/drivers/foomatic-db-ppds { withNonfreeDb = true; }; gutenprint = callPackage ../misc/drivers/gutenprint { }; @@ -37814,7 +37902,7 @@ with pkgs; dbus-map = callPackage ../tools/misc/dbus-map { }; - dell-530cdn = callPackage ../misc/drivers/dell-530cdn {}; + dell-530cdn = callPackage ../misc/drivers/dell-530cdn { }; deploy-rs = callPackage ../tools/package-management/deploy-rs { inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; @@ -37842,7 +37930,7 @@ with pkgs; electricsheep = callPackage ../misc/screensavers/electricsheep { }; - aaphoto = callPackage ../tools/graphics/aaphoto {}; + aaphoto = callPackage ../tools/graphics/aaphoto { }; flam3 = callPackage ../tools/graphics/flam3 { }; @@ -37880,17 +37968,17 @@ with pkgs; flockit = callPackage ../tools/backup/flockit { }; - fahclient = callPackage ../applications/science/misc/foldingathome/client.nix {}; - fahcontrol = callPackage ../applications/science/misc/foldingathome/control.nix {}; - fahviewer = callPackage ../applications/science/misc/foldingathome/viewer.nix {}; + fahclient = callPackage ../applications/science/misc/foldingathome/client.nix { }; + fahcontrol = callPackage ../applications/science/misc/foldingathome/control.nix { }; + fahviewer = callPackage ../applications/science/misc/foldingathome/viewer.nix { }; fbmark = callPackage ../tools/misc/fbmark { }; foma = callPackage ../tools/misc/foma { }; - foo2zjs = callPackage ../misc/drivers/foo2zjs {}; + foo2zjs = callPackage ../misc/drivers/foo2zjs { }; - foomatic-filters = callPackage ../misc/drivers/foomatic-filters {}; + foomatic-filters = callPackage ../misc/drivers/foomatic-filters { }; gajim = callPackage ../applications/networking/instant-messengers/gajim { inherit (gst_all_1) gstreamer gst-plugins-base gst-libav; @@ -37911,7 +37999,7 @@ with pkgs; x11Support = false; }; - glava = callPackage ../applications/misc/glava {}; + glava = callPackage ../applications/misc/glava { }; gnuk = callPackage ../misc/gnuk { gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; @@ -37924,9 +38012,9 @@ with pkgs; gotestwaf = callPackage ../tools/security/gotestwaf { }; - gotrue = callPackage ../tools/security/gotrue {}; + gotrue = callPackage ../tools/security/gotrue { }; - gotrue-supabase = callPackage ../tools/security/gotrue/supabase.nix {}; + gotrue-supabase = callPackage ../tools/security/gotrue/supabase.nix { }; gowitness = callPackage ../tools/security/gowitness { }; @@ -38091,7 +38179,7 @@ with pkgs; mongoc = callPackage ../development/libraries/mongoc { }; - mongoose = callPackage ../development/libraries/science/math/mongoose {}; + mongoose = callPackage ../development/libraries/science/math/mongoose { }; morph = callPackage ../tools/package-management/morph { }; @@ -38224,11 +38312,13 @@ with pkgs; nixos-render-docs = callPackage ../tools/nix/nixos-render-docs { }; - nixdoc = callPackage ../tools/nix/nixdoc {}; + nixdoc = callPackage ../tools/nix/nixdoc { }; dnadd = callPackage ../tools/nix/dnadd { }; - nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { }; + nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { + nix = nixVersions.nix_2_14; + }; nix-doc = callPackage ../tools/package-management/nix-doc { }; @@ -38275,9 +38365,9 @@ with pkgs; nix-update = python3Packages.callPackage ../tools/package-management/nix-update { }; - nix-update-source = callPackage ../tools/package-management/nix-update-source {}; + nix-update-source = callPackage ../tools/package-management/nix-update-source { }; - nix-script = callPackage ../tools/nix/nix-script {}; + nix-script = callPackage ../tools/nix/nix-script { }; nix-template-rpm = callPackage ../build-support/templaterpm { inherit (python2Packages) python toposort; }; @@ -38322,7 +38412,7 @@ with pkgs; extra-container = callPackage ../tools/virtualization/extra-container { }; - norwester-font = callPackage ../data/fonts/norwester {}; + norwester-font = callPackage ../data/fonts/norwester { }; nut = callPackage ../applications/misc/nut { }; @@ -38350,7 +38440,7 @@ with pkgs; i3a = callPackage ../misc/i3a { }; - lice = python3Packages.callPackage ../tools/misc/lice {}; + lice = python3Packages.callPackage ../tools/misc/lice { }; m33-linux = callPackage ../misc/drivers/m33-linux { }; @@ -38457,7 +38547,7 @@ with pkgs; redprl = callPackage ../applications/science/logic/redprl { }; - renderizer = callPackage ../development/tools/renderizer {}; + renderizer = callPackage ../development/tools/renderizer { }; rfc = callPackage ../tools/misc/rfc { }; @@ -38473,9 +38563,9 @@ with pkgs; rmfakecloud = callPackage ../servers/rmfakecloud { }; - rmfuse = callPackage ../tools/filesystems/rmfuse {}; + rmfuse = callPackage ../tools/filesystems/rmfuse { }; - rmount = callPackage ../tools/filesystems/rmount {}; + rmount = callPackage ../tools/filesystems/rmount { }; romdirfs = callPackage ../tools/filesystems/romdirfs { stdenv = gccStdenv; @@ -38561,7 +38651,7 @@ with pkgs; sane-backends = callPackage ../applications/graphics/sane/backends (config.sane or {}); - sane-drivers = callPackage ../applications/graphics/sane/drivers.nix {}; + sane-drivers = callPackage ../applications/graphics/sane/drivers.nix { }; senv = callPackage ../applications/misc/senv { }; @@ -38589,7 +38679,7 @@ with pkgs; inherit libusb1; # Shadow python.pkgs.libusb1. }; - sct = callPackage ../tools/X11/sct {}; + sct = callPackage ../tools/X11/sct { }; scylladb = callPackage ../servers/scylladb { thrift = thrift-0_10; @@ -38599,9 +38689,9 @@ with pkgs; seafile-shared = callPackage ../misc/seafile-shared { }; - ser2net = callPackage ../servers/ser2net {}; + ser2net = callPackage ../servers/ser2net { }; - serviio = callPackage ../servers/serviio {}; + serviio = callPackage ../servers/serviio { }; selinux-python = callPackage ../os-specific/linux/selinux-python { }; slock = callPackage ../misc/screensavers/slock { @@ -38614,7 +38704,7 @@ with pkgs; snscrape = with python3Packages; toPythonApplication snscrape; - soundmodem = callPackage ../applications/radio/soundmodem {}; + soundmodem = callPackage ../applications/radio/soundmodem { }; soundOfSorting = callPackage ../misc/sound-of-sorting { }; @@ -38646,7 +38736,7 @@ with pkgs; go-swagger = callPackage ../development/tools/go-swagger { }; - jx = callPackage ../applications/networking/cluster/jx {}; + jx = callPackage ../applications/networking/cluster/jx { }; prow = callPackage ../applications/networking/cluster/prow { }; @@ -38658,7 +38748,7 @@ with pkgs; tellico = libsForQt5.callPackage ../applications/misc/tellico { }; - termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {}; + termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py { }; inherit (callPackage ../applications/networking/cluster/terraform { }) mkTerraform @@ -38674,27 +38764,27 @@ with pkgs; terraforming = callPackage ../applications/networking/cluster/terraforming { }; - terraform-compliance = python3Packages.callPackage ../applications/networking/cluster/terraform-compliance {}; + terraform-compliance = python3Packages.callPackage ../applications/networking/cluster/terraform-compliance { }; - terraform-docs = callPackage ../applications/networking/cluster/terraform-docs {}; + terraform-docs = callPackage ../applications/networking/cluster/terraform-docs { }; - terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; + terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory { }; - terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {}; + terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape { }; - terragrunt = callPackage ../applications/networking/cluster/terragrunt {}; + terragrunt = callPackage ../applications/networking/cluster/terragrunt { }; - terranix = callPackage ../applications/networking/cluster/terranix {}; + terranix = callPackage ../applications/networking/cluster/terranix { }; - terraspace = callPackage ../applications/networking/cluster/terraspace {}; + terraspace = callPackage ../applications/networking/cluster/terraspace { }; - tfswitch = callPackage ../applications/networking/cluster/tfswitch {}; + tfswitch = callPackage ../applications/networking/cluster/tfswitch { }; - tgswitch = callPackage ../applications/networking/cluster/tgswitch {}; + tgswitch = callPackage ../applications/networking/cluster/tgswitch { }; tilt = callPackage ../applications/networking/cluster/tilt { }; - timeular = callPackage ../applications/office/timeular {}; + timeular = callPackage ../applications/office/timeular { }; tewi-font = callPackage ../data/fonts/tewi { }; @@ -38702,7 +38792,7 @@ with pkgs; ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; }; - vcluster = callPackage ../applications/networking/cluster/vcluster {}; + vcluster = callPackage ../applications/networking/cluster/vcluster { }; vnote = libsForQt5.callPackage ../applications/office/vnote { }; @@ -38720,7 +38810,7 @@ with pkgs; thinkfan = callPackage ../tools/system/thinkfan { }; - touchosc = callPackage ../applications/audio/touchosc {}; + touchosc = callPackage ../applications/audio/touchosc { }; tp-auto-kbbl = callPackage ../tools/system/tp-auto-kbbl { }; @@ -38758,6 +38848,8 @@ with pkgs; unixcw = libsForQt5.callPackage ../applications/radio/unixcw { }; + valent = callPackage ../applications/misc/valent { }; + vault = callPackage ../tools/security/vault { }; vault-medusa = callPackage ../tools/security/vault-medusa { }; @@ -38894,7 +38986,7 @@ with pkgs; with-shell = callPackage ../applications/misc/with-shell { }; - wizer = darwin.apple_sdk_11_0.callPackage ../development/tools/wizer {}; + wizer = darwin.apple_sdk_11_0.callPackage ../development/tools/wizer { }; wmutils-core = callPackage ../tools/X11/wmutils-core { }; @@ -38928,7 +39020,7 @@ with pkgs; inherit (darwin.stubs) setfile; }; - x11idle = callPackage ../tools/misc/x11idle {}; + x11idle = callPackage ../tools/misc/x11idle { }; x11docker = callPackage ../applications/virtualization/x11docker { }; @@ -38990,7 +39082,7 @@ with pkgs; xwiimote = callPackage ../misc/drivers/xwiimote { }; - xzoom = callPackage ../tools/X11/xzoom {}; + xzoom = callPackage ../tools/X11/xzoom { }; yabai = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/yabai { inherit (darwin.apple_sdk_11_0.frameworks) SkyLight Cocoa Carbon ScriptingBridge; @@ -39018,7 +39110,7 @@ with pkgs; yatas = callPackage ../tools/security/yatas { }; - yaxg = callPackage ../tools/graphics/yaxg {}; + yaxg = callPackage ../tools/graphics/yaxg { }; zap = callPackage ../tools/networking/zap { }; @@ -39085,11 +39177,11 @@ with pkgs; branch = "canary"; }; - golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah {}; + golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah { }; linkchecker = callPackage ../tools/networking/linkchecker { }; - tomb = callPackage ../os-specific/linux/tomb {}; + tomb = callPackage ../os-specific/linux/tomb { }; sccache = callPackage ../development/tools/misc/sccache { inherit (darwin.apple_sdk.frameworks) Security; @@ -39097,15 +39189,15 @@ with pkgs; sequeler = callPackage ../applications/misc/sequeler { }; - sequelpro = callPackage ../applications/misc/sequelpro {}; + sequelpro = callPackage ../applications/misc/sequelpro { }; - snowsql = callPackage ../applications/misc/snowsql {}; + snowsql = callPackage ../applications/misc/snowsql { }; - snowmachine = python3Packages.callPackage ../applications/misc/snowmachine {}; + snowmachine = python3Packages.callPackage ../applications/misc/snowmachine { }; - sidequest = callPackage ../applications/misc/sidequest {}; + sidequest = callPackage ../applications/misc/sidequest { }; - maphosts = callPackage ../tools/networking/maphosts {}; + maphosts = callPackage ../tools/networking/maphosts { }; zimg = callPackage ../development/libraries/zimg { }; @@ -39113,7 +39205,7 @@ with pkgs; zk-shell = callPackage ../applications/misc/zk-shell { }; - tora = libsForQt5.callPackage ../development/tools/tora {}; + tora = libsForQt5.callPackage ../development/tools/tora { }; xulrunner = firefox-unwrapped; @@ -39138,33 +39230,33 @@ with pkgs; vdr = callPackage ../applications/video/vdr { }; vdrPlugins = recurseIntoAttrs (callPackage ../applications/video/vdr/plugins.nix { }); - wrapVdr = callPackage ../applications/video/vdr/wrapper.nix {}; + wrapVdr = callPackage ../applications/video/vdr/wrapper.nix { }; - chrome-export = callPackage ../tools/misc/chrome-export {}; + chrome-export = callPackage ../tools/misc/chrome-export { }; - chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing {}; + chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing { }; - NSPlist = callPackage ../development/libraries/NSPlist {}; + NSPlist = callPackage ../development/libraries/NSPlist { }; PlistCpp = callPackage ../development/libraries/PlistCpp { boost = boost172; }; - xib2nib = callPackage ../development/tools/xib2nib {}; + xib2nib = callPackage ../development/tools/xib2nib { }; - linode-cli = python3Packages.callPackage ../tools/virtualization/linode-cli {}; + linode-cli = python3Packages.callPackage ../tools/virtualization/linode-cli { }; - hss = callPackage ../tools/networking/hss {}; + hss = callPackage ../tools/networking/hss { }; - undaemonize = callPackage ../tools/system/undaemonize {}; + undaemonize = callPackage ../tools/system/undaemonize { }; wtfis = callPackage ../tools/networking/wtfis { }; - houdini = callPackage ../applications/misc/houdini {}; + houdini = callPackage ../applications/misc/houdini { }; - openfst = callPackage ../development/libraries/openfst {}; + openfst = callPackage ../development/libraries/openfst { }; - opengrm-ngram = callPackage ../development/libraries/opengrm-ngram {}; + opengrm-ngram = callPackage ../development/libraries/opengrm-ngram { }; openring = callPackage ../applications/misc/openring { }; @@ -39189,15 +39281,15 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; - dnstake = callPackage ../tools/networking/dnstake {}; + dnstake = callPackage ../tools/networking/dnstake { }; dnstracer = callPackage ../tools/networking/dnstracer { inherit (darwin) libresolv; }; - dnstwist = callPackage ../tools/networking/dnstwist {}; + dnstwist = callPackage ../tools/networking/dnstwist { }; - dsniff = callPackage ../tools/networking/dsniff {}; + dsniff = callPackage ../tools/networking/dsniff { }; wal-g = callPackage ../tools/backup/wal-g { }; @@ -39237,12 +39329,12 @@ with pkgs; name = "bsd-setup-hook"; } ../os-specific/bsd/setup-hook.sh; - freebsd = callPackage ../os-specific/bsd/freebsd {}; + freebsd = callPackage ../os-specific/bsd/freebsd { }; freebsdCross = callPackage ../os-specific/bsd/freebsd { stdenv = crossLibcStdenv; }; - netbsd = callPackage ../os-specific/bsd/netbsd {}; + netbsd = callPackage ../os-specific/bsd/netbsd { }; netbsdCross = callPackage ../os-specific/bsd/netbsd { stdenv = crossLibcStdenv; }; @@ -39261,9 +39353,9 @@ with pkgs; tsukae = callPackage ../applications/misc/tsukae { }; - tsung = callPackage ../applications/networking/tsung {}; + tsung = callPackage ../applications/networking/tsung { }; - bcompare = libsForQt5.callPackage ../applications/version-management/bcompare {}; + bcompare = libsForQt5.callPackage ../applications/version-management/bcompare { }; xp-pen-deco-01-v2-driver = libsForQt5.xp-pen-deco-01-v2-driver; @@ -39286,7 +39378,7 @@ with pkgs; omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { }; - wasmtime = callPackage ../development/interpreters/wasmtime {}; + wasmtime = callPackage ../development/interpreters/wasmtime { }; wfuzz = with python3Packages; toPythonApplication wfuzz; @@ -39300,7 +39392,7 @@ with pkgs; buildGoModule = buildGo118Module; # tests fail with 1.19 }; - zfs-prune-snapshots = callPackage ../tools/backup/zfs-prune-snapshots {}; + zfs-prune-snapshots = callPackage ../tools/backup/zfs-prune-snapshots { }; zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { }; @@ -39308,65 +39400,67 @@ with pkgs; zrepl = callPackage ../tools/backup/zrepl { }; - uhubctl = callPackage ../tools/misc/uhubctl {}; + uhubctl = callPackage ../tools/misc/uhubctl { }; kodelife = callPackage ../applications/graphics/kodelife { inherit (gst_all_1) gstreamer gst-plugins-base; }; - bunnyfetch = callPackage ../tools/misc/bunnyfetch {}; + bunnyfetch = callPackage ../tools/misc/bunnyfetch { }; - _3proxy = callPackage ../applications/networking/3proxy {}; + _3proxy = callPackage ../applications/networking/3proxy { }; - pigeon = callPackage ../development/tools/pigeon {}; + pigeon = callPackage ../development/tools/pigeon { }; - verifpal = callPackage ../tools/security/verifpal {}; + verifpal = callPackage ../tools/security/verifpal { }; - nix-store-gcs-proxy = callPackage ../tools/nix/nix-store-gcs-proxy {}; + nix-store-gcs-proxy = callPackage ../tools/nix/nix-store-gcs-proxy { }; webwormhole = callPackage ../tools/networking/webwormhole { }; werf = callPackage ../applications/networking/cluster/werf { }; - wifi-password = callPackage ../os-specific/darwin/wifi-password {}; + wifi-password = callPackage ../os-specific/darwin/wifi-password { }; - qubes-core-vchan-xen = callPackage ../applications/qubes/qubes-core-vchan-xen {}; + qubes-core-vchan-xen = callPackage ../applications/qubes/qubes-core-vchan-xen { }; - coz = callPackage ../development/tools/analysis/coz {}; + coz = callPackage ../development/tools/analysis/coz { }; - keycard-cli = callPackage ../tools/security/keycard-cli {}; + keycard-cli = callPackage ../tools/security/keycard-cli { }; sieveshell = with python3.pkgs; toPythonApplication managesieve; - gortr = callPackage ../servers/gortr {}; + gortr = callPackage ../servers/gortr { }; - stayrtr = callPackage ../servers/stayrtr {}; + stayrtr = callPackage ../servers/stayrtr { }; - sunshine = callPackage ../servers/sunshine {}; + sunshine = callPackage ../servers/sunshine { + ffmpeg_5-full = ffmpeg_5-full.override { nv-codec-headers = nv-codec-headers-11; }; + }; - sentencepiece = callPackage ../development/libraries/sentencepiece {}; + sentencepiece = callPackage ../development/libraries/sentencepiece { }; kaf = callPackage ../development/tools/kaf { }; kcli = callPackage ../development/tools/kcli { }; - pxlib = callPackage ../development/libraries/pxlib {}; + pxlib = callPackage ../development/libraries/pxlib { }; - pxview = callPackage ../development/tools/pxview {}; + pxview = callPackage ../development/tools/pxview { }; - unstick = callPackage ../os-specific/linux/unstick {}; + unstick = callPackage ../os-specific/linux/unstick { }; - quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; + quartus-prime-lite = callPackage ../applications/editors/quartus-prime { }; - usb-blaster-udev-rules = callPackage ../os-specific/linux/usb-blaster-udev-rules {}; + usb-blaster-udev-rules = callPackage ../os-specific/linux/usb-blaster-udev-rules { }; go-license-detector = callPackage ../development/tools/misc/go-license-detector { }; hashdeep = callPackage ../tools/security/hashdeep { }; - pdf-parser = callPackage ../tools/misc/pdf-parser {}; + pdf-parser = callPackage ../tools/misc/pdf-parser { }; - fluxboxlauncher = callPackage ../applications/misc/fluxboxlauncher {}; + fluxboxlauncher = callPackage ../applications/misc/fluxboxlauncher { }; btcdeb = callPackage ../applications/blockchains/btcdeb { }; @@ -39378,11 +39472,11 @@ with pkgs; jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { }; - zenstates = callPackage ../os-specific/linux/zenstates {}; + zenstates = callPackage ../os-specific/linux/zenstates { }; - ryzenadj = callPackage ../os-specific/linux/ryzenadj {}; + ryzenadj = callPackage ../os-specific/linux/ryzenadj { }; - vpsfree-client = callPackage ../tools/virtualization/vpsfree-client {}; + vpsfree-client = callPackage ../tools/virtualization/vpsfree-client { }; gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; @@ -39394,7 +39488,7 @@ with pkgs; texlive = texlive.combined.scheme-medium; }; - unpoller = callPackage ../servers/monitoring/unpoller {}; + unpoller = callPackage ../servers/monitoring/unpoller { }; fac-build = callPackage ../development/tools/build-managers/fac { inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -39408,9 +39502,9 @@ with pkgs; wlroots = wlroots_0_15; }; - psftools = callPackage ../os-specific/linux/psftools {}; + psftools = callPackage ../os-specific/linux/psftools { }; - lc3tools = callPackage ../development/tools/lc3tools {}; + lc3tools = callPackage ../development/tools/lc3tools { }; ldid = callPackage ../development/tools/ldid { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; @@ -39428,9 +39522,9 @@ with pkgs; ymuse = callPackage ../applications/audio/ymuse { }; - zk = callPackage ../applications/office/zk {}; + zk = callPackage ../applications/office/zk { }; - zktree = callPackage ../applications/misc/zktree {}; + zktree = callPackage ../applications/misc/zktree { }; zram-generator = callPackage ../tools/system/zram-generator { }; @@ -39458,7 +39552,7 @@ with pkgs; alsa-scarlett-gui = callPackage ../applications/audio/alsa-scarlett-gui { }; - flac2all = callPackage ../applications/audio/flac2all {}; + flac2all = callPackage ../applications/audio/flac2all { }; tuner = callPackage ../applications/audio/tuner { }; diff --git a/third_party/nixpkgs/pkgs/top-level/dotnet-packages.nix b/third_party/nixpkgs/pkgs/top-level/dotnet-packages.nix index bdf8faa66f..d62ebf9518 100644 --- a/third_party/nixpkgs/pkgs/top-level/dotnet-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/dotnet-packages.nix @@ -333,13 +333,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { Nuget = buildDotnetPackage rec { pname = "Nuget"; - version = "5.6.0.6489"; + version = "6.3.1.1"; src = fetchFromGitHub { owner = "mono"; repo = "linux-packaging-nuget"; rev = "upstream/${version}.bin"; - sha256 = "sha256-71vjM7a+F0DNTY+dML3UBSkrVyXv/k5rdl7iXBKSpNM="; + sha256 = "sha256-D7F4B23HK5ElY68PYKVDsyi8OF0DLqqUqQzj5CpMfkc="; }; # configurePhase breaks the binary and results in diff --git a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix index f4f526cc48..7eda3c5ddc 100644 --- a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -25,6 +25,8 @@ let "ghc943" "ghc944" "ghc94" + "ghc96" + "ghc961" "ghcHEAD" ]; @@ -40,6 +42,8 @@ let "ghc942" "ghc943" "ghc944" + "ghc96" + "ghc961" "ghcHEAD" ]; @@ -225,7 +229,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc92 = ghc926; + ghc92 = ghc927; ghc942 = callPackage ../development/compilers/ghc/9.4.2.nix { bootPkgs = # Building with 9.2 is broken due to @@ -299,6 +303,27 @@ in { llvmPackages = pkgs.llvmPackages_12; }; ghc94 = ghc944; + ghc961 = callPackage ../development/compilers/ghc/9.6.1.nix { + bootPkgs = + # For GHC 9.2 no armv7l bindists are available. + if stdenv.hostPlatform.isAarch32 then + packages.ghc924 + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc924 + else if stdenv.isAarch64 then + packages.ghc924BinaryMinimal + else + packages.ghc924Binary; + inherit (buildPackages.python3Packages) sphinx; + # Need to use apple's patched xattr until + # https://github.com/xattr/xattr/issues/44 and + # https://github.com/xattr/xattr/issues/55 are solved. + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; + # Support range >= 10 && < 15 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_14; + llvmPackages = pkgs.llvmPackages_14; + }; + ghc96 = ghc961; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. @@ -315,7 +340,7 @@ in { # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - # 2022-08-04: Support range >= 10 && < 15 + # 2023-01-15: Support range >= 10 && < 15 buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_14; llvmPackages = pkgs.llvmPackages_14; }; @@ -434,7 +459,7 @@ in { ghc = bh.compiler.ghc927; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; }; - ghc92 = ghc926; + ghc92 = ghc927; ghc942 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc942; ghc = bh.compiler.ghc942; @@ -451,6 +476,12 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; ghc94 = ghc942; + ghc961 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc961; + ghc = bh.compiler.ghc961; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; + }; + ghc96 = ghc961; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; diff --git a/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix b/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix index 7891669e0f..3b948080c0 100644 --- a/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix @@ -9,7 +9,7 @@ in let self = rec { addonDir = "/share/kodi/addons"; - rel = "Matrix"; + rel = "Nexus"; callPackage = newScope self; diff --git a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix index acb5b3d174..14767d88c1 100644 --- a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix +++ b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix @@ -342,6 +342,10 @@ in { intel-speed-select = if lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null; + ipu6-drivers = callPackage ../os-specific/linux/ipu6-drivers {}; + + ivsc-driver = callPackage ../os-specific/linux/ivsc-driver {}; + ixgbevf = callPackage ../os-specific/linux/ixgbevf {}; it87 = callPackage ../os-specific/linux/it87 {}; diff --git a/third_party/nixpkgs/pkgs/top-level/nim-packages.nix b/third_party/nixpkgs/pkgs/top-level/nim-packages.nix index ecc5a9e0bb..0b7eb960b7 100644 --- a/third_party/nixpkgs/pkgs/top-level/nim-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/nim-packages.nix @@ -30,10 +30,16 @@ lib.makeScope newScope (self: chroma = callPackage ../development/nim-packages/chroma { }; + coap = callPackage ../development/nim-packages/coap { }; + docopt = callPackage ../development/nim-packages/docopt { }; + eris = callPackage ../development/nim-packages/eris { }; + flatty = callPackage ../development/nim-packages/flatty { }; + freedesktop_org = callPackage ../development/nim-packages/freedesktop_org { }; + frosty = callPackage ../development/nim-packages/frosty { }; getdns = callPackage ../development/nim-packages/getdns { @@ -73,6 +79,8 @@ lib.makeScope newScope (self: pixie = callPackage ../development/nim-packages/pixie { }; + preserves = callPackage ../development/nim-packages/preserves { }; + redis = callPackage ../development/nim-packages/redis { }; redpool = callPackage ../development/nim-packages/redpool { }; @@ -83,6 +91,8 @@ lib.makeScope newScope (self: inherit (pkgs) rocksdb; }; + safeset = callPackage ../development/nim-packages/safeset { }; + sass = callPackage ../development/nim-packages/sass { }; sdl2 = callPackage ../development/nim-packages/sdl2 { }; @@ -100,6 +110,8 @@ lib.makeScope newScope (self: supersnappy = callPackage ../development/nim-packages/supersnappy { }; + syndicate = callPackage ../development/nim-packages/syndicate { }; + taps = callPackage ../development/nim-packages/taps { }; tempfile = callPackage ../development/nim-packages/tempfile { }; @@ -114,6 +126,8 @@ lib.makeScope newScope (self: vmath = callPackage ../development/nim-packages/vmath { }; + x11 = callPackage ../development/nim-packages/x11 { }; + zippy = callPackage ../development/nim-packages/zippy { }; }) diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index 7fb8e25519..4015e00132 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -312,6 +312,10 @@ let dns-client = callPackage ../development/ocaml-modules/dns/client.nix { }; + dns-client-lwt = callPackage ../development/ocaml-modules/dns/client-lwt.nix { }; + + dns-client-mirage = callPackage ../development/ocaml-modules/dns/client-mirage.nix { }; + dns-mirage = callPackage ../development/ocaml-modules/dns/mirage.nix { }; dns-resolver = callPackage ../development/ocaml-modules/dns/resolver.nix { }; @@ -479,7 +483,7 @@ let }; ffmpeg-avdevice = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix { inherit (pkgs) ffmpeg; - inherit (pkgs.darwin.apple_sdk.frameworks) AppKit AudioToolbox Cocoa CoreImage ForceFeedback OpenGL VideoToolbox; + inherit (pkgs.darwin.apple_sdk.frameworks) AppKit AudioToolbox AVFoundation Cocoa CoreImage ForceFeedback OpenGL VideoToolbox; }; fiber = callPackage ../development/ocaml-modules/fiber { }; @@ -565,6 +569,8 @@ let hpack = callPackage ../development/ocaml-modules/hpack { }; + http-mirage-client = callPackage ../development/ocaml-modules/http-mirage-client { }; + hxd = callPackage ../development/ocaml-modules/hxd { }; imagelib = callPackage ../development/ocaml-modules/imagelib { }; @@ -609,8 +615,6 @@ let git-binary = pkgs.git; }; - gmetadom = callPackage ../development/ocaml-modules/gmetadom { }; - graphics = if lib.versionOlder "4.09" ocaml.version then callPackage ../development/ocaml-modules/graphics { } @@ -751,6 +755,8 @@ let letsencrypt-dns = callPackage ../development/ocaml-modules/letsencrypt/dns.nix { }; + letsencrypt-mirage = callPackage ../development/ocaml-modules/letsencrypt/mirage.nix { }; + lilv = callPackage ../development/ocaml-modules/lilv { inherit (pkgs) lilv; }; @@ -906,6 +912,8 @@ let mirage-crypto-rng-async = callPackage ../development/ocaml-modules/mirage-crypto/rng-async.nix { }; + mirage-crypto-rng-lwt = callPackage ../development/ocaml-modules/mirage-crypto/rng-lwt.nix { }; + mirage-crypto-rng-mirage = callPackage ../development/ocaml-modules/mirage-crypto/rng-mirage.nix { }; mirage-device = callPackage ../development/ocaml-modules/mirage-device { }; @@ -1294,6 +1302,8 @@ let tls-async = callPackage ../development/ocaml-modules/tls/async.nix { }; + tls-lwt = callPackage ../development/ocaml-modules/tls/lwt.nix { }; + tls-mirage = callPackage ../development/ocaml-modules/tls/mirage.nix { }; torch = callPackage ../development/ocaml-modules/torch { diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index c75df40fce..ab1469d3c0 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -303,6 +303,8 @@ let url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.17.tar.gz"; hash = "sha256-c7RSRPC1w25TMsM1abgqGrLDPiY/HQB4XSADvK7GjbM="; }; + strictDeps = true; + nativeBuildInputs = [ pkgs.pkg-config ]; propagatedBuildInputs = [ AlienBuild ]; buildInputs = [ pkgs.libxml2 MojoDOM58 SortVersions Test2Suite URI ]; meta = { diff --git a/third_party/nixpkgs/pkgs/top-level/php-packages.nix b/third_party/nixpkgs/pkgs/top-level/php-packages.nix index f819d2fd36..af4f288bb7 100644 --- a/third_party/nixpkgs/pkgs/top-level/php-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/php-packages.nix @@ -244,6 +244,8 @@ lib.makeScope pkgs.newScope (self: with self; { mongodb = callPackage ../development/php-packages/mongodb { }; + msgpack = callPackage ../development/php-packages/msgpack { }; + oci8 = callPackage ../development/php-packages/oci8 { }; openswoole = callPackage ../development/php-packages/openswoole { }; @@ -286,6 +288,8 @@ lib.makeScope pkgs.newScope (self: with self; { sqlsrv = callPackage ../development/php-packages/sqlsrv { }; + ssh2 = callPackage ../development/php-packages/ssh2 { }; + swoole = callPackage ../development/php-packages/swoole { }; xdebug = callPackage ../development/php-packages/xdebug { }; diff --git a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix index 6537b06d26..b251be559d 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix @@ -38,17 +38,24 @@ mapAliases ({ ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30 anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 argon2_cffi = argon2-cffi; # added 2022-05-09 + APScheduler = apscheduler; # added 2023-02-19 asyncio-nats-client = nats-py; # added 2022-02-08 awkward0 = throw "awkward0 has been removed, use awkward instead"; # added 2022-12-13 Babel = babel; # added 2022-05-06 bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15 + BlinkStick = blinkstick; # added 2023-02-19 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 bsblan = python-bsblan; # added 2022-11-04 + btchip = btchip-python; # added 2023-03-03 bt_proximity = bt-proximity; # added 2021-07-02 + BTrees = btrees; # added 2023-02-19 carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18 + cchardet = faust-cchardet; # added 2023-03-02 class-registry = phx-class-registry; # added 2021-10-05 codespell = throw "codespell has been promoted to a top-level attribute"; # Added 2022-10-02 + ColanderAlchemy = colanderalchemy; # added 2023-02-19 + CommonMark = commonmark; # added 2023-02-1 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 cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23 @@ -77,7 +84,9 @@ mapAliases ({ 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 + EasyProcess = easyprocess; # added 2023-02-19 email_validator = email-validator; # added 2022-06-22 + Fabric = fabric; # addedd 2023-02-19 face_recognition = face-recognition; # added 2022-10-15 face_recognition_models = face-recognition-models; # added 2022-10-15 fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30 @@ -89,10 +98,12 @@ mapAliases ({ flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20 flask_testing = flask-testing; # added 2022-04-25 flask_wtf = flask-wtf; # added 2022-05-24 + FormEncode = formencode; # added 2023-02-19 functorch = throw "functorch is now part of the torch package and has therefore been removed. See https://github.com/pytorch/functorch/releases/tag/v1.13.0 for more info."; # added 2022-12-01 garages-amsterdam = throw "garages-amsterdam has been renamed odp-amsterdam."; # added 2023-01-04 garminconnect-ha = garminconnect; # added 2022-02-05 gdtoolkit = throw "gdtoolkit has been promoted to a top-level attribute"; # added 2023-02-15 + GeoIP = geoip; # added 2023-02-19 gigalixir = throw "gigalixir has been promoted to a top-level attribute"; # Added 2022-10-02 gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 GitPython = gitpython; # added 2022-10-28 @@ -109,24 +120,29 @@ mapAliases ({ hangups = throw "hangups was removed because Google Hangouts has been shut down"; # added 2023-02-13 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 + HTSeq = htseq; # added 2023-02-19 hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29 IMAPClient = imapclient; # added 2021-10-28 imdbpy = throw "imdbpy has been renamed to cinemagoer"; # added 2022-08-08 ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 itanium_demangler = itanium-demangler; # added 2022-1017 + JayDeBeApi = jaydebeapi; # added 2023-02-19 jinja2_time = jinja2-time; # added 2022-11-07 + JPype1 = jpype1; # added 2023-02-19 jupyter_client = jupyter-client; # added 2021-10-15 jupyter_core = jupyter-core; # added 2023-01-05 jupyter_server = jupyter-server; # added 2023-01-05 + Kajiki = kajiki; # added 2023-02-19 Keras = keras; # added 2021-11-25 ldap = python-ldap; # added 2022-09-16 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29 logilab_common = logilab-common; # added 2022-11-21 loo-py = loopy; # added 2022-05-03 + Mako = mako; # added 2023-02-19 Markups = markups; # added 2022-02-14 - MDP = mdp; # added 2023-02-24 + MDP = mdp; # added 2023-02-19 MechanicalSoup = mechanicalsoup; # added 2021-06-01 memcached = python-memcached; # added 2022-05-06 mailman = throw "Please use pkgs.mailman"; # added 2022-04-29 @@ -140,6 +156,8 @@ mapAliases ({ nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 nose_progressive = throw "nose_progressive has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; #added 2023-02-21 notifymuch = throw "notifymuch has been promoted to a top-level attribute"; # added 2022-10-02 + Nuitka = nuitka; # added 2023-02-19 + ntlm-auth = throw "ntlm-auth has been removed, because it relies on the md4 implementation provided by openssl. Use pyspnego instead."; ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28 pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19 pam = python-pam; # added 2020-09-07. @@ -158,11 +176,14 @@ mapAliases ({ protonup = protonup-ng; # Added 2022-11-06 pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 pushbullet = pushbullet-py; # Added 2022-10-15 + Pweave = pweave; # added 2023-02-19 pyalmond = throw "pyalmond has been removed, since its API endpoints have been shutdown"; # added 2023-02-02 pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01 + PyGithub = pygithub; # added 2023-02-19 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 pychef = throw "pychef has been removed because it's been archived upstream and abandoned since 2017."; # added 2022-11-14 + PyChromecast = pychromecast; # added 2023-02-19 pycryptodome-test-vectors = throw "pycryptodome-test-vectors has been removed because it is an internal package to pycryptodome"; # added 2022-05-28 pyflunearyou = pyoutbreaksnearme; # added 2023-02-11 pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07 @@ -173,6 +194,7 @@ mapAliases ({ PyLD = pyld; # added 2022-06-22 pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 + PyMVGLive = pymvglive; # added 2023-02-19 pyramid_hawkauth = throw "pyramid_hawkauth has been removed because it is no longer maintained"; # added 2023-02-2 pyreadability = readability-lxml; # added 2022-05-24 pyroute2-core = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 @@ -183,9 +205,13 @@ mapAliases ({ pyroute2-nftables = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 pyroute2-nslink = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 pyroute2-protocols = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 + Pyro4 = pyro4; # added 2023-02-19 + Pyro5 = pyro5; # added 2023-02-19 + PyRSS2Gen = pyrss2gen; # added 2023-02-19 pysmart-smartx = pysmart; # added 2021-10-22 pysparse = throw "pysparse has been abandoned upstream."; # added 2023-02-28 pyspotify = throw "pyspotify has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29 + PyStemmer = pystemmer; # added 2023-02-19 pytest_6 = pytest; # added 2022-02-10 pytestcov = pytest-cov; # added 2021-01-04 pytest-pep8 = pytestpep8; # added 2021-01-04 @@ -208,7 +234,9 @@ mapAliases ({ pytorchWithCuda = torchWithCuda; # added 2022-09-30 pytorchWithoutCuda = torchWithoutCuda; # added 2022-09-30 pytwitchapi = twitchapi; # added 2022-03-07 + PyVirtualDisplay = pyvirtualdisplay; # added 2023-02-19 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 + Quandl = quandl; # added 2023-02-19 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 repeated_test = repeated-test; # added 2022-11-15 @@ -230,7 +258,9 @@ mapAliases ({ smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 somecomfort = throw "somecomfort was removed because Home Assistant switched to aiosomecomfort"; # added 2023-02-01 SPARQLWrapper = sparqlwrapper; + sphinx-jquery = sphinxcontrib-jquery; # added 2023-02-24 sphinx_rtd_theme = sphinx-rtd-theme; # added 2022-08-03 + sphinxcontrib-autoapi = sphinx-autoapi; # added 2023-02=28 sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02 sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28 SQLAlchemy-ImageAttach = throw "sqlalchemy-imageattach has been removed as it is incompatible with sqlalchemy 1.4 and unmaintained"; # added 2022-04-23 @@ -242,6 +272,9 @@ mapAliases ({ tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25 tensorflow-tensorboard = tensorboard; # added 2022-03-06 tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25 + Theano = theano; # added 2023-02-19 + TheanoWithCuda = theanoWithCuda; # added 2023-02-19 + TheanoWithoutCuda = theanoWithoutCuda; # added 2023-02-19 transip = throw "transip has been removed because it is no longer maintained. TransIP SOAP V5 API was marked as deprecated"; # added 2023-02-27 tumpa = throw "tumpa was promoted to a top-level attribute"; # added 2022-11-19 tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 @@ -256,7 +289,10 @@ mapAliases ({ weakrefmethod = throw "weakrefmethod was removed since it's not needed in Python >= 3.4"; # added 2022-12-01 webapp2 = throw "webapp2 is unmaintained since 2012"; # added 2022-05-29 websocket_client = websocket-client; # added 2021-06-15 + WSME = wsme; # added 2023-02-19 xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31 + XlsxWriter = xlsxwriter; # added 2023-02-19 + Yapsy = yapsy; # added 2023-02-19 zc-buildout221 = zc-buildout; # added 2021-07-21 zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; }) diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index d200757218..de3f2ba61f 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -558,7 +558,7 @@ self: super: with self; { aprslib = callPackage ../development/python-modules/aprslib { }; - APScheduler = callPackage ../development/python-modules/APScheduler { }; + apscheduler = callPackage ../development/python-modules/apscheduler { }; apsw = callPackage ../development/python-modules/apsw { }; @@ -1209,6 +1209,10 @@ self: super: with self; { bbox = callPackage ../development/python-modules/bbox { }; + bc-detect-secrets = callPackage ../development/python-modules/bc-detect-secrets { }; + + bc-jsonpath-ng = callPackage ../development/python-modules/bc-jsonpath-ng { }; + bc-python-hcl2 = callPackage ../development/python-modules/bc-python-hcl2 { }; bcdoc = callPackage ../development/python-modules/bcdoc { }; @@ -1342,7 +1346,7 @@ self: super: with self; { blinkpy = callPackage ../development/python-modules/blinkpy { }; - BlinkStick = callPackage ../development/python-modules/blinkstick { }; + blinkstick = callPackage ../development/python-modules/blinkstick { }; blis = callPackage ../development/python-modules/blis { }; @@ -1354,6 +1358,8 @@ self: super: with self; { blocksat-cli = callPackage ../development/python-modules/blocksat-cli { }; + blosc2 = callPackage ../development/python-modules/blosc2 { }; + blspy = callPackage ../development/python-modules/blspy { }; bluemaestro-ble = callPackage ../development/python-modules/bluemaestro-ble { }; @@ -1469,13 +1475,13 @@ self: super: with self; { bsuite = callPackage ../development/python-modules/bsuite { }; - btchip = callPackage ../development/python-modules/btchip { }; + btchip-python = callPackage ../development/python-modules/btchip-python { }; bthome-ble = callPackage ../development/python-modules/bthome-ble { }; bt-proximity = callPackage ../development/python-modules/bt-proximity { }; - BTrees = callPackage ../development/python-modules/btrees { }; + btrees = callPackage ../development/python-modules/btrees { }; btrfs = callPackage ../development/python-modules/btrfs { }; @@ -1621,8 +1627,6 @@ self: super: with self; { cccolutils = callPackage ../development/python-modules/cccolutils { }; - cchardet = callPackage ../development/python-modules/cchardet { }; - cdcs = callPackage ../development/python-modules/cdcs { }; celery = callPackage ../development/python-modules/celery { }; @@ -1931,7 +1935,7 @@ self: super: with self; { coinmetrics-api-client = callPackage ../development/python-modules/coinmetrics-api-client { }; - ColanderAlchemy = callPackage ../development/python-modules/colanderalchemy { }; + colanderalchemy = callPackage ../development/python-modules/colanderalchemy { }; colander = callPackage ../development/python-modules/colander { }; @@ -1975,7 +1979,7 @@ self: super: with self; { commoncode = callPackage ../development/python-modules/commoncode { }; - CommonMark = callPackage ../development/python-modules/commonmark { }; + commonmark = callPackage ../development/python-modules/commonmark { }; compiledb = callPackage ../development/python-modules/compiledb { }; @@ -2115,7 +2119,6 @@ self: super: with self; { cryptography = callPackage ../development/python-modules/cryptography { inherit (pkgs.darwin) libiconv; inherit (pkgs.darwin.apple_sdk.frameworks) Security; - openssl = pkgs.openssl_1_1; }; cryptolyzer = callPackage ../development/python-modules/cryptolyzer { }; @@ -2217,6 +2220,8 @@ self: super: with self; { daemonocle = callPackage ../development/python-modules/daemonocle { }; + daiquiri = callPackage ../development/python-modules/daiquiri { }; + dalle-mini = callPackage ../development/python-modules/dalle-mini { }; daphne = callPackage ../development/python-modules/daphne { }; @@ -2936,6 +2941,8 @@ self: super: with self; { dvc-data = callPackage ../development/python-modules/dvc-data { }; + dvc-http = callPackage ../development/python-modules/dvc-http { }; + dvc-objects = callPackage ../development/python-modules/dvc-objects { }; dvc-render = callPackage ../development/python-modules/dvc-render { }; @@ -2962,7 +2969,7 @@ self: super: with self; { easyocr = callPackage ../development/python-modules/easyocr { }; - EasyProcess = callPackage ../development/python-modules/easyprocess { }; + easyprocess = callPackage ../development/python-modules/easyprocess { }; easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { }; @@ -3139,6 +3146,10 @@ self: super: with self; { etcd = callPackage ../development/python-modules/etcd { }; + etcd3 = callPackage ../development/python-modules/etcd3 { + inherit (pkgs) etcd; + }; + ete3 = callPackage ../development/python-modules/ete3 { }; etelemetry = callPackage ../development/python-modules/etelemetry { }; @@ -3260,7 +3271,7 @@ self: super: with self; { f90nml = callPackage ../development/python-modules/f90nml { }; - Fabric = callPackage ../development/python-modules/Fabric { }; + fabric = callPackage ../development/python-modules/fabric { }; faadelays = callPackage ../development/python-modules/faadelays { }; @@ -3490,6 +3501,8 @@ self: super: with self; { flask_elastic = callPackage ../development/python-modules/flask-elastic { }; + flask-expects-json = callPackage ../development/python-modules/flask-expects-json { }; + flask-gravatar = callPackage ../development/python-modules/flask-gravatar { }; flask-httpauth = callPackage ../development/python-modules/flask-httpauth { }; @@ -3643,7 +3656,7 @@ self: super: with self; { fortiosapi = callPackage ../development/python-modules/fortiosapi { }; - FormEncode = callPackage ../development/python-modules/FormEncode { }; + formencode = callPackage ../development/python-modules/formencode { }; formulaic = callPackage ../development/python-modules/formulaic { }; @@ -3821,7 +3834,9 @@ self: super: with self; { geoip2 = callPackage ../development/python-modules/geoip2 { }; - GeoIP = callPackage ../development/python-modules/GeoIP { }; + geoip = callPackage ../development/python-modules/geoip { + libgeoip = pkgs.geoip; + }; geojson = callPackage ../development/python-modules/geojson { }; @@ -4464,7 +4479,7 @@ self: super: with self; { html-text = callPackage ../development/python-modules/html-text { }; - HTSeq = callPackage ../development/python-modules/HTSeq { }; + htseq = callPackage ../development/python-modules/htseq { }; httmock = callPackage ../development/python-modules/httmock { }; @@ -4784,6 +4799,8 @@ self: super: with self; { ipwhl = callPackage ../development/python-modules/ipwhl { }; + ipwhois = callPackage ../development/python-modules/ipwhois { }; + ipy = callPackage ../development/python-modules/IPy { }; ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { }; @@ -4924,7 +4941,7 @@ self: super: with self; { jaxopt = callPackage ../development/python-modules/jaxopt { }; - JayDeBeApi = callPackage ../development/python-modules/JayDeBeApi { }; + jaydebeapi = callPackage ../development/python-modules/jaydebeapi { }; jc = callPackage ../development/python-modules/jc { }; @@ -4982,7 +4999,7 @@ self: super: with self; { jpylyzer = callPackage ../development/python-modules/jpylyzer { }; - JPype1 = callPackage ../development/python-modules/JPype1 { }; + jpype1 = callPackage ../development/python-modules/jpype1 { }; jq = callPackage ../development/python-modules/jq { inherit (pkgs) jq; @@ -5020,6 +5037,8 @@ self: super: with self; { json-stream = callPackage ../development/python-modules/json-stream { }; + json-stream-rs-tokenizer = callPackage ../development/python-modules/json-stream-rs-tokenizer { }; + jsonnet = buildPythonPackage { inherit (pkgs.jsonnet) name src; }; jsonpatch = callPackage ../development/python-modules/jsonpatch { }; @@ -5088,8 +5107,13 @@ self: super: with self; { jupyter-server = callPackage ../development/python-modules/jupyter-server { }; + jupyter-server-fileid = callPackage ../development/python-modules/jupyter-server-fileid { }; + jupyter-server-terminals = callPackage ../development/python-modules/jupyter-server-terminals { }; + jupyter-server-ydoc = callPackage ../development/python-modules/jupyter-server-ydoc { }; + + jupyter-ydoc = callPackage ../development/python-modules/jupyter-ydoc { }; jupyterhub = callPackage ../development/python-modules/jupyterhub { }; @@ -5153,7 +5177,7 @@ self: super: with self; { kaitaistruct = callPackage ../development/python-modules/kaitaistruct { }; - Kajiki = callPackage ../development/python-modules/kajiki { }; + kajiki = callPackage ../development/python-modules/kajiki { }; kaldi-active-grammar = callPackage ../development/python-modules/kaldi-active-grammar { }; @@ -5304,10 +5328,14 @@ self: super: with self; { lazy_import = callPackage ../development/python-modules/lazy_import { }; + lazy-loader = callPackage ../development/python-modules/lazy-loader { }; + lazy-object-proxy = callPackage ../development/python-modules/lazy-object-proxy { }; lc7001 = callPackage ../development/python-modules/lc7001 { }; + lcgit = callPackage ../development/python-modules/lcgit { }; + lcov_cobertura = callPackage ../development/python-modules/lcov_cobertura { }; ldap3 = callPackage ../development/python-modules/ldap3 { }; @@ -5544,6 +5572,8 @@ self: super: with self; { linecache2 = callPackage ../development/python-modules/linecache2 { }; + lineedit = callPackage ../development/python-modules/lineedit { }; + line_profiler = callPackage ../development/python-modules/line_profiler { }; lingua = callPackage ../development/python-modules/lingua { }; @@ -5613,7 +5643,7 @@ self: super: with self; { log-symbols = callPackage ../development/python-modules/log-symbols { }; - Logbook = callPackage ../development/python-modules/Logbook { }; + logbook = callPackage ../development/python-modules/logbook { }; logfury = callPackage ../development/python-modules/logfury { }; @@ -5727,7 +5757,7 @@ self: super: with self; { maison = callPackage ../development/python-modules/maison { }; - Mako = callPackage ../development/python-modules/Mako { }; + mako = callPackage ../development/python-modules/mako { }; malduck= callPackage ../development/python-modules/malduck { }; @@ -6003,6 +6033,8 @@ self: super: with self; { mitogen = callPackage ../development/python-modules/mitogen { }; + mixins = callPackage ../development/python-modules/mixins { }; + mixpanel = callPackage ../development/python-modules/mixpanel { }; mizani = callPackage ../development/python-modules/mizani { }; @@ -6065,6 +6097,8 @@ self: super: with self; { mock-services = callPackage ../development/python-modules/mock-services { }; + mock-ssh-server = callPackage ../development/python-modules/mock-ssh-server { }; + mockupdb = callPackage ../development/python-modules/mockupdb { }; modeled = callPackage ../development/python-modules/modeled { }; @@ -6344,6 +6378,8 @@ self: super: with self; { ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { }; + ndindex = callPackage ../development/python-modules/ndindex { }; + ndjson = callPackage ../development/python-modules/ndjson { }; ndms2-client = callPackage ../development/python-modules/ndms2-client { }; @@ -6418,6 +6454,8 @@ self: super: with self; { niaaml = callPackage ../development/python-modules/niaaml { }; + nianet = callPackage ../development/python-modules/nianet { }; + niaarm = callPackage ../development/python-modules/niaarm { }; niapy = callPackage ../development/python-modules/niapy { }; @@ -6428,7 +6466,7 @@ self: super: with self; { nidaqmx = callPackage ../development/python-modules/nidaqmx { }; - Nikola = callPackage ../development/python-modules/Nikola { }; + nikola = callPackage ../development/python-modules/nikola { }; niko-home-control = callPackage ../development/python-modules/niko-home-control { }; @@ -6556,11 +6594,9 @@ self: super: with self; { ntc-templates = callPackage ../development/python-modules/ntc-templates { }; - ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; - ntplib = callPackage ../development/python-modules/ntplib { }; - Nuitka = callPackage ../development/python-modules/nuitka { }; + nuitka = callPackage ../development/python-modules/nuitka { }; nuheat = callPackage ../development/python-modules/nuheat { }; @@ -7058,6 +7094,8 @@ self: super: with self; { pdfx = callPackage ../development/python-modules/pdfx { }; + pdm-backend = callPackage ../development/python-modules/pdm-backend { }; + pdm-pep517 = callPackage ../development/python-modules/pdm-pep517 { }; pdoc = callPackage ../development/python-modules/pdoc { }; @@ -7148,6 +7186,8 @@ self: super: with self; { openai = callPackage ../development/python-modules/openai { }; + openaiauth = callPackage ../development/python-modules/openaiauth { }; + openapi-core = callPackage ../development/python-modules/openapi-core { }; overly = callPackage ../development/python-modules/overly { }; @@ -7509,7 +7549,7 @@ self: super: with self; { plyvel = callPackage ../development/python-modules/plyvel { }; - Pmw = callPackage ../development/python-modules/Pmw { }; + pmw = callPackage ../development/python-modules/pmw { }; pocket = callPackage ../development/python-modules/pocket { }; @@ -7757,7 +7797,7 @@ self: super: with self; { pvo = callPackage ../development/python-modules/pvo { }; - Pweave = callPackage ../development/python-modules/pweave { }; + pweave = callPackage ../development/python-modules/pweave { }; pwntools = callPackage ../development/python-modules/pwntools { debugger = pkgs.gdb; @@ -7933,7 +7973,7 @@ self: super: with self; { pychm = callPackage ../development/python-modules/pychm { }; - PyChromecast = callPackage ../development/python-modules/pychromecast { }; + pychromecast = callPackage ../development/python-modules/pychromecast { }; pyclimacell = callPackage ../development/python-modules/pyclimacell { }; @@ -8200,7 +8240,7 @@ self: super: with self; { pygit2 = callPackage ../development/python-modules/pygit2 { }; - PyGithub = callPackage ../development/python-modules/pyGithub { }; + pygithub = callPackage ../development/python-modules/pygithub { }; pyglet = callPackage ../development/python-modules/pyglet { }; @@ -8409,7 +8449,7 @@ self: super: with self; { pylpsd = callPackage ../development/python-modules/pylpsd { }; - PyLTI = callPackage ../development/python-modules/pylti { }; + pylti = callPackage ../development/python-modules/pylti { }; pylutron = callPackage ../development/python-modules/pylutron { }; @@ -8523,7 +8563,7 @@ self: super: with self; { pymupdf = callPackage ../development/python-modules/pymupdf { }; - PyMVGLive = callPackage ../development/python-modules/pymvglive { }; + pymvglive = callPackage ../development/python-modules/pymvglive { }; pymyq = callPackage ../development/python-modules/pymyq { }; @@ -8652,6 +8692,8 @@ self: super: with self; { pypck = callPackage ../development/python-modules/pypck { }; + pypdf = callPackage ../development/python-modules/pypdf { }; + pypdf2 = callPackage ../development/python-modules/pypdf2 { }; pypdf3 = callPackage ../development/python-modules/pypdf3 { }; @@ -8731,6 +8773,8 @@ self: super: with self; { pyqt6 = callPackage ../development/python-modules/pyqt/6.x.nix { }; + pyqt6-charts = callPackage ../development/python-modules/pyqt6-charts.nix { }; + pyqt6-sip = callPackage ../development/python-modules/pyqt/pyqt6-sip.nix { }; pyqt6-webengine = callPackage ../development/python-modules/pyqt6-webengine.nix { }; @@ -8811,9 +8855,9 @@ self: super: with self; { pyrmvtransport = callPackage ../development/python-modules/pyrmvtransport { }; - Pyro4 = callPackage ../development/python-modules/pyro4 { }; + pyro4 = callPackage ../development/python-modules/pyro4 { }; - Pyro5 = callPackage ../development/python-modules/pyro5 { }; + pyro5 = callPackage ../development/python-modules/pyro5 { }; pyroma = callPackage ../development/python-modules/pyroma { }; @@ -8827,7 +8871,7 @@ self: super: with self; { pyrsistent = callPackage ../development/python-modules/pyrsistent { }; - PyRSS2Gen = callPackage ../development/python-modules/pyrss2gen { }; + pyrss2gen = callPackage ../development/python-modules/pyrss2gen { }; pyrtlsdr = callPackage ../development/python-modules/pyrtlsdr { }; @@ -9025,7 +9069,7 @@ self: super: with self; { inherit (pkgs) systemd; }; - PyStemmer = callPackage ../development/python-modules/pystemmer { }; + pystemmer = callPackage ../development/python-modules/pystemmer { }; pystray = callPackage ../development/python-modules/pystray { }; @@ -9210,6 +9254,8 @@ self: super: with self; { pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; + pytest-pytestrail = callPackage ../development/python-modules/pytest-pytestrail { }; + pytest-qt = callPackage ../development/python-modules/pytest-qt { }; pytest-quickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; @@ -9679,7 +9725,7 @@ self: super: with self; { version = "0.2.3"; src = old.src.override { inherit version; - sha256 = "0x8a9h4mc2r2yz49s9arsbs4bn3h25mvmg4zbgksm9hcyi9536x5"; + hash = "sha256-pZtRUvQMpqrnW5+8umsRcNhF9NJZJZ3I9yILVglMCnU="; }; }); }; @@ -9728,7 +9774,7 @@ self: super: with self; { pyvicare = callPackage ../development/python-modules/pyvicare { }; - PyVirtualDisplay = callPackage ../development/python-modules/PyVirtualDisplay { }; + pyvirtualdisplay = callPackage ../development/python-modules/pyvirtualdisplay { }; pyvis = callPackage ../development/python-modules/pyvis { }; @@ -9898,9 +9944,6 @@ self: super: with self; { quandl = callPackage ../development/python-modules/quandl { }; - # TODO: rename this - Quandl = callPackage ../development/python-modules/quandl { }; # alias for an older package which did not support Python 3 - quantities = callPackage ../development/python-modules/quantities { }; quantiphy = callPackage ../development/python-modules/quantiphy { }; @@ -9929,6 +9972,8 @@ self: super: with self; { radicale = pkgs.radicale.override { python3 = python; }; }; + radian = callPackage ../development/python-modules/radian { }; + radio_beam = callPackage ../development/python-modules/radio_beam { }; radios = callPackage ../development/python-modules/radios { }; @@ -9975,6 +10020,8 @@ self: super: with self; { rbtools = callPackage ../development/python-modules/rbtools { }; + rchitect = callPackage ../development/python-modules/rchitect { }; + rcssmin = callPackage ../development/python-modules/rcssmin { }; rdflib = callPackage ../development/python-modules/rdflib { }; @@ -10319,7 +10366,7 @@ self: super: with self; { rtoml = callPackage ../development/python-modules/rtoml { }; - Rtree = callPackage ../development/python-modules/Rtree { + rtree = callPackage ../development/python-modules/rtree { inherit (pkgs) libspatialindex; }; @@ -10385,7 +10432,9 @@ self: super: with self; { sampledata = callPackage ../development/python-modules/sampledata { }; - samplerate = callPackage ../development/python-modules/samplerate { }; + samplerate = callPackage ../development/python-modules/samplerate { + inherit (pkgs) libsamplerate; + }; samsungctl = callPackage ../development/python-modules/samsungctl { }; @@ -10453,8 +10502,14 @@ self: super: with self; { scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; + scikit-rf = callPackage ../development/python-modules/scikit-rf { }; + scikits-odes = callPackage ../development/python-modules/scikits-odes { }; + scikits-samplerate = callPackage ../development/python-modules/scikits-samplerate { + inherit (pkgs) libsamplerate; + }; + scikit-tda = callPackage ../development/python-modules/scikit-tda { }; scipy = callPackage ../development/python-modules/scipy { }; @@ -10894,6 +10949,10 @@ self: super: with self; { soupsieve = callPackage ../development/python-modules/soupsieve { }; + soxr = callPackage ../development/python-modules/soxr { + libsoxr = pkgs.soxr; + }; + spacy = callPackage ../development/python-modules/spacy { }; spacy-alignments = callPackage ../development/python-modules/spacy-alignments { }; @@ -10982,7 +11041,7 @@ self: super: with self; { sphinxcontrib-asyncio = callPackage ../development/python-modules/sphinxcontrib-asyncio { }; - sphinxcontrib-autoapi = callPackage ../development/python-modules/sphinxcontrib-autoapi { }; + sphinx-autoapi = callPackage ../development/python-modules/sphinx-autoapi { }; sphinxcontrib-bayesnet = callPackage ../development/python-modules/sphinxcontrib-bayesnet { }; @@ -11002,6 +11061,8 @@ self: super: with self; { sphinxcontrib_httpdomain = callPackage ../development/python-modules/sphinxcontrib_httpdomain { }; + sphinxcontrib-jquery = callPackage ../development/python-modules/sphinxcontrib-jquery { }; + sphinxcontrib-jsmath = callPackage ../development/python-modules/sphinxcontrib-jsmath { }; sphinxcontrib-katex = callPackage ../development/python-modules/sphinxcontrib-katex { }; @@ -11042,8 +11103,6 @@ self: super: with self; { sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { }; - sphinx-jquery = callPackage ../development/python-modules/sphinx-jquery { }; - sphinx-autobuild = callPackage ../development/python-modules/sphinx-autobuild { }; sphinx-autodoc-typehints = callPackage ../development/python-modules/sphinx-autodoc-typehints { }; @@ -11130,6 +11189,8 @@ self: super: with self; { sqltrie = callPackage ../development/python-modules/sqltrie { }; + squarify = callPackage ../development/python-modules/squarify { }; + srp = callPackage ../development/python-modules/srp { }; srpenergy = callPackage ../development/python-modules/srpenergy { }; @@ -11154,6 +11215,8 @@ self: super: with self; { ssh-mitm = callPackage ../development/python-modules/ssh-mitm { }; + sshfs = callPackage ../development/python-modules/sshfs { }; + sshpubkeys = callPackage ../development/python-modules/sshpubkeys { }; sshtunnel = callPackage ../development/python-modules/sshtunnel { }; @@ -11510,6 +11573,8 @@ self: super: with self; { testpath = callPackage ../development/python-modules/testpath { }; + testrail-api = callPackage ../development/python-modules/testrail-api { }; + testrepository = callPackage ../development/python-modules/testrepository { }; testresources = callPackage ../development/python-modules/testresources { }; @@ -11542,17 +11607,17 @@ self: super: with self; { theano-pymc = callPackage ../development/python-modules/theano-pymc { }; - Theano = callPackage ../development/python-modules/Theano rec { + theano = callPackage ../development/python-modules/theano rec { cudaSupport = pkgs.config.cudaSupport or false; cudnnSupport = cudaSupport; }; - TheanoWithCuda = self.Theano.override { + theanoWithCuda = self.theano.override { cudaSupport = true; cudnnSupport = true; }; - TheanoWithoutCuda = self.Theano.override { + theanoWithoutCuda = self.theano.override { cudaSupport = false; cudnnSupport = false; }; @@ -11689,7 +11754,7 @@ self: super: with self; { torch = callPackage ../development/python-modules/torch { cudaSupport = pkgs.config.cudaSupport or false; - inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; + inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate CoreServices; inherit (pkgs.darwin) libobjc; inherit (pkgs.llvmPackages_rocm) openmp; }; @@ -11894,6 +11959,8 @@ self: super: with self; { txgithub = callPackage ../development/python-modules/txgithub { }; + txi2p-tahoe = callPackage ../development/python-modules/txi2p-tahoe { }; + txredisapi = callPackage ../development/python-modules/txredisapi { }; txrequests = callPackage ../development/python-modules/txrequests { }; @@ -11960,6 +12027,8 @@ self: super: with self; { types-typed-ast = callPackage ../development/python-modules/types-typed-ast { }; + types-ujson = callPackage ../development/python-modules/types-ujson { }; + types-urllib3 = callPackage ../development/python-modules/types-urllib3 { }; typesentry = callPackage ../development/python-modules/typesentry { }; @@ -12505,7 +12574,7 @@ self: super: with self; { wsgitools = callPackage ../development/python-modules/wsgitools { }; - WSME = callPackage ../development/python-modules/WSME { }; + wsme = callPackage ../development/python-modules/wsme { }; wsnsimpy = callPackage ../development/python-modules/wsnsimpy { }; @@ -12593,7 +12662,7 @@ self: super: with self; { xlsx2csv = callPackage ../development/python-modules/xlsx2csv { }; - XlsxWriter = callPackage ../development/python-modules/XlsxWriter { }; + xlsxwriter = callPackage ../development/python-modules/xlsxwriter { }; xlwt = callPackage ../development/python-modules/xlwt { }; @@ -12649,6 +12718,8 @@ self: super: with self; { xyzservices = callPackage ../development/python-modules/xyzservices { }; + y-py = callPackage ../development/python-modules/y-py { }; + yabadaba = callPackage ../development/python-modules/yabadaba { }; yahooweather = callPackage ../development/python-modules/yahooweather { }; @@ -12677,7 +12748,7 @@ self: super: with self; { yappi = callPackage ../development/python-modules/yappi { }; - Yapsy = callPackage ../development/python-modules/yapsy { }; + yapsy = callPackage ../development/python-modules/yapsy { }; yara-python = callPackage ../development/python-modules/yara-python { }; @@ -12733,6 +12804,8 @@ self: super: with self; { yowsup = callPackage ../development/python-modules/yowsup { }; + ypy-websocket = callPackage ../development/python-modules/ypy-websocket { }; + yq = callPackage ../development/python-modules/yq { inherit (pkgs) jq; }; diff --git a/third_party/nixpkgs/pkgs/top-level/release-haskell.nix b/third_party/nixpkgs/pkgs/top-level/release-haskell.nix index 9a06b9c9ee..8bd38359f9 100644 --- a/third_party/nixpkgs/pkgs/top-level/release-haskell.nix +++ b/third_party/nixpkgs/pkgs/top-level/release-haskell.nix @@ -9,7 +9,7 @@ $ hydra-eval-jobs -I . pkgs/top-level/release-haskell.nix */ -{ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] }: +{ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ] }: let @@ -303,6 +303,7 @@ let # musl only supports linux, not darwin. "x86_64-darwin" + "aarch64-darwin" ] { inherit (packagePlatforms pkgs.pkgsMusl.haskellPackages) @@ -319,7 +320,10 @@ let removePlatforms [ "aarch64-linux" # times out on Hydra - "x86_64-darwin" # TODO: reenable when static libiconv works on darwin + + # Static doesn't work on darwin + "x86_64-darwin" + "aarch64-darwin" ] { haskellPackages = { inherit (packagePlatforms pkgs.pkgsStatic.haskellPackages) @@ -333,8 +337,8 @@ let ; }; - haskell.packages.native-bignum.ghc926 = { - inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc926) + haskell.packages.native-bignum.ghc927 = { + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc927) hello lens random @@ -346,22 +350,26 @@ let }; }; - # TODO(@sternenseemann): when GHC 9.6 comes out we need separate jobs for - # default GHC and ghcHEAD. - pkgsCross.ghcjs.haskellPackages = + pkgsCross.ghcjs = removePlatforms [ - # Still unexplained build failure: https://github.com/NixOS/nixpkgs/issues/217127 - "x86_64-darwin" - # Hydra output size of 3GB is exceeded "aarch64-linux" ] { - inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskellPackages) - ghc - hello - ; + haskellPackages = { + inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskellPackages) + ghc + hello + ; + }; + + haskell.packages.ghcHEAD = { + inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskell.packages.ghcHEAD) + ghc + hello + ; + }; }; }) (versionedCompilerJobs { @@ -507,7 +515,7 @@ let }; constituents = accumulateDerivations [ jobs.pkgsStatic.haskellPackages - jobs.pkgsStatic.haskell.packages.native-bignum.ghc926 + jobs.pkgsStatic.haskell.packages.native-bignum.ghc927 ]; }; } diff --git a/third_party/nixpkgs/pkgs/top-level/release.nix b/third_party/nixpkgs/pkgs/top-level/release.nix index 374a308ac1..e14e1bee7e 100644 --- a/third_party/nixpkgs/pkgs/top-level/release.nix +++ b/third_party/nixpkgs/pkgs/top-level/release.nix @@ -11,7 +11,7 @@ { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; revision = "0000000000000000000000000000000000000000"; } , officialRelease ? false # The platforms for which we build Nixpkgs. -, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] +, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ] , limitedSupportedSystems ? [ "i686-linux" ] # Strip most of attributes when evaluating to spare memory usage , scrubJobs ? true @@ -82,7 +82,7 @@ let jobs.tests.cc-wrapper-libcxx.x86_64-darwin jobs.tests.stdenv-inputs.x86_64-darwin jobs.tests.macOSSierraShared.x86_64-darwin - jobs.tests.patch-shebangs.x86_64-darwin + jobs.tests.stdenv.hooks.patch-shebangs.x86_64-darwin */ ]; } else null; @@ -127,7 +127,7 @@ let jobs.tests.cc-multilib-gcc.x86_64-linux jobs.tests.cc-multilib-clang.x86_64-linux jobs.tests.stdenv-inputs.x86_64-linux - jobs.tests.patch-shebangs.x86_64-linux + jobs.tests.stdenv.hooks.patch-shebangs.x86_64-linux */ ] # FIXME: reintroduce aarch64-darwin after this builds again @@ -158,50 +158,39 @@ let jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin jobs.tests.stdenv-inputs.x86_64-darwin jobs.tests.macOSSierraShared.x86_64-darwin - jobs.tests.patch-shebangs.x86_64-darwin + jobs.tests.stdenv.hooks.patch-shebangs.x86_64-darwin */ ]; }; stdenvBootstrapTools = with lib; - genAttrs systemsWithAnySupport - (system: { - inherit - (import ../stdenv/linux/make-bootstrap-tools.nix { + genAttrs systemsWithAnySupport (system: + if hasSuffix "-linux" system then + let + bootstrap = import ../stdenv/linux/make-bootstrap-tools.nix { pkgs = import ../.. { localSystem = { inherit system; }; }; - }) - dist test; - }) - # darwin is special in this - // optionalAttrs supportDarwin.x86_64 { - x86_64-darwin = + }; + in { + inherit (bootstrap) dist test; + } + else if hasSuffix "-darwin" system then let bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { - localSystem = { system = "x86_64-darwin"; }; + localSystem = { inherit system; }; }; in { # Lightweight distribution and test inherit (bootstrap) dist test; # Test a full stdenv bootstrap from the bootstrap tools definition - inherit (bootstrap.test-pkgs) stdenv; - }; - } // optionalAttrs supportDarwin.aarch64 { - # Cross compiled bootstrap tools - aarch64-darwin = - let - bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { - localSystem = { system = "x86_64-darwin"; }; - crossSystem = { system = "aarch64-darwin"; }; - }; - in { - # Distribution only for now - inherit (bootstrap) dist; - }; - }; - - }; + # TODO: Re-enable once the new bootstrap-tools are in place. + #inherit (bootstrap.test-pkgs) stdenv; + } + else + abort "No bootstrap implementation for system: ${system}" + ); + }; # Do not allow attribute collision between jobs inserted in # 'nonPackageAttrs' and jobs pulled in from 'pkgs'. diff --git a/third_party/nixpkgs/pkgs/top-level/stage.nix b/third_party/nixpkgs/pkgs/top-level/stage.nix index 2b503bce7c..b796b26307 100644 --- a/third_party/nixpkgs/pkgs/top-level/stage.nix +++ b/third_party/nixpkgs/pkgs/top-level/stage.nix @@ -103,7 +103,7 @@ let trivialBuilders = self: super: import ../build-support/trivial-builders.nix { inherit lib; - inherit (self) runtimeShell stdenv stdenvNoCC; + inherit (self) runtimeShell stdenv stdenvNoCC haskell; inherit (self.pkgsBuildHost) shellcheck; inherit (self.pkgsBuildHost.xorg) lndir; };